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

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-13 12:09:58 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-13 12:09:58 +0300
commitda12067d6bb2603f40d2de107df70e2ff03630e8 (patch)
tree7d5fcdce8e53a4f491d9a6a81826ffef3589cf83 /config
parente9626c2383e1bbf325a302bb840891c3c7b8cb07 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r--config/feature_flags/development/between_uses_list_commits.yml8
-rw-r--r--config/metrics/counts_28d/20210201124930_deployments.yml2
-rw-r--r--config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216175055_merge_requests.yml2
-rw-r--r--config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml2
-rw-r--r--config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml2
-rw-r--r--config/metrics/counts_28d/20210216175101_merge_requests_users.yml2
-rw-r--r--config/metrics/counts_28d/20210216175109_suggestions.yml2
-rw-r--r--config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml2
-rw-r--r--config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml2
-rw-r--r--config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml2
-rw-r--r--config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml2
-rw-r--r--config/metrics/counts_28d/20210216175413_clusters_management_project.yml2
-rw-r--r--config/metrics/counts_28d/20210216175415_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_28d/20210216175417_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml2
-rw-r--r--config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml2
-rw-r--r--config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml2
-rw-r--r--config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_28d/20210216175542_ci_builds.yml2
-rw-r--r--config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml2
-rw-r--r--config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml2
-rw-r--r--config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml2
-rw-r--r--config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml2
-rw-r--r--config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml2
-rw-r--r--config/metrics/counts_28d/20210216175554_ci_pipelines.yml2
-rw-r--r--config/metrics/counts_28d/20210216175556_ci_triggers.yml2
-rw-r--r--config/metrics/counts_28d/20210216175616_user_dast_jobs.yml2
-rw-r--r--config/metrics/counts_28d/20210216175618_dast_pipeline.yml2
-rw-r--r--config/metrics/counts_28d/20210216180308_personal_snippets.yml2
-rw-r--r--config/metrics/counts_28d/20210216180310_project_snippets.yml2
-rw-r--r--config/metrics/counts_28d/20210216180312_snippets.yml2
-rw-r--r--config/metrics/counts_28d/20210216180317_snippets.yml2
-rw-r--r--config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml2
-rw-r--r--config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml2
-rw-r--r--config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml2
-rw-r--r--config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml2
-rw-r--r--config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml2
-rw-r--r--config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml2
-rw-r--r--config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml2
-rw-r--r--config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml2
-rw-r--r--config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml2
-rw-r--r--config/metrics/counts_28d/20210216180524_projects_with_incidents.yml2
-rw-r--r--config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml2
-rw-r--r--config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml2
-rw-r--r--config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml2
-rw-r--r--config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml2
-rw-r--r--config/metrics/counts_28d/20210216180814_events.yml2
-rw-r--r--config/metrics/counts_28d/20210216180816_groups.yml2
-rw-r--r--config/metrics/counts_28d/20210216180818_users_created.yml2
-rw-r--r--config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml2
-rw-r--r--config/metrics/counts_28d/20210216180956_clusters.yml2
-rw-r--r--config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml2
-rw-r--r--config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml2
-rw-r--r--config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml2
-rw-r--r--config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml2
-rw-r--r--config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml2
-rw-r--r--config/metrics/counts_28d/20210216181050_packages.yml2
-rw-r--r--config/metrics/counts_28d/20210216181057_projects_with_packages.yml2
-rw-r--r--config/metrics/counts_28d/20210216181139_issues.yml2
-rw-r--r--config/metrics/counts_28d/20210216181141_notes.yml2
-rw-r--r--config/metrics/counts_28d/20210216181143_projects.yml2
-rw-r--r--config/metrics/counts_28d/20210216181145_todos.yml2
-rw-r--r--config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml2
-rw-r--r--config/metrics/counts_28d/20210216181148_service_desk_issues.yml2
-rw-r--r--config/metrics/counts_28d/20210216181150_projects_jira_active.yml2
-rw-r--r--config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml2
-rw-r--r--config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml2
-rw-r--r--config/metrics/counts_28d/20210216181158_epics.yml2
-rw-r--r--config/metrics/counts_28d/20210216181200_label_lists.yml2
-rw-r--r--config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216181923_successful_deployments.yml2
-rw-r--r--config/metrics/counts_28d/20210216181924_failed_deployments.yml2
-rw-r--r--config/metrics/counts_28d/20210216181935_deployments.yml2
-rw-r--r--config/metrics/counts_28d/20210216181937_failed_deployments.yml2
-rw-r--r--config/metrics/counts_28d/20210216181939_releases.yml2
-rw-r--r--config/metrics/counts_28d/20210216181941_successful_deployments.yml2
-rw-r--r--config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml2
-rw-r--r--config/metrics/counts_28d/20210216181956_user_unique_users_all_secure_scanners.yml2
-rw-r--r--config/metrics/counts_28d/20210216182034_deploy_keys.yml2
-rw-r--r--config/metrics/counts_28d/20210216182036_keys.yml2
-rw-r--r--config/metrics/counts_28d/20210216182038_remote_mirrors.yml2
-rw-r--r--config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml2
-rw-r--r--config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml2
-rw-r--r--config/metrics/counts_28d/20210216182051_protected_branches.yml2
-rw-r--r--config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216182106_design_action_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216182109_project_action_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216182125_user_sast_jobs.yml2
-rw-r--r--config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.yml2
-rw-r--r--config/metrics/counts_28d/20210216182129_sast_pipeline.yml2
-rw-r--r--config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml2
-rw-r--r--config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml2
-rw-r--r--config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml2
-rw-r--r--config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml2
-rw-r--r--config/metrics/counts_28d/20210216183627_omniauth_providers.yml2
-rw-r--r--config/metrics/counts_28d/20210216183629_two-factor.yml2
-rw-r--r--config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml2
-rw-r--r--config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml2
-rw-r--r--config/metrics/counts_28d/20210216183634_standard.yml2
-rw-r--r--config/metrics/counts_28d/20210216183636_google_oauth2.yml2
-rw-r--r--config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml2
-rw-r--r--config/metrics/counts_28d/20210216183640_gitlab.yml2
-rw-r--r--config/metrics/counts_28d/20210216183642_gitlab_v1.yml2
-rw-r--r--config/metrics/counts_28d/20210216183644_gitlab_project.yml2
-rw-r--r--config/metrics/counts_28d/20210216183646_gitlab.yml2
-rw-r--r--config/metrics/counts_28d/20210216183648_github.yml2
-rw-r--r--config/metrics/counts_28d/20210216183650_bitbucket.yml2
-rw-r--r--config/metrics/counts_28d/20210216183652_bitbucket_server.yml2
-rw-r--r--config/metrics/counts_28d/20210216183653_gitea.yml2
-rw-r--r--config/metrics/counts_28d/20210216183655_git.yml2
-rw-r--r--config/metrics/counts_28d/20210216183657_manifest.yml2
-rw-r--r--config/metrics/counts_28d/20210216183659_gitlab_migration.yml2
-rw-r--r--config/metrics/counts_28d/20210216183701_jira.yml2
-rw-r--r--config/metrics/counts_28d/20210216183703_fogbugz.yml2
-rw-r--r--config/metrics/counts_28d/20210216183705_phabricator.yml2
-rw-r--r--config/metrics/counts_28d/20210216183707_csv.yml2
-rw-r--r--config/metrics/counts_28d/20210216183709_group_import.yml2
-rw-r--r--config/metrics/counts_28d/20210216183711_gitlab_migration.yml2
-rw-r--r--config/metrics/counts_28d/20210216183712_total.yml2
-rw-r--r--config/metrics/counts_28d/20210216183714_gitlab_project.yml2
-rw-r--r--config/metrics/counts_28d/20210216183716_gitlab.yml2
-rw-r--r--config/metrics/counts_28d/20210216183718_github.yml2
-rw-r--r--config/metrics/counts_28d/20210216183720_bitbucket.yml2
-rw-r--r--config/metrics/counts_28d/20210216183722_bitbucket_server.yml2
-rw-r--r--config/metrics/counts_28d/20210216183724_gitea.yml2
-rw-r--r--config/metrics/counts_28d/20210216183726_git.yml2
-rw-r--r--config/metrics/counts_28d/20210216183728_manifest.yml2
-rw-r--r--config/metrics/counts_28d/20210216183730_jira.yml2
-rw-r--r--config/metrics/counts_28d/20210216183731_fogbugz.yml2
-rw-r--r--config/metrics/counts_28d/20210216183733_phabricator.yml2
-rw-r--r--config/metrics/counts_28d/20210216183735_csv.yml2
-rw-r--r--config/metrics/counts_28d/20210216183737_groups_imported.yml2
-rw-r--r--config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml2
-rw-r--r--config/metrics/counts_28d/20210216183826_sast_scans.yml2
-rw-r--r--config/metrics/counts_28d/20210216183830_container_scanning_scans.yml2
-rw-r--r--config/metrics/counts_28d/20210216183832_dast_scans.yml2
-rw-r--r--config/metrics/counts_28d/20210216183834_secret_detection_scans.yml2
-rw-r--r--config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml2
-rw-r--r--config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml2
-rw-r--r--config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml2
-rw-r--r--config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml2
-rw-r--r--config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml2
-rw-r--r--config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210427213346_geo_secondary_web_oauth_users.yml2
-rw-r--r--config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml2
-rw-r--r--config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210520111133_total.yml2
-rw-r--r--config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210720144005_i_code_review_user_searches_diff_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml2
-rw-r--r--config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml2
-rw-r--r--config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml2
-rw-r--r--config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216182104_design_action_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216182107_project_action_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml2
-rw-r--r--config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml2
-rw-r--r--config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml2
-rw-r--r--config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml2
-rw-r--r--config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml2
-rw-r--r--config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml2
-rw-r--r--config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml2
-rw-r--r--config/metrics/counts_all/20210201124934_deployments.yml2
-rw-r--r--config/metrics/counts_all/20210204124930_servers.yml2
-rw-r--r--config/metrics/counts_all/20210204124932_clusters.yml2
-rw-r--r--config/metrics/counts_all/20210216174832_cycle_analytics_views.yml2
-rw-r--r--config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml2
-rw-r--r--config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml2
-rw-r--r--config/metrics/counts_all/20210216174856_p_analytics_repo.yml2
-rw-r--r--config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml2
-rw-r--r--config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml2
-rw-r--r--config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml2
-rw-r--r--config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml2
-rw-r--r--config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml2
-rw-r--r--config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml2
-rw-r--r--config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml2
-rw-r--r--config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml2
-rw-r--r--config/metrics/counts_all/20210216175026_service_desk_issues.yml2
-rw-r--r--config/metrics/counts_all/20210216175037_suggestions.yml2
-rw-r--r--config/metrics/counts_all/20210216175039_merge_requests.yml2
-rw-r--r--config/metrics/counts_all/20210216175041_merge_request_comment.yml2
-rw-r--r--config/metrics/counts_all/20210216175043_merge_request_create.yml2
-rw-r--r--config/metrics/counts_all/20210216175045_merge_requests.yml2
-rw-r--r--config/metrics/counts_all/20210216175053_suggestions.yml2
-rw-r--r--config/metrics/counts_all/20210216175206_merged_merge_requests_using_approval_rules.yml2
-rw-r--r--config/metrics/counts_all/20210216175229_auto_devops_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175231_auto_devops_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175232_clusters.yml2
-rw-r--r--config/metrics/counts_all/20210216175234_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175236_project_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175238_group_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175242_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175244_project_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175246_group_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml2
-rw-r--r--config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml2
-rw-r--r--config/metrics/counts_all/20210216175253_clusters_platforms_user.yml2
-rw-r--r--config/metrics/counts_all/20210216175255_clusters_applications_helm.yml2
-rw-r--r--config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml2
-rw-r--r--config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml2
-rw-r--r--config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml2
-rw-r--r--config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml2
-rw-r--r--config/metrics/counts_all/20210216175305_clusters_applications_runner.yml2
-rw-r--r--config/metrics/counts_all/20210216175307_clusters_applications_knative.yml2
-rw-r--r--config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml2
-rw-r--r--config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml2
-rw-r--r--config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml2
-rw-r--r--config/metrics/counts_all/20210216175314_clusters_management_project.yml2
-rw-r--r--config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml2
-rw-r--r--config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml2
-rw-r--r--config/metrics/counts_all/20210216175324_terraform_reports.yml2
-rw-r--r--config/metrics/counts_all/20210216175326_terraform_states.yml2
-rw-r--r--config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml2
-rw-r--r--config/metrics/counts_all/20210216175331_clusters_applications_helm.yml2
-rw-r--r--config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml2
-rw-r--r--config/metrics/counts_all/20210216175335_clusters_applications_knative.yml2
-rw-r--r--config/metrics/counts_all/20210216175337_clusters_management_project.yml2
-rw-r--r--config/metrics/counts_all/20210216175339_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175341_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml2
-rw-r--r--config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml2
-rw-r--r--config/metrics/counts_all/20210216175346_clusters_platforms_user.yml2
-rw-r--r--config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175352_group_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175354_group_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175356_project_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175358_project_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml2
-rw-r--r--config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml2
-rw-r--r--config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml2
-rw-r--r--config/metrics/counts_all/20210216175446_network_policy_forwards.yml2
-rw-r--r--config/metrics/counts_all/20210216175448_network_policy_drops.yml2
-rw-r--r--config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml2
-rw-r--r--config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml2
-rw-r--r--config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml2
-rw-r--r--config/metrics/counts_all/20210216175510_ci_builds.yml2
-rw-r--r--config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml2
-rw-r--r--config/metrics/counts_all/20210216175514_ci_external_pipelines.yml2
-rw-r--r--config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml2
-rw-r--r--config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml2
-rw-r--r--config/metrics/counts_all/20210216175520_ci_runners.yml2
-rw-r--r--config/metrics/counts_all/20210216175521_ci_triggers.yml2
-rw-r--r--config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml2
-rw-r--r--config/metrics/counts_all/20210216175525_ci_builds.yml2
-rw-r--r--config/metrics/counts_all/20210216175527_ci_external_pipelines.yml2
-rw-r--r--config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml2
-rw-r--r--config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml2
-rw-r--r--config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml2
-rw-r--r--config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml2
-rw-r--r--config/metrics/counts_all/20210216175537_ci_pipelines.yml2
-rw-r--r--config/metrics/counts_all/20210216175539_ci_triggers.yml2
-rw-r--r--config/metrics/counts_all/20210216175612_dast_jobs.yml2
-rw-r--r--config/metrics/counts_all/20210216175614_user_dast_jobs.yml2
-rw-r--r--config/metrics/counts_all/20210216175621_web_hooks.yml2
-rw-r--r--config/metrics/counts_all/20210216175623_projects_asana_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175625_groups_asana_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175627_templates_asana_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175628_instances_asana_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175634_projects_assembla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175636_groups_assembla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175638_templates_assembla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175640_instances_assembla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175645_projects_bamboo_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175647_groups_bamboo_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175649_templates_bamboo_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175651_instances_bamboo_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175708_projects_buildkite_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175710_groups_buildkite_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175712_templates_buildkite_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175714_instances_buildkite_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175719_projects_campfire_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175721_groups_campfire_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175723_templates_campfire_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175725_instances_campfire_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175731_projects_confluence_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175733_groups_confluence_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175734_templates_confluence_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175736_instances_confluence_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175753_projects_discord_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175755_groups_discord_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175756_templates_discord_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175758_instances_discord_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175837_projects_flowdock_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175839_groups_flowdock_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175840_templates_flowdock_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175842_instances_flowdock_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175910_projects_hipchat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175912_groups_hipchat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175913_templates_hipchat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175915_instances_hipchat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175921_projects_irker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175923_groups_irker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175924_templates_irker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175926_instances_irker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175932_projects_jenkins_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175934_groups_jenkins_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175935_templates_jenkins_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175937_instances_jenkins_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175943_projects_jira_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175945_groups_jira_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175946_templates_jira_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175948_instances_jira_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175954_projects_mattermost_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175956_groups_mattermost_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175957_templates_mattermost_active.yml2
-rw-r--r--config/metrics/counts_all/20210216175959_instances_mattermost_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180027_projects_packagist_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180029_groups_packagist_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180030_templates_packagist_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180032_instances_packagist_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180100_projects_pushover_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180102_groups_pushover_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180104_templates_pushover_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180105_instances_pushover_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180111_projects_redmine_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180113_groups_redmine_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180115_templates_redmine_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180116_instances_redmine_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180122_projects_slack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180124_groups_slack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180126_templates_slack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180127_instances_slack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180144_projects_teamcity_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180146_groups_teamcity_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180148_templates_teamcity_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180149_instances_teamcity_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180217_projects_youtrack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180219_groups_youtrack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180221_templates_youtrack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180223_instances_youtrack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180228_projects_jira_server_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180239_personal_snippets.yml2
-rw-r--r--config/metrics/counts_all/20210216180241_project_snippets.yml2
-rw-r--r--config/metrics/counts_all/20210216180242_web_ide_commits.yml2
-rw-r--r--config/metrics/counts_all/20210216180244_web_ide_views.yml2
-rw-r--r--config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml2
-rw-r--r--config/metrics/counts_all/20210216180248_web_ide_previews.yml2
-rw-r--r--config/metrics/counts_all/20210216180250_web_ide_terminals.yml2
-rw-r--r--config/metrics/counts_all/20210216180252_web_ide_pipelines.yml2
-rw-r--r--config/metrics/counts_all/20210216180253_snippet_comment.yml2
-rw-r--r--config/metrics/counts_all/20210216180255_snippet_create.yml2
-rw-r--r--config/metrics/counts_all/20210216180257_snippet_update.yml2
-rw-r--r--config/metrics/counts_all/20210216180259_static_site_editor_views.yml2
-rw-r--r--config/metrics/counts_all/20210216180301_static_site_editor_commits.yml2
-rw-r--r--config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml2
-rw-r--r--config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216180306_snippets.yml2
-rw-r--r--config/metrics/counts_all/20210216180316_snippets.yml2
-rw-r--r--config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml2
-rw-r--r--config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml2
-rw-r--r--config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml2
-rw-r--r--config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml2
-rw-r--r--config/metrics/counts_all/20210216180410_pool_repositories.yml2
-rw-r--r--config/metrics/counts_all/20210216180413_all_searches.yml2
-rw-r--r--config/metrics/counts_all/20210216180414_navbar_searches.yml2
-rw-r--r--config/metrics/counts_all/20210216180416_i_search_total.yml2
-rw-r--r--config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml2
-rw-r--r--config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml2
-rw-r--r--config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml2
-rw-r--r--config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml2
-rw-r--r--config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml2
-rw-r--r--config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml2
-rw-r--r--config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml2
-rw-r--r--config/metrics/counts_all/20210216180447_incident_issues.yml2
-rw-r--r--config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml2
-rw-r--r--config/metrics/counts_all/20210216180451_incident_labeled_issues.yml2
-rw-r--r--config/metrics/counts_all/20210216180453_projects_creating_incidents.yml2
-rw-r--r--config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml2
-rw-r--r--config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml2
-rw-r--r--config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216180518_projects_with_incidents.yml2
-rw-r--r--config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml2
-rw-r--r--config/metrics/counts_all/20210216180628_projects_imported_from_github.yml2
-rw-r--r--config/metrics/counts_all/20210216180630_projects_imported_from_github.yml2
-rw-r--r--config/metrics/counts_all/20210216180632_unique_users_all_imports.yml2
-rw-r--r--config/metrics/counts_all/20210216180634_gitlab.yml2
-rw-r--r--config/metrics/counts_all/20210216180636_gitlab_v1.yml2
-rw-r--r--config/metrics/counts_all/20210216180638_gitlab_project.yml2
-rw-r--r--config/metrics/counts_all/20210216180639_gitlab.yml2
-rw-r--r--config/metrics/counts_all/20210216180641_github.yml2
-rw-r--r--config/metrics/counts_all/20210216180643_bitbucket.yml2
-rw-r--r--config/metrics/counts_all/20210216180645_bitbucket_server.yml2
-rw-r--r--config/metrics/counts_all/20210216180647_gitea.yml2
-rw-r--r--config/metrics/counts_all/20210216180649_git.yml2
-rw-r--r--config/metrics/counts_all/20210216180650_manifest.yml2
-rw-r--r--config/metrics/counts_all/20210216180652_gitlab_migration.yml2
-rw-r--r--config/metrics/counts_all/20210216180654_jira.yml2
-rw-r--r--config/metrics/counts_all/20210216180656_fogbugz.yml2
-rw-r--r--config/metrics/counts_all/20210216180658_phabricator.yml2
-rw-r--r--config/metrics/counts_all/20210216180700_csv.yml2
-rw-r--r--config/metrics/counts_all/20210216180702_group_import.yml2
-rw-r--r--config/metrics/counts_all/20210216180703_gitlab_migration.yml2
-rw-r--r--config/metrics/counts_all/20210216180705_total.yml2
-rw-r--r--config/metrics/counts_all/20210216180707_gitlab_project.yml2
-rw-r--r--config/metrics/counts_all/20210216180709_gitlab.yml2
-rw-r--r--config/metrics/counts_all/20210216180711_github.yml2
-rw-r--r--config/metrics/counts_all/20210216180713_bitbucket.yml2
-rw-r--r--config/metrics/counts_all/20210216180715_bitbucket_server.yml2
-rw-r--r--config/metrics/counts_all/20210216180716_gitea.yml2
-rw-r--r--config/metrics/counts_all/20210216180718_git.yml2
-rw-r--r--config/metrics/counts_all/20210216180720_manifest.yml2
-rw-r--r--config/metrics/counts_all/20210216180722_jira.yml2
-rw-r--r--config/metrics/counts_all/20210216180724_fogbugz.yml2
-rw-r--r--config/metrics/counts_all/20210216180726_phabricator.yml2
-rw-r--r--config/metrics/counts_all/20210216180727_csv.yml2
-rw-r--r--config/metrics/counts_all/20210216180729_groups_imported.yml2
-rw-r--r--config/metrics/counts_all/20210216180734_wiki_pages_create.yml2
-rw-r--r--config/metrics/counts_all/20210216180736_wiki_pages_update.yml2
-rw-r--r--config/metrics/counts_all/20210216180738_wiki_pages_delete.yml2
-rw-r--r--config/metrics/counts_all/20210216180740_design_management_designs_create.yml2
-rw-r--r--config/metrics/counts_all/20210216180741_design_management_designs_update.yml2
-rw-r--r--config/metrics/counts_all/20210216180743_design_management_designs_delete.yml2
-rw-r--r--config/metrics/counts_all/20210216180750_groups.yml2
-rw-r--r--config/metrics/counts_all/20210216180752_keys.yml2
-rw-r--r--config/metrics/counts_all/20210216180754_events.yml2
-rw-r--r--config/metrics/counts_all/20210216180756_groups.yml2
-rw-r--r--config/metrics/counts_all/20210216180758_users_created.yml2
-rw-r--r--config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml2
-rw-r--r--config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216180931_projects_prometheus_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180933_groups_prometheus_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180934_templates_prometheus_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180936_instances_prometheus_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml2
-rw-r--r--config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml2
-rw-r--r--config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml2
-rw-r--r--config/metrics/counts_all/20210216180945_clusters.yml2
-rw-r--r--config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml2
-rw-r--r--config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml2
-rw-r--r--config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml2
-rw-r--r--config/metrics/counts_all/20210216181009_lfs_objects.yml2
-rw-r--r--config/metrics/counts_all/20210216181011_projects_with_packages.yml2
-rw-r--r--config/metrics/counts_all/20210216181012_packages.yml2
-rw-r--r--config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml2
-rw-r--r--config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml2
-rw-r--r--config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml2
-rw-r--r--config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml2
-rw-r--r--config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml2
-rw-r--r--config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml2
-rw-r--r--config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml2
-rw-r--r--config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml2
-rw-r--r--config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml2
-rw-r--r--config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml2
-rw-r--r--config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml2
-rw-r--r--config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml2
-rw-r--r--config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml2
-rw-r--r--config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml2
-rw-r--r--config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml2
-rw-r--r--config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml2
-rw-r--r--config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml2
-rw-r--r--config/metrics/counts_all/20210216181051_vendor.yml2
-rw-r--r--config/metrics/counts_all/20210216181055_projects_with_packages.yml2
-rw-r--r--config/metrics/counts_all/20210216181102_issues.yml2
-rw-r--r--config/metrics/counts_all/20210216181104_label_lists.yml2
-rw-r--r--config/metrics/counts_all/20210216181108_milestones.yml2
-rw-r--r--config/metrics/counts_all/20210216181109_uploads.yml2
-rw-r--r--config/metrics/counts_all/20210216181111_labels.yml2
-rw-r--r--config/metrics/counts_all/20210216181113_notes.yml2
-rw-r--r--config/metrics/counts_all/20210216181115_issues.yml2
-rw-r--r--config/metrics/counts_all/20210216181117_notes.yml2
-rw-r--r--config/metrics/counts_all/20210216181119_projects.yml2
-rw-r--r--config/metrics/counts_all/20210216181121_todos.yml2
-rw-r--r--config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml2
-rw-r--r--config/metrics/counts_all/20210216181124_service_desk_issues.yml2
-rw-r--r--config/metrics/counts_all/20210216181126_projects_jira_active.yml2
-rw-r--r--config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml2
-rw-r--r--config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml2
-rw-r--r--config/metrics/counts_all/20210216181134_epics.yml2
-rw-r--r--config/metrics/counts_all/20210216181135_label_lists.yml2
-rw-r--r--config/metrics/counts_all/20210216181249_feature_flags.yml2
-rw-r--r--config/metrics/counts_all/20210216181252_boards.yml2
-rw-r--r--config/metrics/counts_all/20210216181254_projects.yml2
-rw-r--r--config/metrics/counts_all/20210216181256_todos.yml2
-rw-r--r--config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml2
-rw-r--r--config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml2
-rw-r--r--config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml2
-rw-r--r--config/metrics/counts_all/20210216181908_deploy_keys.yml2
-rw-r--r--config/metrics/counts_all/20210216181911_successful_deployments.yml2
-rw-r--r--config/metrics/counts_all/20210216181912_failed_deployments.yml2
-rw-r--r--config/metrics/counts_all/20210216181914_environments.yml2
-rw-r--r--config/metrics/counts_all/20210216181916_in_review_folder.yml2
-rw-r--r--config/metrics/counts_all/20210216181918_releases.yml2
-rw-r--r--config/metrics/counts_all/20210216181926_deployments.yml2
-rw-r--r--config/metrics/counts_all/20210216181928_failed_deployments.yml2
-rw-r--r--config/metrics/counts_all/20210216181930_releases.yml2
-rw-r--r--config/metrics/counts_all/20210216181932_successful_deployments.yml2
-rw-r--r--config/metrics/counts_all/20210216181946_pages_domains.yml2
-rw-r--r--config/metrics/counts_all/20210216181949_clusters_applications_runner.yml2
-rw-r--r--config/metrics/counts_all/20210216181954_user_unique_users_all_secure_scanners.yml2
-rw-r--r--config/metrics/counts_all/20210216182002_remote_mirrors.yml2
-rw-r--r--config/metrics/counts_all/20210216182004_commit_comment.yml2
-rw-r--r--config/metrics/counts_all/20210216182006_source_code_pushes.yml2
-rw-r--r--config/metrics/counts_all/20210216182010_deploy_keys.yml2
-rw-r--r--config/metrics/counts_all/20210216182012_keys.yml2
-rw-r--r--config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml2
-rw-r--r--config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml2
-rw-r--r--config/metrics/counts_all/20210216182017_remote_mirrors.yml2
-rw-r--r--config/metrics/counts_all/20210216182112_sast_jobs.yml2
-rw-r--r--config/metrics/counts_all/20210216182114_secret_detection_jobs.yml2
-rw-r--r--config/metrics/counts_all/20210216182116_user_sast_jobs.yml2
-rw-r--r--config/metrics/counts_all/20210216182118_user_secret_detection_jobs.yml2
-rw-r--r--config/metrics/counts_all/20210216182454_protected_branches_except_default.yml2
-rw-r--r--config/metrics/counts_all/20210216182547_projects_datadog_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182549_groups_datadog_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182551_templates_datadog_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182553_instances_datadog_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182614_projects_ewm_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182616_groups_ewm_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182618_templates_ewm_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182620_instances_ewm_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml2
-rw-r--r--config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml2
-rw-r--r--config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml2
-rw-r--r--config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml2
-rw-r--r--config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml2
-rw-r--r--config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml2
-rw-r--r--config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml2
-rw-r--r--config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml2
-rw-r--r--config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml2
-rw-r--r--config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml2
-rw-r--r--config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210216183023_wiki_pages_view.yml2
-rw-r--r--config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml2
-rw-r--r--config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml2
-rw-r--r--config/metrics/counts_all/20210216183400_omniauth_providers.yml2
-rw-r--r--config/metrics/counts_all/20210216183402_two-factor.yml2
-rw-r--r--config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml2
-rw-r--r--config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml2
-rw-r--r--config/metrics/counts_all/20210216183408_standard.yml2
-rw-r--r--config/metrics/counts_all/20210216183410_google_oauth2.yml2
-rw-r--r--config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml2
-rw-r--r--config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml2
-rw-r--r--config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml2
-rw-r--r--config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210423005644_i_analytics_dev_ops_adoption.yml2
-rw-r--r--config/metrics/counts_all/20210427212450_geo_secondary_web_oauth_users.yml2
-rw-r--r--config/metrics/counts_all/20210428142406_users_viewing_analytics_group_devops_adoption.yml2
-rw-r--r--config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml2
-rw-r--r--config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml2
-rw-r--r--config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml2
-rw-r--r--config/metrics/counts_all/20210502050942_ci_runners_online.yml2
-rw-r--r--config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml2
-rw-r--r--config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml2
-rw-r--r--config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml2
-rw-r--r--config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml2
-rw-r--r--config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210514141520_project_imports_total.yml2
-rw-r--r--config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml2
-rw-r--r--config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml2
-rw-r--r--config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml2
-rw-r--r--config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml2
-rw-r--r--config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml2
-rw-r--r--config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml2
-rw-r--r--config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml2
-rw-r--r--config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml2
-rw-r--r--config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml2
-rw-r--r--config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml2
-rw-r--r--config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml2
-rw-r--r--config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml2
-rw-r--r--config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml2
-rw-r--r--config/metrics/counts_all/20210723075525_diff_searches.yml2
-rw-r--r--config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml2
-rw-r--r--config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml2
-rw-r--r--config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml2
-rw-r--r--config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml2
-rw-r--r--config/metrics/license/20210201124932_recorded_at.yml2
-rw-r--r--config/metrics/license/20210201124933_uuid.yml2
-rw-r--r--config/metrics/license/20210204124827_hostname.yml2
-rw-r--r--config/metrics/license/20210204124829_active_user_count.yml2
-rw-r--r--config/metrics/license/20210204124928_version.yml2
-rw-r--r--config/metrics/license/20210204124936_pages_version.yml2
-rw-r--r--config/metrics/license/20210204124938_recording_ce_finished_at.yml2
-rw-r--r--config/metrics/license/20210216175601_version.yml2
-rw-r--r--config/metrics/license/20210216175602_installation_type.yml2
-rw-r--r--config/metrics/license/20210216181053_version.yml2
-rw-r--r--config/metrics/license/20210216183237_version.yml2
-rw-r--r--config/metrics/settings/20210201124935_database_adapter.yml2
-rw-r--r--config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml2
-rw-r--r--config/metrics/settings/20210204124858_container_registry_enabled.yml2
-rw-r--r--config/metrics/settings/20210204124900_dependency_proxy_enabled.yml2
-rw-r--r--config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml2
-rw-r--r--config/metrics/settings/20210204124904_gravatar_enabled.yml2
-rw-r--r--config/metrics/settings/20210204124906_ldap_enabled.yml2
-rw-r--r--config/metrics/settings/20210204124908_mattermost_enabled.yml2
-rw-r--r--config/metrics/settings/20210204124910_omniauth_enabled.yml2
-rw-r--r--config/metrics/settings/20210204124912_prometheus_enabled.yml2
-rw-r--r--config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml2
-rw-r--r--config/metrics/settings/20210204124916_reply_by_email_enabled.yml2
-rw-r--r--config/metrics/settings/20210204124918_signup_enabled.yml2
-rw-r--r--config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml2
-rw-r--r--config/metrics/settings/20210204124922_grafana_link_enabled.yml2
-rw-r--r--config/metrics/settings/20210204124934_pages_enabled.yml2
-rw-r--r--config/metrics/settings/20210216174829_smtp_server.yml2
-rw-r--r--config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml2
-rw-r--r--config/metrics/settings/20210216175604_edition.yml2
-rw-r--r--config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml2
-rw-r--r--config/metrics/settings/20210216175609_version.yml2
-rw-r--r--config/metrics/settings/20210216180314_gitpod_enabled.yml2
-rw-r--r--config/metrics/settings/20210216180836_enabled.yml2
-rw-r--r--config/metrics/settings/20210216180838_enabled.yml2
-rw-r--r--config/metrics/settings/20210216180840_direct_upload.yml2
-rw-r--r--config/metrics/settings/20210216180841_background_upload.yml2
-rw-r--r--config/metrics/settings/20210216180843_provider.yml2
-rw-r--r--config/metrics/settings/20210216180845_enabled.yml2
-rw-r--r--config/metrics/settings/20210216180847_enabled.yml2
-rw-r--r--config/metrics/settings/20210216180849_direct_upload.yml2
-rw-r--r--config/metrics/settings/20210216180851_background_upload.yml2
-rw-r--r--config/metrics/settings/20210216180852_provider.yml2
-rw-r--r--config/metrics/settings/20210216180854_enabled.yml2
-rw-r--r--config/metrics/settings/20210216180856_enabled.yml2
-rw-r--r--config/metrics/settings/20210216180858_direct_upload.yml2
-rw-r--r--config/metrics/settings/20210216180900_background_upload.yml2
-rw-r--r--config/metrics/settings/20210216180902_provider.yml2
-rw-r--r--config/metrics/settings/20210216180903_enabled.yml2
-rw-r--r--config/metrics/settings/20210216180905_enabled.yml2
-rw-r--r--config/metrics/settings/20210216180907_direct_upload.yml2
-rw-r--r--config/metrics/settings/20210216180909_background_upload.yml2
-rw-r--r--config/metrics/settings/20210216180911_provider.yml2
-rw-r--r--config/metrics/settings/20210216180913_enabled.yml2
-rw-r--r--config/metrics/settings/20210216180915_enabled.yml2
-rw-r--r--config/metrics/settings/20210216180916_direct_upload.yml2
-rw-r--r--config/metrics/settings/20210216180918_background_upload.yml2
-rw-r--r--config/metrics/settings/20210216180920_provider.yml2
-rw-r--r--config/metrics/settings/20210216183241_filesystems.yml2
-rw-r--r--config/metrics/settings/20210216183248_pg_system_id.yml2
-rw-r--r--config/metrics/settings/20210225045628_operating_system.yml2
-rw-r--r--config/metrics/settings/20210321224827_gitaly_apdex.yml2
-rw-r--r--config/metrics/settings/20210323120839_topology.yml2
-rw-r--r--config/metrics/settings/20210702140138_collected_data_categories.yml2
1299 files changed, 1306 insertions, 1298 deletions
diff --git a/config/feature_flags/development/between_uses_list_commits.yml b/config/feature_flags/development/between_uses_list_commits.yml
new file mode 100644
index 00000000000..84b34e1f8b2
--- /dev/null
+++ b/config/feature_flags/development/between_uses_list_commits.yml
@@ -0,0 +1,8 @@
+---
+name: between_uses_list_commits
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67591
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337960
+milestone: '14.2'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/metrics/counts_28d/20210201124930_deployments.yml b/config/metrics/counts_28d/20210201124930_deployments.yml
index 80a6bc1bf4f..b19276cdd4e 100644
--- a/config/metrics/counts_28d/20210201124930_deployments.yml
+++ b/config/metrics/counts_28d/20210201124930_deployments.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts_monthly.deployments
description: Total deployments count for recent 28 days
product_section: ops
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 7c2636a297e..b031e885f93 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: analytics_unique_visits.analytics_unique_visits_for_any_target_monthly
description: Unique visitors to any analytics feature by month
product_section: dev
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 fcc5c0d5154..b1eea4562f4 100644
--- a/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.analytics.p_analytics_pipelines_monthly
description: Unique visitors to /groups/:group/-/analytics/ci_cd by month
product_section: dev
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 2144c420690..504b5906dee 100644
--- a/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
+++ b/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.analytics.p_analytics_valuestream_monthly
description: Unique visitors to /:group/:project/-/value_stream_analytics by month
product_section: dev
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 0fa3c63371c..52a7662d4df 100644
--- a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
+++ b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.analytics.i_analytics_cohorts_monthly
description:
product_section: fulfillment
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 17a54feb331..4a6d8c0571d 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.analytics.i_analytics_dev_ops_score_monthly
description: Unique visitors to /admin/dev_ops_report by month
product_section: dev
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 5153b1136b7..17d8e3a8934 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.analytics.g_analytics_merge_request_monthly
description:
product_section: dev
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 c3126fa4ea3..a3eba286679 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.analytics.i_analytics_instance_statistics_monthly
description: Unique visitors to /admin/usage_trends by month
product_section: dev
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 789ec32aee1..d055837771d 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
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: redis_hll_counters.analytics.analytics_total_unique_counts_monthly
description: The number of unique users who visited any analytics feature by month
product_section: dev
diff --git a/config/metrics/counts_28d/20210216175055_merge_requests.yml b/config/metrics/counts_28d/20210216175055_merge_requests.yml
index 746cfa2b8f7..97e1983b5d6 100644
--- a/config/metrics/counts_28d/20210216175055_merge_requests.yml
+++ b/config/metrics/counts_28d/20210216175055_merge_requests.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.create.merge_requests
description: Count of the number of users creating merge requests
product_section: dev
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 e7b5a17c4aa..921ab4885fa 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 ede7c42724d..b86af740a13 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
diff --git a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
index 27aa5b65d3e..6cdb30a18bf 100644
--- a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
+++ b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.create.merge_requests_users
description: Monthly count of the number of merge request users
product_section: dev
diff --git a/config/metrics/counts_28d/20210216175109_suggestions.yml b/config/metrics/counts_28d/20210216175109_suggestions.yml
index ce82d927e77..6b41d92d91f 100644
--- a/config/metrics/counts_28d/20210216175109_suggestions.yml
+++ b/config/metrics/counts_28d/20210216175109_suggestions.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 b6e3c697afb..2db087832d0 100644
--- a/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.source_code.merge_request_action_monthly
description: Count of unique users who perform an action on a merge request
product_section: dev
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 d29e9bbc25e..be85a73c7fa 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.source_code.i_source_code_code_intelligence_monthly
description: Count of unique users who use code intelligence
product_section: dev
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 470c26e6709..18b89a5b25a 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_mr_diffs_monthly
description: Count of unique merge requests per month with diffs viewed
product_section: dev
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 55425a84e1e..b518c040926 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_single_file_diffs_monthly
description: Count of unique users per month with diffs viewed file by file
product_section: dev
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 8c407ece1ef..c256637f367 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_mr_single_file_diffs_monthly
description: Count of unique merge requests per month with diffs viewed file by file
product_section: dev
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 3116c0af798..013f185730a 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_monthly
description: Count of unique users per month who created a MR
product_section: dev
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 fa29ed01234..744afd9809b 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_close_mr_monthly
description: Count of unique users per month who closed a MR
product_section: dev
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 38693fd44ba..45f5b8e6dac 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_reopen_mr_monthly
description: Count of unique users per month who reopened a MR
product_section: dev
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 73cbfda323a..4a7035c3ee1 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_merge_mr_monthly
description: Count of unique users per month who merged a MR
product_section: dev
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 1e4b1c7abd6..8fd9dd97780 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_comment_monthly
description: Count of unique users per month who commented on a MR
product_section: dev
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 268d039cd8f..693e7075104 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_edit_mr_comment_monthly
description: Count of unique users per month who edited a comment on a MR
product_section: dev
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 67bfcedffe4..80d47f52583 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_remove_mr_comment_monthly
description: Count of unique users per month who removed a comment on a MR
product_section: dev
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 75918a6280d..a92186f2678 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_add_suggestion_monthly
description: Count of unique users per month who added a suggestion
product_section: dev
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 3fa777f811e..468b1062365 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_apply_suggestion_monthly
description: Count of unique users per month who applied a suggestion
product_section: dev
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 b030dfc360f..4637648ce92 100644
--- a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.configure.clusters_applications_cert_managers
description: Total GitLab Managed clusters with Cert Manager enabled
product_section: ops
diff --git a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
index fd76f35188e..9e092d6f2e3 100644
--- a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
+++ b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.configure.clusters_applications_helm
description: Total GitLab Managed clusters with Helm enabled
product_section: ops
diff --git a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
index 821855f4cd5..56ee17554eb 100644
--- a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
+++ b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.configure.clusters_applications_ingress
description: Total GitLab Managed clusters with Ingress enabled
product_section: ops
diff --git a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
index 67862bc7644..3bed0406dd5 100644
--- a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
+++ b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.configure.clusters_applications_knative
description: Total GitLab Managed clusters with Knative enabled
product_section: ops
diff --git a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
index 6b573f81478..6e7f851eb6d 100644
--- a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
+++ b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
diff --git a/config/metrics/counts_28d/20210216175415_clusters_disabled.yml b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
index e96d62d730c..8c2e9b87870 100644
--- a/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.configure.clusters_disabled
description: Total GitLab Managed disabled clusters
product_section: ops
diff --git a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
index 6cc770051ff..80e3872ddc3 100644
--- a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.configure.clusters_enabled
description: Total GitLab Managed clusters currently enabled
product_section: ops
diff --git a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
index b1b433590b2..0a2f09a4bc0 100644
--- a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
+++ b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.configure.clusters_platforms_gke
description: Total GitLab Managed clusters provisioned with GitLab on GCE GKE
product_section: ops
diff --git a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
index d4747dcaf91..63da2198876 100644
--- a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
+++ b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.configure.clusters_platforms_eks
description: Total GitLab Managed clusters provisioned with GitLab on AWS EKS
product_section: ops
diff --git a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
index 374032da3ec..2cb190d348f 100644
--- a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
+++ b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.configure.clusters_platforms_user
description: Total GitLab Managed clusters that are user provisioned
product_section: ops
diff --git a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
index 11917dbc798..e67abe0543c 100644
--- a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.configure.instance_clusters_disabled
description: Total GitLab Managed disabled clusters attached to the instance
product_section: ops
diff --git a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
index e649c0dba9a..44784dbf040 100644
--- a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.configure.instance_clusters_enabled
description: Total GitLab Managed enabled clusters attached to the instance
product_section: ops
diff --git a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
index f4d7b8ab504..61735006560 100644
--- a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.configure.group_clusters_disabled
description: Total GitLab Managed disabled clusters attached to groups
product_section: ops
diff --git a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
index 89210bba5da..3973ddf26b6 100644
--- a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.configure.group_clusters_enabled
description: Total GitLab Managed enabled clusters attached to groups
product_section: ops
diff --git a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
index 2db09000f86..17b6fef0151 100644
--- a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.configure.project_clusters_disabled
description: Total GitLab Managed disabled clusters attached to projects
product_section: ops
diff --git a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
index 3369612a761..a59cdae01e5 100644
--- a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage_monthly.configure.project_clusters_enabled
description: Total GitLab Managed enabled clusters attached to projects
product_section: ops
diff --git a/config/metrics/counts_28d/20210216175542_ci_builds.yml b/config/metrics/counts_28d/20210216175542_ci_builds.yml
index f7a8eca77ec..ac42d618ea0 100644
--- a/config/metrics/counts_28d/20210216175542_ci_builds.yml
+++ b/config/metrics/counts_28d/20210216175542_ci_builds.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.verify.ci_builds
description: Unique monthly builds in project
product_section: ops
diff --git a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
index 31c3fbf4ce0..a3044a7b9aa 100644
--- a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.verify.ci_external_pipelines
description: Total pipelines in external repositories in a month
product_section: ops
diff --git a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
index cb629d4cc6d..2b125cf1a7c 100644
--- a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.verify.ci_internal_pipelines
description: Total pipelines in GitLab repositories in a month
product_section: ops
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 185161d661d..8bf228643c8 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_config_auto_devops
description: Total pipelines from an Auto DevOps template
product_section: ops
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 128f5eac72a..dd470b7da22 100644
--- a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_config_repository
description: Total Monthly Pipelines from templates in repository
product_section: ops
diff --git a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
index ace1c8d01dc..a593d08a567 100644
--- a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_schedules
description: Total monthly Pipeline schedules in GitLab
product_section: ops
diff --git a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
index d6f8c6bcdbf..fdb67b99e55 100644
--- a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.verify.ci_pipelines
description: "Distinct users triggering pipelines in a month"
product_section: ops
diff --git a/config/metrics/counts_28d/20210216175556_ci_triggers.yml b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
index f4f94c25df9..a8f784ec579 100644
--- a/config/metrics/counts_28d/20210216175556_ci_triggers.yml
+++ b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.verify.ci_triggers
description: Total configured Triggers in project
product_section: ops
diff --git a/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml b/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml
index ef0454089c5..a5d8c06bc0a 100644
--- a/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml
+++ b/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage_monthly.secure.user_dast_jobs
description: Users who run a DAST job
product_section: sec
diff --git a/config/metrics/counts_28d/20210216175618_dast_pipeline.yml b/config/metrics/counts_28d/20210216175618_dast_pipeline.yml
index f7295051f8f..39e51ca80f7 100644
--- a/config/metrics/counts_28d/20210216175618_dast_pipeline.yml
+++ b/config/metrics/counts_28d/20210216175618_dast_pipeline.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage_monthly.secure.dast_pipeline
description: Count of pipelines that have at least 1 DAST job
product_section: sec
diff --git a/config/metrics/counts_28d/20210216180308_personal_snippets.yml b/config/metrics/counts_28d/20210216180308_personal_snippets.yml
index 2d6364cb49e..1a4183acc62 100644
--- a/config/metrics/counts_28d/20210216180308_personal_snippets.yml
+++ b/config/metrics/counts_28d/20210216180308_personal_snippets.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_monthly.personal_snippets
description: Monthly count of personal Snippets
product_section: dev
diff --git a/config/metrics/counts_28d/20210216180310_project_snippets.yml b/config/metrics/counts_28d/20210216180310_project_snippets.yml
index 2e9a55b8237..1037c5ed029 100644
--- a/config/metrics/counts_28d/20210216180310_project_snippets.yml
+++ b/config/metrics/counts_28d/20210216180310_project_snippets.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_monthly.project_snippets
description: Monthly count of project Snippets
product_section: dev
diff --git a/config/metrics/counts_28d/20210216180312_snippets.yml b/config/metrics/counts_28d/20210216180312_snippets.yml
index 89260564d97..22e242d5cab 100644
--- a/config/metrics/counts_28d/20210216180312_snippets.yml
+++ b/config/metrics/counts_28d/20210216180312_snippets.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_monthly.snippets
description: Monthly count of All Snippets
product_section: dev
diff --git a/config/metrics/counts_28d/20210216180317_snippets.yml b/config/metrics/counts_28d/20210216180317_snippets.yml
index 690827f5fbd..b501c8dd6d0 100644
--- a/config/metrics/counts_28d/20210216180317_snippets.yml
+++ b/config/metrics/counts_28d/20210216180317_snippets.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.create.snippets
name: count_distinct_author_id_from_snippets
description: Count of distinct author_id from snippets for last 28 days
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 91d086b3f27..fc52a50969e 100644
--- a/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
+++ b/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_web_ide_edit
description: Number of users editing using web IDE
product_section: dev
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 2cd4666cd4a..809f1bcc52f 100644
--- a/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
+++ b/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_sfe_edit
description: Number of users using single file editor
product_section: dev
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 a48d6e7c263..6c9bb0319cc 100644
--- a/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
+++ b/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_snippet_editor_edit
description: Number of users using the snippet editor
product_section: dev
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 020e5b68e59..a181eacd724 100644
--- a/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
+++ b/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_sse_edit
description: Number of users using the static site editor
product_section: dev
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 0e141a85463..f15f9817a58 100644
--- a/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
+++ b/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_ide_edit
description: Number of unique users per month who edited a file from any web editor
product_section: dev
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 c5e0d1a1128..770ba30b8a2 100644
--- a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ide_edit.g_edit_by_web_ide_monthly
description: Number of users editing a file from the Web IDE
product_section: dev
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 113d9343e78..44a6758d41e 100644
--- a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
+++ b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ide_edit.g_edit_by_sfe_monthly
description: Number of users editing a file from the single file editor
product_section: dev
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 70a509045f0..5cc87cba469 100644
--- a/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ide_edit.g_edit_by_snippet_ide_monthly
description: Count of monthly edits to a snippet
product_section: dev
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 b2744df874d..81ccdfd0854 100644
--- a/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ide_edit.ide_edit_total_unique_counts_monthly
description: Count of unique users per month who edited a file from the Web IDE
product_section: dev
diff --git a/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml b/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml
index 9bc7e8b0772..28d153bf39c 100644
--- a/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml
+++ b/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage_monthly.secure.user_api_fuzzing_jobs
description: Count of API Fuzzing jobs by job name
product_section: sec
diff --git a/config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml b/config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml
index 14d7fa1f83d..f0534118a8f 100644
--- a/config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml
+++ b/config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage_monthly.secure.user_api_fuzzing_dnd_jobs
description: Count of API Fuzzing `docker-in-docker` jobs by job names
product_section: sec
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 7f32bc22606..89afaa17bce 100644
--- a/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
+++ b/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.search.i_search_total_monthly
description: Calculated unique users to perform Basic or Advanced searches by month
product_section: enablement
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 fbfc43eb553..41d6d1f0d96 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: enablement
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 00cc03ebd88..8a76ed1dc22 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_monthly.aggregated_metrics.incident_management_alerts_total_unique_counts
description: Count of unique users per month to take an action on an alert
product_section: ops
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 1928f834fe0..c561aafb144 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_monthly.aggregated_metrics.incident_management_incidents_total_unique_counts
description: Count of unique users per month to take an action on an incident
product_section: ops
diff --git a/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml b/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
index 12739d124f4..f9a8a2d440a 100644
--- a/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
+++ b/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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'
product_section: ops
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 7626b56bc11..70234ac6602 100644
--- a/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
+++ b/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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'
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 8cdfa4851ae..5bbb15c786c 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_alert_status_changed_monthly
description: Count of unique users changing alert's status changes per month
product_section: ops
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 3a8ff85518b..a23e14b8879 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_alert_assigned_monthly
description: Count of unique users assigning an alert per month
product_section: ops
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 d056f6e5883..4cbc1280562 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_alert_todo_monthly
description: Count of unique users adding alerts to the TODO list per month
product_section: ops
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 6fa9855a966..97680ad4d1b 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_incident_created_monthly
description: Count of unique users creating incidents per month
product_section: ops
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 e17d074f243..f14f31af62d 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_incident_reopened_monthly
description: Count of unique users reopening incidents per month
product_section: ops
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 73c595574d4..0809c3fab68 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_incident_closed_monthly
description: Count of users closing incidents per month
product_section: ops
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 9201fba4905..ceed852b509 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_incident_assigned_monthly
description: Count of users assigning incidents per month
product_section: ops
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 5d4a04a823c..fbe1a334bbb 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_incident_todo_monthly
description: Count of unique users adding incidents to the TODO list per month
product_section: ops
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 fb0b8b1c784..d812b52d97b 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_incident_comment_monthly
description: Count of unique users adding comments per month on incidents
product_section: ops
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 e71c7b597c3..313f75f7ebb 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_incident_zoom_meeting_monthly
description: Count of users creating Zoom meetings about incidents per month
product_section: ops
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 906014bccf5..75c9fa64f8c 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 f8d9cfb416a..473b0a2b2ad 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_incident_unrelate_monthly
description: Count of users removing issues that are related to an incident per month
product_section: ops
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 6eb5f7b7757..17ab21c9818 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_incident_change_confidential_monthly
description: Count of users changing incidents to confidential per month
product_section: ops
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 aabf78c5a20..5a09b270eb2 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
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: redis_hll_counters.incident_management.incident_management_total_unique_counts_monthly
description: Count of unique users performing events related with incidents per month
product_section: ops
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 e5c543e7ea7..14ba7fa3421 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management_alerts.incident_management_alert_create_incident_monthly
description: Count of unique users per month to create an incident corresponding to
an alert
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 afeec6c1e9c..38048e0f443 100644
--- a/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
+++ b/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.create.projects_imported_from_github
description: Count of projects imported from GitHub
product_section: dev
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 eec12d91eb7..beb8969618f 100644
--- a/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
+++ b/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_design_management
description: Monthly active users for design management
product_section: dev
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 c8b4e7bc9ad..1353686c5a6 100644
--- a/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
+++ b/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_wiki_repo
description: Unique monthly active users of the Wiki
product_section: dev
diff --git a/config/metrics/counts_28d/20210216180814_events.yml b/config/metrics/counts_28d/20210216180814_events.yml
index 6d30965425e..ddc06e6c9ea 100644
--- a/config/metrics/counts_28d/20210216180814_events.yml
+++ b/config/metrics/counts_28d/20210216180814_events.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.events
description:
product_section: dev
diff --git a/config/metrics/counts_28d/20210216180816_groups.yml b/config/metrics/counts_28d/20210216180816_groups.yml
index e47143bc3c9..247fa015c22 100644
--- a/config/metrics/counts_28d/20210216180816_groups.yml
+++ b/config/metrics/counts_28d/20210216180816_groups.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.groups
description: Number of users who are group members for last 28 days
product_section: dev
diff --git a/config/metrics/counts_28d/20210216180818_users_created.yml b/config/metrics/counts_28d/20210216180818_users_created.yml
index ddaf652960d..319b8a08e79 100644
--- a/config/metrics/counts_28d/20210216180818_users_created.yml
+++ b/config/metrics/counts_28d/20210216180818_users_created.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.users_created
description: Number of users created in the month
product_section: dev
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 ca6883c4967..7b928a08fae 100644
--- a/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.configure.projects_with_prometheus_alerts
description: Projects with Prometheus alerting enabled
product_section: ops
diff --git a/config/metrics/counts_28d/20210216180956_clusters.yml b/config/metrics/counts_28d/20210216180956_clusters.yml
index be5f5d9be35..d5a54796a1f 100644
--- a/config/metrics/counts_28d/20210216180956_clusters.yml
+++ b/config/metrics/counts_28d/20210216180956_clusters.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.monitor.clusters
description: Count users creating clusters in last 28 days.
product_section: ops
diff --git a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
index 18ae674dcc6..615bb247f86 100644
--- a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
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 219b2b4ffd5..2d29c9fd088 100644
--- a/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
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 b5798063805..ac0e6015cb9 100644
--- a/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.monitor.projects_with_tracing_enabled
description: Projects with tracing enabled
product_section: ops
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 446bd17478f..f5c1ecec384 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
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 2954560a8ca..7ffe2e82ab2 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
diff --git a/config/metrics/counts_28d/20210216181050_packages.yml b/config/metrics/counts_28d/20210216181050_packages.yml
index 1603e8f8568..c007ab50182 100644
--- a/config/metrics/counts_28d/20210216181050_packages.yml
+++ b/config/metrics/counts_28d/20210216181050_packages.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_monthly.packages
description: A monthly count of packages published to the registry
product_section: ops
diff --git a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
index 5d106bcb3a4..e1f1bcd05e7 100644
--- a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
+++ b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.package.projects_with_packages
description: The total number of projects in a given month with at least one package
product_section: ops
diff --git a/config/metrics/counts_28d/20210216181139_issues.yml b/config/metrics/counts_28d/20210216181139_issues.yml
index b3080dbde7c..dd36265fe9d 100644
--- a/config/metrics/counts_28d/20210216181139_issues.yml
+++ b/config/metrics/counts_28d/20210216181139_issues.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.plan.issues
description: Count of users creating Issues in last 28 days.
product_section: dev
diff --git a/config/metrics/counts_28d/20210216181141_notes.yml b/config/metrics/counts_28d/20210216181141_notes.yml
index 92ffc9ab5ef..0e2d39e42e7 100644
--- a/config/metrics/counts_28d/20210216181141_notes.yml
+++ b/config/metrics/counts_28d/20210216181141_notes.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.plan.notes
description: Count of MAU commenting on an issuable
product_section: dev
diff --git a/config/metrics/counts_28d/20210216181143_projects.yml b/config/metrics/counts_28d/20210216181143_projects.yml
index 2ad6f985b4b..16e2ddf8050 100644
--- a/config/metrics/counts_28d/20210216181143_projects.yml
+++ b/config/metrics/counts_28d/20210216181143_projects.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.plan.projects
description: Count of MAU creating projects
product_section: dev
diff --git a/config/metrics/counts_28d/20210216181145_todos.yml b/config/metrics/counts_28d/20210216181145_todos.yml
index 88aece81a3e..e35963f2a57 100644
--- a/config/metrics/counts_28d/20210216181145_todos.yml
+++ b/config/metrics/counts_28d/20210216181145_todos.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.plan.todos
description: Count of MAU creating todos
product_section: dev
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 c26e76645f8..9f730faaf93 100644
--- a/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.plan.service_desk_enabled_projects
description:
product_section: dev
diff --git a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
index 6dcf7127148..a61745d1177 100644
--- a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
+++ b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage_monthly.plan.service_desk_issues
description:
product_section: dev
diff --git a/config/metrics/counts_28d/20210216181150_projects_jira_active.yml b/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
index 6bb7cc3c206..a51dfa3e49f 100644
--- a/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
+++ b/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+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.
product_section: dev
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 149bdb158de..e78d178c081 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,5 +1,5 @@
---
-data_category: Operational
+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.
product_section: dev
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 66af5e99b78..c5a8b0cf75e 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,5 +1,5 @@
---
-data_category: Operational
+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.
product_section: dev
diff --git a/config/metrics/counts_28d/20210216181158_epics.yml b/config/metrics/counts_28d/20210216181158_epics.yml
index 4a896092194..9ede1ef12f8 100644
--- a/config/metrics/counts_28d/20210216181158_epics.yml
+++ b/config/metrics/counts_28d/20210216181158_epics.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.plan.epics
description: Count distinct author ids from epics
product_section: dev
diff --git a/config/metrics/counts_28d/20210216181200_label_lists.yml b/config/metrics/counts_28d/20210216181200_label_lists.yml
index 91463a4678c..f7eaf2bf484 100644
--- a/config/metrics/counts_28d/20210216181200_label_lists.yml
+++ b/config/metrics/counts_28d/20210216181200_label_lists.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.plan.label_lists
description: Count of MAU creating label lists on Boards
product_section: dev
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 2f665b70b97..285f8371785 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_title_changed_monthly
description: Count of MAU editing an issue title
product_section: dev
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 e41e729a5fd..554bc86cada 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_description_changed_monthly
description: Count of MAU editing an issue description
product_section: dev
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 6c69ce110ac..07fa4ceaa3c 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_assignee_changed_monthly
description: Count of MAU changing issue assignees
product_section: dev
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 344713942fc..5417ffe2433 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_made_confidential_monthly
description: Count of MAU making an issue confidential
product_section: dev
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 3127f67dc01..f7c63e9bd03 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_made_visible_monthly
description: Count of MAU making an issue not confidential
product_section: dev
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 126264279fd..a0b173e5c37 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
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: redis_hll_counters.issues_edit.g_project_management_issue_created_monthly
description: Count of MAU creating new issues
product_section: dev
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 f8f2b018f70..7ff662b2466 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
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: redis_hll_counters.issues_edit.g_project_management_issue_closed_monthly
description: Count of MAU closing an issue
product_section: dev
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 3137d120236..f6b3b824afd 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_reopened_monthly
description: Count of MAU re-opening a closed issue
product_section: dev
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 f3106e74896..a84dcac22d9 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_label_changed_monthly
description: Count of MAU changing an issue's label
product_section: dev
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 89cabf2b80b..12ea62b75f1 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_milestone_changed_monthly
description: Count of MAU changing an issue's milestone
product_section: dev
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 f29cc4ff2ec..a7f631d6620 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_cross_referenced_monthly
description: Count of MAU referencing an issue from somewhere else
product_section: dev
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 3fef89a23b1..1538b0cc755 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_moved_monthly
description: Count of MAU moving an issue to another project
product_section: dev
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 7c21c40a425..02926948430 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_related_monthly
description: Count of MAU relating an issue to another issue
product_section: dev
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 25666725e9c..01c5c768674 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_unrelated_monthly
description: Count of MAU unrelating an issue to another issue
product_section: dev
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 e4824c5531e..ca0573ba618 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_marked_as_duplicate_monthly
description: Count of MAU marking an issue as a duplicate
product_section: dev
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 4f5f6eaed79..012eaeb5001 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_locked_monthly
description: Count of MAU locking an issue
product_section: dev
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 bce5bce76c2..a1b800b77cf 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_unlocked_monthly
description: Count of MAU unlocking an issue
product_section: dev
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 04c1e19947a..e94d56ad8b8 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_added_monthly
description: Count of MAU adding a design to an issue
product_section: dev
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 dbf9c5f378a..0af03218ab0 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_modified_monthly
description: Count of MAU modifying a design on an issue
product_section: dev
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 dfb14377c91..c466a775050 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_removed_monthly
description: Count of MAU removing a design from an issue
product_section: dev
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 b77b891429f..29517a25739 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_due_date_changed_monthly
description: Count of MAU changing an issue due date
product_section: dev
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 8b24e5eaf03..6f572b3a0c9 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_time_estimate_changed_monthly
description: Count of MAU changing an issue time estimate
product_section: dev
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 3e7568c9e00..4c0717f699c 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_time_spent_changed_monthly
description: Count of MAU recording time spent on an issue
product_section: dev
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 6382fd73edd..dc7775542dd 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_added_monthly
description: Count of MAU commenting on an issue
product_section: dev
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 d038ef21b7c..27c18c21b3d 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_edited_monthly
description: Count of MAU editing a comment on an issue
product_section: dev
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 7d6e327a18d..ce0bfa86bcd 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_removed_monthly
description: Count of MAU deleting a comment from an issue
product_section: dev
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 fd40cb87181..2d785856ed8 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_cloned_monthly
description: Count of MAU cloning an issue
product_section: dev
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 213d742bbf2..5da5997ad67 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
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: redis_hll_counters.issues_edit.issues_edit_total_unique_counts_monthly
description: Aggregate count of MAU taking an action related to an issue
product_section: dev
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 e810ab28af9..452d83dec1b 100644
--- a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
+++ b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_approve_monthly
description: Count of MAU using the `/approve` quick action
product_section: dev
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 5d103c204fa..1e213eeb778 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 06a3897eae1..10f38fbcb9c 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 e07553d8790..f9351208172 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 244b24ce56c..90ea87a63cf 100644
--- a/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
+++ b/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 8a0076c2dab..cc86c66caf6 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_board_move_monthly
description: Count of MAU using the `/board_move` quick action
product_section: dev
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 ca022ed4730..0f7ad1b15cc 100644
--- a/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_clone_monthly
description: Count of MAU using the `/clone` quick action to clone an issue.
product_section: dev
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 ab93859aa98..4750bc1412e 100644
--- a/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
+++ b/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_close_monthly
description: Count of MAU using the `/close` quick action to close an issuable
product_section: dev
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 9a0729bfe03..843f00bda28 100644
--- a/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 3e8e48fa0b6..41e31b3031a 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_copy_metadata_merge_request_monthly
description: Count of MAU using the `/copy_metadata` quick action on a Merge Request
product_section: dev
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 67b0c81af92..861bb1ac02b 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_copy_metadata_issue_monthly
description: Count of MAU using the `/copy_metadata` quick action on an issue
product_section: dev
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 0f985f7b54e..ec09f5a3269 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 da31b57a401..84b7359359a 100644
--- a/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
+++ b/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_done_monthly
description: Count of MAU using the `/done` quick action to mark a todo as done
product_section: dev
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 c45a81d1387..d503f9c56b7 100644
--- a/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
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
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 3a67fb16420..d1e18f0e072 100644
--- a/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
+++ b/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 23f564a114b..eb8e1f504d9 100644
--- a/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 ad21f7d141d..91c79aff0fe 100644
--- a/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 d0fe9b9f118..774bcc02bef 100644
--- a/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
+++ b/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_label_monthly
description: Count of MAU using the `/label` quick action
product_section: dev
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 f26ba29e354..13aeb663c87 100644
--- a/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_lock_monthly
description: Count of MAU using the `/lock` quick action
product_section: dev
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 433d51470d4..64f987ae889 100644
--- a/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
+++ b/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_merge_monthly
description: Count of MAU using the `/merge` quick action
product_section: dev
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 7ad17685e7d..7865b63c6ea 100644
--- a/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
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 26c3b85c930..d57b4cb31af 100644
--- a/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_move_monthly
description: Count of MAU using the `/move` quick action
product_section: dev
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 8e63e25a8de..5b7a8a6a4c8 100644
--- a/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
+++ b/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_reassign_monthly
description: Count of MAU using the `/reassign @user1` quick action
product_section: dev
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 df7e9cf2524..1da59b2b523 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_reassign_reviewer_monthly
description: Count of MAU using the `/reassign_reviewer` quick action
product_section: dev
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 828c1769686..b49f8796179 100644
--- a/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
+++ b/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
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 01ab64df5c0..287bb72a37f 100644
--- a/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
+++ b/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_relabel_monthly
description: Count of MAU using the `/relabel` quick action
product_section: dev
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 37f49898fed..acaf3378966 100644
--- a/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_relate_monthly
description: Count of MAU using the `/relate` quick action
product_section: dev
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 f1bf864fd8f..1bf024eb356 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_remove_due_date_monthly
description: Count of MAU using the `/remove_due_date` quick action
product_section: dev
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 70e5b0ac77d..4e878c9c37c 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,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_remove_estimate_monthly
description: Count of MAU using the `/remove_estimate` quick action
product_section: dev
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 7e3eb749ce0..d2cd09a7d2b 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,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_remove_milestone_monthly
description: Count of MAU using the `/remove_milestone` quick action
product_section: dev
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 2182df26490..58f7ef809c4 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_remove_time_spent_monthly
description: Count of MAU using the `/remove_time_spent` quick action
product_section: dev
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 069a43f5ce0..a9e53de5c8f 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,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_remove_zoom_monthly
description: Count of MAU using the `/remove_zoom` quick action
product_section: dev
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 b199f518cea..6a104d2e1cb 100644
--- a/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
+++ b/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_reopen_monthly
description: Count of MAU using the `/reopen` quick action
product_section: dev
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 ecd23dd7352..d4ebe27abec 100644
--- a/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
+++ b/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_shrug_monthly
description: Count of MAU using the `/shrug` quick action
product_section: dev
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 83f893083e9..fb0bfcb8f01 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 29d5d4ccaad..dbd94c30488 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 29e52cc26ef..0058aa315c8 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_submit_review_monthly
description: Count of MAU using the `/submit_review` quick action on Merge Requests
product_section: dev
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 08d75e9831b..7aa266017b4 100644
--- a/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_subscribe_monthly
description: Count of MAU using the `/subscribe` quick action
product_section: dev
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 7f7f318f08e..c8695b2776e 100644
--- a/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_tableflip_monthly
description: Count of MAU using the `/tableflip` quick action
product_section: dev
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 216305fe08d..de74bb6f7b0 100644
--- a/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
+++ b/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_tag_monthly
description: Count of MAU using the `/tag` quick action
product_section: dev
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 e4a5e1a9f48..7de88a30689 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
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
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 e2a554d3840..fb94d9581f8 100644
--- a/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
+++ b/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_title_monthly
description: Count of MAU using the `/title` quick action
product_section: dev
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 6b5c9fb405a..c101c389dfe 100644
--- a/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_todo_monthly
description: Count of MAU using the `/todo` quick action
product_section: dev
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 b9b4c0a097a..98e0b1bdff3 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_unassign_specific_monthly
description: Count of MAU using the `/unassign @user1` quick action on Merge Requests
product_section: dev
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 80e03f09b7e..502bc6bccfa 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_unassign_all_monthly
description: Count of MAU using the `/unassign` quick action on Merge Requests
product_section: dev
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 23bed7d7ac1..1e3ea5daac8 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 fc4d95f8147..d8f3ece625f 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 f846fc102a7..df3403f9f0a 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_unlabel_all_monthly
description: Count of MAU using the `/unlabel` quick action to remove all labels
product_section: dev
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 783e5d1385c..4fa69c643c9 100644
--- a/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_unlock_monthly
description: Count of MAU using the `/unlock` quick action
product_section: dev
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 f4d89155b77..f3add38826d 100644
--- a/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_unsubscribe_monthly
description: Count of MAU using the `/unsubscribe` quick action
product_section: dev
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 154fea29cc0..2aa277a0163 100644
--- a/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
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
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 3f0b7d0399f..b6ff94e5367 100644
--- a/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_zoom_monthly
description: Count of MAU using the `/zoom` quick action on Issues
product_section: dev
diff --git a/config/metrics/counts_28d/20210216181923_successful_deployments.yml b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
index c7878ed9283..45b50f20720 100644
--- a/config/metrics/counts_28d/20210216181923_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_monthly.successful_deployments
description: Total successful deployments
product_section: ops
diff --git a/config/metrics/counts_28d/20210216181924_failed_deployments.yml b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
index 00b148e51d1..a7f0d6e5847 100644
--- a/config/metrics/counts_28d/20210216181924_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_monthly.failed_deployments
description: Total failed deployments
product_section: ops
diff --git a/config/metrics/counts_28d/20210216181935_deployments.yml b/config/metrics/counts_28d/20210216181935_deployments.yml
index 751b2bb52d8..01978e14de0 100644
--- a/config/metrics/counts_28d/20210216181935_deployments.yml
+++ b/config/metrics/counts_28d/20210216181935_deployments.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.release.deployments
description: Unique users triggering deployments
product_section: ops
diff --git a/config/metrics/counts_28d/20210216181937_failed_deployments.yml b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
index 3c772526e78..0bf293cef72 100644
--- a/config/metrics/counts_28d/20210216181937_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.release.failed_deployments
description: Total failed deployments
product_section: ops
diff --git a/config/metrics/counts_28d/20210216181939_releases.yml b/config/metrics/counts_28d/20210216181939_releases.yml
index e2536a92e1a..858b760e464 100644
--- a/config/metrics/counts_28d/20210216181939_releases.yml
+++ b/config/metrics/counts_28d/20210216181939_releases.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.release.releases
description: Unique users creating release tags
product_section: ops
diff --git a/config/metrics/counts_28d/20210216181941_successful_deployments.yml b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
index f9a8d048ff0..1d3a5f23cfd 100644
--- a/config/metrics/counts_28d/20210216181941_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.release.successful_deployments
description: Total successful deployments
product_section: ops
diff --git a/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml b/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
index d66bc893846..e515792f124 100644
--- a/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
+++ b/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.verify.clusters_applications_runner
description: Total GitLab Managed clusters with Runner enabled
product_section: ops
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 fa593c4443c..8c659619dfc 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,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage_monthly.secure.user_unique_users_all_secure_scanners
description:
product_section: sec
diff --git a/config/metrics/counts_28d/20210216182034_deploy_keys.yml b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
index 16bb8d53e6d..f6949e85a5b 100644
--- a/config/metrics/counts_28d/20210216182034_deploy_keys.yml
+++ b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.create.deploy_keys
description: Count of users creating deploy keys in last 28 days.
product_section: dev
diff --git a/config/metrics/counts_28d/20210216182036_keys.yml b/config/metrics/counts_28d/20210216182036_keys.yml
index c1bbdbbe4ca..ca77b038a1e 100644
--- a/config/metrics/counts_28d/20210216182036_keys.yml
+++ b/config/metrics/counts_28d/20210216182036_keys.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.create.keys
description: Count of users creating regular keys in last 28 days.
product_section: dev
diff --git a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
index 3475eacdf44..340ce92ad80 100644
--- a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
+++ b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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.
product_section: dev
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 885cf560521..cf40c69e276 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_project_repo
description: Count of monthly active users who have performed any Git operation (read/write/push)
product_section: dev
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 087afb371fa..a37ec1225ff 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_git_write
description: Aggregated value for wiki, design, and project repo Git write actions
product_section: dev
diff --git a/config/metrics/counts_28d/20210216182051_protected_branches.yml b/config/metrics/counts_28d/20210216182051_protected_branches.yml
index acb1914f1c6..9e1afb8146c 100644
--- a/config/metrics/counts_28d/20210216182051_protected_branches.yml
+++ b/config/metrics/counts_28d/20210216182051_protected_branches.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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.
product_section: dev
diff --git a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
index fab51aaa8a0..b34c2a44a8c 100644
--- a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.source_code.wiki_action_monthly
description: Count of unique actions done on a wiki (create, edit, delete)
product_section: dev
diff --git a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
index 3f05898ed4e..b08d1181b0a 100644
--- a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.source_code.design_action_monthly
description: Count of total design actions (upload, delete, comment, reply)
product_section: dev
diff --git a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
index 7ed87e33e1e..c766eb71596 100644
--- a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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)
product_section: dev
diff --git a/config/metrics/counts_28d/20210216182125_user_sast_jobs.yml b/config/metrics/counts_28d/20210216182125_user_sast_jobs.yml
index 07b29b212d6..7d1f7d333f2 100644
--- a/config/metrics/counts_28d/20210216182125_user_sast_jobs.yml
+++ b/config/metrics/counts_28d/20210216182125_user_sast_jobs.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage_monthly.secure.user_sast_jobs
description: Users who run a SAST job
product_section: sec
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 42d3b6c88dc..e600c877c7b 100644
--- a/config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.yml
+++ b/config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage_monthly.secure.user_secret_detection_jobs
description: Users who run a Secret Detection job
product_section: sec
diff --git a/config/metrics/counts_28d/20210216182129_sast_pipeline.yml b/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
index 5057ab925e9..8d45c304779 100644
--- a/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
+++ b/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage_monthly.secure.sast_pipeline
description: Counts of Pipelines that have at least 1 SAST job
product_section: sec
diff --git a/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml b/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
index 7ce0f4cb4a0..ff1067285de 100644
--- a/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
+++ b/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage_monthly.secure.secret_detection_pipeline
description: Counts of Pipelines that have at least 1 Secret Detection job
product_section: sec
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 97479d10ff2..396f9534393 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.testing.i_testing_test_case_parsed_monthly
description: Internal Tracking to count number of unit tests parsed for planning of
future code testing features. Data available [here](https://app.periscopedata.com/app/gitlab/788674/Verify:Testing-Group-Metrics?widget=10454394&udv=0)
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 196fc834155..4d09eb0b376 100644
--- a/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
+++ b/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_monthly.projects_with_alerts_created
description: Monthly count of unique projects with HTTP alerting enabled
product_section: ops
diff --git a/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml b/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
index a412754ca62..924a19cae74 100644
--- a/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
+++ b/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_monthly.aggregated_metrics.product_analytics_test_metrics_union
description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature
product_section: growth
diff --git a/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml b/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
index 2583c51990f..1e3913056e1 100644
--- a/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
+++ b/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_monthly.aggregated_metrics.product_analytics_test_metrics_intersection
description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature
product_section: growth
diff --git a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
index ccea430d8ac..d059bcd8022 100644
--- a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
+++ b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.omniauth_providers
description: Number of unique user logins using an OmniAuth provider
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183629_two-factor.yml b/config/metrics/counts_28d/20210216183629_two-factor.yml
index 0165a40155e..4d4603818eb 100644
--- a/config/metrics/counts_28d/20210216183629_two-factor.yml
+++ b/config/metrics/counts_28d/20210216183629_two-factor.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.two-factor
description: Number of unique user logins using two factor authentication
product_section: dev
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 d814e539b26..fe24823cdd6 100644
--- a/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml
+++ b/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.two-factor-via-u2f-device
description: Number of unique user logins using two factor via a U2F device
product_section: dev
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 a910851e2f0..95176ccabe5 100644
--- a/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml
+++ b/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.two-factor-via-webauthn-device
description: Number of unique user logins using two factor via a WebAuthn device
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183634_standard.yml b/config/metrics/counts_28d/20210216183634_standard.yml
index 0fd7d6f4708..172fa780a69 100644
--- a/config/metrics/counts_28d/20210216183634_standard.yml
+++ b/config/metrics/counts_28d/20210216183634_standard.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.standard
description: Number of unique user logins using password authentication
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183636_google_oauth2.yml b/config/metrics/counts_28d/20210216183636_google_oauth2.yml
index 7d9bdd6c5dd..1fdccd17217 100644
--- a/config/metrics/counts_28d/20210216183636_google_oauth2.yml
+++ b/config/metrics/counts_28d/20210216183636_google_oauth2.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.google_oauth2
description: Number of unique user logins using Google OAuth authentication
product_section: dev
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 296b0aeda37..063c16fefef 100644
--- a/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
+++ b/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.unique_users_all_imports
description: Number of unique users performing imports
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183640_gitlab.yml b/config/metrics/counts_28d/20210216183640_gitlab.yml
index dd93201f085..139184cc8ac 100644
--- a/config/metrics/counts_28d/20210216183640_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183640_gitlab.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.bulk_imports.gitlab
description: DEPRECATED - Count of projects imported using bulk imports
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183642_gitlab_v1.yml b/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
index 8f448ad04c9..dc8dec74ef3 100644
--- a/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
+++ b/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.bulk_imports.gitlab_v1
description: Count of bulk imports - GitLab Migration
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183644_gitlab_project.yml b/config/metrics/counts_28d/20210216183644_gitlab_project.yml
index bd41426f678..394d85b4863 100644
--- a/config/metrics/counts_28d/20210216183644_gitlab_project.yml
+++ b/config/metrics/counts_28d/20210216183644_gitlab_project.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.project_imports.gitlab_project
description: Count of projects imported using Project Import/Export
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183646_gitlab.yml b/config/metrics/counts_28d/20210216183646_gitlab.yml
index 0871d5d8c80..84a6387fbf5 100644
--- a/config/metrics/counts_28d/20210216183646_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183646_gitlab.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.project_imports.gitlab
description: Count of projects imported from GitLab using Project Export/Import
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183648_github.yml b/config/metrics/counts_28d/20210216183648_github.yml
index 0a3264c42c1..d7ad93520a7 100644
--- a/config/metrics/counts_28d/20210216183648_github.yml
+++ b/config/metrics/counts_28d/20210216183648_github.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.project_imports.github
description: Count of projects imported from GitHub
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183650_bitbucket.yml b/config/metrics/counts_28d/20210216183650_bitbucket.yml
index eb6562ffd34..c702f1a065f 100644
--- a/config/metrics/counts_28d/20210216183650_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183650_bitbucket.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.project_imports.bitbucket
description: Count of projects imported from Bitbucket
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183652_bitbucket_server.yml b/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
index 33052c998ab..0781ceca40f 100644
--- a/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.project_imports.bitbucket_server
description: Count of projects imported from Bitbucket Server
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183653_gitea.yml b/config/metrics/counts_28d/20210216183653_gitea.yml
index 07cf905e938..f5909eb7475 100644
--- a/config/metrics/counts_28d/20210216183653_gitea.yml
+++ b/config/metrics/counts_28d/20210216183653_gitea.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.project_imports.gitea
description: Count of projects imported from Gitea
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183655_git.yml b/config/metrics/counts_28d/20210216183655_git.yml
index 5fe5dd58521..68738e36ddd 100644
--- a/config/metrics/counts_28d/20210216183655_git.yml
+++ b/config/metrics/counts_28d/20210216183655_git.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.project_imports.git
description: Count of projects imported from Git
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183657_manifest.yml b/config/metrics/counts_28d/20210216183657_manifest.yml
index 5c9f008a2ea..d93467a3965 100644
--- a/config/metrics/counts_28d/20210216183657_manifest.yml
+++ b/config/metrics/counts_28d/20210216183657_manifest.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.project_imports.manifest
description: Count of projects imported using Manifest file
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183659_gitlab_migration.yml b/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
index 49b8cf23a37..40f4965f8a0 100644
--- a/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
+++ b/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.project_imports.gitlab_migration
description: Count of projects imported using GitLab Migration
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183701_jira.yml b/config/metrics/counts_28d/20210216183701_jira.yml
index ca48d7ffd3d..cb6c808fb90 100644
--- a/config/metrics/counts_28d/20210216183701_jira.yml
+++ b/config/metrics/counts_28d/20210216183701_jira.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.issue_imports.jira
description: Count of imports from Jira
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183703_fogbugz.yml b/config/metrics/counts_28d/20210216183703_fogbugz.yml
index 3342c8a5422..e3369043e74 100644
--- a/config/metrics/counts_28d/20210216183703_fogbugz.yml
+++ b/config/metrics/counts_28d/20210216183703_fogbugz.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.issue_imports.fogbugz
description: Count of imports from Fogbugz
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183705_phabricator.yml b/config/metrics/counts_28d/20210216183705_phabricator.yml
index 821834b1744..57bf3e5abf3 100644
--- a/config/metrics/counts_28d/20210216183705_phabricator.yml
+++ b/config/metrics/counts_28d/20210216183705_phabricator.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.issue_imports.phabricator
description: Count of imports from Phabricator
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183707_csv.yml b/config/metrics/counts_28d/20210216183707_csv.yml
index 67e664392fc..703edf02f76 100644
--- a/config/metrics/counts_28d/20210216183707_csv.yml
+++ b/config/metrics/counts_28d/20210216183707_csv.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.issue_imports.csv
description: Count of (issue) imports from CSV file
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183709_group_import.yml b/config/metrics/counts_28d/20210216183709_group_import.yml
index a12ec6e836b..bbe9da3175c 100644
--- a/config/metrics/counts_28d/20210216183709_group_import.yml
+++ b/config/metrics/counts_28d/20210216183709_group_import.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.group_imports.group_import
description: Number of group import states
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183711_gitlab_migration.yml b/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
index f860a247746..1a517169eeb 100644
--- a/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
+++ b/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.group_imports.gitlab_migration
description: Count of groups imported using GitLab Migration
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183712_total.yml b/config/metrics/counts_28d/20210216183712_total.yml
index 370eba135ea..8942de0f9b8 100644
--- a/config/metrics/counts_28d/20210216183712_total.yml
+++ b/config/metrics/counts_28d/20210216183712_total.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.projects_imported.total
description: Count of all imported projects
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183714_gitlab_project.yml b/config/metrics/counts_28d/20210216183714_gitlab_project.yml
index 0318e869c40..e8d1204d428 100644
--- a/config/metrics/counts_28d/20210216183714_gitlab_project.yml
+++ b/config/metrics/counts_28d/20210216183714_gitlab_project.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.projects_imported.gitlab_project
description: Count of projects imported using Project Import/Export
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183716_gitlab.yml b/config/metrics/counts_28d/20210216183716_gitlab.yml
index 16f9295459a..b5ad788c6d0 100644
--- a/config/metrics/counts_28d/20210216183716_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183716_gitlab.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.projects_imported.gitlab
description: Count of projects imported using Project Import/Export
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183718_github.yml b/config/metrics/counts_28d/20210216183718_github.yml
index e2bf0a2c5a9..a476a103458 100644
--- a/config/metrics/counts_28d/20210216183718_github.yml
+++ b/config/metrics/counts_28d/20210216183718_github.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.projects_imported.github
description: Count of projects imported from GitHub
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183720_bitbucket.yml b/config/metrics/counts_28d/20210216183720_bitbucket.yml
index cab61cd4472..4c3a0bd3721 100644
--- a/config/metrics/counts_28d/20210216183720_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183720_bitbucket.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.projects_imported.bitbucket
description: Count of projects imported from Bitbucket
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
index 176ef054949..82bcde1b2ee 100644
--- a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.projects_imported.bitbucket_server
description: Count of projects imported from Bitbucket Server
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183724_gitea.yml b/config/metrics/counts_28d/20210216183724_gitea.yml
index 43270b79fa5..df1d3c5b012 100644
--- a/config/metrics/counts_28d/20210216183724_gitea.yml
+++ b/config/metrics/counts_28d/20210216183724_gitea.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.projects_imported.gitea
description: Count of projects imported from Gitea
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183726_git.yml b/config/metrics/counts_28d/20210216183726_git.yml
index cd8e524de5b..7e711694253 100644
--- a/config/metrics/counts_28d/20210216183726_git.yml
+++ b/config/metrics/counts_28d/20210216183726_git.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.projects_imported.git
description: Count of projects imported from Git
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183728_manifest.yml b/config/metrics/counts_28d/20210216183728_manifest.yml
index f1dd348112b..3c935d604fa 100644
--- a/config/metrics/counts_28d/20210216183728_manifest.yml
+++ b/config/metrics/counts_28d/20210216183728_manifest.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.projects_imported.manifest
description: Count of projects imported from Git using file Manifest
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183730_jira.yml b/config/metrics/counts_28d/20210216183730_jira.yml
index e540fda2c14..488b4b4c19e 100644
--- a/config/metrics/counts_28d/20210216183730_jira.yml
+++ b/config/metrics/counts_28d/20210216183730_jira.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.issues_imported.jira
description: Count of projects imported from Jira
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183731_fogbugz.yml b/config/metrics/counts_28d/20210216183731_fogbugz.yml
index 716f4245eca..2239c83696d 100644
--- a/config/metrics/counts_28d/20210216183731_fogbugz.yml
+++ b/config/metrics/counts_28d/20210216183731_fogbugz.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.issues_imported.fogbugz
description: Count of projects imported from Fogbugz
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183733_phabricator.yml b/config/metrics/counts_28d/20210216183733_phabricator.yml
index 2e6dbdfc791..903a06793e1 100644
--- a/config/metrics/counts_28d/20210216183733_phabricator.yml
+++ b/config/metrics/counts_28d/20210216183733_phabricator.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.issues_imported.phabricator
description: Count of projects imported from Phabricator
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183735_csv.yml b/config/metrics/counts_28d/20210216183735_csv.yml
index bca04d3b416..2890302b24a 100644
--- a/config/metrics/counts_28d/20210216183735_csv.yml
+++ b/config/metrics/counts_28d/20210216183735_csv.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.issues_imported.csv
description: Count of projects imported from CSV file
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183737_groups_imported.yml b/config/metrics/counts_28d/20210216183737_groups_imported.yml
index cb86542bd45..b2a53befda2 100644
--- a/config/metrics/counts_28d/20210216183737_groups_imported.yml
+++ b/config/metrics/counts_28d/20210216183737_groups_imported.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.groups_imported
description: Count of imported groups
product_section: dev
diff --git a/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml b/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml
index 0dd8f7b9f68..b4b4c6fb28e 100644
--- a/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml
+++ b/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage_monthly.secure.user_coverage_fuzzing_jobs
description: ''
product_section: ''
diff --git a/config/metrics/counts_28d/20210216183826_sast_scans.yml b/config/metrics/counts_28d/20210216183826_sast_scans.yml
index 3e24bb9a28c..0f645f5b1d7 100644
--- a/config/metrics/counts_28d/20210216183826_sast_scans.yml
+++ b/config/metrics/counts_28d/20210216183826_sast_scans.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage_monthly.secure.sast_scans
description: ''
product_section: ''
diff --git a/config/metrics/counts_28d/20210216183830_container_scanning_scans.yml b/config/metrics/counts_28d/20210216183830_container_scanning_scans.yml
index 93ac69f5434..386c05ea5b2 100644
--- a/config/metrics/counts_28d/20210216183830_container_scanning_scans.yml
+++ b/config/metrics/counts_28d/20210216183830_container_scanning_scans.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage_monthly.secure.container_scanning_scans
description: ''
product_section: ''
diff --git a/config/metrics/counts_28d/20210216183832_dast_scans.yml b/config/metrics/counts_28d/20210216183832_dast_scans.yml
index db70df0fd9c..d0b6946d495 100644
--- a/config/metrics/counts_28d/20210216183832_dast_scans.yml
+++ b/config/metrics/counts_28d/20210216183832_dast_scans.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage_monthly.secure.dast_scans
description: ''
product_section: ''
diff --git a/config/metrics/counts_28d/20210216183834_secret_detection_scans.yml b/config/metrics/counts_28d/20210216183834_secret_detection_scans.yml
index a1bf05e201b..fda980b8252 100644
--- a/config/metrics/counts_28d/20210216183834_secret_detection_scans.yml
+++ b/config/metrics/counts_28d/20210216183834_secret_detection_scans.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage_monthly.secure.secret_detection_scans
description: ''
product_section: ''
diff --git a/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml b/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml
index 058e00a64bc..3505b82722a 100644
--- a/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml
+++ b/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage_monthly.secure.coverage_fuzzing_scans
description: ''
product_section: ''
diff --git a/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml b/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml
index 3fda9daa701..a9f68160b26 100644
--- a/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml
+++ b/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage_monthly.secure.api_fuzzing_scans
description: ''
product_section: ''
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 15939ae2a9d..3987df0e7eb 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: enablement
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 f962e1abba6..fe05044105a 100644
--- a/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
+++ b/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ide_edit.g_edit_by_sse_monthly
description: Number of user editing files using the Static Site Editor
product_section: dev
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 f5ad324b0dc..e47c1d8b729 100644
--- a/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.source_code.git_write_action_monthly
description: Count of unique Git write actions
product_section: dev
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 b4b800d1e10..be9420ef8cd 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.testing.testing_total_unique_counts_monthly
description: ''
product_section: ''
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 fef847b51b4..b30148f3090 100644
--- a/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
+++ b/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.snippets.i_snippets_show_monthly
description: Monthly number of users viewing snippets
product_section: dev
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 2cec39f73ce..b3b3c7b6749 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
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: redis_hll_counters.terraform.p_terraform_state_api_unique_users_monthly
description: Monthly active users of GitLab Managed Terraform states
product_section: ops
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 babaaae2225..ca852c74821 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 ac38b5aa7fb..1307111cc3c 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_toggled_task_item_status_monthly
description: Count of unique users per month who toggled a task item in a merge request
product_stage: create
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 014b1143c62..a2e858cd886 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_approve_mr_monthly
description: Count of unique users per month who approve a merge request
product_stage: create
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 fb1125a0d81..583978e9bd6 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_unapprove_mr_monthly
description: Count of unique users per month who unapprove a merge request
product_stage: create
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 40e98d14684..0828587051e 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_resolve_thread_monthly
description: Count of unique users per month who resolve a thread in a merge request
product_stage: create
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 56092427ce9..fe195544df4 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_unresolve_thread_monthly
description: Count of unique users per month who unresolve a thread in a merge request
product_stage: create
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 1732c4fcf89..0bd8573477b 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_edit_mr_title_monthly
description: Count of unique users per month who edit the title of a merge request
product_stage: create
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 9226a2527ce..ba30f3aad30 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_edit_mr_desc_monthly
description: Count of unique users per month who edit the description of a merge request
product_stage: create
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 cbc6572b0e4..f948c01170f 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,5 +1,5 @@
---
-data_category: Optional
+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
product_stage: create
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 35177419f6f..478ae4bef09 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,5 +1,5 @@
---
-data_category: Optional
+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
product_stage: create
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 3e753a743b8..7e5ccc54f67 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,5 +1,5 @@
---
-data_category: Optional
+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
product_stage: create
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 bc397d334e7..59def107ab6 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,5 +1,5 @@
---
-data_category: Optional
+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
product_stage: create
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 3ea2a8f6631..ec940edea17 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,5 +1,5 @@
---
-data_category: Optional
+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
product_stage: create
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 275f7bc6e9f..2e4b9bffb9f 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_assigned_monthly
description: Count of unique users per month who are assigned to a merge request
product_stage: create
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 71c7481a4ca..bf49cac8446 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_marked_as_draft_monthly
description: Count of unique users per month who mark a merge request as a draft
product_stage: create
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 89463b3ed86..746e9ed6f2f 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_unmarked_as_draft_monthly
description: Count of unique users per month who unmark a merge request as a draft
product_stage: create
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 27f530fbab7..a93b38a14ec 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_review_requested_monthly
description: Count of unique users per month who request a review of a merge request
product_stage: create
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 b14fca38a50..fec8c67a6e7 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_added_monthly
description: Count of unique users per month who add an approval rule to a merge request
product_stage: create
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 50749578b9b..c33697d8925 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,5 +1,5 @@
---
-data_category: Optional
+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
product_stage: create
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 5696672f651..c46191814fe 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,5 +1,5 @@
---
-data_category: Optional
+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
product_stage: create
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 4bcb1197b48..d4f72aab3eb 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_vs_code_api_request_monthly
description: Count of unique users per month who use GitLab Workflow for VS Code
product_stage: create
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 e39b2a76208..3a672ceb92f 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_from_issue_monthly
description: Count of unique users per month who create a merge request from an issue
product_stage: create
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 73967f0bb2b..2b6e1c978d7 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.code_review_total_unique_counts_monthly
description: Count of unique users per month who interact with a merge request
product_stage: create
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 79a064cad59..6a4c6ecabbb 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_monthly
description: Count of pipelines with implicit Auto DevOps runs
product_section: ops
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 84166d3edb7..be444d905d3 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_build_monthly
description: Count of pipelines with implicit Auto Build runs
product_section: ops
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 170de93af35..af29b691d7b 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_deploy_monthly
description: Count of pipelines with implicit Auto Deploy runs
product_section: ops
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 37cb1d072a0..11f73e174ea 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_sast_monthly
description: ''
product_section: ''
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 2b45b340aec..d1063fd0505 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_secret_detection_monthly
description: ''
product_section: ''
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 1474f229d77..f072b2c99ab 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ci_templates.p_ci_templates_5_min_production_app_monthly
description: Number of projects using 5 min production app CI template in last 7 days.
product_section: seg
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 94dc4763471..40556dccc72 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_monthly
description: Count of pipelines using the Auto DevOps template
product_section: ops
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 471923e85c3..4fc5cbef8f1 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,5 +1,5 @@
---
-data_category: Optional
+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."
product_section: ops
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 54b5514d8a1..d3cdde90cfd 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,5 +1,5 @@
---
-data_category: Optional
+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."
product_section: ops
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 8e8f11f034b..7762acff858 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_build_monthly
description: Count of pipelines using the Auto Build template
product_section: ops
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 200fb9a7c1e..39bb1696cd0 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_monthly
description: Count of pipelines using the stable Auto Deploy template
product_section: ops
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 2fd81cd64af..ba769b2ada4 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_latest_monthly
description: Count of pipelines using the latest Auto Deploy template
product_section: ops
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 b264fe19f26..c65feb0d63d 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ci_templates.p_ci_templates_security_sast_monthly
description: ''
product_section: ''
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 cfe17ea167d..3f4b13b27e3 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ci_templates.p_ci_templates_security_secret_detection_monthly
description: ''
product_section: ''
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 bd7a17b87ab..a1e5c7b2504 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_base_latest_monthly
description: Count of pipelines that include the terraform base template from GitLab
product_section: ops
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 a8a144c9f7e..74f362d3bcc 100644
--- a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ci_templates.ci_templates_total_unique_counts_monthly
description: Total count of pipelines runs
product_section: ops
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 5efa8c29fcf..de5acc6a60c 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
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 52256b10097..e17b27e27c8 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 adc89858093..1a507cd7fd7 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 3b6951db697..90e21c17b14 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 b1685bc86bf..c7adbbc8f76 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 a852830bd40..e6290c53726 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 a7d1fdc1271..0275bbe7d2c 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 cc9f97ee1d5..bc98afc8236 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 d0dce27f3dc..cdcab5ecb82 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 e8557007c34..410a9fc3c5f 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 f72bb17bedb..1ac4a545d06 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 9e96d08b8eb..2d8650cbdb8 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 67968bb1520..fe88689c47d 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 cb42ba4186e..fd9cf0a3cda 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 e37d9e69c2d..66035bb09af 100644
--- a/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.user_packages.i_package_conan_user_monthly
description: A monthly count of users that have published a Conan package to the registry
product_section: ops
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 d480e8eacf6..77d6cfd06ac 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 2683628049d..eb7fc9876b2 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 903f9f8b146..bdc5084d090 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 0c559a16839..aa30b7ffd40 100644
--- a/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.user_packages.i_package_golang_user_monthly
description: A monthly count of users that have published a Go moduleto the registry
product_section: ops
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 8aadb66dfbb..1a9093ce26b 100644
--- a/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.user_packages.i_package_maven_user_monthly
description: A monthly count of users that have published a Maven package to the registry
product_section: ops
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 ef281ea174c..dcb27ebe037 100644
--- a/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.user_packages.i_package_npm_user_monthly
description: A monthly count of users that have published an npm package to the registry
product_section: ops
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 e89c7811a4e..71417d00306 100644
--- a/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.user_packages.i_package_nuget_user_monthly
description: A monthly count of users that have published a NuGet package to the registry
product_section: ops
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 a1d3c6d1db4..4682225a570 100644
--- a/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.user_packages.i_package_pypi_user_monthly
description: A monthly count of users that have published a PyPI package to the registry
product_section: ops
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 f39cb56f015..d4dc5266572 100644
--- a/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.user_packages.i_package_tag_user_monthly
description: A monthly count of users that have published a package tag to the registry
product_section: ops
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 b6f25efd154..3a8a100ce8f 100644
--- a/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: redis_hll_counters.user_packages.user_packages_total_unique_counts_monthly
description: A monthly count of users that have published a package to the registry
product_section: ops
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 10f02ffec9c..09e1cbbbd5c 100644
--- a/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_close_issue_monthly
description: Number of users closing Jira issues by month
product_section: dev
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 9c32f66fba6..ea70b84f273 100644
--- a/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
+++ b/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_cross_reference_monthly
description: Number of users that cross-referenced Jira issues by month
product_section: dev
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 825bcdb1a82..e5009ce8c7f 100644
--- a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.ecosystem_total_unique_counts_monthly
description: Number of users performing actions on Jira issues by month
product_section: dev
diff --git a/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml b/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
index 6bb847c958b..0ed31fa36d7 100644
--- a/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
+++ b/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_invite_email_single_monthly
description: Unique users using the /invite_email quick action to add a single email participant to an issue within 28 days
product_section: dev
diff --git a/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml b/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
index 989f170b970..e7e6ecd5d3c 100644
--- a/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
+++ b/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_invite_email_multiple_monthly
description: Unique users using the /invite_email quick action to add a multiple email participants to an issue within 28 days
product_section: dev
diff --git a/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml b/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml
index c376bc9b08e..c6447db3ccb 100644
--- a/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_time_estimate_changed_monthly
description: Count of unique users per month who changed time estimate of a MR
product_section: dev
diff --git a/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml b/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml
index 123903b0103..277060a93a9 100644
--- a/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_time_spent_changed_monthly
description: Count of unique users per month who changed time spent on a MR
product_section: dev
diff --git a/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml b/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml
index 6c2feab380b..e9b8ac665ac 100644
--- a/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml
+++ b/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_mr_discussion_locked_monthly
description: Count of unique users per month who locked a MR
product_section: dev
diff --git a/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml b/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml
index 48aaf34a449..b1380590eb2 100644
--- a/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml
+++ b/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_mr_discussion_unlocked_monthly
description: Count of unique users per month who unlocked a MR
product_section: dev
diff --git a/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml b/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml
index 7c3ba5fc1dc..3f71aff89d5 100644
--- a/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml
+++ b/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.pipeline_authoring.o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly
description: Monthly unique user count having merge requests which contains the CI config file
product_section: ops
diff --git a/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml b/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml
index 3442bce3fc5..e5530f3a5de 100644
--- a/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_milestone_changed_monthly
description: Count of unique users per month who changed milestone of a MR
product_section: dev
diff --git a/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml b/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml
index 8e6028cc1ba..7ce83b31a76 100644
--- a/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_labels_changed_monthly
description: Count of unique users per month who changed labels of a MR
product_section: dev
diff --git a/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml b/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml
index 49b75204a69..c0dd76951a5 100644
--- a/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_assignees_changed_monthly
description: Count of unique users per month who changed assignees of a MR
product_section: dev
diff --git a/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml b/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml
index dbc5b67505a..60ad9493fee 100644
--- a/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_reviewers_changed_monthly
description: Count of unique users per month who changed reviewers of a MR
product_section: dev
diff --git a/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml b/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
index 7982e5c2080..5c8f73cba5e 100644
--- a/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_issue_notification_monthly
description: Calculated unique users to trigger a Slack message by performing an action on an issue by month
product_section: dev
diff --git a/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml b/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
index 58a19c976ef..253c77cb4f9 100644
--- a/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_push_notification_monthly
description: Calculated unique users to trigger a Slack message by performing a Git push by month
product_section: dev
diff --git a/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml b/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
index a496c23f27a..3991875e665 100644
--- a/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_deployment_notification_monthly
description: Calculated unique users to trigger a Slack message by performing a deployment by month
product_section: dev
diff --git a/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml b/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
index 4fd3024a123..8c209b3510c 100644
--- a/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_wiki_page_notification_monthly
description: Calculated unique users to trigger a Slack message by performing an action on a wiki page by month
product_section: dev
diff --git a/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml b/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
index cca179d85d9..1b861af7ee1 100644
--- a/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_merge_request_notification_monthly
description: Calculated unique users to trigger a Slack message by performing an action on a merge request by month
product_section: dev
diff --git a/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml b/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
index 373207882e6..83e178a7493 100644
--- a/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_note_notification_monthly
description: Calculated unique users to trigger a Slack message by creating a note by month
product_section: dev
diff --git a/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml b/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
index deffb8604b2..8b0e54d471f 100644
--- a/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_tag_push_notification_monthly
description: Calculated unique users to trigger a Slack message by performing a tag push by month
product_section: dev
diff --git a/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml b/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
index c6d22aeee3a..8d1e866afb0 100644
--- a/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_confidential_note_notification_monthly
description: Calculated unique users to trigger a Slack message by creating a confidential note by month
product_section: dev
diff --git a/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml b/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
index 5ffe284e566..a2cfa975d91 100644
--- a/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_confidential_issue_notification_monthly
description: Calculated unique users to trigger a Slack message by performing an action on a confidential issue by month
product_section: dev
diff --git a/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml b/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml
index 5084e954108..3844eb6ccfd 100644
--- a/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.deploy_token_packages.i_package_rubygems_deploy_token_monthly
description: Distinct count events for RubyGems packages published using a Deploy token in recent 28 days
product_section: ops
diff --git a/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml b/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml
index 1058ace0ae5..8f3912ee37e 100644
--- a/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml
+++ b/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.user_packages.i_package_rubygems_user_monthly
description: Distinct user count of RubyGems packages published in recent 28 days
product_section: ops
diff --git a/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml b/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
index bae8dd4d544..18c3f96be6a 100644
--- a/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.secure.users_expanding_secure_security_report_monthly
description: Count of expanding the security report widget
product_section: sec
diff --git a/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml b/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
index a86d69b33fb..d9b6ad05ac6 100644
--- a/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.testing.users_expanding_testing_code_quality_report_monthly
description: Count of expanding the code quality widget
product_section: ops
diff --git a/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml b/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
index 5c8f72e96b9..3767fedeb86 100644
--- a/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.testing.users_expanding_testing_accessibility_report_monthly
description: Count of expanding the accessibility report widget
product_section: ops
diff --git a/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml b/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml
index 5eaeda70733..259e334d6d3 100644
--- a/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.deploy_token_packages.i_package_terraform_module_deploy_token_monthly
description: Number of distinct users authorized via deploy token creating Terraform Module packages in recent 28 days
product_section: ops
diff --git a/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml b/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml
index 89b39d7052f..0d37dc229e8 100644
--- a/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml
+++ b/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.user_packages.i_package_terraform_module_user_monthly
description: Number of distinct users creating Terraform Module packages in recent 28 days
product_section: ops
diff --git a/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml b/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
index aeaf9615ec4..e71f298b992 100644
--- a/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
+++ b/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.testing.i_testing_summary_widget_total_monthly
description: Unique users that expand the test summary merge request widget by month
product_section: ops
diff --git a/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml b/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml
index d4b704c89b3..5fea551038a 100644
--- a/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml
+++ b/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_click_single_file_mode_setting_monthly
description: Count of users clicking single file mode setting
product_section: dev
diff --git a/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml b/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml
index 8dab5c3eab6..6a1b63c25f7 100644
--- a/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml
+++ b/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_click_file_browser_setting_monthly
description: Count of users clicking merge request file browser setting
product_section: dev
diff --git a/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml b/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml
index c245a41b99b..f8d978844a9 100644
--- a/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml
+++ b/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_click_whitespace_setting_monthly
description: Count of users clicking merge request whitespae setting
product_section: dev
diff --git a/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml b/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml
index 467c2fe3956..d86772cea6b 100644
--- a/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml
+++ b/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_diff_view_inline_monthly
description: Count of users with merge request view type as inline
product_section: dev
diff --git a/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml b/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml
index ff581eca8cf..d3d2889dfa3 100644
--- a/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml
+++ b/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_diff_view_parallel_monthly
description: Count of users with merge request view type as parallel
product_section: dev
diff --git a/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml b/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml
index c1bf821be4a..55fe49b2639 100644
--- a/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml
+++ b/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_file_browser_tree_view_monthly
description: Count of users with merge request file tree setting
product_section: dev
diff --git a/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml b/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml
index 901e93f93e9..d26aa837f26 100644
--- a/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml
+++ b/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_file_browser_list_view_monthly
description: Count of users with merge request file list setting
product_section: dev
diff --git a/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml b/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml
index a6e0068b8cd..06a8b55ff62 100644
--- a/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml
+++ b/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_diff_show_whitespace_monthly
description: Count of users with show whitespace enabled
product_section: dev
diff --git a/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml b/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml
index 1ff74f17d00..6095e9ec05d 100644
--- a/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml
+++ b/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_diff_hide_whitespace_monthly
description: Count of users with show whitespace disabled
product_section: dev
diff --git a/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml b/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml
index 4061c6b84ee..58c7aafd9de 100644
--- a/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml
+++ b/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_diff_single_file_monthly
description: Count of users with single file mode enabled
product_section: dev
diff --git a/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml b/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml
index aa017fc66d8..9af4cab1e87 100644
--- a/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml
+++ b/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_diff_multiple_files_monthly
description: Count of users with single mode disabled
product_section: dev
diff --git a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
index f092c87e80d..d341ce11ec4 100644
--- a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_monthly.aggregated_metrics.code_review_category_monthly_active_users
name: "0"
description:
diff --git a/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
index 663bc22a8b1..e263777a2dd 100644
--- a/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_monthly.aggregated_metrics.code_review_extension_category_monthly_active_users
name: "0"
description:
diff --git a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
index 16ca7da854d..fbe5fba73be 100644
--- a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_monthly.aggregated_metrics.code_review_group_monthly_active_users
name: "0"
description:
diff --git a/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
index 03f4ed9ce85..eda0f937450 100644
--- a/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.pipeline_authoring.pipeline_authoring_total_unique_counts_monthly
name: "0"
description:
diff --git a/config/metrics/counts_28d/20210427213346_geo_secondary_web_oauth_users.yml b/config/metrics/counts_28d/20210427213346_geo_secondary_web_oauth_users.yml
index 34d9e157975..c74b28e0546 100644
--- a/config/metrics/counts_28d/20210427213346_geo_secondary_web_oauth_users.yml
+++ b/config/metrics/counts_28d/20210427213346_geo_secondary_web_oauth_users.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.enablement.geo_secondary_web_oauth_users
name: ""
description:
diff --git a/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml b/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml
index bba1ecc98dd..596063e4a43 100644
--- a/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml
+++ b/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_resolve_conflict_monthly
name: resolve_conflict
description: Count of unique users per week who attempt to resolve a conflict through the ui
diff --git a/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml b/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml
index 01e452da2b4..c793a2887d8 100644
--- a/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml
+++ b/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_load_conflict_ui_monthly
name: load_conflict_ui
description: Count of unique users per week who load the conflict resolution page
diff --git a/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml b/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
index 47b33835640..abf16d3dee9 100644
--- a/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
+++ b/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_monthly.projects
description: 'Count number of projects created monthly'
product_section: dev
diff --git a/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml b/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml
index 1560e2ba43d..e830504277e 100644
--- a/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.deploy_token_packages.i_package_helm_deploy_token_monthly
description: Distinct Helm pakages deployed in recent 28 days
product_section: ops
diff --git a/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml b/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml
index ec903822901..b085325637f 100644
--- a/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml
+++ b/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.user_packages.i_package_helm_user_monthly
description: Distinct user count events for Helm packages in recent 28 days
product_section: ops
diff --git a/config/metrics/counts_28d/20210520111133_total.yml b/config/metrics/counts_28d/20210520111133_total.yml
index 770edde3753..9470b6f1dff 100644
--- a/config/metrics/counts_28d/20210520111133_total.yml
+++ b/config/metrics/counts_28d/20210520111133_total.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage_monthly.manage.project_imports.total
description: Total count of projects imported
product_section: dev
diff --git a/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml b/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml
index 7fa681db2ba..4a3ec6eb8f2 100644
--- a/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml
+++ b/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_click_diff_view_setting_monthly
description: Count of users clicking diff view setting
product_section: dev
diff --git a/config/metrics/counts_28d/20210720144005_i_code_review_user_searches_diff_monthly.yml b/config/metrics/counts_28d/20210720144005_i_code_review_user_searches_diff_monthly.yml
index 1f3beeda1f9..8b48a623045 100644
--- a/config/metrics/counts_28d/20210720144005_i_code_review_user_searches_diff_monthly.yml
+++ b/config/metrics/counts_28d/20210720144005_i_code_review_user_searches_diff_monthly.yml
@@ -15,7 +15,7 @@ instrumentation_class: RedisHLLMetric
options:
events:
- i_code_review_user_searches_diff
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml b/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml
index 36cf23f04c4..f23300c3a52 100644
--- a/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml
+++ b/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml
@@ -15,7 +15,7 @@ instrumentation_class: RedisHLLMetric
options:
events:
- i_quickactions_severity
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
index df6ff762df8..48e72f62caf 100644
--- a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_title_changed_weekly
description: Count of WAU editing an issue title
product_stage: plan
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 18926bd6332..bf8d4fd5df3 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.analytics.i_analytics_instance_statistics_weekly
description: Unique visitors to /admin/usage_trends by week
product_section: dev
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 362816dfbca..a8cba319df8 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.analytics.analytics_total_unique_counts_weekly
description: The number of unique users who visited any analytics feature by week
product_section: dev
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 eeb808f1cdf..004b24b0d0e 100644
--- a/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.source_code.merge_request_action_weekly
description: Count of unique users who perform an action on a merge request
product_section: dev
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 6cd8b60d104..e712a02c27d 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.source_code.i_source_code_code_intelligence_weekly
description: Count of unique users who use code intelligence
product_section: dev
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 c4804375634..7c27eff7b75 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_mr_diffs_weekly
description: Count of unique merge requests per week with diffs viewed
product_section: dev
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 0f90cef09b2..8430bb9c1ad 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_single_file_diffs_weekly
description: Count of unique users per week with diffs viewed file by file
product_section: dev
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 98c9fb7af11..c6d312cac70 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_mr_single_file_diffs_weekly
description: Count of unique merge requests per week with diffs viewed file by file
product_section: dev
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 ba77134b83f..92a7035b685 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_weekly
description: Count of unique users per week who created a MR
product_section: dev
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 868b7780aad..c336a950746 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_close_mr_weekly
description: Count of unique users per week who closed a MR
product_section: dev
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 9803777d3e1..c4e59d2dcdb 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_reopen_mr_weekly
description: Count of unique users per week who reopened a MR
product_section: dev
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 a190639a060..635681cc47c 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_merge_mr_weekly
description: Count of unique users per week who merged a MR
product_section: dev
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 2f7199e1c13..064367405c8 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_comment_weekly
description: Count of unique users per week who commented on a MR
product_section: dev
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 11ad934989b..783c456c379 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_edit_mr_comment_weekly
description: Count of unique users per week who edited a comment on a MR
product_section: dev
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 96a7db25394..8e0dc5b31a6 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_remove_mr_comment_weekly
description: Count of unique users per month who removed a comment on a MR
product_section: dev
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 704b05ca3be..57fd33f2e22 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_add_suggestion_weekly
description: Count of unique users per week who added a suggestion
product_section: dev
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 04b76c42a5d..4e34212e9cb 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_apply_suggestion_weekly
description: Count of unique users per week who applied a suggestion
product_section: dev
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 985c20899f1..90840faf43d 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ide_edit.g_edit_by_web_ide_weekly
description: Weekly number of users editing using the Web IDE
product_section: dev
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 ffab5422fd5..0e7720ee8b3 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ide_edit.g_edit_by_sfe_weekly
description: Weekly number of users editing from the single file editor
product_section: dev
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 d96b178173c..3bd141fbfcc 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ide_edit.g_edit_by_snippet_ide_weekly
description: Weekly number of users editing Snippets
product_section: dev
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 8ca9395075f..6b5b8d8914e 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ide_edit.ide_edit_total_unique_counts_weekly
description: Weekly number of users editing a file using the Web IDE
product_section: dev
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 6002b7c1bfa..e7146cf8158 100644
--- a/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
+++ b/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.search.i_search_total_weekly
description: Calculated unique users to perform Basic or Advanced searches by week
product_section: enablement
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 e9184ffdb3a..c27b8be56ee 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.search.search_total_unique_counts_weekly
description: Calculated unique users to perform Basic or Advanced searches by week
product_section: enablement
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 13e01bf4a3e..628956629fc 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_weekly.aggregated_metrics.incident_management_alerts_total_unique_counts
description: Count of unique users per week to take an action on an alert
product_section: ops
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 25711f674b9..bfdc0410d2b 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_weekly.aggregated_metrics.incident_management_incidents_total_unique_counts
description: Count of unique users per week to take an action on an incident
product_section: ops
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 db4f6bba6eb..903a1da1f1f 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_alert_status_changed_weekly
description: Count of unique users changing alert's status per week
product_section: ops
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 a18b40a2e12..98546cb7a84 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_alert_assigned_weekly
description: Count of unique users assigning an alert per week
product_section: ops
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 47e80be1834..25c54267179 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_alert_todo_weekly
description: Count of unique users adding alerts to the TODO list per week
product_section: ops
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 da9cc8e95ba..79abe8e9459 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_incident_created_weekly
description: Count of unique users creating incidents per week
product_section: ops
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 c5d0f53f455..718faa29b4a 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_incident_reopened_weekly
description: Count of unique users reopening incidents per week
product_section: ops
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 f8e1bca3b59..e04baa14a93 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_incident_closed_weekly
description: Count of users closing incidents per week
product_section: ops
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 455bcbfb41c..47919052937 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_incident_assigned_weekly
description: Count of unique users assiging incidents per week
product_section: ops
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 76a29bb330f..6bb7e389b86 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_incident_todo_weekly
description: Count of unique users adding incidents to the TODO list per week
product_section: ops
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 fbb1cc1bc3e..cfc02a494fd 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_incident_comment_weekly
description: Count of unique users adding comments on incidents per week
product_section: ops
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 3a15dcc4272..9e3f16ea2db 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_incident_zoom_meeting_weekly
description: Count of unique users creating Zoom meetings about incidents per week
product_section: ops
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 038b8773648..8b4e93fe938 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 e0fa9aa6b88..dab3f0a5611 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 a792ccb17f5..5ef90c0269a 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_incident_change_confidential_weekly
description: Count of unique users changing incidents to confidential per week
product_section: ops
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 a90ec06dd33..f8b657e27b7 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management.incident_management_total_unique_counts_weekly
description: Count of unique users performing events related to the incident management
product_section: ops
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 4c72cd8d82c..fc6dbd18b32 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.incident_management_alerts.incident_management_alert_create_incident_weekly
description: Count of unique users per week to create an incident corresponding to
an alert
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 c9584047b15..67721c0f081 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_description_changed_weekly
description: Count of WAU editing an issue description
product_section: dev
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 e2bf888b376..3b24f3d43ee 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_assignee_changed_weekly
description: Count of WAU changing issue assignees
product_section: dev
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 559d5d1e171..a1d3ebb2770 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_made_confidential_weekly
description: Count of WAU making an issue confidential
product_section: dev
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 2a8d3cd48c9..eda1f51f2a1 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_made_visible_weekly
description: Count of WAU making an issue not confidential
product_section: dev
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 d515230b080..8c4037fd1db 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_created_weekly
description: Count of WAU creating issues
product_section: dev
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 51c8db351bf..41dca2aac8d 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_closed_weekly
description: Count of WAU closing an issue
product_section: dev
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 8432562b1bb..5ceedd15a2f 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_reopened_weekly
description: Count of WAU re-opening a closed issue
product_section: dev
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 e31f46e7291..8df9757fc1e 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_label_changed_weekly
description: Count of WAU changing an issue's label
product_section: dev
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 20a0d39d460..6ce7c5fa822 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_milestone_changed_weekly
description: Count of WAU changing an issue's milestone
product_section: dev
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 a4d478aa0e9..0cd55b58aa0 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_cross_referenced_weekly
description: Count of WAU referencing an issue from somewhere else
product_section: dev
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 221766645b3..5ce80d42f33 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_moved_weekly
description: Count of WAU moving an issue to another project
product_section: dev
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 d4320262313..7291567e17f 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_related_weekly
description: Count of WAU relating an issue to another issue
product_section: dev
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 342ec66a8ba..b7abc40eb9f 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_unrelated_weekly
description: Count of WAU unrelating an issue to another issue
product_section: dev
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 7abbbbc888e..c661beb585f 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_marked_as_duplicate_weekly
description: Count of WAU marking an issue as a duplicate
product_section: dev
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 369b71980ca..99cfc654a63 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_locked_weekly
description: Count of WAU locking an issue
product_section: dev
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 d9750e399d6..17754a930fb 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_unlocked_weekly
description: Count of WAU unlocking an issue
product_section: dev
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 fbdc9d21804..2bc0b001482 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_added_weekly
description: Count of WAU adding a design to an issue
product_section: dev
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 34db2d39dd6..162e8e91c7b 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_modified_weekly
description: Count of WAU modifying a design on an issue
product_section: dev
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 380c3fdeb55..829f7610001 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_removed_weekly
description: Count of WAU removing a design from an issue
product_section: dev
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 a8fcc825648..b5fa673f35a 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_due_date_changed_weekly
description: Count of WAU changing an issue due date
product_section: dev
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 fa5f73bd415..e855dec21e8 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_time_estimate_changed_weekly
description: Count of WAU changing an issue time estimate
product_section: dev
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 d45a9d5390d..e7d071731db 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_time_spent_changed_weekly
description: Count of WAU recording time spent on an issue
product_section: dev
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 cbfea8cb910..76d60040879 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_added_weekly
description: Count of WAU commenting on an issue
product_section: dev
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 9a902037ecb..d0c8fd5c863 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_edited_weekly
description: Count of WAU editing a comment on an issue
product_section: dev
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 cb790a7a27e..8dace3f5ed4 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_removed_weekly
description: Count of WAU deleting a comment from an issue
product_section: dev
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 43a4e1b1c84..3a5a3b6c3b6 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.g_project_management_issue_cloned_weekly
description: Count of WAU cloning an issue
product_section: dev
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 c77d02eab46..6e016fabbba 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.issues_edit.issues_edit_total_unique_counts_weekly
description: Aggregate count of WAU taking an action related to an issue
product_section: dev
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 05d9bee86ce..0ed6dc80f0b 100644
--- a/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
+++ b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_approve_weekly
description: Count of WAU using the `/approve` quick action
product_section: dev
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 759cc2c1fb0..a7a3ec1ad95 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 620dbf804a0..a5115aff30f 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 f3c7de295d2..c38a8df55d8 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 be38ef308f5..38bf53b85c7 100644
--- a/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
+++ b/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 a26798a93db..8f250a3f9d6 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_board_move_weekly
description: Count of WAU using the `/board_move` quick action
product_section: dev
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 e6e88c16f80..4c7e9a65640 100644
--- a/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_clone_weekly
description: Count of WAU using the `/clone` quick action to clone an issue.
product_section: dev
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 88f34521f1f..0abd261a955 100644
--- a/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
+++ b/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_close_weekly
description: Count of WAU using the `/close` quick action to close an issuable
product_section: dev
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 873105f4e64..923c8acdb38 100644
--- a/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 52da1fe765b..38ed29c54d0 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_copy_metadata_merge_request_weekly
description: Count of WAU using the `/copy_metadata` quick action on a Merge Request
product_section: dev
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 197ae5da660..2358d4409b9 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_copy_metadata_issue_weekly
description: Count of WAU using the `/copy_metadata` quick action on an issue
product_section: dev
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 1a1a688c2c2..35eecec2be2 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 8da3c6bfe33..575992ebb56 100644
--- a/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
+++ b/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_done_weekly
description: Count of WAU using the `/done` quick action to mark a todo as done
product_section: dev
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 4fb4eec4838..dff8845d13e 100644
--- a/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
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
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 11d765ac7dd..269b20a85f4 100644
--- a/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
+++ b/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 991f6dba561..0b4d121e7f1 100644
--- a/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 8d166ac79b5..7a48efa232f 100644
--- a/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 e20baed4e5f..0106fe73fb7 100644
--- a/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
+++ b/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_label_weekly
description: Count of WAU using the `/label` quick action
product_section: dev
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 df251caef8a..05baed74083 100644
--- a/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
+++ b/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_lock_weekly
description: Count of WAU using the `/lock` quick action
product_section: dev
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 516b09c1b34..4f71a2b34a2 100644
--- a/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
+++ b/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_merge_weekly
description: Count of WAU using the `/merge` quick action
product_section: dev
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 2c4daede54e..070b1a8fcea 100644
--- a/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
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 728e45897c0..2523ac9d6bc 100644
--- a/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
+++ b/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_move_weekly
description: Count of WAU using the `/move` quick action
product_section: dev
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 0121682ea09..abc657df3c2 100644
--- a/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
+++ b/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_reassign_weekly
description: Count of WAU using the `/reassign @user1` quick action
product_section: dev
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 273121f1a0c..951e97973cf 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_reassign_reviewer_weekly
description: Count of WAU using the `/reassign_reviewer` quick action
product_section: dev
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 6ce5d7743cd..d43e975f900 100644
--- a/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
+++ b/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
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 8e6a7ee093d..cd0ef13cf14 100644
--- a/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
+++ b/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_relabel_weekly
description: Count of WAU using the `/relabel` quick action
product_section: dev
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 fbc62505ee2..f6076e328a8 100644
--- a/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_relate_weekly
description: Count of WAU using the `/relate` quick action
product_section: dev
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 b17ea84052d..2111cb5f388 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_remove_due_date_weekly
description: Count of WAU using the `/remove_due_date` quick action
product_section: dev
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 c6c9c6b2403..69035a5cd2f 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,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_remove_estimate_weekly
description: Count of WAU using the `/remove_estimate` quick action
product_section: dev
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 0839d8ab6ec..4dffc94c782 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,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_remove_milestone_weekly
description: Count of WAU using the `/remove_milestone` quick action
product_section: dev
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 e1fa53fbb3a..83ade2edb86 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_remove_time_spent_weekly
description: Count of WAU using the `/remove_time_spent` quick action
product_section: dev
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 5468c0d8212..bd3beb71a63 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,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_remove_zoom_weekly
description: Count of WAU using the `/remove_zoom` quick action
product_section: dev
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 00349bfaa57..4b861cf2767 100644
--- a/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
+++ b/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_reopen_weekly
description: Count of WAU using the `/reopen` quick action
product_section: dev
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 ab4b1451997..b9f858890da 100644
--- a/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
+++ b/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_shrug_weekly
description: Count of WAU using the `/shrug` quick action
product_section: dev
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 59d354bfc0d..95ca954f425 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 3b6a75bffd8..5b96c328208 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 0ee8f918d2f..61738f62506 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_submit_review_weekly
description: Count of WAU using the `/submit_review` quick action on Merge Requests
product_section: dev
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 d8f86c2a14c..819b314862d 100644
--- a/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
+++ b/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_subscribe_weekly
description: Count of WAU using the `/subscribe` quick action
product_section: dev
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 dd732adf42f..490dd5f3dce 100644
--- a/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
+++ b/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_tableflip_weekly
description: Count of WAU using the `/tableflip` quick action
product_section: dev
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 8eab6430180..52ffe59604e 100644
--- a/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
+++ b/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_tag_weekly
description: Count of WAU using the `/tag` quick action
product_section: dev
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 26a6c2920dc..8a7a20e0168 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
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
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 4c31b0d3b70..5d390130bcf 100644
--- a/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
+++ b/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_title_weekly
description: Count of WAU using the `/title` quick action
product_section: dev
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 73b3f32b641..62c2ecadc39 100644
--- a/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_todo_weekly
description: Count of WAU using the `/todo` quick action
product_section: dev
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 72d9c8d7f3b..a3bed5449c9 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_unassign_specific_weekly
description: Count of WAU using the `/unassign @user1` quick action on Merge Requests
product_section: dev
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 3fd749e96db..41b6b77e73b 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_unassign_all_weekly
description: Count of WAU using the `/unassign` quick action on Merge Requests
product_section: dev
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 7639f6150f5..ffcd580673e 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 9a9eba132ae..5ce812bd6ec 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 e4678349c8f..b78f9ca8ef9 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_unlabel_all_weekly
description: Count of WAU using the `/unlabel` quick action to remove all labels
product_section: dev
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 58326ce548e..57b310903f3 100644
--- a/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
+++ b/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_unlock_weekly
description: Count of WAU using the `/unlock` quick action
product_section: dev
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 2b03fe4120e..a105958e4a1 100644
--- a/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
+++ b/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_unsubscribe_weekly
description: Count of WAU using the `/unsubscribe` quick action
product_section: dev
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 90ea8899d40..25e8f4be9ea 100644
--- a/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
+++ b/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
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
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 0edaae2867e..5a39c45b49b 100644
--- a/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
+++ b/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_zoom_weekly
description: Count of WAU using the `/zoom` quick action on Issues
product_section: dev
diff --git a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
index 4b26158640b..e82cd9f475b 100644
--- a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.source_code.wiki_action_weekly
description: Count of unique actions done on a wiki (create, edit, delete)
product_section: dev
diff --git a/config/metrics/counts_7d/20210216182104_design_action_weekly.yml b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
index fac16272d7c..476ec404822 100644
--- a/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.source_code.design_action_weekly
description: Count of total design actions (upload, delete, comment, reply)
product_section: dev
diff --git a/config/metrics/counts_7d/20210216182107_project_action_weekly.yml b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
index 8b10e1e06ce..db7052b12ef 100644
--- a/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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)
product_section: dev
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 e3e826ad618..d03fd57da15 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.testing.i_testing_test_case_parsed_weekly
description: Internal Tracking to count number of unit tests parsed for planning of
future code testing features. Data available [here](https://app.periscopedata.com/app/gitlab/788674/Verify:Testing-Group-Metrics?widget=10454394&udv=0)
diff --git a/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml b/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml
index 12530d0be66..98bcd975333 100644
--- a/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml
+++ b/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_weekly.aggregated_metrics.product_analytics_test_metrics_union
description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature
product_section: growth
diff --git a/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml b/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml
index 117be73d66f..bfd8f27de07 100644
--- a/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml
+++ b/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_weekly.aggregated_metrics.product_analytics_test_metrics_intersection
description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature
product_section: growth
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 5b971cee7be..abde6514c0d 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ide_edit.g_edit_by_sse_weekly
description: Weekly number of users editing using the Static Site Editor
product_section: dev
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 1c006679c2b..3e2c55c64a5 100644
--- a/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.source_code.git_write_action_weekly
description: Count of unique Git write actions
product_section: dev
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 7cff2e21c0c..b3116e2b31a 100644
--- a/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
+++ b/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.snippets.i_snippets_show_weekly
description: Weekly number of users viewing snippets
product_section: dev
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 1a81aabe9ac..34c7a54c61a 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.pipeline_authoring.o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly
description: Weekly unique user count doing commits which contains the CI config file
product_section: ops
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 f8b491aeb51..8d67335f0d2 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_toggled_task_item_status_weekly
description: Count of unique users per week who toggled a task item in a merge request
product_stage: create
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 6ec6cf0ffd5..14eb2ace2fb 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_approve_mr_weekly
description: Count of unique users per week who approve a merge request
product_stage: create
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 3ab0727ca86..ba26fdb3d6f 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_unapprove_mr_weekly
description: Count of unique users per week who unapprove a merge request
product_stage: create
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 c7a642de9d8..7aed369c9b0 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_resolve_thread_weekly
description: Count of unique users per week who resolve a thread in a merge request
product_stage: create
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 cee45063058..77e7b6a2ffd 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_unresolve_thread_weekly
description: Count of unique users per week who unresolve a thread in a merge request
product_stage: create
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 696daf0a505..2676804eab8 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_edit_mr_title_weekly
description: Count of unique users per week who edit the title of a merge request
product_stage: create
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 08692ac1430..7195b41324c 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_edit_mr_desc_weekly
description: Count of unique users per week who edit the description of a merge request
product_stage: create
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 b7cb438efb6..0f1b9370ac8 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,5 +1,5 @@
---
-data_category: Optional
+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
product_stage: create
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 921ccf65d92..2228aacdfac 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,5 +1,5 @@
---
-data_category: Optional
+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
product_stage: create
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 f7ec69b4deb..5874320eaa6 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,5 +1,5 @@
---
-data_category: Optional
+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
product_stage: create
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 0c179754e0f..77da5c512dd 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,5 +1,5 @@
---
-data_category: Optional
+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
product_stage: create
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 549385fde21..a84bf25dc3b 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,5 +1,5 @@
---
-data_category: Optional
+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
product_stage: create
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 b971671d885..8dcb7355259 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_assigned_weekly
description: Count of unique users per week who are assigned to a merge request
product_stage: create
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 c21c0cfef4d..d629ff47e6a 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_marked_as_draft_weekly
description: Count of unique users per week who mark a merge request as a draft
product_stage: create
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 031929e3d90..a9ca86c9c89 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_unmarked_as_draft_weekly
description: Count of unique users per week who unmark a merge request as a draft
product_stage: create
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 c38f486032c..1f048cc0ab5 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_review_requested_weekly
description: Count of unique users per week who request a review of a merge request
product_stage: create
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 8c2cde4b632..3880ed061b0 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_added_weekly
description: Count of unique users per week who add an approval rule to a merge request
product_stage: create
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 f7fc0a626cc..d11f0e03d57 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,5 +1,5 @@
---
-data_category: Optional
+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
product_stage: create
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 4da656bb9b5..f07a6b8084f 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_edited_weekly
description: Count of unique users per week who edit an approval rule to a merge request
product_stage: create
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 f7a6028f429..a583b1a1ad7 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_vs_code_api_request_weekly
description: Count of unique users per week who use GitLab Workflow for VS Code
product_stage: create
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 4b3cf44956f..3147fe6d7a6 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_from_issue_weekly
description: Count of unique users per week who create a merge request from an issue
product_stage: create
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 f20b311bc57..ddd40581db4 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.code_review_total_unique_counts_weekly
description: Count of unique users per week who interact with a merge request
product_stage: create
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 93a0b2b1e6a..9e53e8a6163 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ci_templates.p_ci_templates_5_min_production_app_weekly
description: Number of projects using 5 min production app CI template in last 7 days.
product_section: seg
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 bb6ef10ac48..dee5f9367b2 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,5 +1,5 @@
---
-data_category: Optional
+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."
product_section: ops
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 dc08b474904..86aa02c908d 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,5 +1,5 @@
---
-data_category: Optional
+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."
product_section: ops
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 0d4b6998951..9a245bb8f1c 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ci_templates.ci_templates_total_unique_counts_weekly
description: Total count of pipelines runs
product_section: ops
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 88c55330def..350b37fc661 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 9885ecabc44..467223efb13 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 f96fcbd6e8e..81c74d6ce95 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 49bd4018846..a8c4278e62d 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 b508344d827..9bfde9e94b8 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 06538828958..95f6b254814 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 f2124562c27..b16798a2edf 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 256a767760b..cdb829e9a9e 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 941080f14dd..260a14fb838 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 8a35ec09135..b14ec9501c9 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 9e9bb850987..96f3b8f2e11 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 10c2a3a26ea..4324c71f4fa 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.deploy_token_packages.deploy_token_packages_total_unique_counts_weekly
description: A weekly count of packages published to the registry using a deploy token
product_section: ops
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 073b38b0e2c..1647099c06f 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 22b3d3d764b..11fddf41ffe 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.user_packages.i_package_conan_user_weekly
description: A weekly count of users that have published a Conan package to the registry
product_section: ops
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 2f2acedfebe..79e47427bc5 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 7ba0cb93c43..b6ee8272a52 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.user_packages.i_package_debian_user_weekly
description: A weekly count of users that have published a Debian package to the registry
product_section: ops
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 ce8820ccc87..041e7e0e76a 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 fed1dcb357a..ebd928af2a2 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.user_packages.i_package_golang_user_weekly
description: A weekly count of users that have published a Go module to the registry
product_section: ops
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 8c48ba8551d..eb1349b721c 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.user_packages.i_package_maven_user_weekly
description: A weekly count of users that have published a Maven package to the registry
product_section: ops
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 b6769fc0e9e..ddfbcbaefbd 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.user_packages.i_package_npm_user_weekly
description: A weekly count of users that have published an npm package to the registry
product_section: ops
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 f9178500bf6..5317059bad4 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.user_packages.i_package_nuget_user_weekly
description: A weekly count of users that have published a NuGet package to the registry
product_section: ops
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 ac35d2908fe..4c373dec446 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.user_packages.i_package_pypi_user_weekly
description: A weekly count of users that have published a Python package to the registry
product_section: ops
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 a7dd78aca70..39211a67bee 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 bd3e1837b77..90ad2a3fe43 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.user_packages.user_packages_total_unique_counts_weekly
description: A weekly count of users that have published a package to the registry
product_section: ops
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 1c8a9679fa7..c26d2634317 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_close_issue_weekly
description: Number of users closing Jira issues by week
product_section: dev
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 1a76c1c69fd..6685d94e358 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_cross_reference_weekly
description: Number of users that cross-referenced Jira issues by week
product_section: dev
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 8f1ca0fb40c..18bf17c4796 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.ecosystem_total_unique_counts_weekly
description: Number of users performing actions on Jira issues by week
product_section: dev
diff --git a/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml b/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml
index d89ad057a55..d5ae76cfb97 100644
--- a/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml
+++ b/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.pipeline_authoring.o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly
description: Weekly unique user count having merge requests which contains the CI config file
product_section: ops
diff --git a/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml b/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
index 83d68d739a4..01309360230 100644
--- a/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_issue_notification_weekly
description: Calculated unique users to trigger a Slack message by performing an action on an issue by week
product_section: dev
diff --git a/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml b/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml
index 3abdc77b9fb..42817360fb6 100644
--- a/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_time_estimate_changed_weekly
description: Count of unique users per week who changed time estimate of a MR
product_section: dev
diff --git a/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml b/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml
index a27845001b2..6acc51a14ee 100644
--- a/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_time_spent_changed_weekly
description: Count of unique users per week who changed time spent on a MR
product_section: dev
diff --git a/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml b/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
index 14a590de64a..d13f44c8a9b 100644
--- a/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_push_notification_weekly
description: Calculated unique users to trigger a Slack message by performing a Git push by week
product_section: dev
diff --git a/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml b/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
index 6859319d83a..66fdd4305bb 100644
--- a/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_deployment_notification_weekly
description: Calculated unique users to trigger a Slack message by performing a deployment by week
product_section: dev
diff --git a/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml b/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
index 8307e3a3099..7176d98bcfe 100644
--- a/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_wiki_page_notification_weekly
description: Calculated unique users to trigger a Slack message by performing an action on a wiki page by week
product_section: dev
diff --git a/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml b/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
index 250cfc6506e..5502062e2c6 100644
--- a/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_merge_request_notification_weekly
description: Calculated unique users to trigger a Slack message by performing an action on a merge request by week
product_section: dev
diff --git a/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml b/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
index 6ee4f87b7ba..35de18e199a 100644
--- a/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_note_notification_weekly
description: Calculated unique users to trigger a Slack message by creating a note by week
product_section: dev
diff --git a/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml b/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
index 8b2fbd61c44..3fcf5c0ca7a 100644
--- a/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_tag_push_notification_weekly
description: Calculated unique users to trigger a Slack message by performing a tag push by week
product_section: dev
diff --git a/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml b/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
index 2edbc10c9c4..1d2ea9b328f 100644
--- a/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_confidential_note_notification_weekly
description: Calculated unique users to trigger a Slack message by creating a confidential note by week
product_section: dev
diff --git a/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml b/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
index cac5da84490..e67b983f291 100644
--- a/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_confidential_issue_notification_weekly
description: Calculated unique users to trigger a Slack message by performing an action on a confidential issue by week
product_section: dev
diff --git a/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml b/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml
index 895e2f438f9..b3704a4232a 100644
--- a/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml
+++ b/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_mr_discussion_unlocked_weekly
description: Count of unique users per week who unlocked a MR
product_section: dev
diff --git a/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml b/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml
index 24bfd08cb53..aaba247ea02 100644
--- a/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml
+++ b/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_mr_discussion_locked_weekly
description: Count of unique users per week who locked a MR
product_section: dev
diff --git a/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml b/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml
index e3406730952..eed67a4cda6 100644
--- a/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_milestone_changed_weekly
description: Count of unique users per week who changed milestone of a MR
product_section: dev
diff --git a/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml b/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml
index 2daedee9efc..b003c999c23 100644
--- a/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_labels_changed_weekly
description: Count of unique users per week who changed labels of a MR
product_section: dev
diff --git a/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml b/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml
index 7bc3bcf50aa..57a1a8bf307 100644
--- a/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_assignees_changed_weekly
description: Count of unique users per week who changed assignees of a MR
product_section: dev
diff --git a/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml b/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml
index c4d46da15a2..bd792b7cb7b 100644
--- a/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_reviewers_changed_weekly
description: Count of unique users per week who changed reviewers of a MR
product_section: dev
diff --git a/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml b/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml
index 74172eeb2a6..b0f1ceebbfd 100644
--- a/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml
+++ b/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_invite_email_single_weekly
description: Unique users using the /invite_email quick action to add a single email participant to an issue within 7 days
product_section: dev
diff --git a/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml b/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml
index cd0c0d5a77d..da29ef10c7f 100644
--- a/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml
+++ b/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.quickactions.i_quickactions_invite_email_multiple_weekly
description: Unique users using the /invite_email quick action to add a multiple email participants to an issue within 7 days
product_section: dev
diff --git a/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml b/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml
index caa19531176..c1dbe7dcbc5 100644
--- a/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.deploy_token_packages.i_package_rubygems_deploy_token_weekly
description: A weekly count of distinct RubyGems packages published using a deploy token
product_section: ops
diff --git a/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml b/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml
index 013ac9ecb14..ec12a173e3d 100644
--- a/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml
+++ b/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.user_packages.i_package_rubygems_user_weekly
description: A weekly count of distinct RubyGems packages published by a user
product_section: ops
diff --git a/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml b/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
index f6de8e608e3..c8ad3b64364 100644
--- a/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.secure.users_expanding_secure_security_report_weekly
description: Count of expanding the security report widget
product_section: sec
diff --git a/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml b/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
index 13cc4ae2498..278bd1691cd 100644
--- a/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.testing.users_expanding_testing_code_quality_report_weekly
description: Count of expanding the code quality widget
product_section: ops
diff --git a/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml b/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
index e59e3e0bd7c..3cde67e9c1e 100644
--- a/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.testing.users_expanding_testing_accessibility_report_weekly
description: Count of expanding the accessibility report widget
product_section: ops
diff --git a/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml b/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
index 0dd6837c8b8..efb54f700f7 100644
--- a/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.deploy_token_packages.i_package_terraform_module_deploy_token_weekly
description: Number of distinct users authorized via deploy token creating Terraform Module packages in recent 7 days
product_section: ops
diff --git a/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml b/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
index 94a310dbac4..be2f1669d9b 100644
--- a/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
+++ b/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.user_packages.i_package_terraform_module_user_weekly
description: Number of distinct users creating Terraform Module packages in recent 7 days
product_section: ops
diff --git a/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml b/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
index 847f615e166..96994ba0dc2 100644
--- a/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
+++ b/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.testing.i_testing_summary_widget_total_weekly
description: Unique users that expand the test summary merge request widget by week
product_section: ops
diff --git a/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml b/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml
index f93f1c725a7..ec3e664e464 100644
--- a/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_click_single_file_mode_setting_weekly
description: Count of users clicking single file mode setting
product_section: dev
diff --git a/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml b/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml
index a0ef33f28eb..eed8def8793 100644
--- a/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_click_file_browser_setting_weekly
description: Count of users with merge request file list setting
product_section: dev
diff --git a/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml b/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml
index 31433f8689a..354e2e01443 100644
--- a/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_click_whitespace_setting_weekly
description: Count of users clicking merge request whitespae setting
product_section: dev
diff --git a/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml b/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml
index e892a12a2c9..4332d62b411 100644
--- a/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml
+++ b/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_diff_view_inline_weekly
description: Count of users with merge request view type as inline
product_section: dev
diff --git a/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml b/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml
index c7dbee79e8f..21f757638d3 100644
--- a/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml
+++ b/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_diff_view_parallel_weekly
description: Count of users with merge request view type as parallel
product_section: dev
diff --git a/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml b/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml
index db5c56586ac..03d83daa800 100644
--- a/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml
+++ b/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_file_browser_tree_view_weekly
description: Count of users with merge request file tree setting
product_section: dev
diff --git a/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml b/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml
index c9f155bd396..ea6ce090c2f 100644
--- a/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml
+++ b/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_file_browser_list_view_weekly
description: Count of users with merge request file list setting
product_section: dev
diff --git a/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml b/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml
index 20606bd1ee8..2042dc2bcca 100644
--- a/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml
+++ b/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_diff_show_whitespace_weekly
description: Count of users with show whitespace enabled
product_section: dev
diff --git a/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml b/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml
index 647db667bfe..2104698319e 100644
--- a/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml
+++ b/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_diff_hide_whitespace_weekly
description: Count of users with show whitespace disabled
product_section: dev
diff --git a/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml b/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml
index aa855ffd54b..2e11afbf0c5 100644
--- a/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml
+++ b/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_diff_single_file_weekly
description: Count of users with single file mode enabled
product_section: dev
diff --git a/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml b/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml
index eaaa9c34c1d..99e470b7a9b 100644
--- a/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml
+++ b/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_diff_multiple_files_weekly
description: Count of users with single mode disabled
product_section: dev
diff --git a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
index bbe90e2b809..6a0eff41bf2 100644
--- a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_weekly.aggregated_metrics.code_review_group_monthly_active_users
name: "0"
description:
diff --git a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
index 98c66534ed9..88871232e78 100644
--- a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_weekly.aggregated_metrics.code_review_category_monthly_active_users
name: "0"
description:
diff --git a/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
index cd837f9812a..5e6de879284 100644
--- a/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts_weekly.aggregated_metrics.code_review_extension_category_monthly_active_users
name: ""
description:
diff --git a/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
index 85cc6f63db1..aceb92b7576 100644
--- a/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.pipeline_authoring.pipeline_authoring_total_unique_counts_weekly
name: "0"
description:
diff --git a/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml b/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml
index 7bda024ca4b..75841e1a340 100644
--- a/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml
+++ b/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_load_conflict_ui_weekly
name: load_conflict_ui
description: Count of unique users per week who load the conflict resolution page
diff --git a/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml b/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml
index d3b5e11fba9..485797cf199 100644
--- a/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml
+++ b/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_user_resolve_conflict_weekly
name: resolve_conflict
description: Count of unique users per week who attempt to resolve a conflict through the ui
diff --git a/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml b/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml
index 020d10a7900..08f1428d17e 100644
--- a/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.deploy_token_packages.i_package_helm_deploy_token_weekly
description: Distinct Helm pakages deployed in recent 7 days
product_section: ops
diff --git a/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml b/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml
index 7eeb3280389..c12ff60a8e0 100644
--- a/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml
+++ b/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.user_packages.i_package_helm_user_weekly
description: Distinct user count events for Helm packages in recent 7 days
product_section: ops
diff --git a/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml b/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml
index 92c8ce8fb06..a3cb9e2c400 100644
--- a/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: redis_hll_counters.code_review.i_code_review_click_diff_view_setting_weekly
description: Count of users clicking diff view setting
product_section: dev
diff --git a/config/metrics/counts_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml b/config/metrics/counts_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml
index 729e250b144..ac63687acfb 100644
--- a/config/metrics/counts_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml
+++ b/config/metrics/counts_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml
@@ -15,7 +15,7 @@ instrumentation_class: RedisHLLMetric
options:
events:
- i_code_review_user_searches_diff
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml b/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml
index d75b80f6269..911aec604b1 100644
--- a/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml
+++ b/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml
@@ -15,7 +15,7 @@ instrumentation_class: RedisHLLMetric
options:
events:
- i_quickactions_severity
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210201124934_deployments.yml b/config/metrics/counts_all/20210201124934_deployments.yml
index eecea9c8cf2..a25586f27e8 100644
--- a/config/metrics/counts_all/20210201124934_deployments.yml
+++ b/config/metrics/counts_all/20210201124934_deployments.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.deployments
description: Total deployments count
product_section: ops
diff --git a/config/metrics/counts_all/20210204124930_servers.yml b/config/metrics/counts_all/20210204124930_servers.yml
index f17144ac78b..8012b83b251 100644
--- a/config/metrics/counts_all/20210204124930_servers.yml
+++ b/config/metrics/counts_all/20210204124930_servers.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: gitaly.servers
description: Total Gitalty Servers
product_section: growth
diff --git a/config/metrics/counts_all/20210204124932_clusters.yml b/config/metrics/counts_all/20210204124932_clusters.yml
index 2c59827cda0..c5be4a912a6 100644
--- a/config/metrics/counts_all/20210204124932_clusters.yml
+++ b/config/metrics/counts_all/20210204124932_clusters.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: gitaly.clusters
description: Total GitLab Managed clusters both enabled and disabled
product_section: growth
diff --git a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
index ec1e55acd6a..03b58e61f70 100644
--- a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
+++ b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.cycle_analytics_views
description: Total visits to VSA (both group- and project-level) all time
product_section: dev
diff --git a/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml b/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
index 14c97a9b8b9..c31b0a9d912 100644
--- a/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
+++ b/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: analytics_unique_visits.p_analytics_pipelines
description: Unique visitors to /:group/:project/pipelines/charts
product_section: dev
diff --git a/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml b/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
index 0995d26c9ed..8fb0041b290 100644
--- a/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
+++ b/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: analytics_unique_visits.p_analytics_valuestream
description: Unique visitors to /:group/:project/-/value_stream_analytics
product_section: dev
diff --git a/config/metrics/counts_all/20210216174856_p_analytics_repo.yml b/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
index 4bed3379057..f70c95b4b35 100644
--- a/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
+++ b/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: analytics_unique_visits.p_analytics_repo
description: Unique visitors to /:group/:project/-/graphs/master/charts
product_section: dev
diff --git a/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml b/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
index b0cb18358ca..7bd836eb477 100644
--- a/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
+++ b/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: analytics_unique_visits.i_analytics_cohorts
description: Unique visitors to /-/instance_statistics/cohorts
product_section: dev
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 a6dfe768e20..5d2413b9297 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: analytics_unique_visits.i_analytics_dev_ops_score
description: Unique visitors to /-/instance_statistics/dev_ops_score
product_section: dev
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 5fd57bdb019..3fdb40f32d9 100644
--- a/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
+++ b/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: analytics_unique_visits.g_analytics_merge_request
description: Unique visitors to /groups/:group/-/analytics/merge_request_analytics
product_section: dev
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 6b92fa1aa1e..dc5d05da04a 100644
--- a/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
+++ b/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: analytics_unique_visits.i_analytics_instance_statistics
description: Unique visitors to/admin/usage_trends
product_section: dev
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 4990ea7a1a9..55197013071 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: analytics_unique_visits.analytics_unique_visits_for_any_target
description: Unique visitors to any analytics feature by week
product_section: dev
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 7b285ee8d88..5f03db90f3b 100644
--- a/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_with_prometheus_alerts
description: Projects with Prometheus alerting enabled
product_section: ops
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 4e9e2f27d1d..74a39d81941 100644
--- a/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
+++ b/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.pod_logs_usages_total
description: Count the total number of log views
product_section: ops
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 252676cc359..8cd2a5bd761 100644
--- a/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.service_desk_enabled_projects
description: Count of service desk enabled projects
product_section: dev
diff --git a/config/metrics/counts_all/20210216175026_service_desk_issues.yml b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
index 8a778c7280d..9e2dc5499b0 100644
--- a/config/metrics/counts_all/20210216175026_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.service_desk_issues
description: Count of service desk issues
product_section: dev
diff --git a/config/metrics/counts_all/20210216175037_suggestions.yml b/config/metrics/counts_all/20210216175037_suggestions.yml
index 844b2e3003a..5cd566a3186 100644
--- a/config/metrics/counts_all/20210216175037_suggestions.yml
+++ b/config/metrics/counts_all/20210216175037_suggestions.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.suggestions
description: Count of all comments that contain suggested changes
product_section: dev
diff --git a/config/metrics/counts_all/20210216175039_merge_requests.yml b/config/metrics/counts_all/20210216175039_merge_requests.yml
index 3a0b7d34dbe..1c9a1a0185c 100644
--- a/config/metrics/counts_all/20210216175039_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175039_merge_requests.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.merge_requests
description: Count of the number of merge requests
product_section: dev
diff --git a/config/metrics/counts_all/20210216175041_merge_request_comment.yml b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
index 4d8cc9b8806..0b3bce59176 100644
--- a/config/metrics/counts_all/20210216175041_merge_request_comment.yml
+++ b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.merge_request_comment
description: Count of the number of merge request comments
product_section: dev
diff --git a/config/metrics/counts_all/20210216175043_merge_request_create.yml b/config/metrics/counts_all/20210216175043_merge_request_create.yml
index 32a4d8357c6..13393b8c1b8 100644
--- a/config/metrics/counts_all/20210216175043_merge_request_create.yml
+++ b/config/metrics/counts_all/20210216175043_merge_request_create.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.merge_request_create
description: Count of the number of merge requests created
product_section: dev
diff --git a/config/metrics/counts_all/20210216175045_merge_requests.yml b/config/metrics/counts_all/20210216175045_merge_requests.yml
index 4fe94585cb5..088df8eca7c 100644
--- a/config/metrics/counts_all/20210216175045_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175045_merge_requests.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.create.merge_requests
description: Count of the number of users creating merge requests
product_section: dev
diff --git a/config/metrics/counts_all/20210216175053_suggestions.yml b/config/metrics/counts_all/20210216175053_suggestions.yml
index eecdbbce928..f0361655616 100644
--- a/config/metrics/counts_all/20210216175053_suggestions.yml
+++ b/config/metrics/counts_all/20210216175053_suggestions.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.create.suggestions
description: Count of unique users who create suggestions in merge request comments
product_section: dev
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 f027dffc6f4..b5facd08c21 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.merged_merge_requests_using_approval_rules
description: Count of merge requests merged using approval rules
product_section: dev
diff --git a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
index e6f8da7ce95..be8c33d144d 100644
--- a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
+++ b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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)
product_section: ops
diff --git a/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml b/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
index 32bf0ef9437..69e9729d825 100644
--- a/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
+++ b/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.auto_devops_disabled
description: Projects with Auto DevOps template disabled
product_section: ops
diff --git a/config/metrics/counts_all/20210216175232_clusters.yml b/config/metrics/counts_all/20210216175232_clusters.yml
index 67e7bd1f8c7..e6894699827 100644
--- a/config/metrics/counts_all/20210216175232_clusters.yml
+++ b/config/metrics/counts_all/20210216175232_clusters.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.clusters
description: Total GitLab Managed clusters both enabled and disabled
product_section: ops
diff --git a/config/metrics/counts_all/20210216175234_clusters_enabled.yml b/config/metrics/counts_all/20210216175234_clusters_enabled.yml
index a361d034e4a..6b940dfb5b3 100644
--- a/config/metrics/counts_all/20210216175234_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175234_clusters_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.clusters_enabled
description: Number of Kubernetes clusters attached to GitLab currently enabled
product_section: ops
diff --git a/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml b/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
index 30f01bd0ad0..f0db7b473cf 100644
--- a/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.project_clusters_enabled
description: Total GitLab Managed clusters attached to projects
product_section: ops
diff --git a/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml b/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
index a06ca7ef62d..6765d24cea8 100644
--- a/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.group_clusters_enabled
description: Total GitLab Managed clusters attached to groups
product_section: ops
diff --git a/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml b/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
index a4aee8218f0..afa8a761cf1 100644
--- a/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instance_clusters_enabled
description: Total GitLab Managed clusters attached to the instance
product_section: ops
diff --git a/config/metrics/counts_all/20210216175242_clusters_disabled.yml b/config/metrics/counts_all/20210216175242_clusters_disabled.yml
index d4a3f87e40f..0fac20affd3 100644
--- a/config/metrics/counts_all/20210216175242_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175242_clusters_disabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.clusters_disabled
description: Number of Kubernetes clusters attached to GitLab currently disabled
product_section: ops
diff --git a/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml b/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
index 34f838041ff..2b41f610415 100644
--- a/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.project_clusters_disabled
description: Total GitLab Managed disabled clusters previously attached to projects
product_section: ops
diff --git a/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml b/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
index c3c863438fb..b7a839f345a 100644
--- a/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.group_clusters_disabled
description: Total GitLab Managed disabled clusters previously attached to groups
product_section: ops
diff --git a/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml b/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
index 1838fdeed26..94b5d48dffa 100644
--- a/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instance_clusters_disabled
description: Total GitLab Managed disabled clusters previously attached to the instance
product_section: ops
diff --git a/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml b/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
index 2b17e5bb1f1..1470dbe809f 100644
--- a/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
+++ b/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.clusters_platforms_eks
description: Total GitLab Managed clusters provisioned with GitLab on AWS EKS
product_section: ops
diff --git a/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml b/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
index bccf35d2341..6f1692cc2b6 100644
--- a/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
+++ b/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.clusters_platforms_gke
description: Total GitLab Managed clusters provisioned with GitLab on GCE GKE
product_section: ops
diff --git a/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml b/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
index 249ba51d2f9..eaeff4aa3a0 100644
--- a/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
+++ b/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.clusters_platforms_user
description: Total GitLab Managed clusters that are user provisioned
product_section: ops
diff --git a/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
index 83fd4bca2af..bb85d43bc63 100644
--- a/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
+++ b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.clusters_applications_helm
description: Total GitLab Managed clusters with GitLab Managed App:Helm enabled
product_section: ops
diff --git a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
index cf8ce670dc7..87b412b45f6 100644
--- a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
+++ b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.clusters_applications_ingress
description: Total GitLab Managed clusters with GitLab Managed App:Ingress installed
product_section: ops
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 3458e0a157b..f93f0e73e9d 100644
--- a/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
diff --git a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
index 1ac33d8a602..b365dabe466 100644
--- a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
+++ b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.clusters_applications_crossplane
description: Total GitLab Managed clusters with GitLab Managed App:Crossplane installed
product_section: ops
diff --git a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
index fb8b3915771..7d86d5da125 100644
--- a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.clusters_applications_prometheus
description: Total GitLab Managed clusters with GitLab Managed App:Prometheus installed
product_section: ops
diff --git a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
index 0284537975f..d10f2bb240a 100644
--- a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.clusters_applications_runner
description: Total GitLab Managed clusters with GitLab Managed App:Runner installed
product_section: ops
diff --git a/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
index 9679cc2c49d..a92b043622d 100644
--- a/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
+++ b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.clusters_applications_knative
description: Total GitLab Managed clusters with GitLab Managed App:Knative installed
product_section: ops
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 36245ac3c00..9f94bf9ff30 100644
--- a/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
+++ b/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
diff --git a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
index f04a852a309..8501a763454 100644
--- a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
+++ b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.clusters_applications_jupyter
description: Total GitLab Managed clusters with GitLab Managed App:Jupyter installed
product_section: ops
diff --git a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
index ec3ab0d8c44..f0157783235 100644
--- a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
+++ b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.clusters_applications_cilium
description: Total GitLab Managed clusters with GitLab Managed App:Cilium installed
product_section: ops
diff --git a/config/metrics/counts_all/20210216175314_clusters_management_project.yml b/config/metrics/counts_all/20210216175314_clusters_management_project.yml
index bd0be6aee61..c6dbd9469c1 100644
--- a/config/metrics/counts_all/20210216175314_clusters_management_project.yml
+++ b/config/metrics/counts_all/20210216175314_clusters_management_project.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.clusters_management_project
description: Total GitLab Managed clusters with defined cluster management project
product_section: ops
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 c4fdbe9572b..9fc55da3b64 100644
--- a/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.projects_with_terraform_reports
description: Count of projects with Terraform MR reports
product_section: ops
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 b19a1876d05..b7ea1a99a1f 100644
--- a/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.projects_with_terraform_states
description: Count of projects with GitLab Managed Terraform State
product_section: ops
diff --git a/config/metrics/counts_all/20210216175324_terraform_reports.yml b/config/metrics/counts_all/20210216175324_terraform_reports.yml
index 71df1c73f30..7694a8fd2fd 100644
--- a/config/metrics/counts_all/20210216175324_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175324_terraform_reports.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.terraform_reports
description: Count of Terraform MR reports generated
product_section: ops
diff --git a/config/metrics/counts_all/20210216175326_terraform_states.yml b/config/metrics/counts_all/20210216175326_terraform_states.yml
index 322f8082a50..0c1c27335cc 100644
--- a/config/metrics/counts_all/20210216175326_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175326_terraform_states.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.terraform_states
description: Count of GitLab Managed Terraform States
product_section: ops
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 ce9a919460a..a9f0eb521d9 100644
--- a/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.configure.clusters_applications_cert_managers
description: Total GitLab Managed clusters with GitLab Managed App:Cert Manager installed
product_section: ops
diff --git a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
index 46301cbf2f3..44ff075ea0e 100644
--- a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
+++ b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.configure.clusters_applications_helm
description: Total GitLab Managed clusters with GitLab Managed App:Helm enabled
product_section: ops
diff --git a/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
index 89eb556a996..9b92d67d09b 100644
--- a/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
+++ b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.configure.clusters_applications_ingress
description: Total GitLab Managed clusters with GitLab Managed App:Ingress installed
product_section: ops
diff --git a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
index a7101c89a2c..5bd5d52f8ab 100644
--- a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
+++ b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.configure.clusters_applications_knative
description: Total GitLab Managed clusters with GitLab Managed App:Knative installed
product_section: ops
diff --git a/config/metrics/counts_all/20210216175337_clusters_management_project.yml b/config/metrics/counts_all/20210216175337_clusters_management_project.yml
index d32374df6a8..f137981b7fd 100644
--- a/config/metrics/counts_all/20210216175337_clusters_management_project.yml
+++ b/config/metrics/counts_all/20210216175337_clusters_management_project.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.configure.clusters_management_project
description: Total GitLab Managed clusters with defined cluster management project
product_section: ops
diff --git a/config/metrics/counts_all/20210216175339_clusters_disabled.yml b/config/metrics/counts_all/20210216175339_clusters_disabled.yml
index 7547ea1c8ed..15becf3a739 100644
--- a/config/metrics/counts_all/20210216175339_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175339_clusters_disabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.configure.clusters_disabled
description: Total GitLab Managed disabled clusters
product_section: ops
diff --git a/config/metrics/counts_all/20210216175341_clusters_enabled.yml b/config/metrics/counts_all/20210216175341_clusters_enabled.yml
index 77ffd392775..2a5d932ccf5 100644
--- a/config/metrics/counts_all/20210216175341_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175341_clusters_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.configure.clusters_enabled
description: Total GitLab Managed clusters currently enabled
product_section: ops
diff --git a/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml b/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
index 833ca0494db..2847e56bbcf 100644
--- a/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
+++ b/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.configure.clusters_platforms_gke
description: Total GitLab Managed clusters provisioned with GitLab on GCE GKE
product_section: ops
diff --git a/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml b/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
index c25be58930f..52af7411aae 100644
--- a/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
+++ b/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.configure.clusters_platforms_eks
description: Total GitLab Managed clusters provisioned with GitLab on AWS EKS
product_section: ops
diff --git a/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml b/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
index cc0f4efad56..53ec5375937 100644
--- a/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
+++ b/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.configure.clusters_platforms_user
description: Total GitLab Managed clusters that are user provisioned
product_section: ops
diff --git a/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml b/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
index d90a85a149d..27826144191 100644
--- a/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.configure.instance_clusters_disabled
description: Total GitLab Managed disabled clusters attached to the instance
product_section: ops
diff --git a/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml b/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
index e038d6980a3..4e26fef5e62 100644
--- a/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.configure.instance_clusters_enabled
description: Total GitLab Managed enabled clusters attached to the instance
product_section: ops
diff --git a/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml b/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
index 4aa9989d950..07651126a41 100644
--- a/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.configure.group_clusters_disabled
description: Total GitLab Managed disabled clusters attached to groups
product_section: ops
diff --git a/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml b/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
index d953b58a6e0..72182fde574 100644
--- a/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.configure.group_clusters_enabled
description: Total GitLab Managed enabled clusters attached to groups
product_section: ops
diff --git a/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml b/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
index 85334120c78..a8b21924a1b 100644
--- a/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.configure.project_clusters_disabled
description: Total GitLab Managed disabled clusters attached to projects
product_section: ops
diff --git a/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml b/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
index c94c1f8cbd8..80ac8ff67e3 100644
--- a/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.configure.project_clusters_enabled
description: Total GitLab Managed enabled clusters attached to projects
product_section: ops
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 e09bf71d2cf..ab1a286bc0c 100644
--- a/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.configure.projects_with_prometheus_alerts
description: Projects with Prometheus alerting enabled
product_section: ops
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 a026947735e..7e9b163f23a 100644
--- a/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
+++ b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.ingress_modsecurity_packets_processed
description: Cumulative count of packets processed by ModSecurity since Usage Ping
was last reported
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 d5da1cd1478..23c3beb2812 100644
--- a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
+++ b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.ingress_modsecurity_packets_anomalous
description: Cumulative count of packets identified as anomalous by ModSecurity since
Usage Ping was last reported
diff --git a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
index 13b6862a28c..1b3448efecc 100644
--- a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
+++ b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.network_policy_forwards
description: Cumulative count of packets forwarded by Cilium (Container Network Security)
since Usage Ping was last reported
diff --git a/config/metrics/counts_all/20210216175448_network_policy_drops.yml b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
index 78ad43c9061..54b947599a9 100644
--- a/config/metrics/counts_all/20210216175448_network_policy_drops.yml
+++ b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.network_policy_drops
description: Cumulative count of packets dropped by Cilium (Container Network Security)
since Usage Ping was last reported
diff --git a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
index 3f050f2dd61..8db0a0bd4d6 100644
--- a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
+++ b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.ingress_modsecurity_logging
description: Whether or not ModSecurity is set to logging mode
product_section: sec
diff --git a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
index 0f0f52f4df8..a663a49b88e 100644
--- a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
+++ b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.ingress_modsecurity_blocking
description: Whether or not ModSecurity is set to blocking mode
product_section: sec
diff --git a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
index 2f1cb1aa55f..44bf44bd20a 100644
--- a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
+++ b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.ingress_modsecurity_disabled
description: Whether or not ModSecurity is disabled within Ingress
product_section: sec
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 d197c9de37a..7de28e42533 100644
--- a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
+++ b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.ingress_modsecurity_not_installed
description: Whether or not ModSecurity has not been installed into the cluster
product_section: sec
diff --git a/config/metrics/counts_all/20210216175510_ci_builds.yml b/config/metrics/counts_all/20210216175510_ci_builds.yml
index 2a9d55888ff..74f9d3963a7 100644
--- a/config/metrics/counts_all/20210216175510_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175510_ci_builds.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.ci_builds
description: Unique builds in project
product_section: ops
diff --git a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
index e7efb016c5b..85db2d7eed1 100644
--- a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.ci_internal_pipelines
description: Total pipelines in GitLab repositories
product_section: ops
diff --git a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
index a5c3f1a25f8..31f948b0eb7 100644
--- a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.ci_external_pipelines
description: Total pipelines in external repositories
product_section: ops
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 fbbf404d6c4..e3a379ed21e 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.ci_pipeline_config_auto_devops
description: Total pipelines from an Auto DevOps template
product_section: ops
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 701540cec86..1c03e614c6e 100644
--- a/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.ci_pipeline_config_repository
description: Total Pipelines from templates in repository
product_section: ops
diff --git a/config/metrics/counts_all/20210216175520_ci_runners.yml b/config/metrics/counts_all/20210216175520_ci_runners.yml
index 3db2cb13c5b..185783bf693 100644
--- a/config/metrics/counts_all/20210216175520_ci_runners.yml
+++ b/config/metrics/counts_all/20210216175520_ci_runners.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.ci_runners
description: Total configured Runners of all types
product_section: ops
diff --git a/config/metrics/counts_all/20210216175521_ci_triggers.yml b/config/metrics/counts_all/20210216175521_ci_triggers.yml
index 8b10ff31de6..b6452ca45f2 100644
--- a/config/metrics/counts_all/20210216175521_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175521_ci_triggers.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.ci_triggers
description: Total configured Triggers in project
product_section: ops
diff --git a/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml b/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
index 5f4fdf0d372..f136cb35ac5 100644
--- a/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.ci_pipeline_schedules
description: Pipeline schedules in GitLab
product_section: ops
diff --git a/config/metrics/counts_all/20210216175525_ci_builds.yml b/config/metrics/counts_all/20210216175525_ci_builds.yml
index 08ca3cd8016..3b857e8bb0d 100644
--- a/config/metrics/counts_all/20210216175525_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175525_ci_builds.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.verify.ci_builds
description: Unique count of builds in project
product_section: ops
diff --git a/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
index 1ad849f6a28..827bcbcd2e2 100644
--- a/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.verify.ci_external_pipelines
description: Total pipelines in external repositories
product_section: ops
diff --git a/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml b/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
index 85368582dd9..1e1a1ee7af3 100644
--- a/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.verify.ci_internal_pipelines
description: Total pipelines in GitLab repositories
product_section: ops
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 381c16ff446..3b9790f9b71 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.verify.ci_pipeline_config_auto_devops
description: Total pipelines from an Auto DevOps template
product_section: ops
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 2e54d756869..6763d3f0f10 100644
--- a/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.verify.ci_pipeline_config_repository
description: Total Pipelines from templates in repository
product_section: ops
diff --git a/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml b/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
index b1585df984e..3c882f1f759 100644
--- a/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.verify.ci_pipeline_schedules
description: Pipeline schedules in GitLab
product_section: ops
diff --git a/config/metrics/counts_all/20210216175537_ci_pipelines.yml b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
index 1815adef5ba..f6fb62945f0 100644
--- a/config/metrics/counts_all/20210216175537_ci_pipelines.yml
+++ b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.verify.ci_pipelines
description: Distinct Users triggering Total pipelines
product_section: ops
diff --git a/config/metrics/counts_all/20210216175539_ci_triggers.yml b/config/metrics/counts_all/20210216175539_ci_triggers.yml
index 9ef3dfa56b4..5a0e630993c 100644
--- a/config/metrics/counts_all/20210216175539_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175539_ci_triggers.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.verify.ci_triggers
description: Total configured Triggers in project
product_section: ops
diff --git a/config/metrics/counts_all/20210216175612_dast_jobs.yml b/config/metrics/counts_all/20210216175612_dast_jobs.yml
index 97bcd1a82c4..50f7b08da1b 100644
--- a/config/metrics/counts_all/20210216175612_dast_jobs.yml
+++ b/config/metrics/counts_all/20210216175612_dast_jobs.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.dast_jobs
description: Count of DAST jobs run
product_section: sec
diff --git a/config/metrics/counts_all/20210216175614_user_dast_jobs.yml b/config/metrics/counts_all/20210216175614_user_dast_jobs.yml
index 2670cb4b8fe..81fc465c59c 100644
--- a/config/metrics/counts_all/20210216175614_user_dast_jobs.yml
+++ b/config/metrics/counts_all/20210216175614_user_dast_jobs.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage.secure.user_dast_jobs
description: Count of DAST jobs
product_section: sec
diff --git a/config/metrics/counts_all/20210216175621_web_hooks.yml b/config/metrics/counts_all/20210216175621_web_hooks.yml
index 189cb714f24..2afed7fc4c6 100644
--- a/config/metrics/counts_all/20210216175621_web_hooks.yml
+++ b/config/metrics/counts_all/20210216175621_web_hooks.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.web_hooks
description:
product_section: dev
diff --git a/config/metrics/counts_all/20210216175623_projects_asana_active.yml b/config/metrics/counts_all/20210216175623_projects_asana_active.yml
index f45e2e025bc..c82f090d8fa 100644
--- a/config/metrics/counts_all/20210216175623_projects_asana_active.yml
+++ b/config/metrics/counts_all/20210216175623_projects_asana_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_asana_active
description: Count of projects with active integrations for Asana
product_section: dev
diff --git a/config/metrics/counts_all/20210216175625_groups_asana_active.yml b/config/metrics/counts_all/20210216175625_groups_asana_active.yml
index 63560cc2f10..ea990248ee3 100644
--- a/config/metrics/counts_all/20210216175625_groups_asana_active.yml
+++ b/config/metrics/counts_all/20210216175625_groups_asana_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_asana_active
description: Count of groups with active integrations for Asana
product_section: dev
diff --git a/config/metrics/counts_all/20210216175627_templates_asana_active.yml b/config/metrics/counts_all/20210216175627_templates_asana_active.yml
index de3580ee116..910c7d98c6d 100644
--- a/config/metrics/counts_all/20210216175627_templates_asana_active.yml
+++ b/config/metrics/counts_all/20210216175627_templates_asana_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_asana_active
description: Count of active service templates for Asana
product_section: dev
diff --git a/config/metrics/counts_all/20210216175628_instances_asana_active.yml b/config/metrics/counts_all/20210216175628_instances_asana_active.yml
index 0138648f8da..ffd2e9ec5a8 100644
--- a/config/metrics/counts_all/20210216175628_instances_asana_active.yml
+++ b/config/metrics/counts_all/20210216175628_instances_asana_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_asana_active
description: Count of active instance-level integrations for Asana
product_section: dev
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 67584002d36..b94d78fb9b7 100644
--- a/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_asana_active
description: Count of active projects inheriting integrations for Asana
product_section: dev
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 9cac9bdcf5d..7ddc2d483f3 100644
--- a/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_asana_active
description: Count of active groups inheriting integrations for Asana
product_section: dev
diff --git a/config/metrics/counts_all/20210216175634_projects_assembla_active.yml b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
index 403666b4a4d..73ed09fb36c 100644
--- a/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_assembla_active
description: Count of projects with active integrations for Assembla
product_section: dev
diff --git a/config/metrics/counts_all/20210216175636_groups_assembla_active.yml b/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
index 7cf5bc07eea..194c3ea73f8 100644
--- a/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_assembla_active
description: Count of groups with active integrations for Assembla
product_section: dev
diff --git a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
index b6fcf0aba1b..a4ec88daf81 100644
--- a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_assembla_active
description: Count of active service templates for Assembla
product_section: dev
diff --git a/config/metrics/counts_all/20210216175640_instances_assembla_active.yml b/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
index fd8c67b1dac..b4d9a61fcf9 100644
--- a/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_assembla_active
description: Count of active instance-level integrations for Assembla
product_section: dev
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 4d77ea4aea7..8cd69af33fe 100644
--- a/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_assembla_active
description: Count of active projects inheriting integrations for Assembla
product_section: dev
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 e6d13126ebe..3962d7ad2f4 100644
--- a/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_assembla_active
description: Count of active groups inheriting integrations for Assembla
product_section: dev
diff --git a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
index c8352684b1a..6234035a982 100644
--- a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.projects_bamboo_active
description: Count of projects with active integrations for Bamboo CI
product_section: dev
diff --git a/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml b/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
index 7e1e93ea66c..b3e44151431 100644
--- a/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_bamboo_active
description: Count of groups with active integrations for Bamboo CI
product_section: dev
diff --git a/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml b/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
index cb400af0782..8125ca58514 100644
--- a/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_bamboo_active
description: Count of active service templates for Bamboo CI
product_section: dev
diff --git a/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml b/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
index 790b84aa1c9..c380a157860 100644
--- a/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_bamboo_active
description: Count of active instance-level integrations for Bamboo CI
product_section: dev
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 9948026ad3d..7ead935e5de 100644
--- a/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_bamboo_active
description: Count of active projects inheriting integrations for Bamboo CI
product_section: dev
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 15bd68fd549..ad98751fe42 100644
--- a/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_bamboo_active
description: Count of active groups inheriting integrations for Bamboo CI
product_section: dev
diff --git a/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml b/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
index c98ea6679fd..3359caab2ff 100644
--- a/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_bugzilla_active
description: Count of projects with active integrations for Bugzilla
product_section: dev
diff --git a/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
index 1ea05ca07c1..702b192ec9d 100644
--- a/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_bugzilla_active
description: Count of groups with active integrations for Bugzilla
product_section: dev
diff --git a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
index 4111b13725d..91a83b141ee 100644
--- a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_bugzilla_active
description: Count of active service templates for Bugzilla
product_section: dev
diff --git a/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml b/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
index fb413aaacc8..7cee8bc3210 100644
--- a/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_bugzilla_active
description: Count of active instance-level integrations for Bugzilla
product_section: dev
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 2c7d9c46a7a..4e1e27b1f55 100644
--- a/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_bugzilla_active
description: Count of active projects inheriting integrations for Bugzilla
product_section: dev
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 9828c541521..43f0a459a46 100644
--- a/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_bugzilla_active
description: Count of active groups inheriting integrations for Bugzilla
product_section: dev
diff --git a/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml b/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
index 5dd9ea58f99..df241ae7314 100644
--- a/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_buildkite_active
description: Count of projects with active integrations for Buildkite
product_section: dev
diff --git a/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
index 1ae574f2ba4..9a1c8dbdc72 100644
--- a/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_buildkite_active
description: Count of groups with active integrations for Buildkite
product_section: dev
diff --git a/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml b/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
index 7b6a7f0bf4e..08dfc5cafdd 100644
--- a/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_buildkite_active
description: Count of active service templates for Buildkite
product_section: dev
diff --git a/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml b/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
index f1a6cba6b98..a0ef1eb280e 100644
--- a/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_buildkite_active
description: Count of active instance-level integrations for Buildkite
product_section: dev
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 3734e8469ca..54f7d8c68e1 100644
--- a/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_buildkite_active
description: Count of active projects inheriting integrations for Buildkite
product_section: dev
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 11393a647e5..aa14f49acd6 100644
--- a/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_buildkite_active
description: Count of active groups inheriting integrations for Buildkite
product_section: dev
diff --git a/config/metrics/counts_all/20210216175719_projects_campfire_active.yml b/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
index f2a589b61c3..0d0aeee1b92 100644
--- a/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_campfire_active
description: Count of projects with active integrations for Campfire
product_section: dev
diff --git a/config/metrics/counts_all/20210216175721_groups_campfire_active.yml b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
index dcf361d0826..3d0c74ddd19 100644
--- a/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_campfire_active
description: Count of groups with active integrations for Campfire
product_section: dev
diff --git a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
index d9ae3828b24..00e18f1ff2e 100644
--- a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_campfire_active
description: Count of active service templates for Campfire
product_section: dev
diff --git a/config/metrics/counts_all/20210216175725_instances_campfire_active.yml b/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
index 42e4950cede..a286b27df81 100644
--- a/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_campfire_active
description: Count of active instance-level integrations for Campfire
product_section: dev
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 225353e68ca..cc96ff408ea 100644
--- a/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_campfire_active
description: Count of active projects inheriting integrations for Campfire
product_section: dev
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 cf1331eba88..578a35d3013 100644
--- a/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_campfire_active
description: Count of active groups inheriting integrations for Campfire
product_section: dev
diff --git a/config/metrics/counts_all/20210216175731_projects_confluence_active.yml b/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
index f2fa411c65a..c2cc6569b2e 100644
--- a/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_confluence_active
description: Count of projects with active integrations for Confluence
product_section: dev
diff --git a/config/metrics/counts_all/20210216175733_groups_confluence_active.yml b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
index 35bb3dc4afe..248668c6bad 100644
--- a/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_confluence_active
description: Count of groups with active integrations for Confluence
product_section: dev
diff --git a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
index b6a19adbd37..ea89ed372cc 100644
--- a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_confluence_active
description: Count of active service templates for Confluence
product_section: dev
diff --git a/config/metrics/counts_all/20210216175736_instances_confluence_active.yml b/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
index 375d0838fe9..3a903ae04e4 100644
--- a/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_confluence_active
description: Count of active instance-level integrations for Confluence
product_section: dev
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 457a4264bca..586a81af305 100644
--- a/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_confluence_active
description: Count of active projects inheriting integrations for Confluence
product_section: dev
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 74965bd30a0..a4a7bad1b60 100644
--- a/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_confluence_active
description: Count of active groups inheriting integrations for Confluence
product_section: dev
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 3270e12fc9c..0a69a9c83ab 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_custom_issue_tracker_active
description: Count of projects with active integrations for a Custom Issue Tracker
product_section: dev
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 cde18220778..6398652ffcd 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_custom_issue_tracker_active
description: Count of groups with active integrations for a Custom Issue Tracker
product_section: dev
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 80a9375fca0..f3911f0474f 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_custom_issue_tracker_active
description: Count of active service templates for a Custom Issue Tracker
product_section: dev
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 13b3f2280f9..ca9798f4f69 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_custom_issue_tracker_active
description: Count of active instance-level integrations for a Custom Issue Tracker
product_section: dev
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 5b8dc3aa211..76099ed9522 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_custom_issue_tracker_active
description: Count of active projects inheriting integrations for a Custom Issue Tracker
product_section: dev
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 39bb0dc2430..042bf8dcf8e 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_custom_issue_tracker_active
description: Count of active groups inheriting integrations for a Custom Issue Tracker
product_section: dev
diff --git a/config/metrics/counts_all/20210216175753_projects_discord_active.yml b/config/metrics/counts_all/20210216175753_projects_discord_active.yml
index 5ad7bfb4655..8a44ab12dc6 100644
--- a/config/metrics/counts_all/20210216175753_projects_discord_active.yml
+++ b/config/metrics/counts_all/20210216175753_projects_discord_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_discord_active
description: Count of projects with active integrations for Discord
product_section: dev
diff --git a/config/metrics/counts_all/20210216175755_groups_discord_active.yml b/config/metrics/counts_all/20210216175755_groups_discord_active.yml
index 1769ea02663..a947527ce38 100644
--- a/config/metrics/counts_all/20210216175755_groups_discord_active.yml
+++ b/config/metrics/counts_all/20210216175755_groups_discord_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_discord_active
description: Count of groups with active integrations for Discord
product_section: dev
diff --git a/config/metrics/counts_all/20210216175756_templates_discord_active.yml b/config/metrics/counts_all/20210216175756_templates_discord_active.yml
index 32fe82690f1..f64e1e3e6d8 100644
--- a/config/metrics/counts_all/20210216175756_templates_discord_active.yml
+++ b/config/metrics/counts_all/20210216175756_templates_discord_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_discord_active
description: Count of active service templates for Discord
product_section: dev
diff --git a/config/metrics/counts_all/20210216175758_instances_discord_active.yml b/config/metrics/counts_all/20210216175758_instances_discord_active.yml
index 9b28d9d5732..5f95cbeea39 100644
--- a/config/metrics/counts_all/20210216175758_instances_discord_active.yml
+++ b/config/metrics/counts_all/20210216175758_instances_discord_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_discord_active
description: Count of active instance-level integrations for Discord
product_section: dev
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 7c14462ecda..87e8f559a9c 100644
--- a/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
+++ b/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_discord_active
description: Count of active projects inheriting integrations for Discord
product_section: dev
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 de4198ee34b..c47976fa8e1 100644
--- a/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
+++ b/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_discord_active
description: Count of active groups inheriting integrations for Discord
product_section: dev
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 937eb4660f0..4e909df707d 100644
--- a/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.projects_drone_ci_active
description: Count of projects with active integrations for Drone CI
product_section: dev
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 886008b7a88..f52b633e17a 100644
--- a/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_drone_ci_active
description: Count of groups with active integrations for Drone CI
product_section: dev
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 d704b2b7f0a..4b446201f36 100644
--- a/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_drone_ci_active
description: Count of active service templates for Drone CI
product_section: dev
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 d5428b0d6b4..685238d19a6 100644
--- a/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_drone_ci_active
description: Count of active instance-level integrations for Drone CI
product_section: dev
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 dfb105de1f5..e2801a89e62 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_drone_ci_active
description: Count of active projects inheriting integrations for Drone CI
product_section: dev
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 b2da8076358..146fc3e0028 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_drone_ci_active
description: Count of active groups inheriting integrations for Drone CI
product_section: dev
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 1c4c8e0138d..2e83ec98940 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_emails_on_push_active
description: Count of projects with active integrations for Emails on Push
product_section: dev
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 5fc1bb55a3e..37f2cad327a 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_emails_on_push_active
description: Count of groups with active integrations for Emails on Push
product_section: dev
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 20c10887219..44474142056 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_emails_on_push_active
description: Count of active service templates for Emails on Push
product_section: dev
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 3f93541b368..638f5de6859 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_emails_on_push_active
description: Count of active instance-level integrations for Emails on Push
product_section: dev
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 c296299583a..4a3260fc0ea 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_emails_on_push_active
description: Count of active projects inheriting integrations for Emails on Push
product_section: dev
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 27281cebf9d..4fee82094fd 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_emails_on_push_active
description: Count of active groups inheriting integrations for Emails on Push
product_section: dev
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 423aed406da..72d038aac24 100644
--- a/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_external_wiki_active
description: Count of projects with active integrations for External Wiki
product_section: dev
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 4d5caf53772..b48d2c169b8 100644
--- a/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_external_wiki_active
description: Count of groups with active integrations for External Wiki
product_section: dev
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 2dacac5d4e9..2b2583731cd 100644
--- a/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_external_wiki_active
description: Count of active service templates for External Wiki
product_section: dev
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 785bdc6654a..5a14f302057 100644
--- a/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_external_wiki_active
description: Count of active instance-level integrations for External Wiki
product_section: dev
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 d5ab8a33a38..b22c7358062 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_external_wiki_active
description: Count of active projects inheriting integrations for External Wiki
product_section: dev
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 6d08bcacb88..75d1e674f0e 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_external_wiki_active
description: Count of active groups inheriting integrations for External Wiki
product_section: dev
diff --git a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
index 7fabab8932e..fbb9af7becc 100644
--- a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_flowdock_active
description: Count of projects with active integrations for Flowdock
product_section: dev
diff --git a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
index 15eb2acae10..e199895848f 100644
--- a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_flowdock_active
description: Count of groups with active integrations for Flowdock
product_section: dev
diff --git a/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml b/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
index 476b26f4231..08b141acaeb 100644
--- a/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_flowdock_active
description: Count of active service templates for Flowdock
product_section: dev
diff --git a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
index 1fc7911f804..0eda76b4568 100644
--- a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_flowdock_active
description: Count of active instance-level integrations for Flowdock
product_section: dev
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 fcf4ac0508d..a62ebedaa28 100644
--- a/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_flowdock_active
description: Count of active projects inheriting integrations for Flowdock
product_section: dev
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 60c3443abb6..cd931910795 100644
--- a/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_flowdock_active
description: Count of active groups inheriting integrations for Flowdock
product_section: dev
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 44fb92fd5a2..ef94b49587f 100644
--- a/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_hangouts_chat_active
description: Count of projects with active integrations for Hangouts Chat
product_section: dev
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 4ff960e67c8..d072af78ef2 100644
--- a/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_hangouts_chat_active
description: Count of groups with active integrations for Hangouts Chat
product_section: dev
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 7b5b91fb435..7688db7b417 100644
--- a/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_hangouts_chat_active
description: Count of active service templates for Hangouts Chat
product_section: dev
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 6533b9f8fdf..5aee8f1bf26 100644
--- a/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_hangouts_chat_active
description: Count of active instance-level integrations for Hangouts Chat
product_section: dev
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 c4377cd4c7c..9a763f6a19d 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_hangouts_chat_active
description: Count of active projects inheriting integrations for Hangouts Chat
product_section: dev
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 203038f2092..00c4cd12ceb 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_hangouts_chat_active
description: Count of active groups inheriting integrations for Hangouts Chat
product_section: dev
diff --git a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
index 044fb2ce3c7..add1887e420 100644
--- a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_hipchat_active
description: Count of projects with active integrations for HipChat
product_section: dev
diff --git a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
index 1cf8e125c40..2b030c7dcc5 100644
--- a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_hipchat_active
description: Count of groups with active integrations for HipChat
product_section: dev
diff --git a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
index 14ea9129ac9..83499f1d28a 100644
--- a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_hipchat_active
description: Count of active service templates for HipChat
product_section: dev
diff --git a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
index 2489c66c11b..bfcc91218fd 100644
--- a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_hipchat_active
description: Count of active instance-level integrations for HipChat
product_section: dev
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 4681958d947..45ec7571795 100644
--- a/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_hipchat_active
description: Count of active projects inheriting integrations for HipChat
product_section: dev
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 93d930160a5..8c9c7bb3984 100644
--- a/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_hipchat_active
description: Count of active groups inheriting integrations for HipChat
product_section: dev
diff --git a/config/metrics/counts_all/20210216175921_projects_irker_active.yml b/config/metrics/counts_all/20210216175921_projects_irker_active.yml
index 29fa695d287..51c3d19f356 100644
--- a/config/metrics/counts_all/20210216175921_projects_irker_active.yml
+++ b/config/metrics/counts_all/20210216175921_projects_irker_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_irker_active
description: Count of projects with active integrations for Irker
product_section: dev
diff --git a/config/metrics/counts_all/20210216175923_groups_irker_active.yml b/config/metrics/counts_all/20210216175923_groups_irker_active.yml
index 82b7f705df0..14554b603c5 100644
--- a/config/metrics/counts_all/20210216175923_groups_irker_active.yml
+++ b/config/metrics/counts_all/20210216175923_groups_irker_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_irker_active
description: Count of groups with active integrations for Irker
product_section: dev
diff --git a/config/metrics/counts_all/20210216175924_templates_irker_active.yml b/config/metrics/counts_all/20210216175924_templates_irker_active.yml
index eb992e58a2c..28fe8982a0a 100644
--- a/config/metrics/counts_all/20210216175924_templates_irker_active.yml
+++ b/config/metrics/counts_all/20210216175924_templates_irker_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_irker_active
description: Count of active service templates for Irker
product_section: dev
diff --git a/config/metrics/counts_all/20210216175926_instances_irker_active.yml b/config/metrics/counts_all/20210216175926_instances_irker_active.yml
index 86639db20c7..168a8233679 100644
--- a/config/metrics/counts_all/20210216175926_instances_irker_active.yml
+++ b/config/metrics/counts_all/20210216175926_instances_irker_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_irker_active
description: Count of active instance-level integrations for Irker
product_section: dev
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 c627c43c2b1..dfe9eddaaee 100644
--- a/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
+++ b/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_irker_active
description: Count of active projects inheriting integrations for Irker
product_section: dev
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 2be0b6fbf5c..b587654dffc 100644
--- a/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
+++ b/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_irker_active
description: Count of active groups inheriting integrations for Irker
product_section: dev
diff --git a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
index c5e8256e6c5..46877e2ebbf 100644
--- a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.projects_jenkins_active
description: Count of projects with active integrations for Jenkins
product_section: dev
diff --git a/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml b/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
index b0f403d30e8..9f4b7b96faf 100644
--- a/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_jenkins_active
description: Count of groups with active integrations for Jenkins
product_section: dev
diff --git a/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml b/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
index 46768e405fe..efe084d8b4c 100644
--- a/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_jenkins_active
description: Count of active service templates for Jenkins
product_section: dev
diff --git a/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml b/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
index 5750f618349..ed22a443026 100644
--- a/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_jenkins_active
description: Count of active instance-level integrations for Jenkins
product_section: dev
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 66950b6e514..f2b8ab6c162 100644
--- a/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_jenkins_active
description: Count of active projects inheriting integrations for Jenkins
product_section: dev
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 59bdad97d66..c3341e8a81f 100644
--- a/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_jenkins_active
description: Count of active groups inheriting integrations for Jenkins
product_section: dev
diff --git a/config/metrics/counts_all/20210216175943_projects_jira_active.yml b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
index 0edf824ac71..f36fdfb0d5d 100644
--- a/config/metrics/counts_all/20210216175943_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.projects_jira_active
description: Count of projects with active integrations for Jira
product_section: dev
diff --git a/config/metrics/counts_all/20210216175945_groups_jira_active.yml b/config/metrics/counts_all/20210216175945_groups_jira_active.yml
index 368bde685d1..76775ac5b82 100644
--- a/config/metrics/counts_all/20210216175945_groups_jira_active.yml
+++ b/config/metrics/counts_all/20210216175945_groups_jira_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_jira_active
description: Count of groups with active integrations for Jira
product_section: dev
diff --git a/config/metrics/counts_all/20210216175946_templates_jira_active.yml b/config/metrics/counts_all/20210216175946_templates_jira_active.yml
index 816d432ca28..9afc44eefd1 100644
--- a/config/metrics/counts_all/20210216175946_templates_jira_active.yml
+++ b/config/metrics/counts_all/20210216175946_templates_jira_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_jira_active
description: Count of active service templates for Jira
product_section: dev
diff --git a/config/metrics/counts_all/20210216175948_instances_jira_active.yml b/config/metrics/counts_all/20210216175948_instances_jira_active.yml
index 44c76d61697..83161b28cbf 100644
--- a/config/metrics/counts_all/20210216175948_instances_jira_active.yml
+++ b/config/metrics/counts_all/20210216175948_instances_jira_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_jira_active
description: Count of active instance-level integrations for Jira
product_section: dev
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 1a99e60b372..3469899c36d 100644
--- a/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
+++ b/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_jira_active
description: Count of active projects inheriting integrations for Jira
product_section: dev
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 fdc4756d97d..e8a02037097 100644
--- a/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
+++ b/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_jira_active
description: Count of active groups inheriting integrations for Jira
product_section: dev
diff --git a/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml b/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
index 7b66de89d30..69c06bac88f 100644
--- a/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_mattermost_active
description: Count of projects with active integrations for Mattermost
product_section: dev
diff --git a/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml b/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
index b6876722adf..1ebe84a137f 100644
--- a/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_mattermost_active
description: Count of groups with active integrations for Mattermost
product_section: dev
diff --git a/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml b/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
index 652cf2343c6..26c4a20334d 100644
--- a/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_mattermost_active
description: Count of active service templates for Mattermost
product_section: dev
diff --git a/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml b/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
index be0e7884e8e..288a338852b 100644
--- a/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_mattermost_active
description: Count of active instance-level integrations for Mattermost
product_section: dev
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 813535c138f..8bc76fa0d7b 100644
--- a/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_mattermost_active
description: Count of active projects inheriting integrations for Mattermost
product_section: dev
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 379adc4d832..fab51879ca1 100644
--- a/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_mattermost_active
description: Count of active groups inheriting integrations for Mattermost
product_section: dev
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 ed2403675cd..b208359a20d 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_mattermost_slash_commands_active
description: Count of projects with active integrations for Mattermost (slash commands)
product_section: dev
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 9f558f2508d..098357b0f3a 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_mattermost_slash_commands_active
description: Count of groups with active integrations for Mattermost (slash commands)
product_section: dev
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 b972c19158a..8a999745894 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_mattermost_slash_commands_active
description: Count of active service templates for Mattermost (slash commands)
product_section: dev
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 804816972df..67a6ae1c2d8 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_mattermost_slash_commands_active
description: Count of active instance-level integrations for Mattermost (slash commands)
product_section: dev
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 19b0edc2f42..fdee7605ee3 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_mattermost_slash_commands_active
description: Count of active projects inheriting integrations for Mattermost (slash
commands)
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 9fd9a85ae47..d4ac690b76e 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_mattermost_slash_commands_active
description: Count of active groups inheriting integrations for Mattermost (slash
commands)
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 95983fbb87e..0b101f20f6f 100644
--- a/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_microsoft_teams_active
description: Count of projects with active integrations for Microsoft Teams
product_section: dev
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 4a59f83009d..e32d30650fc 100644
--- a/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_microsoft_teams_active
description: Count of groups with active integrations for Microsoft Teams
product_section: dev
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 782976da2bd..68047103bc8 100644
--- a/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_microsoft_teams_active
description: Count of active service templates for Microsoft Teams
product_section: dev
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 927ec1de2ce..b73114b25b2 100644
--- a/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_microsoft_teams_active
description: Count of active instance-level integrations for Microsoft Teams
product_section: dev
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 382066cb02d..8b7a69919a9 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_microsoft_teams_active
description: Count of active projects inheriting integrations for Microsoft Teams
product_section: dev
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 548a62a9e3f..99688628f89 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_microsoft_teams_active
description: Count of active groups inheriting integrations for Microsoft Teams
product_section: dev
diff --git a/config/metrics/counts_all/20210216180027_projects_packagist_active.yml b/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
index 922f4c3cc25..18a083b944b 100644
--- a/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_packagist_active
description: Count of projects with active integrations for Packagist
product_section: dev
diff --git a/config/metrics/counts_all/20210216180029_groups_packagist_active.yml b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
index 806175a69fe..7a7f9e4b2e9 100644
--- a/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_packagist_active
description: Count of groups with active integrations for Packagist
product_section: dev
diff --git a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
index 43100d09aa2..3494aa060b0 100644
--- a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_packagist_active
description: Count of active service templates for Packagist
product_section: dev
diff --git a/config/metrics/counts_all/20210216180032_instances_packagist_active.yml b/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
index 947cee6e75c..b0c99452aec 100644
--- a/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_packagist_active
description: Count of active instance-level integrations for Packagist
product_section: dev
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 b00f44f43a2..c5c8b13a0e1 100644
--- a/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_packagist_active
description: Count of active projects inheriting integrations for Packagist
product_section: dev
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 463ca1c30e7..45ed69d86ec 100644
--- a/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_packagist_active
description: Count of active groups inheriting integrations for Packagist
product_section: dev
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 37926a469a7..6ccc794c688 100644
--- a/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_pipelines_email_active
description: Count of projects with active integrations for Pipeline Emails
product_section: dev
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 0a8bfcaa16c..dcb8272938b 100644
--- a/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_pipelines_email_active
description: Count of groups with active integrations for Pipeline Emails
product_section: dev
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 bc5c7fc3f0f..289cfaf2906 100644
--- a/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_pipelines_email_active
description: Count of active service templates for Pipeline Emails
product_section: dev
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 6ff8e86d7ed..0d6ed456221 100644
--- a/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_pipelines_email_active
description: Count of active instance-level integrations for Pipeline Emails
product_section: dev
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 0dcd52c2bda..d4ce2057281 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_pipelines_email_active
description: Count of active projects inheriting integrations for Pipeline Emails
product_section: dev
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 f49cd742a41..e835b4bb776 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_pipelines_email_active
description: Count of active groups inheriting integrations for Pipeline Emails
product_section: dev
diff --git a/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
index 3c302548c20..f6e009bf21e 100644
--- a/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_pivotaltracker_active
description: Count of projects with active integrations for Pivotal Tracker
product_section: dev
diff --git a/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
index f876a2404cf..5e309deeb44 100644
--- a/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_pivotaltracker_active
description: Count of groups with active integrations for Pivotal Tracker
product_section: dev
diff --git a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
index e689ce2c2af..4d1b85589b9 100644
--- a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_pivotaltracker_active
description: Count of active service templates for Pivotal Tracker
product_section: dev
diff --git a/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
index 431cfa8f0ca..0ceafe5781c 100644
--- a/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_pivotaltracker_active
description: Count of active instance-level integrations for Pivotal Tracker
product_section: dev
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 b436e9127b2..5d8441dc36b 100644
--- a/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_pivotaltracker_active
description: Count of active projects inheriting integrations for Pivotal Tracker
product_section: dev
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 864ccc3dfe7..8141db87091 100644
--- a/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_pivotaltracker_active
description: Count of active groups inheriting integrations for Pivotal Tracker
product_section: dev
diff --git a/config/metrics/counts_all/20210216180100_projects_pushover_active.yml b/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
index 42bf8f73d52..41c3f7e0227 100644
--- a/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_pushover_active
description: Count of projects with active integrations for Pushover
product_section: dev
diff --git a/config/metrics/counts_all/20210216180102_groups_pushover_active.yml b/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
index 43008905fd4..d8e0991c869 100644
--- a/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_pushover_active
description: Count of groups with active integrations for Pushover
product_section: dev
diff --git a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
index 8f044c0eb3b..15df53d47d3 100644
--- a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_pushover_active
description: Count of active service templates for Pushover
product_section: dev
diff --git a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
index d2dfb47c275..a50d356cad2 100644
--- a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_pushover_active
description: Count of active instance-level integrations for Pushover
product_section: dev
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 66d8441f35a..acabf43d5a2 100644
--- a/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_pushover_active
description: Count of active projects inheriting integrations for Pushover
product_section: dev
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 63f9d817858..12af7db4bb9 100644
--- a/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_pushover_active
description: Count of active groups inheriting integrations for Pushover
product_section: dev
diff --git a/config/metrics/counts_all/20210216180111_projects_redmine_active.yml b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
index 6fcacd74142..79fa9ef1457 100644
--- a/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_redmine_active
description: Count of projects with active integrations for Redmine
product_section: dev
diff --git a/config/metrics/counts_all/20210216180113_groups_redmine_active.yml b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
index d87e3f8c963..d60f9aaf4c2 100644
--- a/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_redmine_active
description: Count of groups with active integrations for Redmine
product_section: dev
diff --git a/config/metrics/counts_all/20210216180115_templates_redmine_active.yml b/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
index 8e1429bf22e..01b79ac3015 100644
--- a/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_redmine_active
description: Count of active service templates for Redmine
product_section: dev
diff --git a/config/metrics/counts_all/20210216180116_instances_redmine_active.yml b/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
index 21fbe5222b5..c478adad1bd 100644
--- a/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_redmine_active
description: Count of active instance-level integrations for Redmine
product_section: dev
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 5bf3ee5f89c..7a277811115 100644
--- a/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_redmine_active
description: Count of active projects inheriting integrations for Redmine
product_section: dev
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 1b631134ef9..fd6d60ed238 100644
--- a/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_redmine_active
description: Count of active groups inheriting integrations for Redmine
product_section: dev
diff --git a/config/metrics/counts_all/20210216180122_projects_slack_active.yml b/config/metrics/counts_all/20210216180122_projects_slack_active.yml
index 16d69350274..2c5061a66a9 100644
--- a/config/metrics/counts_all/20210216180122_projects_slack_active.yml
+++ b/config/metrics/counts_all/20210216180122_projects_slack_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_slack_active
description: Count of projects with active integrations for Slack
product_section: dev
diff --git a/config/metrics/counts_all/20210216180124_groups_slack_active.yml b/config/metrics/counts_all/20210216180124_groups_slack_active.yml
index 29ffc7fa2a9..ea7aa5dd536 100644
--- a/config/metrics/counts_all/20210216180124_groups_slack_active.yml
+++ b/config/metrics/counts_all/20210216180124_groups_slack_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_slack_active
description: Count of groups with active integrations for Slack
product_section: dev
diff --git a/config/metrics/counts_all/20210216180126_templates_slack_active.yml b/config/metrics/counts_all/20210216180126_templates_slack_active.yml
index f4c623d9763..ee98d9cd464 100644
--- a/config/metrics/counts_all/20210216180126_templates_slack_active.yml
+++ b/config/metrics/counts_all/20210216180126_templates_slack_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_slack_active
description: Count of active service templates for Slack
product_section: dev
diff --git a/config/metrics/counts_all/20210216180127_instances_slack_active.yml b/config/metrics/counts_all/20210216180127_instances_slack_active.yml
index 9b01d0ce9a0..27591e21749 100644
--- a/config/metrics/counts_all/20210216180127_instances_slack_active.yml
+++ b/config/metrics/counts_all/20210216180127_instances_slack_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_slack_active
description: Count of active instance-level integrations for Slack
product_section: dev
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 6a0b4567227..9fb41402079 100644
--- a/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_slack_active
description: Count of active projects inheriting integrations for Slack
product_section: dev
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 2c1f33ff3cc..b6aad3dabe5 100644
--- a/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_slack_active
description: Count of active groups inheriting integrations for Slack
product_section: dev
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 85f097c8588..e24c22e7768 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_slack_slash_commands_active
description: Count of projects with active integrations for Slack (slash commands)
product_section: dev
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 bd4e48c47ed..ef29553917d 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_slack_slash_commands_active
description: Count of groups with active integrations for Slack (slash commands)
product_section: dev
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 35a22de4151..f95c135adfd 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_slack_slash_commands_active
description: Count of active service templates for Slack (slash commands)
product_section: dev
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 eb508981d30..0bc4f65fc20 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_slack_slash_commands_active
description: Count of active instance-level integrations for Slack (slash commands)
product_section: dev
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 833aeca442d..bde6a1aa699 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_slack_slash_commands_active
description: Count of active projects inheriting integrations for Slack (slash commands)
product_section: dev
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 bb616d3d943..acb7986520b 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_slack_slash_commands_active
description: Count of active groups inheriting integrations for Slack (slash commands)
product_section: dev
diff --git a/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
index 6133db22892..40cda2742a0 100644
--- a/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_teamcity_active
description: Count of projects with active integrations for Teamcity CI
product_section: dev
diff --git a/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml b/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
index 59f385375d9..4caf1da1916 100644
--- a/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_teamcity_active
description: Count of groups with active integrations for Teamcity CI
product_section: dev
diff --git a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
index 18ed71d6c97..18e8f918b3a 100644
--- a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_teamcity_active
description: Count of active service templates for Teamcity CI
product_section: dev
diff --git a/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml b/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
index 10261be9fce..01a2c62a8ee 100644
--- a/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_teamcity_active
description: Count of active instance-level integrations for Teamcity CI
product_section: dev
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 52a3e9cb16d..3dcc4f033d6 100644
--- a/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_teamcity_active
description: Count of active projects inheriting integrations for Teamcity CI
product_section: dev
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 851600480ed..2c8b2312500 100644
--- a/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_teamcity_active
description: Count of active groups inheriting integrations for Teamcity CI
product_section: dev
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 1c3ea01d7a9..581a59deb23 100644
--- a/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_unify_circuit_active
description: Count of projects with active integrations for Unifiy Circuit
product_section: dev
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 5569c232a4a..07f696de983 100644
--- a/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_unify_circuit_active
description: Count of groups with active integrations for Unifiy Circuit
product_section: dev
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 f7bf952490a..4c007587abd 100644
--- a/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_unify_circuit_active
description: Count of active service templates for Unifiy Circuit
product_section: dev
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 9fda98c309a..0581c17a32a 100644
--- a/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_unify_circuit_active
description: Count of active instance-level integrations for Unifiy Circuit
product_section: dev
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 a0ebdf99609..e088e588802 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_unify_circuit_active
description: Count of active projects inheriting integrations for Unifiy Circuit
product_section: dev
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 960948a0211..11478c7e1fc 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_unify_circuit_active
description: Count of active groups inheriting integrations for Unifiy Circuit
product_section: dev
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 a73043d63c8..e8487eaf970 100644
--- a/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_webex_teams_active
description: Count of projects with active integrations for Webex Teams
product_section: dev
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 546f21d936f..f6da630e710 100644
--- a/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_webex_teams_active
description: Count of groups with active integrations for Webex Teams
product_section: dev
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 4f8dd7f77bc..3c02d92a4ba 100644
--- a/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_webex_teams_active
description: Count of active service templates for Webex Teams
product_section: dev
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 2013d75b4aa..c44d3488674 100644
--- a/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_webex_teams_active
description: Count of active instance-level integrations for Webex Teams
product_section: dev
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 d0732b302e4..58b29432791 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_webex_teams_active
description: Count of active projects inheriting integrations for Webex Teams
product_section: dev
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 5893725512b..2e73f1386d9 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_webex_teams_active
description: Count of active groups inheriting integrations for Webex Teams
product_section: dev
diff --git a/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml b/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
index 79b1b4ff2bd..aa2c18c14d0 100644
--- a/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_youtrack_active
description: Count of projects with active integrations for YouTrack
product_section: dev
diff --git a/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml b/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
index 15dce5f9cd5..15623c851c9 100644
--- a/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_youtrack_active
description: Count of groups with active integrations for YouTrack
product_section: dev
diff --git a/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml b/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
index 8b61a776ab1..17a54224d5f 100644
--- a/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_youtrack_active
description: Count of active service templates for YouTrack
product_section: dev
diff --git a/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml b/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
index 7ef51d5357f..6bf2cbfdd41 100644
--- a/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_youtrack_active
description: Count of active instance-level integrations for YouTrack
product_section: dev
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 04a1187c3a8..d18ccd0561f 100644
--- a/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_youtrack_active
description: Count of active projects inheriting integrations for YouTrack
product_section: dev
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 a0deaad6355..1fd6038e2a1 100644
--- a/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_youtrack_active
description: Count of active groups inheriting integrations for YouTrack
product_section: dev
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 3d46189a2fc..e5c774666ff 100644
--- a/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
+++ b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.projects_jira_server_active
description: Count of active integrations with Jira Software (server)
product_section: dev
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 5daa5b74d7f..ce1579ec0b1 100644
--- a/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
+++ b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.projects_jira_cloud_active
description: Count of active integrations with Jira Cloud (Saas)
product_section: dev
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 4434dbdb3d6..4c1b54f04a3 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
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.projects_jira_dvcs_cloud_active
description: Count of active integrations with Jira Cloud (DVCS Connector)
product_section: dev
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 cdddc0df4fc..2083b74cdb0 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
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.projects_jira_dvcs_server_active
description: Count of active integrations with Jira Software (DVCS connector)
product_section: dev
diff --git a/config/metrics/counts_all/20210216180239_personal_snippets.yml b/config/metrics/counts_all/20210216180239_personal_snippets.yml
index 2ef2024321e..ea8404a6163 100644
--- a/config/metrics/counts_all/20210216180239_personal_snippets.yml
+++ b/config/metrics/counts_all/20210216180239_personal_snippets.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.personal_snippets
description: Count of personal Snippets
product_section: dev
diff --git a/config/metrics/counts_all/20210216180241_project_snippets.yml b/config/metrics/counts_all/20210216180241_project_snippets.yml
index 483c3cfc254..1f915327d39 100644
--- a/config/metrics/counts_all/20210216180241_project_snippets.yml
+++ b/config/metrics/counts_all/20210216180241_project_snippets.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.project_snippets
description: Count of project Snippets
product_section: dev
diff --git a/config/metrics/counts_all/20210216180242_web_ide_commits.yml b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
index fc0687c902c..c85dd1f876c 100644
--- a/config/metrics/counts_all/20210216180242_web_ide_commits.yml
+++ b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.web_ide_commits
description: Count of commits made from the Web IDE
product_section: dev
diff --git a/config/metrics/counts_all/20210216180244_web_ide_views.yml b/config/metrics/counts_all/20210216180244_web_ide_views.yml
index e8b91e004ba..222e92482e9 100644
--- a/config/metrics/counts_all/20210216180244_web_ide_views.yml
+++ b/config/metrics/counts_all/20210216180244_web_ide_views.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.web_ide_views
description: Count of views of the Web IDE
product_section: dev
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 b87dd22dc40..c5e50275878 100644
--- a/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
+++ b/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.web_ide_merge_requests
description: Count of merge requests created from the Web IDE
product_section: dev
diff --git a/config/metrics/counts_all/20210216180248_web_ide_previews.yml b/config/metrics/counts_all/20210216180248_web_ide_previews.yml
index e9d0a5efb03..b4c349e5cc3 100644
--- a/config/metrics/counts_all/20210216180248_web_ide_previews.yml
+++ b/config/metrics/counts_all/20210216180248_web_ide_previews.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.web_ide_previews
description: Count of Live Preview tab views in the Web IDE
product_section: dev
diff --git a/config/metrics/counts_all/20210216180250_web_ide_terminals.yml b/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
index 4965b1f3931..d451222dfd4 100644
--- a/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
+++ b/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.web_ide_terminals
description: Count of Web Terminal tab views in the Web IDE
product_section: dev
diff --git a/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml b/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
index f31b69a1eb9..562f6381487 100644
--- a/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
+++ b/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.web_ide_pipelines
description: Count of Pipeline tab views in the Web IDE
product_section: dev
diff --git a/config/metrics/counts_all/20210216180253_snippet_comment.yml b/config/metrics/counts_all/20210216180253_snippet_comment.yml
index 0175c709383..efc079fa13e 100644
--- a/config/metrics/counts_all/20210216180253_snippet_comment.yml
+++ b/config/metrics/counts_all/20210216180253_snippet_comment.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.snippet_comment
description: Count of comments on Snippets
product_section: dev
diff --git a/config/metrics/counts_all/20210216180255_snippet_create.yml b/config/metrics/counts_all/20210216180255_snippet_create.yml
index 5bac8795bdf..4303deb1aeb 100644
--- a/config/metrics/counts_all/20210216180255_snippet_create.yml
+++ b/config/metrics/counts_all/20210216180255_snippet_create.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.snippet_create
description: Count of newly created Snippets
product_section: dev
diff --git a/config/metrics/counts_all/20210216180257_snippet_update.yml b/config/metrics/counts_all/20210216180257_snippet_update.yml
index bda8a8b8ded..d59f2a63a42 100644
--- a/config/metrics/counts_all/20210216180257_snippet_update.yml
+++ b/config/metrics/counts_all/20210216180257_snippet_update.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.snippet_update
description: Count of updates to existing Snippets
product_section: dev
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 9012d982cf8..684bf25af10 100644
--- a/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
+++ b/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.static_site_editor_views
description: Count of Static Site Editor views
product_section: dev
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 cc16b87efa4..046448d551a 100644
--- a/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
+++ b/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.static_site_editor_commits
description: Count of commits created from the Static Site Editor
product_section: dev
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 5c3a0b2ae6e..62741924580 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.static_site_editor_merge_requests
description: Count of merge requests created via Static Site Editor
product_section: dev
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 8229f6af2de..ed85c6ba21d 100644
--- a/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
+++ b/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.user_preferences_user_gitpod_enabled
description: Count of users with the GitPod integration enabled
product_section: dev
diff --git a/config/metrics/counts_all/20210216180306_snippets.yml b/config/metrics/counts_all/20210216180306_snippets.yml
index 6f992607084..5dcf43846e6 100644
--- a/config/metrics/counts_all/20210216180306_snippets.yml
+++ b/config/metrics/counts_all/20210216180306_snippets.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.snippets
description: Count of all Snippets
product_section: dev
diff --git a/config/metrics/counts_all/20210216180316_snippets.yml b/config/metrics/counts_all/20210216180316_snippets.yml
index cec9bd481db..f975500f3e6 100644
--- a/config/metrics/counts_all/20210216180316_snippets.yml
+++ b/config/metrics/counts_all/20210216180316_snippets.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.create.snippets
name: count_distinct_author_id_from_snippets
description: Count of distinct author_id from snippets
diff --git a/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml b/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml
index 5ef3f86ae55..30a05f3e979 100644
--- a/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml
+++ b/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.api_fuzzing_jobs
description: Count of API Fuzzing jobs run by job name
product_section: sec
diff --git a/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml b/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml
index 8e7a97ab7d6..1e873b6099c 100644
--- a/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml
+++ b/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.api_fuzzing_dnd_jobs
description: Count of API Fuzzing `docker-in-docker` jobs run by job name
product_section: sec
diff --git a/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml b/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml
index 58fba247d3f..84042e76f7a 100644
--- a/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml
+++ b/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage.secure.user_api_fuzzing_jobs
description: Count of API Fuzzing jobs by job name
product_section: sec
diff --git a/config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml b/config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml
index 417ea83e182..1d75eb78f79 100644
--- a/config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml
+++ b/config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage.secure.user_api_fuzzing_dnd_jobs
description: Count of API Fuzzing `docker-in-docker` jobs by job name
product_section: sec
diff --git a/config/metrics/counts_all/20210216180410_pool_repositories.yml b/config/metrics/counts_all/20210216180410_pool_repositories.yml
index d7831376608..06a65c536dd 100644
--- a/config/metrics/counts_all/20210216180410_pool_repositories.yml
+++ b/config/metrics/counts_all/20210216180410_pool_repositories.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.pool_repositories
description: Count of unique object pool repositories for fork deduplication
product_section: dev
diff --git a/config/metrics/counts_all/20210216180413_all_searches.yml b/config/metrics/counts_all/20210216180413_all_searches.yml
index 1bf54e3b274..b9a3374b333 100644
--- a/config/metrics/counts_all/20210216180413_all_searches.yml
+++ b/config/metrics/counts_all/20210216180413_all_searches.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.all_searches
description: Total Searches for All Basic Search and Advanced Search in self-managed
and SaaS
diff --git a/config/metrics/counts_all/20210216180414_navbar_searches.yml b/config/metrics/counts_all/20210216180414_navbar_searches.yml
index f2835e2cc4c..5cceeecff8a 100644
--- a/config/metrics/counts_all/20210216180414_navbar_searches.yml
+++ b/config/metrics/counts_all/20210216180414_navbar_searches.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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
product_section: enablement
diff --git a/config/metrics/counts_all/20210216180416_i_search_total.yml b/config/metrics/counts_all/20210216180416_i_search_total.yml
index 00371ea9e4b..0e8a7cfecf0 100644
--- a/config/metrics/counts_all/20210216180416_i_search_total.yml
+++ b/config/metrics/counts_all/20210216180416_i_search_total.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: search_unique_visits.i_search_total
description: Calculated unique users to perform Basic or Advanced searches by week
product_section: enablement
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 fd003c1637f..67fac53ec4e 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.issues_created_from_gitlab_error_tracking_ui
description: Count of issues manually created from the GitLab UI on Sentry errors
product_section: ops
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 431ad29f23a..c840150b205 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.issues_with_associated_zoom_link
description: Count of issues where a user has linked a Zoom meeting
product_section: ops
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 5ba7536e804..e69555757d8 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.issues_using_zoom_quick_actions
description: Count of issues where a user have added AND removed a zoom meeting using
slash commands
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 02e4f4fd261..aebb69d4fe7 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.issues_with_embedded_grafana_charts_approx
description: Count of issues where a user has embedded a Grafana chart
product_section: ops
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 fe1006657b3..dcce2f4e366 100644
--- a/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
+++ b/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.issues_created_from_alerts
description: Count of issues created automatically on alerts from GitLab-Managed Prometheus
product_section: ops
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 e483071e60e..373a5e6c262 100644
--- a/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
+++ b/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.issues_created_gitlab_alerts
description: Count of all issues created from GitLab alerts (bot and non-bot)
product_section: ops
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 b19ded2e16e..a72f821f1e7 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.issues_created_manually_from_alerts
description: Count of issues created manually by non-bot users from GitLab alerts
product_section: ops
diff --git a/config/metrics/counts_all/20210216180447_incident_issues.yml b/config/metrics/counts_all/20210216180447_incident_issues.yml
index 17d8bb90562..bc3dd346e4d 100644
--- a/config/metrics/counts_all/20210216180447_incident_issues.yml
+++ b/config/metrics/counts_all/20210216180447_incident_issues.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.incident_issues
description: Count of incidents (issues where issue_type=incident)
product_section: ops
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 b1add8e190f..5fa90b9f6c1 100644
--- a/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
+++ b/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.alert_bot_incident_issues
description: Count of issues created by the alert bot automatically
product_section: ops
diff --git a/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml b/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
index 00057f814b0..9764d0cba4c 100644
--- a/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
+++ b/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.incident_labeled_issues
description: Count of all issues with the label=incident
product_section: ops
diff --git a/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml b/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
index 9006757b339..10f2abcfb84 100644
--- a/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
+++ b/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_creating_incidents
description: Counts of Projects that have incident issues, regardless of status.
product_section: ops
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 ba03d7fad71..c5c4a1e90bf 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_with_error_tracking_enabled
description: Count of projects that have enabled Error tracking via Sentry
product_section: ops
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 300d4a883bd..f162e767cbe 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_with_alerts_service_enabled
description: Count of projects that have enabled the Alerts service
product_section: ops
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 f4f5b8304f9..bfca848f0fd 100644
--- a/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
+++ b/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_with_alerts_created
description: Count of projects with alerts created in given time period
product_section: ops
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 eb22d3cc02b..6b37f627c95 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_with_enabled_alert_integrations
description: Count of projects with at least 1 enabled integration
product_section: ops
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 06fe3da7371..b6de290e3ee 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.monitor.projects_with_error_tracking_enabled
description: Projects where error tracking is enabled
product_section: ops
diff --git a/config/metrics/counts_all/20210216180518_projects_with_incidents.yml b/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
index 70c8a60ebcf..5ed0d61b5d1 100644
--- a/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
+++ b/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.monitor.projects_with_incidents
description: Count of unique projects with an incident
product_section: ops
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 092266e07d9..9a0d7e14566 100644
--- a/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
+++ b/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.monitor.projects_with_alert_incidents
description: Count of unique projects with an incident from an alert
product_section: ops
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 448ba3ee757..967e060db39 100644
--- a/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
+++ b/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.projects_imported_from_github
description: Count of projects imported from GitHub
product_section: dev
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 e7372fc3074..51dd7a63ba4 100644
--- a/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
+++ b/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.create.projects_imported_from_github
description: Count of projects imported from GitHub
product_section: dev
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 ba0089352c5..f2ee013002c 100644
--- a/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
+++ b/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.unique_users_all_imports
description: Distinct count of users that triggered any kind of import
product_section: dev
diff --git a/config/metrics/counts_all/20210216180634_gitlab.yml b/config/metrics/counts_all/20210216180634_gitlab.yml
index 8bf9f623425..c578ff7bab0 100644
--- a/config/metrics/counts_all/20210216180634_gitlab.yml
+++ b/config/metrics/counts_all/20210216180634_gitlab.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.bulk_imports.gitlab
description: Distinct count of users that triggered an import using the Group Migration
tool
diff --git a/config/metrics/counts_all/20210216180636_gitlab_v1.yml b/config/metrics/counts_all/20210216180636_gitlab_v1.yml
index edf30eeb2e5..80cf9db3e46 100644
--- a/config/metrics/counts_all/20210216180636_gitlab_v1.yml
+++ b/config/metrics/counts_all/20210216180636_gitlab_v1.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.bulk_imports.gitlab_v1
description: Count of imports using GitLab Migration
product_section: dev
diff --git a/config/metrics/counts_all/20210216180638_gitlab_project.yml b/config/metrics/counts_all/20210216180638_gitlab_project.yml
index c3aae1afcb1..60f3a0e6bd6 100644
--- a/config/metrics/counts_all/20210216180638_gitlab_project.yml
+++ b/config/metrics/counts_all/20210216180638_gitlab_project.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.project_imports.gitlab_project
description: Count of projects imported using Project Import/Export
product_section: dev
diff --git a/config/metrics/counts_all/20210216180639_gitlab.yml b/config/metrics/counts_all/20210216180639_gitlab.yml
index 1b1a86bf525..66b4511cc75 100644
--- a/config/metrics/counts_all/20210216180639_gitlab.yml
+++ b/config/metrics/counts_all/20210216180639_gitlab.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.project_imports.gitlab
description: Count of projects imported from GitLab.com
product_section: dev
diff --git a/config/metrics/counts_all/20210216180641_github.yml b/config/metrics/counts_all/20210216180641_github.yml
index 133d1fd5f4f..6ebb762be0d 100644
--- a/config/metrics/counts_all/20210216180641_github.yml
+++ b/config/metrics/counts_all/20210216180641_github.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.project_imports.github
description: Count of projects imported from GitHub
product_section: dev
diff --git a/config/metrics/counts_all/20210216180643_bitbucket.yml b/config/metrics/counts_all/20210216180643_bitbucket.yml
index 3c7b9d07127..1b683d1414d 100644
--- a/config/metrics/counts_all/20210216180643_bitbucket.yml
+++ b/config/metrics/counts_all/20210216180643_bitbucket.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.project_imports.bitbucket
description: Count of projects imported from Bitbucket
product_section: dev
diff --git a/config/metrics/counts_all/20210216180645_bitbucket_server.yml b/config/metrics/counts_all/20210216180645_bitbucket_server.yml
index 5448dbf7bd2..a7d6481a0d1 100644
--- a/config/metrics/counts_all/20210216180645_bitbucket_server.yml
+++ b/config/metrics/counts_all/20210216180645_bitbucket_server.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.project_imports.bitbucket_server
description: Count of projects imported from Bitbucket Server
product_section: dev
diff --git a/config/metrics/counts_all/20210216180647_gitea.yml b/config/metrics/counts_all/20210216180647_gitea.yml
index 67fe589dc4f..4cf1ebfd78f 100644
--- a/config/metrics/counts_all/20210216180647_gitea.yml
+++ b/config/metrics/counts_all/20210216180647_gitea.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.project_imports.gitea
description: Count of projects imported from Gitea
product_section: dev
diff --git a/config/metrics/counts_all/20210216180649_git.yml b/config/metrics/counts_all/20210216180649_git.yml
index dcd7c302037..9c60f4a2302 100644
--- a/config/metrics/counts_all/20210216180649_git.yml
+++ b/config/metrics/counts_all/20210216180649_git.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.project_imports.git
description: Count of projects imported by URL
product_section: dev
diff --git a/config/metrics/counts_all/20210216180650_manifest.yml b/config/metrics/counts_all/20210216180650_manifest.yml
index fa599eaf552..ee1037328de 100644
--- a/config/metrics/counts_all/20210216180650_manifest.yml
+++ b/config/metrics/counts_all/20210216180650_manifest.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.project_imports.manifest
description: Count of projects imported using manifst file
product_section: dev
diff --git a/config/metrics/counts_all/20210216180652_gitlab_migration.yml b/config/metrics/counts_all/20210216180652_gitlab_migration.yml
index 0f44c0d8223..8aa45dee434 100644
--- a/config/metrics/counts_all/20210216180652_gitlab_migration.yml
+++ b/config/metrics/counts_all/20210216180652_gitlab_migration.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.project_imports.gitlab_migration
description: Count of projects imported using GitLab Migration
product_section: dev
diff --git a/config/metrics/counts_all/20210216180654_jira.yml b/config/metrics/counts_all/20210216180654_jira.yml
index 1b2fab8e989..7c7a2739576 100644
--- a/config/metrics/counts_all/20210216180654_jira.yml
+++ b/config/metrics/counts_all/20210216180654_jira.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage.manage.issue_imports.jira
description: Count of projects imported from Jira
product_section: dev
diff --git a/config/metrics/counts_all/20210216180656_fogbugz.yml b/config/metrics/counts_all/20210216180656_fogbugz.yml
index 5f487882235..2d4e5ddcc02 100644
--- a/config/metrics/counts_all/20210216180656_fogbugz.yml
+++ b/config/metrics/counts_all/20210216180656_fogbugz.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.issue_imports.fogbugz
description: Count of projects imported from fogbugz
product_section: dev
diff --git a/config/metrics/counts_all/20210216180658_phabricator.yml b/config/metrics/counts_all/20210216180658_phabricator.yml
index aa02bda90dd..e5cdd3f382b 100644
--- a/config/metrics/counts_all/20210216180658_phabricator.yml
+++ b/config/metrics/counts_all/20210216180658_phabricator.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.issue_imports.phabricator
description: Count of projects imported from phabricator
product_section: dev
diff --git a/config/metrics/counts_all/20210216180700_csv.yml b/config/metrics/counts_all/20210216180700_csv.yml
index c6195807273..b69251a5b0b 100644
--- a/config/metrics/counts_all/20210216180700_csv.yml
+++ b/config/metrics/counts_all/20210216180700_csv.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.issue_imports.csv
description: Count of (attempted) imports from csv files
product_section: dev
diff --git a/config/metrics/counts_all/20210216180702_group_import.yml b/config/metrics/counts_all/20210216180702_group_import.yml
index 354d42b6b20..45e2650d69e 100644
--- a/config/metrics/counts_all/20210216180702_group_import.yml
+++ b/config/metrics/counts_all/20210216180702_group_import.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.group_imports.group_import
description: Count of groups imported using Group Import/Export
product_section: dev
diff --git a/config/metrics/counts_all/20210216180703_gitlab_migration.yml b/config/metrics/counts_all/20210216180703_gitlab_migration.yml
index c26356c8567..10b549ca252 100644
--- a/config/metrics/counts_all/20210216180703_gitlab_migration.yml
+++ b/config/metrics/counts_all/20210216180703_gitlab_migration.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.group_imports.gitlab_migration
description: Count of groups imported using GitLab Migration
product_section: dev
diff --git a/config/metrics/counts_all/20210216180705_total.yml b/config/metrics/counts_all/20210216180705_total.yml
index c2c0980e548..ca7cab549c1 100644
--- a/config/metrics/counts_all/20210216180705_total.yml
+++ b/config/metrics/counts_all/20210216180705_total.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.projects_imported.total
description: Total count of all projects imported with import_source NOT NULL
product_section: dev
diff --git a/config/metrics/counts_all/20210216180707_gitlab_project.yml b/config/metrics/counts_all/20210216180707_gitlab_project.yml
index 2c900fa6ce9..3ed628fd20d 100644
--- a/config/metrics/counts_all/20210216180707_gitlab_project.yml
+++ b/config/metrics/counts_all/20210216180707_gitlab_project.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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'
product_section: dev
diff --git a/config/metrics/counts_all/20210216180709_gitlab.yml b/config/metrics/counts_all/20210216180709_gitlab.yml
index 754191744f2..d8c23badb74 100644
--- a/config/metrics/counts_all/20210216180709_gitlab.yml
+++ b/config/metrics/counts_all/20210216180709_gitlab.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.projects_imported.gitlab
description: 'Distinct count of users that imported projects from GitLab.com'
product_section: dev
diff --git a/config/metrics/counts_all/20210216180711_github.yml b/config/metrics/counts_all/20210216180711_github.yml
index ba553b3bf1d..4c7444c7805 100644
--- a/config/metrics/counts_all/20210216180711_github.yml
+++ b/config/metrics/counts_all/20210216180711_github.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.projects_imported.github
description: Distinct count of users that imported projects from GitHub
product_section: dev
diff --git a/config/metrics/counts_all/20210216180713_bitbucket.yml b/config/metrics/counts_all/20210216180713_bitbucket.yml
index f90bd836eca..2d3dc154324 100644
--- a/config/metrics/counts_all/20210216180713_bitbucket.yml
+++ b/config/metrics/counts_all/20210216180713_bitbucket.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.projects_imported.bitbucket
description: 'Distinct count of users that imported projects from Bitbucket Cloud'
product_section: dev
diff --git a/config/metrics/counts_all/20210216180715_bitbucket_server.yml b/config/metrics/counts_all/20210216180715_bitbucket_server.yml
index fea69cf83dc..82a675b5428 100644
--- a/config/metrics/counts_all/20210216180715_bitbucket_server.yml
+++ b/config/metrics/counts_all/20210216180715_bitbucket_server.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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'
product_section: dev
diff --git a/config/metrics/counts_all/20210216180716_gitea.yml b/config/metrics/counts_all/20210216180716_gitea.yml
index a1f738f7851..50d5923e377 100644
--- a/config/metrics/counts_all/20210216180716_gitea.yml
+++ b/config/metrics/counts_all/20210216180716_gitea.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.projects_imported.gitea
description: 'Distinct count of users that imported projects from Gitea'
product_section: dev
diff --git a/config/metrics/counts_all/20210216180718_git.yml b/config/metrics/counts_all/20210216180718_git.yml
index f6929b18f05..f9f648bb713 100644
--- a/config/metrics/counts_all/20210216180718_git.yml
+++ b/config/metrics/counts_all/20210216180718_git.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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'
product_section: dev
diff --git a/config/metrics/counts_all/20210216180720_manifest.yml b/config/metrics/counts_all/20210216180720_manifest.yml
index ba4a97ebad0..28b689eddcf 100644
--- a/config/metrics/counts_all/20210216180720_manifest.yml
+++ b/config/metrics/counts_all/20210216180720_manifest.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.projects_imported.manifest
description: 'Distinct count of users that imported projects using Manifest file'
product_section: dev
diff --git a/config/metrics/counts_all/20210216180722_jira.yml b/config/metrics/counts_all/20210216180722_jira.yml
index dfd073fb5ea..add51bcf494 100644
--- a/config/metrics/counts_all/20210216180722_jira.yml
+++ b/config/metrics/counts_all/20210216180722_jira.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.issues_imported.jira
description: Distinct count of users that imported issues into projects using Jira
product_section: dev
diff --git a/config/metrics/counts_all/20210216180724_fogbugz.yml b/config/metrics/counts_all/20210216180724_fogbugz.yml
index 25087474a43..45dd4ee1f50 100644
--- a/config/metrics/counts_all/20210216180724_fogbugz.yml
+++ b/config/metrics/counts_all/20210216180724_fogbugz.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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'
product_section: dev
diff --git a/config/metrics/counts_all/20210216180726_phabricator.yml b/config/metrics/counts_all/20210216180726_phabricator.yml
index 3b6333343c2..c006ac22b75 100644
--- a/config/metrics/counts_all/20210216180726_phabricator.yml
+++ b/config/metrics/counts_all/20210216180726_phabricator.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.issues_imported.phabricator
description: Distinct count of users that imported issues into projects using Phabricator
product_section: dev
diff --git a/config/metrics/counts_all/20210216180727_csv.yml b/config/metrics/counts_all/20210216180727_csv.yml
index d13e517cf3d..6a6f16e09ef 100644
--- a/config/metrics/counts_all/20210216180727_csv.yml
+++ b/config/metrics/counts_all/20210216180727_csv.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.issues_imported.csv
description: Distinct count of users that imported issues into projects using CSV
upload
diff --git a/config/metrics/counts_all/20210216180729_groups_imported.yml b/config/metrics/counts_all/20210216180729_groups_imported.yml
index e83133bb16b..04e1febb437 100644
--- a/config/metrics/counts_all/20210216180729_groups_imported.yml
+++ b/config/metrics/counts_all/20210216180729_groups_imported.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.groups_imported
description: Distinct count of users that imported groups using Group Import
product_section: dev
diff --git a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
index ab8e8f0b972..25326291509 100644
--- a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
+++ b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.wiki_pages_create
description: Count of all Wiki pages created
product_section: dev
diff --git a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
index daaf95123db..82736e363ae 100644
--- a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
+++ b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.wiki_pages_update
description: Count of all Wiki page updates
product_section: dev
diff --git a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
index f023414dd99..26b88ba5c9f 100644
--- a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
+++ b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.wiki_pages_delete
description: Count of all Wiki pages deleted
product_section: dev
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 48570589044..3332d1963ba 100644
--- a/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
+++ b/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.design_management_designs_create
description: Number of designs that were created
product_section: dev
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 8dd45f2689a..3911079ef56 100644
--- a/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
+++ b/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.design_management_designs_update
description: Number of updates to designs
product_section: dev
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 3842b4001df..c6900276ef7 100644
--- a/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
+++ b/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.design_management_designs_delete
description: Number of designs that were deleted
product_section: dev
diff --git a/config/metrics/counts_all/20210216180750_groups.yml b/config/metrics/counts_all/20210216180750_groups.yml
index a9863345b3f..6163cbab8ad 100644
--- a/config/metrics/counts_all/20210216180750_groups.yml
+++ b/config/metrics/counts_all/20210216180750_groups.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups
description: Total count of groups as of usage ping snapshot
product_section: dev
diff --git a/config/metrics/counts_all/20210216180752_keys.yml b/config/metrics/counts_all/20210216180752_keys.yml
index 870d558454d..d105e047d49 100644
--- a/config/metrics/counts_all/20210216180752_keys.yml
+++ b/config/metrics/counts_all/20210216180752_keys.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.keys
description: Number of keys.
product_section: dev
diff --git a/config/metrics/counts_all/20210216180754_events.yml b/config/metrics/counts_all/20210216180754_events.yml
index 400e924b608..8d1a58f1820 100644
--- a/config/metrics/counts_all/20210216180754_events.yml
+++ b/config/metrics/counts_all/20210216180754_events.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.events
description: Number of distinct users who have generated a manage event
product_section: dev
diff --git a/config/metrics/counts_all/20210216180756_groups.yml b/config/metrics/counts_all/20210216180756_groups.yml
index 86a57dc8e45..938a95c5911 100644
--- a/config/metrics/counts_all/20210216180756_groups.yml
+++ b/config/metrics/counts_all/20210216180756_groups.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.groups
description: Number of users who are group members.
product_section: dev
diff --git a/config/metrics/counts_all/20210216180758_users_created.yml b/config/metrics/counts_all/20210216180758_users_created.yml
index fbc42eee84a..816887531b6 100644
--- a/config/metrics/counts_all/20210216180758_users_created.yml
+++ b/config/metrics/counts_all/20210216180758_users_created.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.users_created
description: Number of users
product_section: dev
diff --git a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
index 4ca260c2795..f46bc3b8566 100644
--- a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
+++ b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.grafana_integrated_projects
description: Total Grafana integrations attached to projects
product_section: ops
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 e8bf748a332..211115a0856 100644
--- a/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_with_tracing_enabled
description: Projects with tracing enabled
product_section: ops
diff --git a/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
index c7c61b6c30b..9b4c7e4e145 100644
--- a/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_prometheus_active
description: Count of projects with active integrations for Prometheus
product_section: ops
diff --git a/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml b/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
index 36739d0e98d..44f7150cb66 100644
--- a/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_prometheus_active
description: Count of groups with active integrations for Prometheus
product_section: ops
diff --git a/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
index d0422adc540..eba4f2f5741 100644
--- a/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_prometheus_active
description: Count of active service templates for Prometheus
product_section: ops
diff --git a/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml b/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
index 2050baa6f1a..3c03a3b2eae 100644
--- a/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_prometheus_active
description: Count of active instance-level integrations for Prometheus
product_section: ops
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 0138bbfa746..d89a809a613 100644
--- a/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_prometheus_active
description: Count of active projects inheriting integrations for Prometheus
product_section: ops
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 c868bd71ee5..0d3f11e9a1a 100644
--- a/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_prometheus_active
description: Count of active groups inheriting integrations for Prometheus
product_section: ops
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 4f18f1e280d..3038e53932c 100644
--- a/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.operations_dashboard_default_dashboard
description: Active users with enabled operations dashboard
product_section: ops
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 d8c714ce4ca..4802532c053 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.operations_dashboard_users_with_projects_added
description: Active users with projects on operations dashboard
product_section: ops
diff --git a/config/metrics/counts_all/20210216180945_clusters.yml b/config/metrics/counts_all/20210216180945_clusters.yml
index 01d4aa22ff2..2294cd5e1de 100644
--- a/config/metrics/counts_all/20210216180945_clusters.yml
+++ b/config/metrics/counts_all/20210216180945_clusters.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.monitor.clusters
description: Users creating clusters.
product_section: ops
diff --git a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
index 7ce1bab9e40..a921b517b40 100644
--- a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.monitor.clusters_applications_prometheus
description: Users creating clusters with Prometheus enabled.
product_section: ops
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 b42af45f821..278cd3d6337 100644
--- a/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.monitor.operations_dashboard_default_dashboard
description: Active users with enabled operations dashboard
product_section: ops
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 ec0ac4b1f67..6d1d00cd1e3 100644
--- a/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.monitor.projects_with_tracing_enabled
description: Projects with tracing enabled
product_section: ops
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 f9e62f5fcc1..13971a4fc71 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.monitor.operations_dashboard_users_with_projects_added
description: Active users with projects on operations dashboard
product_section: ops
diff --git a/config/metrics/counts_all/20210216181009_lfs_objects.yml b/config/metrics/counts_all/20210216181009_lfs_objects.yml
index 843760049bf..cb8b2fc5474 100644
--- a/config/metrics/counts_all/20210216181009_lfs_objects.yml
+++ b/config/metrics/counts_all/20210216181009_lfs_objects.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.lfs_objects
description:
product_section: ops
diff --git a/config/metrics/counts_all/20210216181011_projects_with_packages.yml b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
index 419685cd1a2..59edfc3634d 100644
--- a/config/metrics/counts_all/20210216181011_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_with_packages
description: Projects with package registry enabled
product_section: ops
diff --git a/config/metrics/counts_all/20210216181012_packages.yml b/config/metrics/counts_all/20210216181012_packages.yml
index 636660cd4c4..ec5e1ae7831 100644
--- a/config/metrics/counts_all/20210216181012_packages.yml
+++ b/config/metrics/counts_all/20210216181012_packages.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.packages
description: The total number of packages published to the registry
product_section: ops
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 56e8d3014b2..14cefebb514 100644
--- a/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
+++ b/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_with_expiration_policy_disabled
description: The number of projects with cleanup policy for tags turned off
product_section: ops
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 8ed8308e648..54ab06ea5c4 100644
--- a/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
+++ b/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_with_expiration_policy_enabled
description: A count of projects with the cleanup policy for tags turned on
product_section: ops
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 5827f0e8008..3b742c68758 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_set_to_1
description: A count of projects with the cleanup policy set to keep 1 tag
product_section: ops
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 305715727a9..1681e2c642e 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_set_to_5
description: A count of projects with the cleanup policy set to keep 5 tags
product_section: ops
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 649846cf916..3f5ee49993a 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_set_to_10
description: A count of projects with the cleanup policy set to keep 10 tags
product_section: ops
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 c858c0f07d2..a18a4fa12d8 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_set_to_25
description: A count of projects with the cleanup policy set to keep 25 tags
product_section: ops
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 2ca6796b7b2..bd7d576520e 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_set_to_50
description: A count of projects with the cleanup policy set to keep 50 tags
product_section: ops
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 fb70a1c4241..420c428e46c 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_set_to_100
description: A count of projects with the cleanup policy set to keep 100 tags
product_section: ops
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 f73cdb5cdbe..21cd670e5aa 100644
--- a/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
+++ b/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_with_expiration_policy_enabled_with_cadence_set_to_1d
description: A count of projects with the cleanup policy set to run every day
product_section: ops
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 b690da11e25..d6b0d0dc1d6 100644
--- a/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
+++ b/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_with_expiration_policy_enabled_with_cadence_set_to_7d
description: A count of projects with the cleanup policy set to run every 7 days
product_section: ops
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 bc6d9d3345c..9c4d4b83be9 100644
--- a/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
+++ b/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_with_expiration_policy_enabled_with_cadence_set_to_14d
description: A count of projects with the cleanup policy set to run every 14 days
product_section: ops
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 2ae4ff19a8a..963665a5ee0 100644
--- a/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
+++ b/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_with_expiration_policy_enabled_with_cadence_set_to_1month
description: A count of projects with the cleanup policy set to run monthly
product_section: ops
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 f7394fc2d5b..8fa068bb372 100644
--- a/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
+++ b/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_with_expiration_policy_enabled_with_cadence_set_to_3month
description: A count of projects with the cleanup policy set to run every 3 months
product_section: ops
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 ce1f56fa4dc..3742446b11a 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 28ead2517a8..1216a041bfb 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 6767606c342..387bf3dff90 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 f9a65b00f89..8dcfbc1ce02 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 31916adbdef..29fe874c89e 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 5cf33b1e56f..475b52f856f 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
diff --git a/config/metrics/counts_all/20210216181051_vendor.yml b/config/metrics/counts_all/20210216181051_vendor.yml
index 9411672a8ac..840054e4263 100644
--- a/config/metrics/counts_all/20210216181051_vendor.yml
+++ b/config/metrics/counts_all/20210216181051_vendor.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: container_registry_server.vendor
description: Identifies if a user is using an external container registry and what type
product_section: ops
diff --git a/config/metrics/counts_all/20210216181055_projects_with_packages.yml b/config/metrics/counts_all/20210216181055_projects_with_packages.yml
index cb7c7905b5d..99c51335b80 100644
--- a/config/metrics/counts_all/20210216181055_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181055_projects_with_packages.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.package.projects_with_packages
description: Projects with package registry enabled
product_section: ops
diff --git a/config/metrics/counts_all/20210216181102_issues.yml b/config/metrics/counts_all/20210216181102_issues.yml
index 25f1606447f..8777da9942f 100644
--- a/config/metrics/counts_all/20210216181102_issues.yml
+++ b/config/metrics/counts_all/20210216181102_issues.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.issues
description: Count of Issues created
product_section: dev
diff --git a/config/metrics/counts_all/20210216181104_label_lists.yml b/config/metrics/counts_all/20210216181104_label_lists.yml
index 381e8d8a953..247e891e956 100644
--- a/config/metrics/counts_all/20210216181104_label_lists.yml
+++ b/config/metrics/counts_all/20210216181104_label_lists.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.label_lists
description: Count of label lists created on Boards
product_section: dev
diff --git a/config/metrics/counts_all/20210216181108_milestones.yml b/config/metrics/counts_all/20210216181108_milestones.yml
index 74e4484ec2d..720c7ae0bc0 100644
--- a/config/metrics/counts_all/20210216181108_milestones.yml
+++ b/config/metrics/counts_all/20210216181108_milestones.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.milestones
description: Count of milestones created
product_section: dev
diff --git a/config/metrics/counts_all/20210216181109_uploads.yml b/config/metrics/counts_all/20210216181109_uploads.yml
index db6bb4d991e..42ba5feb46d 100644
--- a/config/metrics/counts_all/20210216181109_uploads.yml
+++ b/config/metrics/counts_all/20210216181109_uploads.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.uploads
description: Count of Uploads via Notes and Descriptions
product_section: dev
diff --git a/config/metrics/counts_all/20210216181111_labels.yml b/config/metrics/counts_all/20210216181111_labels.yml
index 0fc0c13569e..3a0a200754e 100644
--- a/config/metrics/counts_all/20210216181111_labels.yml
+++ b/config/metrics/counts_all/20210216181111_labels.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.labels
description: Count of Labels
product_section: dev
diff --git a/config/metrics/counts_all/20210216181113_notes.yml b/config/metrics/counts_all/20210216181113_notes.yml
index 74322904fe2..5d2c4a029e3 100644
--- a/config/metrics/counts_all/20210216181113_notes.yml
+++ b/config/metrics/counts_all/20210216181113_notes.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.notes
description: Count of Notes across all objects that use them
product_section: dev
diff --git a/config/metrics/counts_all/20210216181115_issues.yml b/config/metrics/counts_all/20210216181115_issues.yml
index da840704e26..6dbb1b910e1 100644
--- a/config/metrics/counts_all/20210216181115_issues.yml
+++ b/config/metrics/counts_all/20210216181115_issues.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage.plan.issues
description: Count of users creating Issues
product_section: dev
diff --git a/config/metrics/counts_all/20210216181117_notes.yml b/config/metrics/counts_all/20210216181117_notes.yml
index 9dc9a2b7b70..20aa29d6d6f 100644
--- a/config/metrics/counts_all/20210216181117_notes.yml
+++ b/config/metrics/counts_all/20210216181117_notes.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.plan.notes
description: Count of users creating Notes on Issues
product_section: dev
diff --git a/config/metrics/counts_all/20210216181119_projects.yml b/config/metrics/counts_all/20210216181119_projects.yml
index 053525815f2..5384bacfec2 100644
--- a/config/metrics/counts_all/20210216181119_projects.yml
+++ b/config/metrics/counts_all/20210216181119_projects.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.plan.projects
description: Count of users creating projects
product_section: dev
diff --git a/config/metrics/counts_all/20210216181121_todos.yml b/config/metrics/counts_all/20210216181121_todos.yml
index d6eedbb8288..562e7be5666 100644
--- a/config/metrics/counts_all/20210216181121_todos.yml
+++ b/config/metrics/counts_all/20210216181121_todos.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.plan.todos
description: Count of users todos created
product_section: dev
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 1558207c2e0..03403b826c0 100644
--- a/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.plan.service_desk_enabled_projects
description:
product_section: dev
diff --git a/config/metrics/counts_all/20210216181124_service_desk_issues.yml b/config/metrics/counts_all/20210216181124_service_desk_issues.yml
index d9bf957ee47..7a425f4d3ed 100644
--- a/config/metrics/counts_all/20210216181124_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216181124_service_desk_issues.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.plan.service_desk_issues
description:
product_section: dev
diff --git a/config/metrics/counts_all/20210216181126_projects_jira_active.yml b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
index c2f723758da..de8f7e5e578 100644
--- a/config/metrics/counts_all/20210216181126_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.plan.projects_jira_active
description: Distinct count of creator_id from projects with an active Jira integration.
product_section: dev
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 c4f3e098d32..6dca1863e3e 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,5 +1,5 @@
---
-data_category: Optional
+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.
product_section: dev
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 de4f2923c8a..2f37969e8ad 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,5 +1,5 @@
---
-data_category: Optional
+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.
product_section: dev
diff --git a/config/metrics/counts_all/20210216181134_epics.yml b/config/metrics/counts_all/20210216181134_epics.yml
index ec43965b4fb..339956d84df 100644
--- a/config/metrics/counts_all/20210216181134_epics.yml
+++ b/config/metrics/counts_all/20210216181134_epics.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage.plan.epics
description: Count distinct author ids from epics
product_section: dev
diff --git a/config/metrics/counts_all/20210216181135_label_lists.yml b/config/metrics/counts_all/20210216181135_label_lists.yml
index 7d2899b7da9..f3f9d84993b 100644
--- a/config/metrics/counts_all/20210216181135_label_lists.yml
+++ b/config/metrics/counts_all/20210216181135_label_lists.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.plan.label_lists
description: Count of users creating label lists on Boards
product_section: dev
diff --git a/config/metrics/counts_all/20210216181249_feature_flags.yml b/config/metrics/counts_all/20210216181249_feature_flags.yml
index 336db342dd4..17435693673 100644
--- a/config/metrics/counts_all/20210216181249_feature_flags.yml
+++ b/config/metrics/counts_all/20210216181249_feature_flags.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.feature_flags
description: Number of feature flag toggles
product_section: ops
diff --git a/config/metrics/counts_all/20210216181252_boards.yml b/config/metrics/counts_all/20210216181252_boards.yml
index 3a8aaa376bb..91370f6192f 100644
--- a/config/metrics/counts_all/20210216181252_boards.yml
+++ b/config/metrics/counts_all/20210216181252_boards.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.boards
description: Count of Boards created
product_section: dev
diff --git a/config/metrics/counts_all/20210216181254_projects.yml b/config/metrics/counts_all/20210216181254_projects.yml
index 65bc2ab6661..ce9659cccc4 100644
--- a/config/metrics/counts_all/20210216181254_projects.yml
+++ b/config/metrics/counts_all/20210216181254_projects.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.projects
description: Count of Projects created
product_section: dev
diff --git a/config/metrics/counts_all/20210216181256_todos.yml b/config/metrics/counts_all/20210216181256_todos.yml
index dae286148de..ab13c2b8d11 100644
--- a/config/metrics/counts_all/20210216181256_todos.yml
+++ b/config/metrics/counts_all/20210216181256_todos.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.todos
description: Count of todos created
product_section: dev
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 f9cffac3f05..b60766bdbce 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.jira_imports_total_imported_count
description: Count of Jira imports completed
product_section: dev
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 de3cb9f389a..0d55dec788c 100644
--- a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
+++ b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.jira_imports_projects_count
description: Count of Projects that imported Issues from Jira
product_section: dev
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 efb9e042526..09f543c0d00 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
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.jira_imports_total_imported_issues_count
description: Count of total issues imported via the Jira Importer
product_section: dev
diff --git a/config/metrics/counts_all/20210216181908_deploy_keys.yml b/config/metrics/counts_all/20210216181908_deploy_keys.yml
index 79bb5a02890..5d144cdb855 100644
--- a/config/metrics/counts_all/20210216181908_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216181908_deploy_keys.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.deploy_keys
description: Count of deploy keys
product_section: ops
diff --git a/config/metrics/counts_all/20210216181911_successful_deployments.yml b/config/metrics/counts_all/20210216181911_successful_deployments.yml
index 44b656cf2dc..d02c5ee2d8b 100644
--- a/config/metrics/counts_all/20210216181911_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181911_successful_deployments.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.successful_deployments
description: Total successful deployments
product_section: ops
diff --git a/config/metrics/counts_all/20210216181912_failed_deployments.yml b/config/metrics/counts_all/20210216181912_failed_deployments.yml
index b584f66dfde..db7532c9e5b 100644
--- a/config/metrics/counts_all/20210216181912_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181912_failed_deployments.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.failed_deployments
description: Total failed deployments
product_section: ops
diff --git a/config/metrics/counts_all/20210216181914_environments.yml b/config/metrics/counts_all/20210216181914_environments.yml
index bb9336f2f93..86958d713b6 100644
--- a/config/metrics/counts_all/20210216181914_environments.yml
+++ b/config/metrics/counts_all/20210216181914_environments.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.environments
description: Total available and stopped environments
product_section: ops
diff --git a/config/metrics/counts_all/20210216181916_in_review_folder.yml b/config/metrics/counts_all/20210216181916_in_review_folder.yml
index 0a8fa13e486..17cc4f8b730 100644
--- a/config/metrics/counts_all/20210216181916_in_review_folder.yml
+++ b/config/metrics/counts_all/20210216181916_in_review_folder.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_review_folder
description: A number of environments with name review/*
product_section: ops
diff --git a/config/metrics/counts_all/20210216181918_releases.yml b/config/metrics/counts_all/20210216181918_releases.yml
index f678032dcb1..caf35bd5245 100644
--- a/config/metrics/counts_all/20210216181918_releases.yml
+++ b/config/metrics/counts_all/20210216181918_releases.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.releases
description: Count of releases
product_section: ops
diff --git a/config/metrics/counts_all/20210216181926_deployments.yml b/config/metrics/counts_all/20210216181926_deployments.yml
index 38bc758f078..36d5b11c115 100644
--- a/config/metrics/counts_all/20210216181926_deployments.yml
+++ b/config/metrics/counts_all/20210216181926_deployments.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.release.deployments
description: Unique users triggering deployments
product_section: ops
diff --git a/config/metrics/counts_all/20210216181928_failed_deployments.yml b/config/metrics/counts_all/20210216181928_failed_deployments.yml
index ffba6d91a28..36346541dd0 100644
--- a/config/metrics/counts_all/20210216181928_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181928_failed_deployments.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.release.failed_deployments
description: Total failed deployments
product_section: ops
diff --git a/config/metrics/counts_all/20210216181930_releases.yml b/config/metrics/counts_all/20210216181930_releases.yml
index dbaca9f247f..e14885bd330 100644
--- a/config/metrics/counts_all/20210216181930_releases.yml
+++ b/config/metrics/counts_all/20210216181930_releases.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.release.releases
description: Unique users creating release tags
product_section: ops
diff --git a/config/metrics/counts_all/20210216181932_successful_deployments.yml b/config/metrics/counts_all/20210216181932_successful_deployments.yml
index f178023b199..23dee12d855 100644
--- a/config/metrics/counts_all/20210216181932_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181932_successful_deployments.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.release.successful_deployments
description: Total successful deployments
product_section: ops
diff --git a/config/metrics/counts_all/20210216181946_pages_domains.yml b/config/metrics/counts_all/20210216181946_pages_domains.yml
index bc0cb8a3d06..4952ae14614 100644
--- a/config/metrics/counts_all/20210216181946_pages_domains.yml
+++ b/config/metrics/counts_all/20210216181946_pages_domains.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.pages_domains
description: Total GitLab Pages domains
product_section: ops
diff --git a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
index 61751d2aed3..11251ac89c5 100644
--- a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.verify.clusters_applications_runner
description: Count of users creating managed clusters with Runner enabled
product_section: ops
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 39fc30c9153..0d4d7ab0524 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
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage.secure.user_unique_users_all_secure_scanners
description:
product_section: sec
diff --git a/config/metrics/counts_all/20210216182002_remote_mirrors.yml b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
index a699200eada..8b03e3891f0 100644
--- a/config/metrics/counts_all/20210216182002_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.remote_mirrors
description: Count of total remote mirrors. Includes both push and pull mirrors
product_section: dev
diff --git a/config/metrics/counts_all/20210216182004_commit_comment.yml b/config/metrics/counts_all/20210216182004_commit_comment.yml
index f14fd72386d..116442201b0 100644
--- a/config/metrics/counts_all/20210216182004_commit_comment.yml
+++ b/config/metrics/counts_all/20210216182004_commit_comment.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.commit_comment
description: Count of total unique commit comments. Does not include MR diff comments
product_section: dev
diff --git a/config/metrics/counts_all/20210216182006_source_code_pushes.yml b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
index 2b2c6dad8d7..2b36e8e883e 100644
--- a/config/metrics/counts_all/20210216182006_source_code_pushes.yml
+++ b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.source_code_pushes
description: Count of total Git push operations
product_section: dev
diff --git a/config/metrics/counts_all/20210216182010_deploy_keys.yml b/config/metrics/counts_all/20210216182010_deploy_keys.yml
index a05b821dd26..862b7a46b40 100644
--- a/config/metrics/counts_all/20210216182010_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216182010_deploy_keys.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.create.deploy_keys
description: Count of users creating deploy keys.
product_section: dev
diff --git a/config/metrics/counts_all/20210216182012_keys.yml b/config/metrics/counts_all/20210216182012_keys.yml
index 6096dccad18..b1f53628e90 100644
--- a/config/metrics/counts_all/20210216182012_keys.yml
+++ b/config/metrics/counts_all/20210216182012_keys.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.create.keys
description: Count of users creating regular keys.
product_section: dev
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 3639ddb0b2e..886de35954d 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
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 0ba200e71f6..96e21c1bdb3 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: dev
diff --git a/config/metrics/counts_all/20210216182017_remote_mirrors.yml b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
index 6826ebf8d4b..60689e01bcc 100644
--- a/config/metrics/counts_all/20210216182017_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.create.remote_mirrors
description: Count of users creating projects with remote mirrors.
product_section: dev
diff --git a/config/metrics/counts_all/20210216182112_sast_jobs.yml b/config/metrics/counts_all/20210216182112_sast_jobs.yml
index 14cfc85b6e4..10e0b0c0532 100644
--- a/config/metrics/counts_all/20210216182112_sast_jobs.yml
+++ b/config/metrics/counts_all/20210216182112_sast_jobs.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.sast_jobs
description: Count of SAST CI jobs for the month. Job names ending in '-sast'
product_section: sec
diff --git a/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml b/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml
index 1454d4c97f1..b6e603499eb 100644
--- a/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml
+++ b/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: counts.secret_detection_jobs
description: Count of all 'secret-detection' CI jobs.
product_section: sec
diff --git a/config/metrics/counts_all/20210216182116_user_sast_jobs.yml b/config/metrics/counts_all/20210216182116_user_sast_jobs.yml
index d10010cff4f..a79c1ebeb2f 100644
--- a/config/metrics/counts_all/20210216182116_user_sast_jobs.yml
+++ b/config/metrics/counts_all/20210216182116_user_sast_jobs.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage.secure.user_sast_jobs
description: Count of SAST jobs per user
product_section: sec
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 3711f1591c9..7d5f638bf73 100644
--- a/config/metrics/counts_all/20210216182118_user_secret_detection_jobs.yml
+++ b/config/metrics/counts_all/20210216182118_user_secret_detection_jobs.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage.secure.user_secret_detection_jobs
description: Count of Secret Detection Jobs per user
product_section: sec
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 8a9db3cb6a6..a07ce8ed1bb 100644
--- a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
+++ b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.protected_branches_except_default
description: Count of branches that have been protected and are not the default branch
product_section: dev
diff --git a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
index 90ac6384419..53e3e03dd5b 100644
--- a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_datadog_active
description: 'Count of projects with active integrations for Datadog'
product_section: dev
diff --git a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
index 210bf576805..d788614567f 100644
--- a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_datadog_active
description: Count of groups with active integrations for Datadog
product_section: dev
diff --git a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
index a6289208f8d..591806003a5 100644
--- a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_datadog_active
description: Count of active service templates for Datadog
product_section: dev
diff --git a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
index 6c9075f49ae..db171354c55 100644
--- a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_datadog_active
description: Count of active instance-level integrations for Datadog
product_section: dev
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 5b216dba2aa..39fc82b33c9 100644
--- a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_datadog_active
description: Count of active projects inheriting integrations for Datadog
product_section: dev
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 7dfb5647d86..589e1e332cf 100644
--- a/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_datadog_active
description: Count of active groups inheriting integrations for Datadog
product_section: dev
diff --git a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
index b3c24e4e5ca..3d366b60d22 100644
--- a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_ewm_active
description: 'Count of projects with active integrations for EWM'
product_section: dev
diff --git a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
index 13c83dcb080..2f4b9931b89 100644
--- a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_ewm_active
description: Count of groups with active integrations for EWM
product_section: dev
diff --git a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
index ff545f45506..314d805da5b 100644
--- a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_ewm_active
description: Count of active service templates for EWM
product_section: dev
diff --git a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
index 004b3d603e8..062804c61ff 100644
--- a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_ewm_active
description: Count of active instance-level integrations for EWM
product_section: dev
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 3f10e0134f7..2fd6d978920 100644
--- a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_ewm_active
description: Count of active projects inheriting integrations for EWM
product_section: dev
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 f385b27ed36..8bb1de6377d 100644
--- a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_ewm_active
description: Count of active groups inheriting integrations for EWM
product_section: dev
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 edcb3cf0bd2..3f4bcf220cf 100644
--- a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_mock_ci_active
description: Count of projects with active integrations for Mock CI
product_section: dev
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 26586a7a8e0..887c6437164 100644
--- a/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_mock_ci_active
description: Count of groups with active integrations for Mock CI
product_section: dev
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 da5595571b0..4ffad1e24be 100644
--- a/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_mock_ci_active
description: Count of active service templates for Mock CI
product_section: dev
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 8176ad143c3..55fe4ec41af 100644
--- a/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_mock_ci_active
description: Count of active instance-level integrations for Mock CI
product_section: dev
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 5b9043aad79..2c6bfe8d7b3 100644
--- a/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_mock_ci_active
description: Count of active projects inheriting integrations for Mock CI
product_section: dev
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 5d0138e4091..95d323d6a28 100644
--- a/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_mock_ci_active
description: Count of active groups inheriting integrations for Mock CI
product_section: dev
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 63cd3fecf7c..fb22e91f8d9 100644
--- a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_mock_monitoring_active
description: Count of projects with active integrations for Mock Monitoring
product_section: dev
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 fe9baa11630..6bd205d1c31 100644
--- a/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_mock_monitoring_active
description: Count of groups with active integrations for Mock Monitoring
product_section: dev
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 00fa0215ac5..62c4cf56bd5 100644
--- a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.templates_mock_monitoring_active
description: Count of active service templates for Mock Monitoring
product_section: dev
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 b58943d95d1..cb8b85a8c38 100644
--- a/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.instances_mock_monitoring_active
description: Count of active instance-level integrations for Mock Monitoring
product_section: dev
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 91b93d10ead..1c6885c853f 100644
--- a/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.projects_inheriting_mock_monitoring_active
description: Count of active projects inheriting integrations for Mock Monitoring
product_section: dev
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 a1ef1252dfa..94f26b17f17 100644
--- a/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.groups_inheriting_mock_monitoring_active
description: Count of active groups inheriting integrations for Mock Monitoring
product_section: dev
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 da0a9cbe25b..a7917d3ed3e 100644
--- a/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
+++ b/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_composer_delete_package
description: A count of Composer packages that have been deleted
product_section: ops
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 2b02ebf2aca..543a3a7c0bb 100644
--- a/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
+++ b/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_composer_pull_package
description: A count of Composer packages that have been downloaded
product_section: ops
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 6308059417f..ea346af7322 100644
--- a/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
+++ b/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_composer_push_package
description: A count of Composer packages that have been published
product_section: ops
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 ddc7c9708c5..07f4d151a2d 100644
--- a/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
+++ b/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_conan_delete_package
description: A count of Conan packages that have been deleted
product_section: ops
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 2b6de2468f1..e9fbb042995 100644
--- a/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
+++ b/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_conan_pull_package
description: A count of Conan packages that have been downloaded
product_section: ops
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 5fcd97fc653..668c7668e94 100644
--- a/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
+++ b/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_conan_push_package
description: A count of Conan packages that have been published
product_section: ops
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 a98b839d299..f33d1fc3299 100644
--- a/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml
+++ b/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_container_delete_package
description: A count of container images that have been deleted
product_section: ops
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 cbf3b097b6f..e1aa7ddc683 100644
--- a/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml
+++ b/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_container_pull_package
description: A count of container images that have been downloaded
product_section: ops
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 d939cbcd931..4d64f574912 100644
--- a/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
+++ b/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_container_push_package
description: A count of container images that have been published
product_section: ops
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 e0f63656b3c..e0256f563a8 100644
--- a/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
+++ b/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_debian_delete_package
description: A count of Debian packages that have been deleted
product_section: ops
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 ecf1ca05da8..61cebf44a73 100644
--- a/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
+++ b/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_debian_pull_package
description: A count of Debian packages that have been downloaded
product_section: ops
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 7c91339b282..2fb6e56c49a 100644
--- a/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
+++ b/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_debian_push_package
description: A count of Debian packages that have been published
product_section: ops
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 012d756ff29..4ab016f854d 100644
--- a/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
+++ b/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_delete_package
description: A count of packages that have been deleted
product_section: ops
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 8babf39989a..45490ab93d6 100644
--- a/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_delete_package_by_deploy_token
description: A count of packages that have been deleted using a Deploy Token
product_section: ops
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 1abc0fbc116..4c1a0729633 100644
--- a/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_delete_package_by_guest
description: A count of packages that have been deleted using a Guest
product_section: ops
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 279caecac84..e46db03bfaa 100644
--- a/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
+++ b/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_delete_package_by_user
description: A count of packages that have been deleted using a logged in user
product_section: ops
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 fd67e83e7e6..c1ee7742636 100644
--- a/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
+++ b/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_generic_delete_package
description: A count of generic packages that have been deleted
product_section: ops
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 6dc7c95f21a..1a31301c8a5 100644
--- a/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
+++ b/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_generic_pull_package
description: A count of generic packages that have been downloaded
product_section: ops
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 25b9ef192b5..ab3c69f7eed 100644
--- a/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
+++ b/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_generic_push_package
description: A count of generic packages that have been published
product_section: ops
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 7950eb474a3..2af3db1ed2c 100644
--- a/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
+++ b/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_golang_delete_package
description: A count of Go modules that have been deleted
product_section: ops
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 ff959ac3e98..ffae5c6efa4 100644
--- a/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
+++ b/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_golang_pull_package
description: A count of Go modules that have been downloaded
product_section: ops
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 767b4c5b2b1..babfe6c3507 100644
--- a/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
+++ b/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_golang_push_package
description: A count of Go modules that have been published
product_section: ops
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 5f358229c12..176996e3447 100644
--- a/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
+++ b/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_maven_delete_package
description: A count of Maven packages that have been deleted
product_section: ops
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 d1383e30607..e589314f06f 100644
--- a/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
+++ b/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_maven_pull_package
description: A count of Maven packages that have been downloaded
product_section: ops
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 d8f16f009e4..4610a24c51f 100644
--- a/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
+++ b/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_maven_push_package
description: A count of Maven packages that have been published
product_section: ops
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 dd410f89789..e540e68355a 100644
--- a/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
+++ b/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_npm_delete_package
description: A count of npm packages that have been deleted
product_section: ops
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 7753eb20014..d2af5aa56c8 100644
--- a/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
+++ b/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_npm_pull_package
description: A count of npm packages that have been downloaded
product_section: ops
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 7f72affd7f4..653fba58565 100644
--- a/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml
+++ b/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_npm_push_package
description: A count of npm packages that have been published
product_section: ops
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 c80830ee7b1..82a5509cd03 100644
--- a/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
+++ b/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_nuget_delete_package
description: A count of NuGet packages that have been deleted
product_section: ops
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 7e08741bb0d..5327b10ecf5 100644
--- a/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
+++ b/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_nuget_pull_package
description: A count of NuGet packages that have been downloaded
product_section: ops
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 5bee4f844f0..e8b0a0e7fb5 100644
--- a/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
+++ b/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_nuget_push_package
description: A count of NuGet packages that have been published
product_section: ops
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 a25813a0d65..f3484ae5b41 100644
--- a/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
+++ b/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_pull_package
description: A count of packages that have been downloaded from the package registry
product_section: ops
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 28723d51e56..183abf834dd 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 1a5d1c8f764..bad5254aac4 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 ff0c45e9ace..f5e450cae7a 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 09bf13376bd..bbcd3e82234 100644
--- a/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
+++ b/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_push_package
description: A count of packages that have been published to the package registry
product_section: ops
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 487703f3920..3a37af76f73 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 f8193329f77..2f241519d3d 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 828f1092373..25b3932ad67 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 dcd35a737d8..2a90a151a53 100644
--- a/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
+++ b/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_pypi_delete_package
description: A count of Python packages that have been deleted from the package registry
product_section: ops
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 d0acbedbab1..0efeac2f9d1 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,5 +1,5 @@
---
-data_category: Optional
+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
product_section: ops
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 e4584fc55e1..75c91704892 100644
--- a/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
+++ b/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_pypi_push_package
description: A count of Python packages that have been published to the package registry
product_section: ops
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 3fb42a6f916..06217938d8e 100644
--- a/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
+++ b/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_tag_delete_package
description: A count of package tags that have been deleted from the package registry
product_section: ops
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 0a9be3d713a..b96c1866a17 100644
--- a/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
+++ b/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_tag_pull_package
description: A count of package tags that have been downloaded from the package registry
product_section: ops
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 666dc88da46..264a9773f7b 100644
--- a/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
+++ b/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_tag_push_package
description: A count of package tags that have been published to the package registry
product_section: ops
diff --git a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
index 62851c4a7fc..75403722e5c 100644
--- a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
+++ b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.wiki_pages_view
description: ''
product_section: ''
diff --git a/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml b/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml
index f4bf2c5b021..77c1e73fa92 100644
--- a/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml
+++ b/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.coverage_fuzzing_jobs
description: ''
product_section: ''
diff --git a/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml b/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml
index c2ed5948763..089bc15ad6a 100644
--- a/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml
+++ b/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.dast_on_demand_pipelines
description: ''
product_section: ''
diff --git a/config/metrics/counts_all/20210216183400_omniauth_providers.yml b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
index efe0e1c5bfe..1f738f7ea73 100644
--- a/config/metrics/counts_all/20210216183400_omniauth_providers.yml
+++ b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.omniauth_providers
description: Number of unique user logins using an OmniAuth provider
product_section: dev
diff --git a/config/metrics/counts_all/20210216183402_two-factor.yml b/config/metrics/counts_all/20210216183402_two-factor.yml
index 2d1aed6115a..623c67195ce 100644
--- a/config/metrics/counts_all/20210216183402_two-factor.yml
+++ b/config/metrics/counts_all/20210216183402_two-factor.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.user_auth_by_provider.two-factor
description: Number of unique user logins using two factor authentication
product_section: dev
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 28aa20c33ad..5bbe08b623c 100644
--- a/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml
+++ b/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.user_auth_by_provider.two-factor-via-u2f-device
description: Number of unique user logins using two factor via a U2F device
product_section: dev
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 b0e93f08989..adc75690057 100644
--- a/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml
+++ b/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.user_auth_by_provider.two-factor-via-webauthn-device
description: Number of unique user logins using two factor via a WebAuthn device
product_section: dev
diff --git a/config/metrics/counts_all/20210216183408_standard.yml b/config/metrics/counts_all/20210216183408_standard.yml
index 21267298f1a..b43bd25031b 100644
--- a/config/metrics/counts_all/20210216183408_standard.yml
+++ b/config/metrics/counts_all/20210216183408_standard.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.user_auth_by_provider.standard
description: Number of unique user logins using password authentication
product_section: dev
diff --git a/config/metrics/counts_all/20210216183410_google_oauth2.yml b/config/metrics/counts_all/20210216183410_google_oauth2.yml
index 24fd143171c..205b8dadbb0 100644
--- a/config/metrics/counts_all/20210216183410_google_oauth2.yml
+++ b/config/metrics/counts_all/20210216183410_google_oauth2.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.user_auth_by_provider.google_oauth2
description: Number of unique user logins using Google OAuth authentication
product_section: dev
diff --git a/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml b/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml
index 014e6f16623..544a258b949 100644
--- a/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml
+++ b/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: usage_activity_by_stage.secure.user_coverage_fuzzing_jobs
description: ''
product_section: ''
diff --git a/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml b/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml
index 448d5cb0fba..de7af7b7e59 100644
--- a/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml
+++ b/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_rubygems_delete_package
description: Total count of RubyGems packages delete events
product_section: ops
diff --git a/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml b/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml
index c7364ce8663..c71c378c917 100644
--- a/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml
+++ b/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_rubygems_pull_package
description: Total count of pull RubyGems packages events
product_section: ops
diff --git a/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml b/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml
index 05584e02c45..025e47c0d04 100644
--- a/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml
+++ b/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_rubygems_push_package
description: Total count of push RubyGems packages events
product_section: ops
diff --git a/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml b/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml
index 5962998fef3..ad2f6bce59e 100644
--- a/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml
+++ b/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.monitor.projects_with_enabled_alert_integrations_histogram
description: Histogram (buckets 1 to 100) of projects with at least 1 enabled integration.
product_section: ops
diff --git a/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml b/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml
index 59b933c812f..3fb804b9a92 100644
--- a/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml
+++ b/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_terraform_module_delete_package
description: Total count of Terraform Module packages delete events
product_section: ops
diff --git a/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml b/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml
index 859f436ee69..bbd5c978794 100644
--- a/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml
+++ b/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_terraform_module_pull_package
description: Total count of pull Terraform Module packages events
product_section: ops
diff --git a/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml b/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml
index 9a890ee943a..fd2f969251f 100644
--- a/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml
+++ b/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_terraform_module_push_package
description: Total count of push Terraform Module packages events
product_section: ops
diff --git a/config/metrics/counts_all/20210423005644_i_analytics_dev_ops_adoption.yml b/config/metrics/counts_all/20210423005644_i_analytics_dev_ops_adoption.yml
index 82b7447bd48..45eebbcca09 100644
--- a/config/metrics/counts_all/20210423005644_i_analytics_dev_ops_adoption.yml
+++ b/config/metrics/counts_all/20210423005644_i_analytics_dev_ops_adoption.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: analytics_unique_visits.i_analytics_dev_ops_adoption
name: "<please fill metric name, suggested format is: {subject}_{verb}{ing|ed}_{object} eg: users_creating_epics or merge_requests_viewed_in_single_file_mode>"
description:
diff --git a/config/metrics/counts_all/20210427212450_geo_secondary_web_oauth_users.yml b/config/metrics/counts_all/20210427212450_geo_secondary_web_oauth_users.yml
index 2447a5c1880..f8577a6d0cb 100644
--- a/config/metrics/counts_all/20210427212450_geo_secondary_web_oauth_users.yml
+++ b/config/metrics/counts_all/20210427212450_geo_secondary_web_oauth_users.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.enablement.geo_secondary_web_oauth_users
name: ""
description:
diff --git a/config/metrics/counts_all/20210428142406_users_viewing_analytics_group_devops_adoption.yml b/config/metrics/counts_all/20210428142406_users_viewing_analytics_group_devops_adoption.yml
index 8838e57a7a3..f342e7ef82b 100644
--- a/config/metrics/counts_all/20210428142406_users_viewing_analytics_group_devops_adoption.yml
+++ b/config/metrics/counts_all/20210428142406_users_viewing_analytics_group_devops_adoption.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: analytics_unique_visits.users_viewing_analytics_group_devops_adoption
name: "<please fill metric name, suggested format is: {subject}_{verb}{ing|ed}_{object} eg: users_creating_epics or merge_requests_viewed_in_single_file_mode>"
description:
diff --git a/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml b/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
index e108406ef11..69fffdf6283 100644
--- a/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
+++ b/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.ci_runners_instance_type_active
name: "count_active_instance_ci_runners"
description: Total active Shared (Instance) Runners
diff --git a/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml b/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
index 6fe5d74a7e7..7edc7086c22 100644
--- a/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
+++ b/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.ci_runners_group_type_active
name: "count_active_group_ci_runners"
description: Total active Group Runners
diff --git a/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml b/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
index eaf9a3b5dd7..66f0c6ad976 100644
--- a/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
+++ b/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.ci_runners_project_type_active
name: "count_active_project_ci_runners"
description: Total active Specific (Project) Runners
diff --git a/config/metrics/counts_all/20210502050942_ci_runners_online.yml b/config/metrics/counts_all/20210502050942_ci_runners_online.yml
index 7e63e095cd4..7a2752ac152 100644
--- a/config/metrics/counts_all/20210502050942_ci_runners_online.yml
+++ b/config/metrics/counts_all/20210502050942_ci_runners_online.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.ci_runners_online
name: "counts_online_runners"
description: Total online Runners of all types
diff --git a/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml b/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
index 2e451b5955e..e32f288e8c9 100644
--- a/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
+++ b/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.ci_runners_instance_type_active_online
name: "count_instance_active_online_ci_runners"
description: Total active and online Shared (Instance) Runners
diff --git a/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml b/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
index 30c6432d611..10e1eeb6ceb 100644
--- a/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
+++ b/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.ci_runners_group_type_active_online
name: "count_group_active_online_ci_runners"
description: Total active and online Group Runners
diff --git a/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml b/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
index 8f47542eac2..f3628f18f60 100644
--- a/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
+++ b/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.ci_runners_project_type_active_online
name: "count_project_active_online_ci_runners"
description: Total active and online Specific (Project) Runners
diff --git a/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml b/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
index 133b85c00e4..2d5b7e3b7a0 100644
--- a/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
+++ b/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_create_0_sent
name: "count_sent_first_email_of_the_create_track_for_in_product_marketing_emails"
description: Total sent emails of the create track's first email
diff --git a/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml b/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
index 70531344912..877f7119f3f 100644
--- a/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_create_0_cta_clicked
name: "count_clicks_on_the_first_email_of_the_create_track_for_in_product_marketing_emails"
description: Total clicks on the create track's first email
diff --git a/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml b/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
index 9f6fff093d3..5d34d5b5803 100644
--- a/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
+++ b/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_create_1_sent
name: "count_sent_second_email_of_the_create_track_for_in_product_marketing_emails"
description: Total sent emails of the create track's second email
diff --git a/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml b/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
index da16bdfc514..d57303b1241 100644
--- a/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_create_1_cta_clicked
name: "count_clicks_on_the_second_email_of_the_create_track_for_in_product_marketing_emails"
description: Total clicks on the create track's second email
diff --git a/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml b/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
index ce00d9d1ba4..8d89567d015 100644
--- a/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
+++ b/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_create_2_sent
name: "count_sent_third_email_of_the_create_track_for_in_product_marketing_emails"
description: Total sent emails of the create track's third email
diff --git a/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml b/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
index 6eae1b19cbb..047e6d4383b 100644
--- a/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_create_2_cta_clicked
name: "count_clicks_on_the_third_email_of_the_create_track_for_in_product_marketing_emails"
description: Total clicks on the create track's third email
diff --git a/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml b/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
index bc66d1bdb47..0dcefe7cc18 100644
--- a/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
+++ b/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_verify_0_sent
name: "count_sent_first_email_of_the_verify_track_for_in_product_marketing_emails"
description: Total sent emails of the verify track's first email
diff --git a/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml b/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
index 525ab313b17..f9ed322c94a 100644
--- a/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_verify_0_cta_clicked
name: "count_clicks_on_the_first_email_of_the_verify_track_for_in_product_marketing_emails"
description: Total clicks on the verify track's first email
diff --git a/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml b/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
index 2279f54232a..a5432f3f08e 100644
--- a/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
+++ b/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_verify_1_sent
name: "count_sent_second_email_of_the_verify_track_for_in_product_marketing_emails"
description: Total sent emails of the verify track's second email
diff --git a/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml b/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
index a346e17801a..33fc65ef90e 100644
--- a/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_verify_1_cta_clicked
name: "count_clicks_on_the_second_email_of_the_verify_track_for_in_product_marketing_emails"
description: Total clicks on the verify track's second email
diff --git a/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml b/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
index 573a8e4c18c..b6a8165a0ad 100644
--- a/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
+++ b/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_verify_2_sent
name: "count_sent_third_email_of_the_verify_track_for_in_product_marketing_emails"
description: Total sent emails of the verify track's third email
diff --git a/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml b/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
index 39e4b91f52c..f7a1116c011 100644
--- a/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_verify_2_cta_clicked
name: "count_clicks_on_the_third_email_of_the_verify_track_for_in_product_marketing_emails"
description: Total clicks on the verify track's third email
diff --git a/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml b/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
index e9e9a82cd02..4525ee77874 100644
--- a/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
+++ b/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_trial_0_sent
name: "count_sent_first_email_of_the_trial_track_for_in_product_marketing_emails"
description: Total sent emails of the trial track's first email
diff --git a/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml b/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
index dec668f44f0..56d54929864 100644
--- a/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_trial_0_cta_clicked
name: "count_clicks_on_the_first_email_of_the_trial_track_for_in_product_marketing_emails"
description: Total clicks on the verify trial's first email
diff --git a/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml b/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
index 09ca27a198b..9ee4363f83c 100644
--- a/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
+++ b/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_trial_1_sent
name: "count_sent_second_email_of_the_trial_track_for_in_product_marketing_emails"
description: Total sent emails of the trial track's second email
diff --git a/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml b/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
index c706faef430..cd8b881e029 100644
--- a/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_trial_1_cta_clicked
name: "count_clicks_on_the_second_email_of_the_trial_track_for_in_product_marketing_emails"
description: Total clicks on the trial track's second email
diff --git a/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml b/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
index 5708ba432b5..c1f6a7da94c 100644
--- a/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
+++ b/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_trial_2_sent
name: "count_sent_third_email_of_the_trial_track_for_in_product_marketing_emails"
description: Total sent emails of the trial track's third email
diff --git a/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml b/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
index ff1ec072ceb..c46dd95d8dc 100644
--- a/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_trial_2_cta_clicked
name: "count_clicks_on_the_third_email_of_the_trial_track_for_in_product_marketing_emails"
description: Total clicks on the trial track's third email
diff --git a/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml b/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
index 8337c962466..6cd44c2475f 100644
--- a/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
+++ b/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_team_0_sent
name: "count_sent_first_email_of_the_trial_team_for_in_product_marketing_emails"
description: Total sent emails of the team track's first email
diff --git a/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml b/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
index 182b1b5f0d7..020ec65966b 100644
--- a/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_team_0_cta_clicked
name: "count_clicks_on_the_first_email_of_the_team_track_for_in_product_marketing_emails"
description: Total clicks on the team track's first email
diff --git a/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml b/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
index aeaa6e43f50..8a0df5a4b9f 100644
--- a/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
+++ b/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_team_1_sent
name: "count_sent_second_email_of_the_team_track_for_in_product_marketing_emails"
description: Total sent emails of the team track's second email
diff --git a/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml b/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
index a1ebe731315..210bad95a55 100644
--- a/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_team_1_cta_clicked
name: "count_clicks_on_the_second_email_of_the_team_track_for_in_product_marketing_emails"
description: Total clicks on the team track's second email
diff --git a/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml b/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
index 9d9cdfb0577..3e3e680d45a 100644
--- a/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
+++ b/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_team_2_sent
name: "count_sent_third_email_of_the_team_track_for_in_product_marketing_emails"
description: Total sent emails of the team track's third email
diff --git a/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml b/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
index ffe99a1d4c3..9967091db09 100644
--- a/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_team_2_cta_clicked
name: "count_clicks_on_the_third_email_of_the_team_track_for_in_product_marketing_emails"
description: Total clicks on the team track's third email
diff --git a/config/metrics/counts_all/20210514141520_project_imports_total.yml b/config/metrics/counts_all/20210514141520_project_imports_total.yml
index 2f61cfa9376..be421a6b577 100644
--- a/config/metrics/counts_all/20210514141520_project_imports_total.yml
+++ b/config/metrics/counts_all/20210514141520_project_imports_total.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: usage_activity_by_stage.manage.project_imports.total
description: 'Count number of projects imported monthly'
product_section: dev
diff --git a/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml b/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml
index cbebbdc4eb0..c24a713711c 100644
--- a/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml
+++ b/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.package_events_i_package_helm_pull_package
description: Total count of pull Helm packages events
product_section: ops
diff --git a/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml b/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
index d85eeefe9e6..17b3cbb7cda 100644
--- a/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
+++ b/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: counts.in_product_marketing_email_experience_0_sent
name: "count_sent_first_email_of_the_experience_track_for_in_product_marketing_emails"
description: Total sent emails of the experience track's first email
diff --git a/config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml b/config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml
index e405692bd87..0b1af1bf6d4 100644
--- a/config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml
+++ b/config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml
@@ -11,7 +11,7 @@ milestone: "14.1"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64814
time_frame: all
data_source: redis
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml b/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml
index b2d39e70fe7..f61a1066759 100644
--- a/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml
+++ b/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml
@@ -12,7 +12,7 @@ milestone: "14.1"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64554
time_frame: all
data_source: redis
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml b/config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml
index a3c68b2d115..e220f54dadd 100644
--- a/config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml
+++ b/config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml
@@ -12,7 +12,7 @@ milestone: "14.1"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64554
time_frame: all
data_source: redis
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml b/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml
index 9a0abf74ba2..825b86958bf 100644
--- a/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml
+++ b/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml
@@ -12,7 +12,7 @@ milestone: "14.1"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64554
time_frame: all
data_source: redis
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml b/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml
index 83117bd3047..b31f9e42aa2 100644
--- a/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml
@@ -12,7 +12,7 @@ milestone: "14.1"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64554
time_frame: all
data_source: redis
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml b/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml
index 69b48c6f469..4a40a793d41 100644
--- a/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml
+++ b/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml
@@ -12,7 +12,7 @@ milestone: "14.1"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64554
time_frame: all
data_source: redis
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml b/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml
index 08cae05ba79..44eb3efe429 100644
--- a/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml
+++ b/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml
@@ -12,7 +12,7 @@ milestone: "14.1"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64554
time_frame: all
data_source: redis
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml b/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml
index 191beea4742..5e4114c1e34 100644
--- a/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml
+++ b/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml
@@ -12,7 +12,7 @@ milestone: "14.1"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64554
time_frame: all
data_source: redis
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml b/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml
index 86b1ad50ace..b6da6dfb60b 100644
--- a/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml
@@ -12,7 +12,7 @@ milestone: "14.1"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64554
time_frame: all
data_source: redis
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml b/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml
index 268376a3912..26a4c1cb2cd 100644
--- a/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml
+++ b/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml
@@ -12,7 +12,7 @@ milestone: "14.1"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64554
time_frame: all
data_source: redis
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml b/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml
index 75e6d8cfa55..aff7e4a5f8d 100644
--- a/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml
+++ b/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml
@@ -12,7 +12,7 @@ milestone: "14.1"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64554
time_frame: all
data_source: redis
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210723075525_diff_searches.yml b/config/metrics/counts_all/20210723075525_diff_searches.yml
index f55b218db49..02bb3c7ff67 100644
--- a/config/metrics/counts_all/20210723075525_diff_searches.yml
+++ b/config/metrics/counts_all/20210723075525_diff_searches.yml
@@ -11,7 +11,7 @@ milestone: '14.2'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66522
time_frame: all
data_source: redis
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml b/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
index 5cdc7f7ec92..c720bf1556a 100644
--- a/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
@@ -12,7 +12,7 @@ milestone: "14.2"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66854
time_frame: all
data_source: database
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml b/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
index 4f6c1d65533..7c63172990f 100644
--- a/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
+++ b/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
@@ -12,7 +12,7 @@ milestone: "14.2"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66854
time_frame: all
data_source: database
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml b/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
index 8c9283cb59c..0761627c548 100644
--- a/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
@@ -12,7 +12,7 @@ milestone: "14.2"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66943
time_frame: all
data_source: database
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml b/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
index 62cd856347c..e18ab01b4a5 100644
--- a/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
+++ b/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
@@ -12,7 +12,7 @@ milestone: "14.2"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66943
time_frame: all
data_source: database
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml b/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
index 771aed31c3e..aa1ce32f7c8 100644
--- a/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
@@ -12,7 +12,7 @@ milestone: "14.2"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67147
time_frame: all
data_source: database
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml b/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
index 8ef7412054d..6cc374030d1 100644
--- a/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
+++ b/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
@@ -12,7 +12,7 @@ milestone: "14.2"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67147
time_frame: all
data_source: database
-data_category: Optional
+data_category: optional
distribution:
- ce
- ee
diff --git a/config/metrics/license/20210201124932_recorded_at.yml b/config/metrics/license/20210201124932_recorded_at.yml
index d9fabfaad19..3b80163a05e 100644
--- a/config/metrics/license/20210201124932_recorded_at.yml
+++ b/config/metrics/license/20210201124932_recorded_at.yml
@@ -1,5 +1,5 @@
---
-data_category: Standard
+data_category: standard
key_path: recorded_at
description: When the Usage Ping computation was started
product_section: growth
diff --git a/config/metrics/license/20210201124933_uuid.yml b/config/metrics/license/20210201124933_uuid.yml
index 594fd1b6d7f..a9503adf6c9 100644
--- a/config/metrics/license/20210201124933_uuid.yml
+++ b/config/metrics/license/20210201124933_uuid.yml
@@ -11,7 +11,7 @@ milestone: "9.1"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1521
time_frame: none
data_source: database
-data_category: Standard
+data_category: standard
instrumentation_class: UuidMetric
distribution:
- ee
diff --git a/config/metrics/license/20210204124827_hostname.yml b/config/metrics/license/20210204124827_hostname.yml
index 1bc9375b69b..36e57ee6e1d 100644
--- a/config/metrics/license/20210204124827_hostname.yml
+++ b/config/metrics/license/20210204124827_hostname.yml
@@ -9,7 +9,7 @@ value_type: string
status: data_available
time_frame: none
data_source: system
-data_category: Standard
+data_category: standard
instrumentation_class: HostnameMetric
distribution:
- ce
diff --git a/config/metrics/license/20210204124829_active_user_count.yml b/config/metrics/license/20210204124829_active_user_count.yml
index b585c027a9f..f8beb5dfd0e 100644
--- a/config/metrics/license/20210204124829_active_user_count.yml
+++ b/config/metrics/license/20210204124829_active_user_count.yml
@@ -7,7 +7,7 @@ product_group: group::product intelligence
product_category: collection
value_type: string
status: data_available
-data_category: Subscription
+data_category: subscription
time_frame: none
data_source: database
distribution:
diff --git a/config/metrics/license/20210204124928_version.yml b/config/metrics/license/20210204124928_version.yml
index 5233c0cabc6..09b9f978519 100644
--- a/config/metrics/license/20210204124928_version.yml
+++ b/config/metrics/license/20210204124928_version.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: gitaly.version
description: Version of Gitaly
product_section: growth
diff --git a/config/metrics/license/20210204124936_pages_version.yml b/config/metrics/license/20210204124936_pages_version.yml
index 4f8e8439b6a..72960ef07a0 100644
--- a/config/metrics/license/20210204124936_pages_version.yml
+++ b/config/metrics/license/20210204124936_pages_version.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: gitlab_pages.version
description: The version number of GitLab Pages
product_section: ops
diff --git a/config/metrics/license/20210204124938_recording_ce_finished_at.yml b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
index 318c9fae50e..07687856974 100644
--- a/config/metrics/license/20210204124938_recording_ce_finished_at.yml
+++ b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
@@ -1,5 +1,5 @@
---
-data_category: Standard
+data_category: standard
key_path: recording_ce_finished_at
description: When the core features were computed
product_section: growth
diff --git a/config/metrics/license/20210216175601_version.yml b/config/metrics/license/20210216175601_version.yml
index ffcf8d97aa1..acc83f0b693 100644
--- a/config/metrics/license/20210216175601_version.yml
+++ b/config/metrics/license/20210216175601_version.yml
@@ -1,5 +1,5 @@
---
-data_category: Standard
+data_category: standard
key_path: version
description: Version of GitLab instance
product_section: enablement
diff --git a/config/metrics/license/20210216175602_installation_type.yml b/config/metrics/license/20210216175602_installation_type.yml
index 9767609ffcd..2c838549beb 100644
--- a/config/metrics/license/20210216175602_installation_type.yml
+++ b/config/metrics/license/20210216175602_installation_type.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: installation_type
description: The installation method used to install GitLab (Omnibus, Helm, etc)
product_section: enablement
diff --git a/config/metrics/license/20210216181053_version.yml b/config/metrics/license/20210216181053_version.yml
index b18d7360560..f4c0c9fa794 100644
--- a/config/metrics/license/20210216181053_version.yml
+++ b/config/metrics/license/20210216181053_version.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: container_registry_server.version
description: Identifies the version of the external registry being used
product_section: ops
diff --git a/config/metrics/license/20210216183237_version.yml b/config/metrics/license/20210216183237_version.yml
index bd1b6158329..1f2a221e456 100644
--- a/config/metrics/license/20210216183237_version.yml
+++ b/config/metrics/license/20210216183237_version.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: git.version
description: Information about Git version
product_section: enablement
diff --git a/config/metrics/settings/20210201124935_database_adapter.yml b/config/metrics/settings/20210201124935_database_adapter.yml
index ca16bec6a08..38cdba2a071 100644
--- a/config/metrics/settings/20210201124935_database_adapter.yml
+++ b/config/metrics/settings/20210201124935_database_adapter.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+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.
product_section: enablement
diff --git a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
index 45361c5b358..8d635cc17a0 100644
--- a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
+++ b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: instance_auto_devops_enabled
description: Whether auto DevOps is enabled
product_section: ops
diff --git a/config/metrics/settings/20210204124858_container_registry_enabled.yml b/config/metrics/settings/20210204124858_container_registry_enabled.yml
index 4c640a1de2b..a780b8cfaa9 100644
--- a/config/metrics/settings/20210204124858_container_registry_enabled.yml
+++ b/config/metrics/settings/20210204124858_container_registry_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: container_registry_enabled
description: A count of projects where the container registry is enabled
product_section: ops
diff --git a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
index 911b9732a56..d92a3d9b5f9 100644
--- a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
+++ b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: dependency_proxy_enabled
description: A count of projects where the dependency proxy is enabled
product_section: ops
diff --git a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
index ae75667134d..552b0467518 100644
--- a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
+++ b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: gitlab_shared_runners_enabled
description: Whether shared runners is enabled
product_section: ops
diff --git a/config/metrics/settings/20210204124904_gravatar_enabled.yml b/config/metrics/settings/20210204124904_gravatar_enabled.yml
index dfbf70bad87..541c7be16e7 100644
--- a/config/metrics/settings/20210204124904_gravatar_enabled.yml
+++ b/config/metrics/settings/20210204124904_gravatar_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: gravatar_enabled
description: Whether gravatar is enabled
product_section: dev
diff --git a/config/metrics/settings/20210204124906_ldap_enabled.yml b/config/metrics/settings/20210204124906_ldap_enabled.yml
index a6e4a4fb80a..cabbac5619e 100644
--- a/config/metrics/settings/20210204124906_ldap_enabled.yml
+++ b/config/metrics/settings/20210204124906_ldap_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: ldap_enabled
description: Whether LDAP is enabled
product_section: growth
diff --git a/config/metrics/settings/20210204124908_mattermost_enabled.yml b/config/metrics/settings/20210204124908_mattermost_enabled.yml
index 9da0e2c604f..6ebc8df8bfc 100644
--- a/config/metrics/settings/20210204124908_mattermost_enabled.yml
+++ b/config/metrics/settings/20210204124908_mattermost_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: mattermost_enabled
description: Whether Mattermost is enabled
product_section: dev
diff --git a/config/metrics/settings/20210204124910_omniauth_enabled.yml b/config/metrics/settings/20210204124910_omniauth_enabled.yml
index a9a6bdc0bda..6451a66c87e 100644
--- a/config/metrics/settings/20210204124910_omniauth_enabled.yml
+++ b/config/metrics/settings/20210204124910_omniauth_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: omniauth_enabled
description: Whether OmniAuth is enabled
product_section: growth
diff --git a/config/metrics/settings/20210204124912_prometheus_enabled.yml b/config/metrics/settings/20210204124912_prometheus_enabled.yml
index 8a8a44056ce..9002751cf6a 100644
--- a/config/metrics/settings/20210204124912_prometheus_enabled.yml
+++ b/config/metrics/settings/20210204124912_prometheus_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: prometheus_enabled
description: Whether the bundled Prometheus is enabled
product_section: growth
diff --git a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
index 0aff4171cfc..04fc99f8dc5 100644
--- a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
+++ b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: prometheus_metrics_enabled
description: Whether Prometheus Metrics endpoint is enabled
product_section: growth
diff --git a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
index 9edc06cdd18..4d4de2da28a 100644
--- a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
+++ b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: reply_by_email_enabled
description: Whether incoming email is setup
product_section: dev
diff --git a/config/metrics/settings/20210204124918_signup_enabled.yml b/config/metrics/settings/20210204124918_signup_enabled.yml
index bc2f2097d41..059a3ecba7f 100644
--- a/config/metrics/settings/20210204124918_signup_enabled.yml
+++ b/config/metrics/settings/20210204124918_signup_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: signup_enabled
description: Whether public signup is enabled
product_section: dev
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 758c7ee62bf..f972622d176 100644
--- a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
+++ b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: web_ide_clientside_preview_enabled
description: Whether Web IDE clientside preview is enabled
product_section: dev
diff --git a/config/metrics/settings/20210204124922_grafana_link_enabled.yml b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
index 4680f4b152c..78225329763 100644
--- a/config/metrics/settings/20210204124922_grafana_link_enabled.yml
+++ b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: grafana_link_enabled
description: Whether Grafana is enabled
product_section: growth
diff --git a/config/metrics/settings/20210204124934_pages_enabled.yml b/config/metrics/settings/20210204124934_pages_enabled.yml
index 907dd4b454c..7c830e56787 100644
--- a/config/metrics/settings/20210204124934_pages_enabled.yml
+++ b/config/metrics/settings/20210204124934_pages_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: gitlab_pages.enabled
description: Whether GitLab Pages is enabled
product_section: ops
diff --git a/config/metrics/settings/20210216174829_smtp_server.yml b/config/metrics/settings/20210216174829_smtp_server.yml
index 46e3396eef6..f82fddbc86c 100644
--- a/config/metrics/settings/20210216174829_smtp_server.yml
+++ b/config/metrics/settings/20210216174829_smtp_server.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: mail.smtp_server
description: The value of the SMTP server that is used
product_section: growth
diff --git a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
index fa6ccaf67b2..d92815bebfd 100644
--- a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
+++ b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Operational
+data_category: operational
key_path: ingress_modsecurity_enabled
description: Whether or not ModSecurity is enabled within Ingress
product_section: sec
diff --git a/config/metrics/settings/20210216175604_edition.yml b/config/metrics/settings/20210216175604_edition.yml
index 03f013e9c98..c85378304cc 100644
--- a/config/metrics/settings/20210216175604_edition.yml
+++ b/config/metrics/settings/20210216175604_edition.yml
@@ -1,5 +1,5 @@
---
-data_category: Standard
+data_category: standard
key_path: edition
description: Edition of GitLab such as EE or CE
product_section: enablement
diff --git a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
index 9d156e327ea..fb0d3163b3e 100644
--- a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
+++ b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: settings.ldap_encrypted_secrets_enabled
description: Is encrypted LDAP secrets configured?
product_section: enablement
diff --git a/config/metrics/settings/20210216175609_version.yml b/config/metrics/settings/20210216175609_version.yml
index 31f6dcece3d..1a8f7af4742 100644
--- a/config/metrics/settings/20210216175609_version.yml
+++ b/config/metrics/settings/20210216175609_version.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: database.version
description: The version of the PostgreSQL database.
product_section: enablement
diff --git a/config/metrics/settings/20210216180314_gitpod_enabled.yml b/config/metrics/settings/20210216180314_gitpod_enabled.yml
index a42042a8200..1ade7ee7186 100644
--- a/config/metrics/settings/20210216180314_gitpod_enabled.yml
+++ b/config/metrics/settings/20210216180314_gitpod_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: gitpod_enabled
description: Whether Gitpod is enabled in the instance
product_section: dev
diff --git a/config/metrics/settings/20210216180836_enabled.yml b/config/metrics/settings/20210216180836_enabled.yml
index 01a7731d6f9..f4f8f721ad1 100644
--- a/config/metrics/settings/20210216180836_enabled.yml
+++ b/config/metrics/settings/20210216180836_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.artifacts.enabled
description: Whether Object Storage is enabled for Artifacts
product_section: enablement
diff --git a/config/metrics/settings/20210216180838_enabled.yml b/config/metrics/settings/20210216180838_enabled.yml
index 7f62d345288..03f4f52aaf9 100644
--- a/config/metrics/settings/20210216180838_enabled.yml
+++ b/config/metrics/settings/20210216180838_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.artifacts.object_store.enabled
description: Whether Object Storage is enabled for Artifacts
product_section: enablement
diff --git a/config/metrics/settings/20210216180840_direct_upload.yml b/config/metrics/settings/20210216180840_direct_upload.yml
index 9932494a421..b8b85af94f9 100644
--- a/config/metrics/settings/20210216180840_direct_upload.yml
+++ b/config/metrics/settings/20210216180840_direct_upload.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.artifacts.object_store.direct_upload
description: Whether Direct Upload for Object Storage is enabled for Artifacts
product_section: enablement
diff --git a/config/metrics/settings/20210216180841_background_upload.yml b/config/metrics/settings/20210216180841_background_upload.yml
index fb0e02b108a..d354ad6ff49 100644
--- a/config/metrics/settings/20210216180841_background_upload.yml
+++ b/config/metrics/settings/20210216180841_background_upload.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.artifacts.object_store.background_upload
description: Whether Background Upload for Object Storage is enabled for Artifacts
product_section: enablement
diff --git a/config/metrics/settings/20210216180843_provider.yml b/config/metrics/settings/20210216180843_provider.yml
index 702f5eab679..8b94a67dba7 100644
--- a/config/metrics/settings/20210216180843_provider.yml
+++ b/config/metrics/settings/20210216180843_provider.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.artifacts.object_store.provider
description: What Object Storage provider has been configured for Artifacts
product_section: enablement
diff --git a/config/metrics/settings/20210216180845_enabled.yml b/config/metrics/settings/20210216180845_enabled.yml
index ab92282eafd..a40aadf701a 100644
--- a/config/metrics/settings/20210216180845_enabled.yml
+++ b/config/metrics/settings/20210216180845_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.external_diffs.enabled
description: Whether Object Storage is enabled for External Diffs
product_section: enablement
diff --git a/config/metrics/settings/20210216180847_enabled.yml b/config/metrics/settings/20210216180847_enabled.yml
index c59efae2129..b1adeac5238 100644
--- a/config/metrics/settings/20210216180847_enabled.yml
+++ b/config/metrics/settings/20210216180847_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.external_diffs.object_store.enabled
description: Whether Object Storage is enabled for External Diffs
product_section: enablement
diff --git a/config/metrics/settings/20210216180849_direct_upload.yml b/config/metrics/settings/20210216180849_direct_upload.yml
index 17eb30c1441..a25637270e7 100644
--- a/config/metrics/settings/20210216180849_direct_upload.yml
+++ b/config/metrics/settings/20210216180849_direct_upload.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.external_diffs.object_store.direct_upload
description: Whether Direct Upload for Object Storage is enabled for External Diffs
product_section: enablement
diff --git a/config/metrics/settings/20210216180851_background_upload.yml b/config/metrics/settings/20210216180851_background_upload.yml
index dc51d8ae733..1326c2ebef4 100644
--- a/config/metrics/settings/20210216180851_background_upload.yml
+++ b/config/metrics/settings/20210216180851_background_upload.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.external_diffs.object_store.background_upload
description: Whether Background Upload for Object Storage is enabled for External
Diffs
diff --git a/config/metrics/settings/20210216180852_provider.yml b/config/metrics/settings/20210216180852_provider.yml
index 44bc38ea5fd..e057a6384a2 100644
--- a/config/metrics/settings/20210216180852_provider.yml
+++ b/config/metrics/settings/20210216180852_provider.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.external_diffs.object_store.provider
description: What Object Storage provider has been configured for External Diffs
product_section: enablement
diff --git a/config/metrics/settings/20210216180854_enabled.yml b/config/metrics/settings/20210216180854_enabled.yml
index 275c26a1478..c129bb028d5 100644
--- a/config/metrics/settings/20210216180854_enabled.yml
+++ b/config/metrics/settings/20210216180854_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.lfs.enabled
description: Whether Object Storage is enabled for LFS
product_section: enablement
diff --git a/config/metrics/settings/20210216180856_enabled.yml b/config/metrics/settings/20210216180856_enabled.yml
index da972595ff9..bd26d91a2fa 100644
--- a/config/metrics/settings/20210216180856_enabled.yml
+++ b/config/metrics/settings/20210216180856_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.lfs.object_store.enabled
description: Whether Object Storage is enabled for LFS
product_section: enablement
diff --git a/config/metrics/settings/20210216180858_direct_upload.yml b/config/metrics/settings/20210216180858_direct_upload.yml
index 120537b8af0..281b6744d35 100644
--- a/config/metrics/settings/20210216180858_direct_upload.yml
+++ b/config/metrics/settings/20210216180858_direct_upload.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.lfs.object_store.direct_upload
description: Whether Direct Upload for Object Storage is enabled for LFS
product_section: enablement
diff --git a/config/metrics/settings/20210216180900_background_upload.yml b/config/metrics/settings/20210216180900_background_upload.yml
index 5c885d29061..2e39fa7e379 100644
--- a/config/metrics/settings/20210216180900_background_upload.yml
+++ b/config/metrics/settings/20210216180900_background_upload.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.lfs.object_store.background_upload
description: Whether Background Upload for Object Storage is enabled for LFS
product_section: enablement
diff --git a/config/metrics/settings/20210216180902_provider.yml b/config/metrics/settings/20210216180902_provider.yml
index 97dd62b8eca..a8d265f9676 100644
--- a/config/metrics/settings/20210216180902_provider.yml
+++ b/config/metrics/settings/20210216180902_provider.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.lfs.object_store.provider
description: What Object Storage provider has been configured for LFS
product_section: enablement
diff --git a/config/metrics/settings/20210216180903_enabled.yml b/config/metrics/settings/20210216180903_enabled.yml
index 55cd0967931..00e52b86d86 100644
--- a/config/metrics/settings/20210216180903_enabled.yml
+++ b/config/metrics/settings/20210216180903_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.uploads.enabled
description: Whether Object Storage is enabled for Uploads
product_section: enablement
diff --git a/config/metrics/settings/20210216180905_enabled.yml b/config/metrics/settings/20210216180905_enabled.yml
index 438a4ea5ff9..dba464bfed3 100644
--- a/config/metrics/settings/20210216180905_enabled.yml
+++ b/config/metrics/settings/20210216180905_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.uploads.object_store.enabled
description: Whether Object Storage is enabled for Uploads
product_section: enablement
diff --git a/config/metrics/settings/20210216180907_direct_upload.yml b/config/metrics/settings/20210216180907_direct_upload.yml
index 14d6ff17106..93b69a728bc 100644
--- a/config/metrics/settings/20210216180907_direct_upload.yml
+++ b/config/metrics/settings/20210216180907_direct_upload.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.uploads.object_store.direct_upload
description: Whether Direct Upload for Object Storage is enabled for Uploads
product_section: enablement
diff --git a/config/metrics/settings/20210216180909_background_upload.yml b/config/metrics/settings/20210216180909_background_upload.yml
index 738148fd0eb..1af3d227f2f 100644
--- a/config/metrics/settings/20210216180909_background_upload.yml
+++ b/config/metrics/settings/20210216180909_background_upload.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.uploads.object_store.background_upload
description: Whether Background Upload for Object Storage is enabled for Uploads
product_section: enablement
diff --git a/config/metrics/settings/20210216180911_provider.yml b/config/metrics/settings/20210216180911_provider.yml
index 60cc2a56573..f9f98da3569 100644
--- a/config/metrics/settings/20210216180911_provider.yml
+++ b/config/metrics/settings/20210216180911_provider.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.uploads.object_store.provider
description: What Object Storage provider has been configured for Uploads
product_section: enablement
diff --git a/config/metrics/settings/20210216180913_enabled.yml b/config/metrics/settings/20210216180913_enabled.yml
index 38a5a3d61ca..436e5f717c1 100644
--- a/config/metrics/settings/20210216180913_enabled.yml
+++ b/config/metrics/settings/20210216180913_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.packages.enabled
description: Whether Object Storage is enabled for Uploads
product_section: enablement
diff --git a/config/metrics/settings/20210216180915_enabled.yml b/config/metrics/settings/20210216180915_enabled.yml
index 6aef961d6db..b52d85ef8df 100644
--- a/config/metrics/settings/20210216180915_enabled.yml
+++ b/config/metrics/settings/20210216180915_enabled.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.packages.object_store.enabled
description: Whether Object Storage is enabled for Packages
product_section: enablement
diff --git a/config/metrics/settings/20210216180916_direct_upload.yml b/config/metrics/settings/20210216180916_direct_upload.yml
index 29a8c3559f4..058531516d7 100644
--- a/config/metrics/settings/20210216180916_direct_upload.yml
+++ b/config/metrics/settings/20210216180916_direct_upload.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.packages.object_store.direct_upload
description: Whether Direct Upload for Object Storage is enabled for Packages
product_section: enablement
diff --git a/config/metrics/settings/20210216180918_background_upload.yml b/config/metrics/settings/20210216180918_background_upload.yml
index b9820da5e42..c03e600b622 100644
--- a/config/metrics/settings/20210216180918_background_upload.yml
+++ b/config/metrics/settings/20210216180918_background_upload.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.packages.object_store.background_upload
description: Whether Background Upload for Object Storage is enabled for Packages
product_section: enablement
diff --git a/config/metrics/settings/20210216180920_provider.yml b/config/metrics/settings/20210216180920_provider.yml
index bc24892c115..bda2c485e3a 100644
--- a/config/metrics/settings/20210216180920_provider.yml
+++ b/config/metrics/settings/20210216180920_provider.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: object_store.packages.object_store.provider
description: What Object Storage provider has been configured for Packages
product_section: enablement
diff --git a/config/metrics/settings/20210216183241_filesystems.yml b/config/metrics/settings/20210216183241_filesystems.yml
index 0f00292b2cc..85f2a736756 100644
--- a/config/metrics/settings/20210216183241_filesystems.yml
+++ b/config/metrics/settings/20210216183241_filesystems.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: gitaly.filesystems
description: ''
product_section: ''
diff --git a/config/metrics/settings/20210216183248_pg_system_id.yml b/config/metrics/settings/20210216183248_pg_system_id.yml
index e605a2df4e7..5883473a003 100644
--- a/config/metrics/settings/20210216183248_pg_system_id.yml
+++ b/config/metrics/settings/20210216183248_pg_system_id.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: database.pg_system_id
description: TBD
product_section: enablement
diff --git a/config/metrics/settings/20210225045628_operating_system.yml b/config/metrics/settings/20210225045628_operating_system.yml
index cc75a6dff68..670babcef44 100644
--- a/config/metrics/settings/20210225045628_operating_system.yml
+++ b/config/metrics/settings/20210225045628_operating_system.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: settings.operating_system
description: Information about the operating system running GitLab
product_section: enablement
diff --git a/config/metrics/settings/20210321224827_gitaly_apdex.yml b/config/metrics/settings/20210321224827_gitaly_apdex.yml
index 509371b6a24..92d80129412 100644
--- a/config/metrics/settings/20210321224827_gitaly_apdex.yml
+++ b/config/metrics/settings/20210321224827_gitaly_apdex.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: settings.gitaly_apdex
description: Gitaly application performance
product_section: dev
diff --git a/config/metrics/settings/20210323120839_topology.yml b/config/metrics/settings/20210323120839_topology.yml
index be761c7f555..934dc4dd6ce 100644
--- a/config/metrics/settings/20210323120839_topology.yml
+++ b/config/metrics/settings/20210323120839_topology.yml
@@ -1,5 +1,5 @@
---
-data_category: Optional
+data_category: optional
key_path: topology
description: Topology data
product_section: enablement
diff --git a/config/metrics/settings/20210702140138_collected_data_categories.yml b/config/metrics/settings/20210702140138_collected_data_categories.yml
index 74697132091..65ae674d502 100644
--- a/config/metrics/settings/20210702140138_collected_data_categories.yml
+++ b/config/metrics/settings/20210702140138_collected_data_categories.yml
@@ -12,7 +12,7 @@ milestone: "14.1"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65336
time_frame: none
data_source: system
-data_category: Standard
+data_category: standard
instrumentation_class: CollectedDataCategoriesMetric
distribution:
- ce