diff --git a/config/metrics/counts_28d/20210201124930_deployments.yml b/config/metrics/counts_28d/20210201124930_deployments.yml
index 4dcb9c5da4bc3a24ab900a4ab0140fb5a9c8a3fb..8fdc28d7ebb4dcf5296359203dbd1a0dc7c87cff 100644
--- a/config/metrics/counts_28d/20210201124930_deployments.yml
+++ b/config/metrics/counts_28d/20210201124930_deployments.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 c5a0a2eebcd160beb751e90bd709850efd334915..a9340d29e269760c30323764d4ecd663a7dc7828 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,4 +1,5 @@
 ---
+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 72a1f5a2faa6ae2c63cb53a49160f8085f39243e..f261fcfda1b473e858fcc47b4b7e22843ae24cfc 100644
--- a/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 7bd0a5ae025c14d56f1c29eb37c0fa500d143c0b..d81846a1736df077e2b7018105a49f0addcfabd7 100644
--- a/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
+++ b/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 dc0d7f35622cf37855d70d1242a824c5e0eaa2d4..c0c45f2df2f7d4c3086aefaa745e7282b44a4f0c 100644
--- a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
+++ b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 ae43df148e5f741eca9ee6309b5484bbb5b7af7b..03187736700a4089631119c776f1a82042094aab 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,4 +1,5 @@
 ---
+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 c0fd0561ee42d8b7d796f4f2ddc07fb85bacbcfe..e9fb3dbfbb2a6bc85bdc36f0449a6d9932dc36f8 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,4 +1,5 @@
 ---
+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 d9011ddf00b236a91f6c15b46a4d714d60431b33..4d4f70b4e9920838a35c82bac3ff7e75a43535f7 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,4 +1,5 @@
 ---
+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 3ce4cbc6e95ac5789c667529ec2e41d0ddebec98..042d0ab84feea0521d135b2e19d9a303931b67aa 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,4 +1,5 @@
 ---
+data_category: Optional
 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 bb1f64177a197ad336d4167986c2cacd030db0fa..b932ade9be2a67b163bbedc63c6834f2f5c6415b 100644
--- a/config/metrics/counts_28d/20210216175055_merge_requests.yml
+++ b/config/metrics/counts_28d/20210216175055_merge_requests.yml
@@ -1,4 +1,5 @@
 ---
+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 2db67a4028c40e854cb038e4b8ae5238236702bf..dc5ba4a9f619e1476b8629e5b156c68867f1466a 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,4 +1,5 @@
 ---
+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 152c248802a77cf6d73c4ce3d7b8b6215846795e..6420fd972fef193f211608f058a72b696138f150 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,4 +1,5 @@
 ---
+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 3df6f0f080a26f44791e53890795140c71e1d234..e51b3819df662fbb82096ea575278c32e77bc950 100644
--- a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
+++ b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
@@ -1,4 +1,5 @@
 ---
+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 b3f019c59bc404d3854b4d2b6b42a78a441ee9e9..9e29b3f3e4b0e7ff47915afcc41276f164484147 100644
--- a/config/metrics/counts_28d/20210216175109_suggestions.yml
+++ b/config/metrics/counts_28d/20210216175109_suggestions.yml
@@ -1,4 +1,5 @@
 ---
+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 212b59a0dd610c8e0fddcf68df788e8329bd7fef..197e7af6944be3fd4266e69daf0c6e77c54e637b 100644
--- a/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 c8d0d7eb575a60e1b2fc79441252e36c37e86da1..acd657dec0a7374c43a7a5f7693e5c66487e4892 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,4 +1,5 @@
 ---
+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 1c4b558288ab40c253e84010f8aafb9e2de2f02b..24509103daa3e7587822a2ca1112af114d566b5b 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,4 +1,5 @@
 ---
+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 d5fded16ee24ebe07bcf918a48841e3eddcb74fc..569666d47afa5e2167d5618507ee52489ad82ec5 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,4 +1,5 @@
 ---
+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 eb566473b3aff2187aaff6fc357eb2807c80d491..b22ba8104cf840d2e5d5d67750954f5623c86263 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,4 +1,5 @@
 ---
+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
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 eb95ff294d824d9e28495d04052e26a258ee6dca..99bb06699f55402cf569b7b2d97b6bbd4156a578 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,4 +1,5 @@
 ---
+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 de9d81070e806b1fd56a2ee4c11f5731b964425d..05b843d275b78f0b42a0a3039ca5aab5db171cb4 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,4 +1,5 @@
 ---
+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 0d954358bbe38e1cf6b1e0ed780a7b9d616176c9..eddb909eb931f3163b393e10c65ce74be1f4fb51 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,4 +1,5 @@
 ---
+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 bdbd0346dbd2616689b6d372193a3e306c20797b..485b47344d05451cadd9518b6a6f64e5537a4492 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,4 +1,5 @@
 ---
+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 bf58a8632b8b41e44999c4ae7d48dc99c5e2c93b..710cd9c05de33951896b00e517b32e6695fb067a 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,4 +1,5 @@
 ---
+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 045dbba58b72660ac77f3760ad78465dc26d22af..304b0f2f8f3811e41a4db09caf5d47f29e4cbfa1 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,4 +1,5 @@
 ---
+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 5cd5e005262c950b64c78e6fb2be43f638285408..cfe688f36c5f0da49394f36d22e167204d80db61 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,4 +1,5 @@
 ---
+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 7ebf20724062b35f55224c84563802890fe3da35..e6f9eb418b9ec91f36408be6b79ede33a5b631d8 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,4 +1,5 @@
 ---
+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 548dddda36f1e91ca9f965caf2807e558a9f257c..edf0ec5359f738d7d45bef30a6bb993a59b6a643 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,4 +1,5 @@
 ---
+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 1561e0e9c3b2ebcfebdb1a2db02b694b37cfdd9d..dd9b9706b7df464d3bba04a6c696b6be76e2b63a 100644
--- a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
@@ -1,4 +1,5 @@
 ---
+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 8882af8aa1347851dce62c53850086df72b278ce..bad028774ed264a2df4b59e2356615802af4fe1f 100644
--- a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
+++ b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
@@ -1,4 +1,5 @@
 ---
+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 189623b8644813d826b8dfac6cde4527b1f16a03..a9af8e1cd3fd5cbd867a20609ff81a394bcdf770 100644
--- a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
+++ b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
@@ -1,4 +1,5 @@
 ---
+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 5a67a5b39d5bb6f5ad15551931be4fb03078a2c4..0d24c5e0fae6fe00dc9b8b6757b160e170fa1594 100644
--- a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
+++ b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
@@ -1,4 +1,5 @@
 ---
+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 357ca87eac4943c4a84b364ecf522002657a835d..71ceb5cd3eafda6f9bda52423d4be25d61d53fcb 100644
--- a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
+++ b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
@@ -1,4 +1,5 @@
 ---
+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 8d1b8dfabd6a520cc2334cc2ee57749196f32863..b62ee3c733b37ca6374ea5c4118b211227cbb975 100644
--- a/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
@@ -1,4 +1,5 @@
 ---
+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 2d2d438022a81fe3678ccbfd204ffff66988c602..15fa74276ff15022ccc2b6f0fd5483aa8d8f161b 100644
--- a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 0c3e410d1c4238a38aa26725d739c5cc4796d57a..0f3f41295589c66d2a8b5f9191be59c8e0d2738b 100644
--- a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
+++ b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
@@ -1,4 +1,5 @@
 ---
+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 bc0295b7789277cf41514c9ecc4b53b68404a940..c6834fd28d9247514d85875807e713866cdec425 100644
--- a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
+++ b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
@@ -1,4 +1,5 @@
 ---
+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 9dd10c58008f235e0c17f9930ead635b890c4750..1e9e9f023436bc0ff6afe4dd382162c1103f2fae 100644
--- a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
+++ b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
@@ -1,4 +1,5 @@
 ---
+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 30122b3d9972086c783484c6346c84008d02f990..cb1339c847539760bce8b0f82a34399670cf354a 100644
--- a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
@@ -1,4 +1,5 @@
 ---
+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 12007dd131d9588a6b007b3514311aed1a9caa53..eae8c0f7a3cd95162ffe245a61d3b590a6cdf08e 100644
--- a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 5a43620e0f5cbdce5735fed275f6ea2d3e1aa249..4c69b0a7671f6a5df4dce2b1200687118e7ae3f6 100644
--- a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
@@ -1,4 +1,5 @@
 ---
+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 443beb4649395d63556a0ec874d2f34b48281aa1..3e149eefbd11ab00ec9a751f8e521f3e7fd95e47 100644
--- a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 cc04c03244c4b24c2fb8d82d9affedd02242c151..f93a6925e968acad3d69e21a9a333132d03f7981 100644
--- a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
@@ -1,4 +1,5 @@
 ---
+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 319fcec57c7783642f3da3384381fb4aa6896e0a..abb5639062221dfdff00afd441cf588a4d7ef3a0 100644
--- a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 b14eda697867e7885d3c42d4489761d92fcaefdc..d856c0d2fd172c589c12f03bbca890cc5a982223 100644
--- a/config/metrics/counts_28d/20210216175542_ci_builds.yml
+++ b/config/metrics/counts_28d/20210216175542_ci_builds.yml
@@ -1,4 +1,5 @@
 ---
+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 d2cda411e0529b302e55666efcc9cca7ba2b6c9a..9898d32b111ce82824354865af6bb8775114d64e 100644
--- a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
@@ -1,4 +1,5 @@
 ---
+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 8046f9f3fd0f4e67ca99beacb880153250cdfe5b..319d1d06e62dbe61b555a1fa1923dbcb1bb459f9 100644
--- a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
@@ -1,4 +1,5 @@
 ---
+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 7cfbe4df3208df34fcc26120e3a96070482abae9..774387813a3dc844948cd657ba525bc96b779bcd 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,4 +1,5 @@
 ---
+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 a24e8038a62d3813fd76762ffb401c584f14919b..31e92760c74549b14c60ccb77576a9e2f937d411 100644
--- a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
@@ -1,4 +1,5 @@
 ---
+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 7a878a5ac1eaa15f4801315d48e783bebb0481b5..5c31532f6667f82fcb0e5369a2b72b5e4fe21b00 100644
--- a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
@@ -1,4 +1,5 @@
 ---
+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 19276843af1f102fe605d17644c660b07938ec95..8af3e4f4248887e9d5995fbfc1aa65780ef8263b 100644
--- a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
@@ -1,4 +1,5 @@
 ---
+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 81be64c520757542843d884c3c33029439cb55b9..c02acdfeed6aba35055f3355c42ebd5146096623 100644
--- a/config/metrics/counts_28d/20210216175556_ci_triggers.yml
+++ b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
@@ -1,4 +1,5 @@
 ---
+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 a8b2cbc40dc294867088f9a5b1a4fe42810549a9..44c9ce38d1db42c18e2c87344ae36bf6359c7ef1 100644
--- a/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml
+++ b/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 f4a110f8ca474afc0d4df2e88f07f91f636264aa..7ff8fa6589f8cf7801a87e126f03dd778131f08c 100644
--- a/config/metrics/counts_28d/20210216175618_dast_pipeline.yml
+++ b/config/metrics/counts_28d/20210216175618_dast_pipeline.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 f38ccc5280d12b207be323061edfde7efe6c9f89..b36c6eddc024472903e5e47a2b23602c7cb182e8 100644
--- a/config/metrics/counts_28d/20210216180308_personal_snippets.yml
+++ b/config/metrics/counts_28d/20210216180308_personal_snippets.yml
@@ -1,4 +1,5 @@
 ---
+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 2c397a3150e1d220e80ea5b0f13eb376a5051f5b..c2b9edd4ecea989ba82341d6230631ec66815c31 100644
--- a/config/metrics/counts_28d/20210216180310_project_snippets.yml
+++ b/config/metrics/counts_28d/20210216180310_project_snippets.yml
@@ -1,4 +1,5 @@
 ---
+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 00498c8ad0a08811fdc384cf03c9612c093ca625..1d8b2e3725b6f07a54643a98d2b30898ce8eb41b 100644
--- a/config/metrics/counts_28d/20210216180312_snippets.yml
+++ b/config/metrics/counts_28d/20210216180312_snippets.yml
@@ -1,4 +1,5 @@
 ---
+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 0e36236b80da28fe4b57482248f2ab9f8bebe105..169b79e731655fb8d18b230d8ec8175eae498134 100644
--- a/config/metrics/counts_28d/20210216180317_snippets.yml
+++ b/config/metrics/counts_28d/20210216180317_snippets.yml
@@ -1,4 +1,5 @@
 ---
+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 3143da2317fa7b26327817a6c09623b9d52bbcdb..d66a7c0a63cd1cca5c5ed4e4d03800cb4067ca31 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,4 +1,5 @@
 ---
+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 b9a06a05a5a00e75e63749d57f20942addbb06b5..df023578215d7f0f3d7e74d554473a89f1764083 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,4 +1,5 @@
 ---
+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 6fec0659d479c88503aeca2f5a5eaae4c6ed68f8..164128a6307fa37c468b2fd38bb705bac4ca3e1c 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,4 +1,5 @@
 ---
+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 86cb28d72374af3946277acd20c33b5e7d5d0e1c..e9e408bb1f6e0ca494d335e3a696d3160c5a5f18 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,4 +1,5 @@
 ---
+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 bf71c3aa9f06e42f84d6e4b1208e68e6250f5a9d..3d123932ab2d4c0dd00aac86d36a527aac3981e4 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,4 +1,5 @@
 ---
+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 50ad1360d8d92fdd1b79952b5d2f3bc2c51b5f71..ab1d99941625da19cc0ebd851a2a551d8672178c 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,4 +1,5 @@
 ---
+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 8c53d1a39c0fa6d6461a728213e0a7092d8d1017..9ae8b537651e8b38d5a67bd4879bb426c56dfd7b 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,4 +1,5 @@
 ---
+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 d9735e35895e1eabdbe27d67ac842b2db06e700d..ba83d1d3ae1e92f9efe07202f81c7ad369bba125 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,4 +1,5 @@
 ---
+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 176f0e3ffe1e0161c0b5a8be794b3463036d984e..4dab922fe4b77467067a3788b8e5dbf97196a8cb 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,4 +1,5 @@
 ---
+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 ce748ad1967c4f8c3eec8cb25a82a3e934780334..0f274f0165444b006aaa93c032413d620d8900b5 100644
--- a/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml
+++ b/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 59dfb493448884b3d8cf82b7164e1cce5c2c09f0..b3635acbbd4bf0269fd24f4ee035297c086124bf 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,4 +1,5 @@
 ---
+data_category: Optional
 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 a50b42d1dba828cd736d911a5a8b1299cc1fa1ec..d678e6c3c91db1ea261d2e4159d197f28a865c93 100644
--- a/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
+++ b/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 fe328b771f6ea0cca9aa667dc42bcd84a88fdd92..ec39054bffbbe96b151c7e76f70507d8fa9acaff 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,4 +1,5 @@
 ---
+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 9240abbe3e47056e0b7a71280dcad4deba6f98dc..0d784481951017a04a8e1eec25d959cec098fde2 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,4 +1,5 @@
 ---
+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 acfa19a35d16a8b698281a523a7ecf3a4b072a89..58fd23391b0bae000f055a2aa488bfef28b433fb 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,4 +1,5 @@
 ---
+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 ca45b34f12d5cb88c82f685de1c8833d9bb9ad56..3046bf5f8a8d6b8025c69f565a4e9b531b083811 100644
--- a/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
+++ b/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
@@ -1,4 +1,5 @@
 ---
+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 63de97f39c1cc66919c40a0a63c7f39601bd0888..3ac5ec3731703c862c4def151382622013bac8c7 100644
--- a/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
+++ b/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
@@ -1,4 +1,5 @@
 ---
+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 594a0dada1fbc2880597e5d3b1eb1cd508a86eab..7cf04627875a400781832eb0af6f1903e8796487 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,4 +1,5 @@
 ---
+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 7fe625a5b8206709e2d77b9dbf2dee58f503108a..46bdc9602c24307e9ccfdf90ba29f7d30012246e 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,4 +1,5 @@
 ---
+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 81a08bccdf38f5b370963b236288d5af22c2538c..ad9fd3debb66234e167fe1559e5538fa5df72e13 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,4 +1,5 @@
 ---
+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 9ebed79c3fbe7a536af89dc80e298a56dc3cd837..eb9a25a1b93c48fe78f53f2ebff3a8ef4e8fbcb9 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,4 +1,5 @@
 ---
+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 cc7d3d679e3ab3e5c0b425c6f48b3d83bf833f8a..6a541dd5166f6f6d844439887297ccd794564442 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,4 +1,5 @@
 ---
+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 522deaaedf55992071e3c47acb15bab558336845..1284cb547dc259d071cee8bfb0e726eca0e54389 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,4 +1,5 @@
 ---
+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 7979dfb860fd7cadd5773889496c3ddd09fe0174..02493515a11d0e694c25cfb2256409267a8e8e7d 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,4 +1,5 @@
 ---
+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 b1285f4173b50083a5985a76d4fd7d57aee1b974..109b5af6c993f7d952a46d3c3181cd7155b5b5a3 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,4 +1,5 @@
 ---
+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 dcb0aeee772a75b6120424934c8b50d8e9cb2e23..8e1346916fe166180b8797f1b69cc469db7c192c 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,4 +1,5 @@
 ---
+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 af3bfcdb2e1921f741b69ed009e8c79b429593ab..e64e09f1abb7e04d632bd8ff4a995546cbaab412 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,4 +1,5 @@
 ---
+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 0d38c8e101492a468bf75c71ec7fbc5000051bbd..d5913791a600a58186e9a4b7c51e6722eb5ae136 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,4 +1,5 @@
 ---
+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 581d9790e24c5280f9f400fd3edef6c6c85c7518..f59613a2723f34bd2dc0bbfa796c6440054d543d 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,4 +1,5 @@
 ---
+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 8cc945c1ff188506fe1f8bae37b611f05037dc5c..e2205dd7d35004d5bdc653dfb4095836767dbf88 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,4 +1,5 @@
 ---
+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 d438e0efa2cc535544c0caa213854f6a89a93df8..9a1e9d4236f957a160e1a52ac7fa1a34f10d9e99 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,4 +1,5 @@
 ---
+data_category: Optional
 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 6496e9048e8e27f58d0c017e5f98c56123c9aa6f..3e24cb64d4fcc12a3a83ded32a7a5d0a689fcd80 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,4 +1,5 @@
 ---
+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 93f07c240578d29b75646c47370f77d5d88298b2..da71196bce92e3e9dea8af2c74db566078b06241 100644
--- a/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
+++ b/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.create.projects_imported_from_github
 description:
 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 15bf70a3adfd0889494aa3d69fe664d1a0674b3c..1468589281d5881ecf7908f474b8308edc55f874 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,4 +1,5 @@
 ---
+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 a513a18d1b5a11432d81233e92d4d71edf4919c8..fa650effab39acc1ed22d853aaf80fce061e2f92 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,4 +1,5 @@
 ---
+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 a1d95f73716d3fc04d441c99293e86f3241a2a0b..745a3c0066ace6637073ec5107cf8514135df21f 100644
--- a/config/metrics/counts_28d/20210216180814_events.yml
+++ b/config/metrics/counts_28d/20210216180814_events.yml
@@ -1,4 +1,5 @@
 ---
+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 61cf815eae7d14ecbec44c99238ae28dd463f95f..0ae86d09c1312995c30aee47d294f19c2027dc57 100644
--- a/config/metrics/counts_28d/20210216180816_groups.yml
+++ b/config/metrics/counts_28d/20210216180816_groups.yml
@@ -1,4 +1,5 @@
 ---
+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 b0212fb3d0153d770dbe55073682d70154ca8038..40e881638bbf69ecd715c515e588bdaae25c5ccb 100644
--- a/config/metrics/counts_28d/20210216180818_users_created.yml
+++ b/config/metrics/counts_28d/20210216180818_users_created.yml
@@ -1,4 +1,5 @@
 ---
+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 116e7c1c816f9e222353223acb2ab108b103790e..aa0191ff47feb0a165040394aad6dea65834628f 100644
--- a/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
@@ -1,4 +1,5 @@
 ---
+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 c33a588fed8df99a7f63be5980cde27569d234a0..2fb39849c11e6c8e1ff83d770ddce7683925f2b7 100644
--- a/config/metrics/counts_28d/20210216180956_clusters.yml
+++ b/config/metrics/counts_28d/20210216180956_clusters.yml
@@ -1,4 +1,5 @@
 ---
+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 5f2a94cc3eadbf339f1ee18ec5f99d38c88206ec..ef305404ad1679d6c38f35fff3ea820b66148ae0 100644
--- a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
@@ -1,4 +1,5 @@
 ---
+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 28391dfb558aade6c87ee9d306b33d3fcb9511a9..6d57a5c0ce16787c48c5812849032a1a9af07ae7 100644
--- a/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
@@ -1,4 +1,5 @@
 ---
+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 b934fa26cd473da1f6d9cd80bd4ffce906601cc1..13cf98b9a2aba539af51fe163da2195a5412c526 100644
--- a/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 2872838e54ada4e48274f48feea7277c799b3fe9..5b67dcc38d7e9c58c09437aa4da80e222180a047 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,4 +1,5 @@
 ---
+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 4ef89c2b47dfbbbb8d093ab42e9d600ec2a4702b..5fde9570540a11d830d0232ccf13a44198ae656e 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,4 +1,5 @@
 ---
+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 f364a4778e02c202db3a254e22fbe4ed34962ceb..d818f90c7a06b799ac06d39287b506fe9c70bf92 100644
--- a/config/metrics/counts_28d/20210216181050_packages.yml
+++ b/config/metrics/counts_28d/20210216181050_packages.yml
@@ -1,4 +1,5 @@
 ---
+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 5460afbc13430ed270da49bcbcab56af0c30a001..bd8ec61b39fc7e661870e314c5abd484cfc3b655 100644
--- a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
+++ b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
@@ -1,4 +1,5 @@
 ---
+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 c6c73e1174620f274abf654c4c9605a26da07865..8264ea12af0830a87283db99a562b71311b0cec0 100644
--- a/config/metrics/counts_28d/20210216181139_issues.yml
+++ b/config/metrics/counts_28d/20210216181139_issues.yml
@@ -1,4 +1,5 @@
 ---
+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 0245705cd8e68dbbc85488f5231a8c2c2c8e1753..d041f9b8685243d97677f833a8edfe5568a0c4cf 100644
--- a/config/metrics/counts_28d/20210216181141_notes.yml
+++ b/config/metrics/counts_28d/20210216181141_notes.yml
@@ -1,4 +1,5 @@
 ---
+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 6dd113bb25ab8b9e20b617084184a9c4231a1d56..a367ade18021f5415739847542202436e56e2efe 100644
--- a/config/metrics/counts_28d/20210216181143_projects.yml
+++ b/config/metrics/counts_28d/20210216181143_projects.yml
@@ -1,4 +1,5 @@
 ---
+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 89378b26bcd1b913e56d51d0388e7415c861be66..43a19351939dd2c1032b0ab1c4d65c35c0bc7c57 100644
--- a/config/metrics/counts_28d/20210216181145_todos.yml
+++ b/config/metrics/counts_28d/20210216181145_todos.yml
@@ -1,4 +1,5 @@
 ---
+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 9532586e2fed810a47a6f65ac1733009f4fb4de6..708df2183579d152e26fd92664940e0e3ba576db 100644
--- a/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
@@ -1,4 +1,5 @@
 ---
+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 fb8c998e3a1a182eab40b7407796e23cc141d224..6af51468a063473761a4b1d575c7a795e040f9e1 100644
--- a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
+++ b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 d7851c9a13498463450d62c175e7965a70a1827e..0507f1eba21a3c6fa3a5f1f15c6c35fce1dfd27d 100644
--- a/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
+++ b/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.plan.projects_jira_active
 description:
 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 2fc84e2cefd474bb7de13a0c0d72d2d162760ad1..6b34e81746721f81e4fbc0ca98bc7ff09393a31c 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,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.plan.projects_jira_dvcs_cloud_active
 description:
 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 d341a41fc6ef280f217ec6f9983ca445441e2962..45de2088c47f4c5c901c6224cc369b2361443849 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,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.plan.projects_jira_dvcs_server_active
 description:
 product_section: dev
diff --git a/config/metrics/counts_28d/20210216181158_epics.yml b/config/metrics/counts_28d/20210216181158_epics.yml
index d0b71aa11d1211dc7efc4cdf67ef4ac4abc80214..8b5694c96c00425f8a9c8db60d30d1f3fcafab09 100644
--- a/config/metrics/counts_28d/20210216181158_epics.yml
+++ b/config/metrics/counts_28d/20210216181158_epics.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.plan.epics
 description:
 product_section: dev
diff --git a/config/metrics/counts_28d/20210216181200_label_lists.yml b/config/metrics/counts_28d/20210216181200_label_lists.yml
index 768692dc39a352fde49b7d90562583548e33b4eb..354c8c3f41b9e321099e8203950e5f64ab6de40c 100644
--- a/config/metrics/counts_28d/20210216181200_label_lists.yml
+++ b/config/metrics/counts_28d/20210216181200_label_lists.yml
@@ -1,4 +1,5 @@
 ---
+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 85406b7bf4ff49b1c8f24df2405faaadb09c1859..545741e02c54886c3c3db7bc091554bd402549dd 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,4 +1,5 @@
 ---
+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 4fe2a89c7f9ad26f6e279f49cc8d308f248451dd..6afaaf788d2e08dc5f275f5926f061eaaf9905d9 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,4 +1,5 @@
 ---
+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 6065495beb20d4bbe21f5885814966497224d770..0fbdb16384f2219e89f81005d7debab42fbedc23 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,4 +1,5 @@
 ---
+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 10f8355d374bfad99ff368dba65f5a09d8d1f038..64584106f546eadcb2ab0d0896ba9cbd264fd41b 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,4 +1,5 @@
 ---
+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 1f45e47cec2bbc10fce2378f6a9ffa95105b4316..12ad3c7469e508c80d5fa76a942ebed106331486 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,4 +1,5 @@
 ---
+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 de02fe709f7cf4d4273b30bdf136a75bedab8fdb..66a973f9bfd26dd42e7b76fabeb867027782ce9c 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,4 +1,5 @@
 ---
+data_category: Optional
 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 9ac69cadc004a36772b87f50af104a4e9cac020c..a66b1bf8ded4a059fce0810be0faf1957f8d1a0b 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,4 +1,5 @@
 ---
+data_category: Optional
 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 e47c00a0f88184a0dac66d7e4c8b918fcfb5f4d0..79148942f11fdb4bc48e055a69bdaa5766f9b3ad 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,4 +1,5 @@
 ---
+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 75a530e5e6e6d2f6f42b895cf729d6be94d2b1b4..aa6c7f74a34e5a1c800fe9dd958302e03162a726 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,4 +1,5 @@
 ---
+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 76bdbaf4401ea68cabff4332237da0be0bbe6919..fc2b81eaf96ef10a22858b84fb978e75a79af874 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,4 +1,5 @@
 ---
+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 f2f96164882b25dc2bbef85b6846b8e248e3d7a4..da20c78f10d1b02d5fb9fdab83b25bdd12e29ebe 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,4 +1,5 @@
 ---
+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 684a8d311572d8799ca5a92cdb83dad06b545383..80c55c9c75f2d33cbe657d41010e05c10f049e3d 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,4 +1,5 @@
 ---
+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 0058a6eece97fb3f6cf3e657868d6c360bb65af4..30e688b95f76c5edb7cf09db9f74d972506db32b 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,4 +1,5 @@
 ---
+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 c735eb37ab2a3909104c1d212093fc91d45a8742..a5786dcc00e4e00a7b7ef58572218f6716bc78af 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,4 +1,5 @@
 ---
+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 25dd972385ccbf0a303b8cf4bfc1cbfadfb74bc9..ccc96aefc7bd7bb27cdf900f5060e38bef40eb3e 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,4 +1,5 @@
 ---
+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 5a9b44afff24186ac8905fab6275db7ec7cbe7db..38d1cddb8ff6c7858b6a1906f30cd89adb28ae31 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,4 +1,5 @@
 ---
+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 ab09a496a88f491535ddd27282c6aaf1c396797c..2045f29d91b7fa1edee37d072d020df41ee6c480 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,4 +1,5 @@
 ---
+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 d57db3474a38aedc4f983971aa7dee495129b851..a9a6335b1582c66b37058289c6d606dd406de057 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,4 +1,5 @@
 ---
+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 5447112e8fb9cdd3c9844a3cb673b399183a3530..b029c819f21801676b81c6a02021e4f2b99f6f3b 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,4 +1,5 @@
 ---
+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 76612a2fdc74b2fe697c942eb4e6fc6093dbe6c9..a47c5a7b4dde70d97ea6ca4ac809bb65cbf8312f 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,4 +1,5 @@
 ---
+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 4b6c2dadbcf0f0ec3343d392daa7673e3f63d27b..13e127d92352f8c2b4c1e7b0acec5329c98be9b0 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,4 +1,5 @@
 ---
+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 13bfaaac98bca32049823d69030d43d43f4691ea..d6a364929bc5916124146e15bc38b761d917f085 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,4 +1,5 @@
 ---
+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 09cb3fdfbf7c7b991fb2173c5c58cd7d8b86134b..fe0386739ba5a50907f17d6c49f1dac7291d60b3 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,4 +1,5 @@
 ---
+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 2a62d55940f96c49c56d5e95afe841453f535d1d..e2ff10cb06f457b68340c4d78cefae507a27d2ed 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,4 +1,5 @@
 ---
+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 a6c7e3d5c901226775fde9431a3e3ecd4fbb6860..610746013fd066bcfbd7b9154554957d5929376c 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,4 +1,5 @@
 ---
+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 feacebfdd475fb4b8267799385c2e1b345ce022d..776fc70727464c741a53e524d96ddf2f55cdff94 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,4 +1,5 @@
 ---
+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 691595635274d473828b00fa3b7a85290947063c..e509b4d2af2a37fbd8485497285d4c6129c4a053 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,4 +1,5 @@
 ---
+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 a100a5bebe72c5ddbbb20e61050fe849ef4aa451..5ea5120b0631ab5bed556c5a97cb8aa7b9e5df25 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,4 +1,5 @@
 ---
+data_category: Optional
 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 77ae29b729a4d4c869a814e1b87dd4552fbbbd24..db9f1d993606493851fd1aae017cbfb97a474d2c 100644
--- a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
+++ b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 e09222561048414a9a1798e0674ba98325a96754..5586b4755cdb9dc2faa885d19c6d977f83cf70a4 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,4 +1,5 @@
 ---
+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 7c5303ecd8f1fe1f8cd64c112056eda9e140bb59..e0ec4d50413d6e77f1273c4371d5c5e3cf7b4aa6 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,4 +1,5 @@
 ---
+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 bcf7a4151383e100c38fef3d53a8ecefa9253712..fac65eb896f66f9f16a9998e51ce484c59485f17 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,4 +1,5 @@
 ---
+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 8ea3318bc0cb61d1810b4aa09f366643c5c70bcc..044b8037d05eedc216072c70f29d0b65505f858d 100644
--- a/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
+++ b/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 6baaabf76723cd6c3c1c11cc43c2803c0df09747..b84f9be0a1d3bbdb84f2e5b86f88cf6811309063 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,4 +1,5 @@
 ---
+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 51c2b5620574a574a22c9afce6f8c00a574701a2..ddbffe293560a84426f9927726c65c7eb49772c8 100644
--- a/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 be0524b633c342bf15f09a2f332970cc615334ef..ca647f138d542c5724c31c499bf8ad92b5c1e47d 100644
--- a/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
+++ b/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 9fa5af8c7c0cb73da000e718c9040fab6d274503..e6f74098306fde246862d2383e986a0589d651d3 100644
--- a/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 cbd8aa83010b25ccbcf75526e337266d017ce3a1..69b46b3d0feca179e2bba486339dcd36cb0734f6 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,4 +1,5 @@
 ---
+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 3075ed64103c7e3b364f0b6606450c6f56f2915b..ebb754bad3bf982b3620f463dc8ded867e53cdcb 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,4 +1,5 @@
 ---
+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 9a83fe2b6e4ab11a341b35b7836b6273bac79f7a..bb5918c155a5540bd44415467bfdc4e7a38a2d19 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,4 +1,5 @@
 ---
+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 9a90dc7a972cb52353558751b040ff2c37dff911..7f607aa3dd0c4285480a582dc60ed9b19ed12d27 100644
--- a/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
+++ b/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 778c15ac26bf09914e7c4827ae6c9368aae1a69f..8987d7325e71958a82a784bdbaf8b9c5e444ebbf 100644
--- a/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 2c785a8653aad5450d18777b1a412dc222c898d2..551975324bc83c5da4bab6f6d6ca724080adc1ee 100644
--- a/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
+++ b/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 68b668e7fc1ec2fcd3276f188ccf0df8481bda39..b7e6cec88cf6f30f761a69f0c064e693569aa8c3 100644
--- a/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 a14340571a671f9c22f5b091d5c0f7756d3901cc..ac99b84040de241783cf4fb519dd81587e0e8d7f 100644
--- a/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 d078d4bc7ce896bc2b4f3f494a4d916abb6ea777..481798bbcd0340348ecd1150cd0d64abb9ad6410 100644
--- a/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
+++ b/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 5be644e630f44e7f3d48021a9e06996e28402f98..9e2a63ef6798992e64f18ab0d9a8db8093636825 100644
--- a/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 8dcdee2b04168b851da951bf0dbbb5a7fccaea9b..7e9130cea3476f0ec528270819bdfad56cb5b65b 100644
--- a/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
+++ b/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 bb1b0d332fde99109783ba3e479e3a33968251d2..ca01e8c22e106dee0f0849f0d6b6150137853f7b 100644
--- a/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 30c1794a4a1a57d5e0209f8259e45f5c68226708..89f1ee7ed8994e0e4d8605f2425d5964eab3ca93 100644
--- a/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 8672b1aa7b8153a7d45e3a3411cf1da011de9901..3ea1c762b8b4ea7af0a332564437e68ff83d23ca 100644
--- a/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
+++ b/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 5ac680311f3cb82d0643034a69cc7e50ed4223de..f7f314181ae246c508dc8543d6c8e2ba36065984 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,4 +1,5 @@
 ---
+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 16c1cbd1360354e2b9e9071109f96cc787e03fd0..5fb1f9782ba248d584a230496bcdbd369b7df05f 100644
--- a/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
+++ b/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 0d8cbf4fb0bd0eb9d608a2c2d6f5acfcc3311e2a..8d695c1cae69491c1e950590224271971a73bac8 100644
--- a/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
+++ b/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 9faa26a1236505ee495a6fc807d5d419c0eca9ba..8d5e2f2811084a6a40de3aa92dd27500a2485d26 100644
--- a/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 d322615104d8ec26bd26186789646042418379c6..f008cc32c600bc7b6053f1f8633bed1bb409b116 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,4 +1,5 @@
 ---
+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 013ae8790a18ab255f6fb44e2d1c0cf4373c7931..4f916ec0790251f07e2955ede948c4918dd76f8a 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,4 +1,5 @@
 ---
+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 c3faaf91c0a37aa4d7fe15d9a2e0ea35b40a4187..238f1d6aeae38782cd41cc857839795a2a7d07a2 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,4 +1,5 @@
 ---
+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 204c336983782b34462b7e9e7661366042332e9b..c8d2fee4a3681cd33516f6bebac216faac1f638f 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,4 +1,5 @@
 ---
+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 fcc04db33b8525ef378eac1ec583af0d2ddaf21c..275dc78a488163bd774439f8d497ada5f140eedc 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,4 +1,5 @@
 ---
+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 863c61968afc0c01f336d87012ebffedf4fb939a..43017704a3b2fb0af70ff015ebfa65adb51de6a0 100644
--- a/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
+++ b/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 0c4f673399905c7768a751b468f0e89c3eff18a7..2d86310480878ad69f81ba324e005ddd22d4196a 100644
--- a/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
+++ b/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 74d8e8e7ad3f6a69eec763d1f26f0a2c264b2515..e02663015f1279e40b314fc63db45ba1a63bdbfc 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,4 +1,5 @@
 ---
+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 619996168d26faa88dd463bf7b0a5fe8bb5ecaf2..38eca135cc46e90a32c7caf5f2708a1a4ffac0d1 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,4 +1,5 @@
 ---
+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 3708266fd0491a18bb66cf0cf48195fd114ed1c8..0c06fca60a0680d6352fd0cf1128380de8944015 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,4 +1,5 @@
 ---
+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 be39d3c91c627c09dd3634c4f161943fb0ae30b0..4e0605f1ee675dd61dcbd671e3eea5caf165672b 100644
--- a/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 6c1f138971f7f55af18afadb918d22bf3888d799..1690e634a0172a86485b7e4d83bdb530bdf36a61 100644
--- a/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 2acae16666ad5a0fbe8f428981ddd70bb9bbef92..84f201ebb21a81697f2e9225f64e602df4a2117f 100644
--- a/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
+++ b/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 e0d0c008b7248a106b100f9e60453d629b07edcf..7a792e721f67889d479f0c3dc59326a0ba5f4159 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,4 +1,5 @@
 ---
+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 3caea4e2eb5c2f19771f2f60837f66a00ca78d58..31c10b3ac34dbb6b8fdb4113268752f82d68a428 100644
--- a/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
+++ b/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 cff94935c33176aca104348fe4e996b7a05f080c..99866112c5d0f20dd5058f5e83aca2d625847fb8 100644
--- a/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 d292412905621878a24615b7879147dd4bf033c2..4cbc8aea8f6bc5257d23299c1d27a51f173d8299 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,4 +1,5 @@
 ---
+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 da7317161c88017ad2838c5cdca57175240dde56..220db3470ddadbc6e49f959a37cbf7a14d203d80 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,4 +1,5 @@
 ---
+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 f807469caf6ef853e83b618803bfb3027913b43b..7a9f050ebbfeaea06ca7b9c7ebac94d385babaf1 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,4 +1,5 @@
 ---
+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 3e33f8ce3a1dde3d4a52c91c7f58b7601be0f6f9..65ad4cd898cb6929a50a27295f86d15bb1d921b6 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,4 +1,5 @@
 ---
+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 f32c83f940ec2218f747a0c052857df6f8ffa0bc..6fd22faa3d72427deba874184aa6b2883e429dee 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,4 +1,5 @@
 ---
+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 bb1b636661d7ef788b47d5c9dc552da1f7401b66..e47a83fd09e9b1a312ffd00a651815a772f8c36c 100644
--- a/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 c3461c4f015f457740f00c2440bf0ae21e27a8fa..406edee879570bb35d9a5949dcd5a649cf45e175 100644
--- a/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 e85ddf9bf2b24763ffd17b296ad1f125e838072a..d8d2778ac384715d327c19b925eb5ef0e889aedc 100644
--- a/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 03df47690812d5ccf2f10bdcf08aa7d5026806ea..a619b3def4500d00ae80fc2602593fd1b4ee704e 100644
--- a/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 76464e5dd27aff4cde8a03ccf06e1822f8b0328a..de1b4a6a58328db05bd3e715262edf4173b4bf16 100644
--- a/config/metrics/counts_28d/20210216181923_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
@@ -1,4 +1,5 @@
 ---
+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 e1d7f0b9762a72a244e6744d0890401af0ba7f19..92a7dc95186597d4b805c158cf378b9966459ac8 100644
--- a/config/metrics/counts_28d/20210216181924_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
@@ -1,4 +1,5 @@
 ---
+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 e8a4ee547e845698a84c39f6c9ca1a8c2fbcebbe..21dcf0a3884d49fd01e79d1674243110f07dc562 100644
--- a/config/metrics/counts_28d/20210216181935_deployments.yml
+++ b/config/metrics/counts_28d/20210216181935_deployments.yml
@@ -1,4 +1,5 @@
 ---
+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 2a14b42d03d393db8e070a7a90cc4f6e78a49907..75496173175adf16c9ba55128bdbc2f95d03285e 100644
--- a/config/metrics/counts_28d/20210216181937_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
@@ -1,4 +1,5 @@
 ---
+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 bd76a32c973890cf9d69ae5fb35c2507bcde41d5..232a8c12873612dadfb4865f3cb8f098d3c7bbaa 100644
--- a/config/metrics/counts_28d/20210216181939_releases.yml
+++ b/config/metrics/counts_28d/20210216181939_releases.yml
@@ -1,4 +1,5 @@
 ---
+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 b2052281d6ee45a9d58115ad5cb80c09f4c47c3d..a3c5e8f73742ef90eb4f6eff090039deca10517b 100644
--- a/config/metrics/counts_28d/20210216181941_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
@@ -1,4 +1,5 @@
 ---
+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 a4047f8eabe9a5a09dad8c56236f797f2f0db4a8..f80caef1333578eaa4ae5217f772806a14f30595 100644
--- a/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
+++ b/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
@@ -1,4 +1,5 @@
 ---
+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 c676e83f2d99f63ba685b29ef4e28c81056fd8ad..abececa5498abcbe4ebff65c9c1e72a07834049c 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,4 +1,5 @@
 ---
+data_category: Optional
 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 0f5a6b3c03de85c75f930ccea0646d05c9026b25..62ce9d03fa0d543a8d695c6d3790682030b494eb 100644
--- a/config/metrics/counts_28d/20210216182034_deploy_keys.yml
+++ b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
@@ -1,4 +1,5 @@
 ---
+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 eb82cc1f0e69204bde6322372498f38a043013f4..95d2524dd6ebb8d05414a8b207bc719e779f0562 100644
--- a/config/metrics/counts_28d/20210216182036_keys.yml
+++ b/config/metrics/counts_28d/20210216182036_keys.yml
@@ -1,4 +1,5 @@
 ---
+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 bb64dcb32ca556eec0098659e3302c2f21485402..01375ac058415d32635f312d04ab246825d1e633 100644
--- a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
+++ b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
@@ -1,4 +1,5 @@
 ---
+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 f1f00fe59e3871c8fbfd249a542b6686ca3e887e..cecef03078d0172db628c9618f3983a166a90310 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,4 +1,5 @@
 ---
+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 de369a47ffb5eb8ad5ffc7328967a0ea348dfa1f..b91b87800e1ca8ec7553b5a6f97c2b66e526a24c 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,4 +1,5 @@
 ---
+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 83c923c173e9dc1c946ec584cfb6e71f3bf6df85..196ecce497e584844dd7e9bc4096eab29397271e 100644
--- a/config/metrics/counts_28d/20210216182051_protected_branches.yml
+++ b/config/metrics/counts_28d/20210216182051_protected_branches.yml
@@ -1,4 +1,5 @@
 ---
+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 527cc42df22328de49535c9c83089364a12423eb..834bfca933b9cff7d7834790f3f0e2f3d572c0e7 100644
--- a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 971e3defe2502879420f889cd358e7c63430b80b..b63c79fa9b53cd5afa0e5cd762dd509d1fe1c86e 100644
--- a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 d60ec7f438b01eee18d9651e7791dde87fa16fa3..c5b38cf041e7448c8677e916e7efb3adce41f01c 100644
--- a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 629b346a6aa69a1d2b68566a916461bbe60abc9b..36a8d5829ea7ce35e10d8e5f57721a532d4e6ec7 100644
--- a/config/metrics/counts_28d/20210216182125_user_sast_jobs.yml
+++ b/config/metrics/counts_28d/20210216182125_user_sast_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 0502b28213e233f281ac4ee5108a3e60d7718b0c..83d06c7eb60ff24746db37a9051a8431b510bb02 100644
--- a/config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.yml
+++ b/config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 f655c4368ad549186ac03dba91873d80d17c381f..6b7ec4c87dab3c5a89d21add3e6364e7615b6453 100644
--- a/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
+++ b/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 14985c91f86747a1e9a6c2f23e8228848b2d47aa..257ea5cebfd89699b8395d46e79f60e1344fbf12 100644
--- a/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
+++ b/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 fa4b6b149469fe49128eace0c366314eeb7804e7..0a94cd08b0e1f70463916e1f7e3f5108ffbd1985 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,4 +1,5 @@
 ---
+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 b5ba1f7d66b25dbaffc11c63311ac2a6049dd497..64d403d10d3efb48c044e8839b1f5bd9d2c6ca2b 100644
--- a/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
+++ b/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
@@ -1,4 +1,5 @@
 ---
+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/20210216183201_compliance_features_track_unique_visits_union.yml b/config/metrics/counts_28d/20210216183201_compliance_features_track_unique_visits_union.yml
index a0f14b7a760e2bcd87c3edf4a94756fc97a82abe..3c22304fa8681ef4a7facbd4b8ef05bd77dc0400 100644
--- a/config/metrics/counts_28d/20210216183201_compliance_features_track_unique_visits_union.yml
+++ b/config/metrics/counts_28d/20210216183201_compliance_features_track_unique_visits_union.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts_monthly.aggregated_metrics.compliance_features_track_unique_visits_union
 description: ''
 product_section: ''
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 1f9832b220db4d1ed01e0a45005316c57d24fc77..a412754ca62a62ce2dcdb09017ce2bea8c79ef87 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,4 +1,5 @@
 ---
+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 171b2a0a0320d7f87abdaa8aa70c817e5631f98c..2583c51990f63b2f4ba3bc4274c0b7ebfbd5935e 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,4 +1,5 @@
 ---
+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 fe7f0a33d9bd013da80c6d8e05b8506d25601231..2a3544fa601c102fe04cad8589a690a4c5e0b83b 100644
--- a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
+++ b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
@@ -1,4 +1,5 @@
 ---
+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 273589b53a2e99861ed77e8dfb262bcb0af5843e..0165a40155e60a31770b40ad7f1a69699f82173e 100644
--- a/config/metrics/counts_28d/20210216183629_two-factor.yml
+++ b/config/metrics/counts_28d/20210216183629_two-factor.yml
@@ -1,4 +1,5 @@
 ---
+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 05b8c96646db80265a2c672d065cea76335c9bd5..d814e539b268a3018ff409290ddd10c1ef3e18db 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,4 +1,5 @@
 ---
+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 a386ae4fea418ba3806a4f0067e5b9687dec0e73..a910851e2f038fd9b506a812445fa0af6109f8ec 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,4 +1,5 @@
 ---
+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 12f33070c85014a9f62f6735a4d875a5f04ef4c2..0144c251c9381d359f611f6046f7f38dd14b649f 100644
--- a/config/metrics/counts_28d/20210216183634_standard.yml
+++ b/config/metrics/counts_28d/20210216183634_standard.yml
@@ -1,4 +1,5 @@
 ---
+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 e7cbc3718bbe90f11e52d9c8c2eeb21c9b22d500..ce5112fcc88b640c51948d81bd415708bc741a82 100644
--- a/config/metrics/counts_28d/20210216183636_google_oauth2.yml
+++ b/config/metrics/counts_28d/20210216183636_google_oauth2.yml
@@ -1,4 +1,5 @@
 ---
+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 670b8d555d8c3d1194957d1eb9fd04b646f253ae..49473e2cfada44f41a6613ef0726e51d2e5619d6 100644
--- a/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
+++ b/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.unique_users_all_imports
 description: Number of users from projects imported
 product_section: dev
diff --git a/config/metrics/counts_28d/20210216183640_gitlab.yml b/config/metrics/counts_28d/20210216183640_gitlab.yml
index b71e1ac45727855a882ab8b40576cf393931232f..2c53566fbd5f5c9d5a47cb6bdd4220e915e1ed7e 100644
--- a/config/metrics/counts_28d/20210216183640_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183640_gitlab.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.bulk_imports.gitlab
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183642_gitlab_v1.yml b/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
index ee61abedd8ac8774e7d302fe4a31d9ca02f433cf..dd0ba521d2f4fe741bfa634c2aa25243d8a28769 100644
--- a/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
+++ b/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.bulk_imports.gitlab_v1
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183644_gitlab_project.yml b/config/metrics/counts_28d/20210216183644_gitlab_project.yml
index 03c2d993a6cff9d7af7994d74b0f68cb61b0ddbd..6ec8fdc7509bf6e820cc592f02e50823b6fb54d6 100644
--- a/config/metrics/counts_28d/20210216183644_gitlab_project.yml
+++ b/config/metrics/counts_28d/20210216183644_gitlab_project.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.project_imports.gitlab_project
 description: ''
 product_section: dev
diff --git a/config/metrics/counts_28d/20210216183646_gitlab.yml b/config/metrics/counts_28d/20210216183646_gitlab.yml
index a3e1f9d35b09c04fc061d5ab7adee955672eacb9..09825a146db5e1fc9ea16f792908740df4d35d17 100644
--- a/config/metrics/counts_28d/20210216183646_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183646_gitlab.yml
@@ -1,4 +1,5 @@
 ---
+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 124ae696d685a064cd80077b57ae98bda122ba79..62873a57949db1526a4e80632581e6b720533350 100644
--- a/config/metrics/counts_28d/20210216183648_github.yml
+++ b/config/metrics/counts_28d/20210216183648_github.yml
@@ -1,4 +1,5 @@
 ---
+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 9d8b9374e3f329e499858e873e405f7721dbd898..82be4fb910a803b74e4abd707b5cde86bf588f61 100644
--- a/config/metrics/counts_28d/20210216183650_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183650_bitbucket.yml
@@ -1,4 +1,5 @@
 ---
+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 e84adc3aba8b10c0b9519e97dc6686f32e48993f..cbf34c1d7cd2dfc2ca0f7629f7e874c48b856162 100644
--- a/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
@@ -1,4 +1,5 @@
 ---
+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 46087d194da66d56eef65fbcce1c2c77cf509830..0b660825f83c4d60c29e57edeb7198ee9b82d3f2 100644
--- a/config/metrics/counts_28d/20210216183653_gitea.yml
+++ b/config/metrics/counts_28d/20210216183653_gitea.yml
@@ -1,4 +1,5 @@
 ---
+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 e0f3a1da4e1ed560bd0255cc7be925a537bb9c7a..7b0457c5902e516d94a5063dd3e18a4e97080d27 100644
--- a/config/metrics/counts_28d/20210216183655_git.yml
+++ b/config/metrics/counts_28d/20210216183655_git.yml
@@ -1,4 +1,5 @@
 ---
+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 3bc9b639a59bce1867501cd09fd07e78d8506884..28796fefaf46274d9fe9c591bfc3b4558fd07bf3 100644
--- a/config/metrics/counts_28d/20210216183657_manifest.yml
+++ b/config/metrics/counts_28d/20210216183657_manifest.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.project_imports.manifest
 description: ''
 product_section: dev
diff --git a/config/metrics/counts_28d/20210216183659_gitlab_migration.yml b/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
index 1304ea7b166cf09597c88489e2b50a5da24644dc..081992cab1f4750d315148eab4e1f152ac119aba 100644
--- a/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
+++ b/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.project_imports.gitlab_migration
 description: ''
 product_section: dev
diff --git a/config/metrics/counts_28d/20210216183701_jira.yml b/config/metrics/counts_28d/20210216183701_jira.yml
index 1ce602b4bd1fcc35f5e888a7287715452cb9d3c0..3dbb664d5f6bc675c8bdbd6e4def18d06a09060a 100644
--- a/config/metrics/counts_28d/20210216183701_jira.yml
+++ b/config/metrics/counts_28d/20210216183701_jira.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.issue_imports.jira
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183703_fogbugz.yml b/config/metrics/counts_28d/20210216183703_fogbugz.yml
index 3595c0ffdce989f203c8dddfccff01cecc0d254e..e89d9a7befbbdda5c5d40e1caeb63b7ca7618064 100644
--- a/config/metrics/counts_28d/20210216183703_fogbugz.yml
+++ b/config/metrics/counts_28d/20210216183703_fogbugz.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.issue_imports.fogbugz
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183705_phabricator.yml b/config/metrics/counts_28d/20210216183705_phabricator.yml
index 5be1c6263aa10cddf14d3397b4ec2385e7a579a5..ecb92ce04ff518820b2ac0723c2b8cc9b338f14b 100644
--- a/config/metrics/counts_28d/20210216183705_phabricator.yml
+++ b/config/metrics/counts_28d/20210216183705_phabricator.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.issue_imports.phabricator
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183707_csv.yml b/config/metrics/counts_28d/20210216183707_csv.yml
index 398d740d78d02446a8179693af483f1921e0a083..5558447f92c6a44dad40b04a12e1e0f67f988877 100644
--- a/config/metrics/counts_28d/20210216183707_csv.yml
+++ b/config/metrics/counts_28d/20210216183707_csv.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.issue_imports.csv
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183709_group_import.yml b/config/metrics/counts_28d/20210216183709_group_import.yml
index eca3eada4d4b282a7a13da2677ee00f04b76fdb1..11c9ed4440ca6d354029435e63057b666d1de13c 100644
--- a/config/metrics/counts_28d/20210216183709_group_import.yml
+++ b/config/metrics/counts_28d/20210216183709_group_import.yml
@@ -1,4 +1,5 @@
 ---
+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 1399e4ebe6d35453004c20c167fd309d9436ca89..1314f58743818a8f363a265001d2ef9f6c41638b 100644
--- a/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
+++ b/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.group_imports.gitlab_migration
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183712_total.yml b/config/metrics/counts_28d/20210216183712_total.yml
index f91e9e015fab0d7b2fdd869fde1f1259f14fccf1..280a493e4a76dd6f8a31d0bf0669fd9914e89fdd 100644
--- a/config/metrics/counts_28d/20210216183712_total.yml
+++ b/config/metrics/counts_28d/20210216183712_total.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.projects_imported.total
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183714_gitlab_project.yml b/config/metrics/counts_28d/20210216183714_gitlab_project.yml
index d6096290073e095ec64db8660e0631e8a01edf4e..a4fdaa791b621674134ee5f87838451b040d871b 100644
--- a/config/metrics/counts_28d/20210216183714_gitlab_project.yml
+++ b/config/metrics/counts_28d/20210216183714_gitlab_project.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.projects_imported.gitlab_project
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183716_gitlab.yml b/config/metrics/counts_28d/20210216183716_gitlab.yml
index e1199192515f04c9b4114c1d9423e14cc8a71b97..6905da714afd30e3ef8200ba5e2a77f68abc77d6 100644
--- a/config/metrics/counts_28d/20210216183716_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183716_gitlab.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.projects_imported.gitlab
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183718_github.yml b/config/metrics/counts_28d/20210216183718_github.yml
index 2dfe7b88f0d1bcbac5ebc9983f2d4cba4eef0823..1ca1658a8abb1cd64b5f4cd40812aad0d592fcd8 100644
--- a/config/metrics/counts_28d/20210216183718_github.yml
+++ b/config/metrics/counts_28d/20210216183718_github.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.projects_imported.github
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183720_bitbucket.yml b/config/metrics/counts_28d/20210216183720_bitbucket.yml
index b3b34c95800e140bf1ba0061cfea9c3e931614ab..0239d138193823fadb322ba82183a262f0169e11 100644
--- a/config/metrics/counts_28d/20210216183720_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183720_bitbucket.yml
@@ -1,4 +1,5 @@
 ---
+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 1a8ace962e0784715642240745853ec2a2ad043c..4ccfeaadbb31e229a548072586695d32e5fc7ba7 100644
--- a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
@@ -1,4 +1,5 @@
 ---
+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 d35f33c30b33fdc1cd40eae68a36a6697e94537a..2a383c2c976352d991a9dae9ae8bf3f67bd8b153 100644
--- a/config/metrics/counts_28d/20210216183724_gitea.yml
+++ b/config/metrics/counts_28d/20210216183724_gitea.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.projects_imported.gitea
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183726_git.yml b/config/metrics/counts_28d/20210216183726_git.yml
index 2e86b7120d39cfe5da280fd64a4b105ab65703af..e0f91fbea1e51dfde7b5eabb5befd8bef1d57e51 100644
--- a/config/metrics/counts_28d/20210216183726_git.yml
+++ b/config/metrics/counts_28d/20210216183726_git.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.projects_imported.git
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183728_manifest.yml b/config/metrics/counts_28d/20210216183728_manifest.yml
index 9bbfc70d6da81d077d394e3a78a5b03113a80751..ba44bc90e64fef9b73ddc00a8ec25846767732f3 100644
--- a/config/metrics/counts_28d/20210216183728_manifest.yml
+++ b/config/metrics/counts_28d/20210216183728_manifest.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.projects_imported.manifest
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183730_jira.yml b/config/metrics/counts_28d/20210216183730_jira.yml
index 78321ae77779781810afb65e8931e50ee35422c6..fd4558506cf9c21c52af67f2698be5c99b659842 100644
--- a/config/metrics/counts_28d/20210216183730_jira.yml
+++ b/config/metrics/counts_28d/20210216183730_jira.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.issues_imported.jira
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183731_fogbugz.yml b/config/metrics/counts_28d/20210216183731_fogbugz.yml
index d504e4ce788a4ad71e4901f8e8dc4138fd68b42c..09892145b27549afd18a4c4275a578452fc5eb5d 100644
--- a/config/metrics/counts_28d/20210216183731_fogbugz.yml
+++ b/config/metrics/counts_28d/20210216183731_fogbugz.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.issues_imported.fogbugz
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183733_phabricator.yml b/config/metrics/counts_28d/20210216183733_phabricator.yml
index 82f9cc0e8aa0427d32cd6d2f07f0aa8b7bbab83f..114fb7ef89795132196a8d50c34a3332b5fae662 100644
--- a/config/metrics/counts_28d/20210216183733_phabricator.yml
+++ b/config/metrics/counts_28d/20210216183733_phabricator.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.issues_imported.phabricator
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183735_csv.yml b/config/metrics/counts_28d/20210216183735_csv.yml
index c81db1420223f8e2326f17ffe602798f5742b7e4..c7f0f6c72b9a03fa720953811d559a767a452b37 100644
--- a/config/metrics/counts_28d/20210216183735_csv.yml
+++ b/config/metrics/counts_28d/20210216183735_csv.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.issues_imported.csv
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183737_groups_imported.yml b/config/metrics/counts_28d/20210216183737_groups_imported.yml
index 10ffa325a11ca498509a2a2e522fb9edffa7a485..64fcdd349044ea5ed3ce8741128729eb40bce43a 100644
--- a/config/metrics/counts_28d/20210216183737_groups_imported.yml
+++ b/config/metrics/counts_28d/20210216183737_groups_imported.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.groups_imported
 description: ''
 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 c93f4bfbe85ff2c76f1bef2255823010b2d24456..aed275aea857359a6912951247e7f51703561a1b 100644
--- a/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml
+++ b/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 81824a66f09ee46be8b92a40ff4a30e5faf0e717..ce7c330b9e6e9699a4c2d2b3c2e7735966ef9173 100644
--- a/config/metrics/counts_28d/20210216183826_sast_scans.yml
+++ b/config/metrics/counts_28d/20210216183826_sast_scans.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 f05361d80bc4e2c4c931c2575b2d240472ff2d97..50b63f70cb8f148f545e0a00b635ce6798311c5a 100644
--- a/config/metrics/counts_28d/20210216183830_container_scanning_scans.yml
+++ b/config/metrics/counts_28d/20210216183830_container_scanning_scans.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 daa8db24b65273959a5a7b6664c9a274925eaf00..e19a593148b77b09a531f3089f1e73170aa9e620 100644
--- a/config/metrics/counts_28d/20210216183832_dast_scans.yml
+++ b/config/metrics/counts_28d/20210216183832_dast_scans.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 dfab9034bd0b78e9207e251dc7cbdc9b7f2c2e67..ce5b9f69eec9afa11034585888d6298ea2aebe24 100644
--- a/config/metrics/counts_28d/20210216183834_secret_detection_scans.yml
+++ b/config/metrics/counts_28d/20210216183834_secret_detection_scans.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 9e3248c7211d1928a71e4dd0ed476b752f62a326..6da04ceb693be5411637582a8c76d96e9e171944 100644
--- a/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml
+++ b/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 db92fcddb749ea4065c07824601e21841311f6b9..6e0a0781e17da20701f92c05b34ea9355072f3f7 100644
--- a/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml
+++ b/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.secure.api_fuzzing_scans
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183916_compliance_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216183916_compliance_unique_visits_for_any_target_monthly.yml
index a95d2ba6e8981ee6f81bab73fc76fef0a7d702d7..0a63dc0e24e14c4ad88d45bad86d67900316ee3b 100644
--- a/config/metrics/counts_28d/20210216183916_compliance_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216183916_compliance_unique_visits_for_any_target_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: compliance_unique_visits.compliance_unique_visits_for_any_target_monthly
 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 07e1d5dfd43bf4e13cfcf13c8c0e8b706af9f0f0..ef051f7031e684ebe980b9f5fab9a331c73e35d6 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,4 +1,5 @@
 ---
+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/20210216183926_g_compliance_dashboard_monthly.yml b/config/metrics/counts_28d/20210216183926_g_compliance_dashboard_monthly.yml
index be1f63fad187e3288426f281d8da2d5cccfa46cf..baabc62f7ee6339320acf5eff7336b911bed786f 100644
--- a/config/metrics/counts_28d/20210216183926_g_compliance_dashboard_monthly.yml
+++ b/config/metrics/counts_28d/20210216183926_g_compliance_dashboard_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.compliance.g_compliance_dashboard_monthly
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183930_g_compliance_audit_events_monthly.yml b/config/metrics/counts_28d/20210216183930_g_compliance_audit_events_monthly.yml
index d3262c4d9ca71b54f13a2e1fafc8ada1b7e623ad..64f7540bcfb346cdfbee922dba93ae1ed957fb0e 100644
--- a/config/metrics/counts_28d/20210216183930_g_compliance_audit_events_monthly.yml
+++ b/config/metrics/counts_28d/20210216183930_g_compliance_audit_events_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.compliance.g_compliance_audit_events_monthly
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183934_i_compliance_audit_events_monthly.yml b/config/metrics/counts_28d/20210216183934_i_compliance_audit_events_monthly.yml
index fb8284bcf315beabb3e2e9cee24a4005b898ee92..ccd95890045356c2e1f3c09b98bfdf2bb039394c 100644
--- a/config/metrics/counts_28d/20210216183934_i_compliance_audit_events_monthly.yml
+++ b/config/metrics/counts_28d/20210216183934_i_compliance_audit_events_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.compliance.i_compliance_audit_events_monthly
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183938_i_compliance_credential_inventory_monthly.yml b/config/metrics/counts_28d/20210216183938_i_compliance_credential_inventory_monthly.yml
index f05fedf23c976df377d8e74046cb18aa5d6c9a05..6f2461e58d8bbd2f35a2ab5a87fc9b6cd4f78db8 100644
--- a/config/metrics/counts_28d/20210216183938_i_compliance_credential_inventory_monthly.yml
+++ b/config/metrics/counts_28d/20210216183938_i_compliance_credential_inventory_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.compliance.i_compliance_credential_inventory_monthly
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183942_a_compliance_audit_events_api_monthly.yml b/config/metrics/counts_28d/20210216183942_a_compliance_audit_events_api_monthly.yml
index ba9bcfba41e4300e1642262304af2ce8b22f77b3..2001d65d7c547a42ef3458a7ec8bfa4a9621ebf3 100644
--- a/config/metrics/counts_28d/20210216183942_a_compliance_audit_events_api_monthly.yml
+++ b/config/metrics/counts_28d/20210216183942_a_compliance_audit_events_api_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.compliance.a_compliance_audit_events_api_monthly
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_28d/20210216183946_compliance_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216183946_compliance_total_unique_counts_monthly.yml
index 63131ea83e24c89338e5278592a348dbfea65467..fdd2cd4cab7c2aeeced98ced5b61218598f9ec5a 100644
--- a/config/metrics/counts_28d/20210216183946_compliance_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216183946_compliance_total_unique_counts_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.compliance.compliance_total_unique_counts_monthly
 description: ''
 product_section: ''
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 77ba0847a629e5f947e7aa50b2aa4d678f217198..c526e6bb0f8d78e13c2670142b70834991c5271b 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,4 +1,5 @@
 ---
+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 e0c301b5c0304e22d85a0f733946c23d0c0a3c7a..46bca52fe2b1944821b23928f1328cbf0d54182c 100644
--- a/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 381f691fe271f817454dda99565cb372f43d2714..3b86a4e46fb00c338ef19b43a1a72cd8d66a1000 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,4 +1,5 @@
 ---
+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 53590df359c69bb5007383a01fcc2dab0341448d..77386f794acde7fbb70e534ac68d58d54a071bc8 100644
--- a/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
+++ b/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
@@ -1,4 +1,5 @@
 ---
+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 915c5e69fba0a4c7078cbafffb2c2e8bbe9cb62b..376a48013720042796fc815f8e28586eb538a869 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,4 +1,5 @@
 ---
+data_category: Optional
 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 8e8f8b9b65b8e8d99aed271b7f1e7a2a05fd35a9..cfc5123301f3421ed37fff2112bc2b7bce72f973 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,4 +1,5 @@
 ---
+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 b562a0c63d5438ad2aabf065a4f8a3164520acc3..a1c0a6944904be896dc6852571465e4d6412339a 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,4 +1,5 @@
 ---
+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 cb0062c55a3afcdca389971351ae71afcd16bbe6..e29924c5f0564d62012d315382a9f77369afc0c2 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,4 +1,5 @@
 ---
+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 ce32c3ac89b8727a85c8648a488d63a19a6d0016..2c9046c237c34cf9ffb59172a78d3bf51ca1ff99 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,4 +1,5 @@
 ---
+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 b1c33edd117b7623db1b3f7bfaa38243545ddd07..c7a8cceb9d31c16080d285b5c68fbdfab1e7301d 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,4 +1,5 @@
 ---
+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 4200abff4fcb3c9a6c48a1a096f3d5e1c7d5330e..7efdd71c118f875cce1cb557002b3930b17f4f0b 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,4 +1,5 @@
 ---
+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 8cca5731801945dff4542ad68e5fcb85951d2708..37ba5d3feb64870d4d54aec5c999ac9e408867d5 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,4 +1,5 @@
 ---
+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 6fcc94e5337e1615af0941452925ac3b73500363..c36f9bbe167dc8f91844ddd2a9457aa65a5b823c 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,4 +1,5 @@
 ---
+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 5a11b327699a4fa15bee44c9974f2e3e2abe9595..9d31aafc1dbb26abe473c70e62ed85060de1f991 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,4 +1,5 @@
 ---
+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 3b8df2a615bc8bb3b47124d1dfeb62a7c835b79f..41e1b2a19185713bc6d756a84ab288b1eaf6e5e1 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,4 +1,5 @@
 ---
+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 717476547a83ecf7395fae3da8bedf78a6cd24fc..9054ab2986ac03f7cc647690f68f12c6bf24d77a 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,4 +1,5 @@
 ---
+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 8d797856907c09730d345bda102a8583b40c20fe..649272b492bf9c7c9277cb90d3f62ccf1b4b70b9 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,4 +1,5 @@
 ---
+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 867e6333c10941c5aedc42035035c5a5ade64956..fbd14f51a671a026b5ec09e6188983ff26f5264e 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,4 +1,5 @@
 ---
+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 7c2545bd3835f959267729076a9ea61731dd139c..705bac961fc1f855f4d8ba7174329bf30f4e9a80 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,4 +1,5 @@
 ---
+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 dd79d196318eb97d630b5f2a2057b1116a015846..71f0f150fc5361839c2f6c58356e025ac48e616b 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,4 +1,5 @@
 ---
+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 42285f42ac4671cf21f7c4e7292fcd4365d04d05..abefec023d033b6517219937179a3c02ab49602c 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,4 +1,5 @@
 ---
+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 664dfb2c36d82a6f3167d4918f7323dfc6e6514c..7ec7e97225ec2c45485e5055ce05c74ab4aae66b 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,4 +1,5 @@
 ---
+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 735f3f23d67c311279020170452d3237cfcaa85e..1c081c538a5bdd35990e127b749f422caeea1440 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,4 +1,5 @@
 ---
+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 e32c033f22fb638cb6438833904ed216c0caa5b6..4fa6ed3886e520950a49352e1879109ad6156b0e 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,4 +1,5 @@
 ---
+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 ca8baf5a5a4204cfb433a164a16ff411a044240b..6f049c8f04dd22dd3efb75140e85cfc6ce77a03f 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,4 +1,5 @@
 ---
+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 d5cf11af2a5fb9923b23531d99ab73c8cb37a631..22d442d0d84a4ced6b5f652d9edb2cdd6f4e703f 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,4 +1,5 @@
 ---
+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 b8ed6e7b1cd0ae538c1fd2ef515e2e0623ebbf4f..cc733cfa149412d2a0f5d5eab91e3f1523f8b15b 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,4 +1,5 @@
 ---
+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 8881a5a75089e8901bf73057327de7c0a80b5c37..8d3792288c9664a1718c6a9da74d4af6589b1587 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,4 +1,5 @@
 ---
+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 53ecb748e05a13d3be7303fafbd795af8ea21061..79a064cad5922b6a1d8d031c10ba359b7df546ce 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,4 +1,5 @@
 ---
+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 eb9df486c8c6a38fae8584b59cac9be92d3d38d7..84166d3edb78225c99bc58e7fc94182bf5cbfaaa 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,4 +1,5 @@
 ---
+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 dba5b22c3d95990611b115797c48604f738723e7..170de93af35e73a973acff0e6b9d35c95ad52589 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,4 +1,5 @@
 ---
+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 5bb03d5c1c9ecdf2604c748a072fadf6aad6cee8..37cb1d072a06b69449667c6e9c75e520c9945c20 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,4 +1,5 @@
 ---
+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 d519411c9f84a9940eb4be6eefbb2ce7e1175063..2b45b340aec8b7ce714fd97552ec0dd80e01187b 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,4 +1,5 @@
 ---
+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 5e1b1c837b0b1560ba2f1dee4ad7582e5aad3c52..3ad6b97db3749dac573c7d154e19a159eddbd2c2 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,4 +1,5 @@
 ---
+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 982c62a62f6f89d76481fc4ef49f6e89aa6ab6c7..ee2182d8c837461a237b9c491ad047148107efa6 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,4 +1,5 @@
 ---
+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 3e00fd8c78474a50e44ff30e03d35ec28b3e9865..471923e85c3a29afb65609912b0a0daa1ca2021e 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,4 +1,5 @@
 ---
+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 ef6b254a6b43cef0663c4da43ac65f374be13ce3..54b5514d8a1c81a59feb95cfc3a5457e30dabd11 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,4 +1,5 @@
 ---
+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 3b272166ed8e124555a87ca24389b6def94f4820..01e0fbe81b2ee1972859d1d545c95a76160ef1f4 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,4 +1,5 @@
 ---
+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 2c66fbbd95fcfd53b704a734cdb532fee8d080e2..c6f9087c9bc042e99656acd947abc87d5dc431bc 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,4 +1,5 @@
 ---
+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 d7ba2da5d9f411166a8bb825808e74024dbac0bf..2fd81cd64af71365a51195e54df956719100bbcd 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,4 +1,5 @@
 ---
+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 e8907f63243dced4dcbf6749ed902463f5ceb658..2938236ef568314f660a3edd4f70d3b03869036f 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,4 +1,5 @@
 ---
+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 b97c400552927d2a824227e2645fd4223078be32..15e28870d1120cc00b1c9b35072049a64702c607 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,4 +1,5 @@
 ---
+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 866ec122f28d552655ed9c4fc7da1d9c272249d7..3bfa045b833a47284113f194f396c06aa53e35a1 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,4 +1,5 @@
 ---
+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 1dcc98ad9751ee98c049cfc20220a8678e173af3..e3f418abaa21a9384e1d6cd40a71205757267abd 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,4 +1,5 @@
 ---
+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 a052c79584e0744e3fedf6d1aa8d6038b84e6212..82c1717e3cfa6f011f838839cb372bc0a6b2ed08 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,4 +1,5 @@
 ---
+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 7f2f93f909ba014a06a9669b5340704ac72a5eb9..52256b10097981b59f9fe75fd20bb7c18144b94c 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,4 +1,5 @@
 ---
+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 6a2bd47f7257e5b10a22e06c10ffcdecb9d04af5..adc89858093021f0122936af93d6ca097dfe835b 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,4 +1,5 @@
 ---
+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 4bb6038634f8cef69ca814452dc25ba5d3545f24..3b6951db6972b74554325afbde0958c6d51f66e1 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,4 +1,5 @@
 ---
+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 1bf0aa9697db0c814c24ef04484ab76a2b740cce..b1685bc86bf1c557530de07562e008501ec4a788 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,4 +1,5 @@
 ---
+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 cc4754964dd740e4a7a660fb3b79e55f770d20b5..a852830bd40b7d2d790c09fe5b2d5adbafdd54f5 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,4 +1,5 @@
 ---
+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 3b4f45e07371f938d56650530c13155fd3df422c..a7d1fdc1271071f70af98f35a4e6de0a80246446 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,4 +1,5 @@
 ---
+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 eabb8cff15fccf30a4c28ecda65396b04fe7cedc..415d136fadc7900b1e7d2b9c1d3521dbb2a5b3d2 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,4 +1,5 @@
 ---
+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 fc3b6db7af86049f1f4e82a1a0a913517213a996..10e3d1546983269d83c1f231ee93f4b1547dc288 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,4 +1,5 @@
 ---
+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 6dfb7a6a20107715ebfd1b6f5245746bb6bc8212..ea9d0c6434cba181d395836cdecd33f55cbd7a5a 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,4 +1,5 @@
 ---
+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 9a73f02c128fe4a5a8a7a1c7bcd3d0fefea21662..5e840499c9ea302b1b1250b374a4e2b72ca584e1 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,4 +1,5 @@
 ---
+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 6a9856418c463c2e2744bd2f3b6aa09d176b40cf..9e96d08b8eb09a03d5bf52c434200cf6a86c1bef 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,4 +1,5 @@
 ---
+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 9df4ad1d53ea3453def701b87ec0ce0de1fa0243..007a008717320161c4bdc4c830c55599464b7a37 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,4 +1,5 @@
 ---
+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 23cdfbb2be4acec1bc1f7e6a48570b6ebb24ae05..9c7f0a48d2c4400095c7621a493ff2320b6538d0 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,4 +1,5 @@
 ---
+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 44b005feeade483c549f67e1c28f1f1c420a742e..f4f53f344d33adc5ac3c172b7a559c55c65aedf3 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,4 +1,5 @@
 ---
+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 3ff19ed318bd3247e5c79c50eb02a5410f55b82a..d480e8eacf67ac7bc2f7c60388f4459afc64d5e2 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,4 +1,5 @@
 ---
+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 84993d1d227e1510e358d9b50321bae28ccec258..2683628049d887046e6d18c78091532d57eb2425 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,4 +1,5 @@
 ---
+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 8365d585d6a3a093349862d279ed0c2b5ff8553d..903f9f8b146f0f13e725d5f655cddcb41840c3d5 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,4 +1,5 @@
 ---
+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 8a8adf299a2ed9212c4efa0cb294b2a971d07083..0c559a16839a63bd6c1d9327fa6dfe1162052d81 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,4 +1,5 @@
 ---
+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 8f404ea70d357f69e1822a5e31dfc64d9ae69ec9..fbf543ab69b7853dba00d66ccff679b212b0ce96 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,4 +1,5 @@
 ---
+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 2c81962800aa078462900348a5335a1169d68cbf..8b73015fbfbbfcbde7599dd7eb151885e2c0bac0 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,4 +1,5 @@
 ---
+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 9dcfb6539947600d715c425952acdc1099b44405..4df4da25bb3f6ded50e16e2a922c6f4127034e92 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,4 +1,5 @@
 ---
+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 d975d7ed7ac030c727bd59964a8e255be4df2495..f8047de893d6b119f9ccd5751b4fb7dc46668c3d 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,4 +1,5 @@
 ---
+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 5e9533224707fab0f3f1c2a396f67870e723dad5..f39cb56f015f6459da6269818b643336873e8cba 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,4 +1,5 @@
 ---
+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 f01aba36f322cdc1ce474849cdd3ed6b01b3be16..f076ca149b20bdbfc8c4d98b97f1572e5025259e 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,4 +1,5 @@
 ---
+data_category: Optional
 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 d5a96845a4d3564cefdac9cebd162b30121a8f2b..10f02ffec9c9844679b1ed01acb6d4b232d73d5d 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,4 +1,5 @@
 ---
+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 81b6bd694c80de1c774f29e4d934c1fdc6581889..9c32f66fba6d6b3a4900f27feb2b146ea279a55c 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,4 +1,5 @@
 ---
+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 edd25537070bc235476a94a07f2a6cae1ceec150..76452c300b76d2fe6e39f2279098d8aeadef156e 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,4 +1,5 @@
 ---
+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 3541c7d48efebe82a1d54aabd557c90850de2708..6c66ac6b52efda96a15a67ab577f8acaec93ecba 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,4 +1,5 @@
 ---
+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 c4848444e75fae93ad72c361fa03d1765ac6c120..a3bcc3732a1779564bc371899a3c3005240d9c4c 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,4 +1,5 @@
 ---
+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 902c916245623a5051b35f67d55ee9236c82ffb1..5dcd06ba0bb7ba633827255007eadacd82f613ff 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,4 +1,5 @@
 ---
+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 b98fa24a789283729227f462afcd13082b2bcbb4..431c3459aeee6b2acb169523db7addc5c3a2d0d7 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,4 +1,5 @@
 ---
+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 109bf35b1c6c6556c09fd4dd81494a8e52163c29..35311eb3d03f454c6b36f4f9502e66f70a9d875b 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,4 +1,5 @@
 ---
+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 1bf8d97ea59f6cc629b505853d5153bcd4c47e0d..a7c127bbce85011cf6a290b14c5bc9fb414a2436 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,4 +1,5 @@
 ---
+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 2bc3ff7d2e1e7f5efcfa43c9d9a94455dc6588a8..20bc28884445ddb6319d974811fdef706326d558 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,4 +1,5 @@
 ---
+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 9008de987e84bb2b56d803a16811b18c9c73b124..a0364f3b662c78f52c2cac99d42b292e89ff46b0 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,4 +1,5 @@
 ---
+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 883eb32feb568a84940d403b199701c725ef6f7a..f3172ea968aaf72e05915ea03ce1cdd38eaf6ff6 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,4 +1,5 @@
 ---
+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 30d410e4b579a3a7e4c76d28e0957981385cd8f8..134273d95e042860c6d1324d16b187800f7f50cf 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,4 +1,5 @@
 ---
+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 b7093d8c0c5d59df6a89840b4bef9fe5b51ce406..e89aff85ae8f362c9259d1da22c77bcd4af2e1dc 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,4 +1,5 @@
 ---
+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 164d37d88e0a5d9a784e4c4b9205c5da3160ccb4..7982e5c2080dac4c166461f53c40908f87daf7ec 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,4 +1,5 @@
 ---
+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 ccf82319d9d2582356dd52edb7fe5f54fc3c2760..58a19c976ef327b3c91fe04729b592ea741b6723 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,4 +1,5 @@
 ---
+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 5333e2b7951c89de39b4902652da71b9fb52a60f..a496c23f27a8f236a33bec2281fc8e95b6b0e3bd 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,4 +1,5 @@
 ---
+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 89004523ce3d927c3446b90508e19441614f1726..4fd3024a12378f3f85c14d33a9fe7e19748c4085 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,4 +1,5 @@
 ---
+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 8b12cd29ae4e9712573e1375e7309ec5b784b214..cca179d85d9ddd928ce4519adc841437f77facc0 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,4 +1,5 @@
 ---
+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 49037eeb57fa11d908917db25d357cde6040c8ac..373207882e65faac55f7043570e9252bb29f11d5 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,4 +1,5 @@
 ---
+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 166176b20262aa8f9e99bb3d47a394178484fbce..deffb8604b24c71d6758f5ab1cf4d78de4d4185b 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,4 +1,5 @@
 ---
+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 9092e7696c523aab1008f5fd55b5a574c9fb285f..c6d22aeee3a2c683e96b6618e031d8dbf72f4439 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,4 +1,5 @@
 ---
+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 968ac5734cb363981888aefdf82dd3536fe38a4d..5ffe284e5666519ef56c2e68520f7f1f33ecd9dc 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,4 +1,5 @@
 ---
+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 38782ce6ce40c6cfee597341ffceea8ea1b3fa7f..5084e9541087da4b17e28fa7e22809fdb7b89fc7 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,4 +1,5 @@
 ---
+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 3c5f72e525e8daaa9dc7316b030b8a7333241ce4..1058ace0ae5868e09ca9b1d6f87ba9c3d5c41f97 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,4 +1,5 @@
 ---
+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 6699b78917820704ed1fcd4525331cc3c1c1b381..58f8c709d3ff60476360098106b02243e4c357f0 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,4 +1,5 @@
 ---
+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 7ce8873f4f6b90fae17ecd82444c899f3a4b3397..d993b1a1ce75829df0c7dce8f6f45b21f6aa0fec 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,4 +1,5 @@
 ---
+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 7669db19d21d9472846b8213074714f55517f087..01d6512d124ce442283107d2050e9a1e620196fb 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,4 +1,5 @@
 ---
+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 5a9029b57c101dd6190e5c77b9a09ffe56cebed0..5eaeda70733665c00f24b98cddff142556f9451f 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,4 +1,5 @@
 ---
+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 ab606fdd903804be76906d828c4fa1a53d6cbb6b..89b39d7052fe6f29aa55c67b93c88fec296e92cf 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,4 +1,5 @@
 ---
+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 e0d1fe6b1f308e2cc5d35796959882eda4a4bf88..8e2da49198b954e8d45d963011e197be96ac5928 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,4 +1,5 @@
 ---
+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 a3d27ec7fd9010a9294cfea75ad27c164ef6e1fd..720cc6bba7965ad728bb9d131126bf27b2833092 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,4 +1,5 @@
 ---
+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 1bacc4d30dc71c517ce02432e53b452180958075..bfc1995721deefb31d100f4320aaa647e8a1c910 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,4 +1,5 @@
 ---
+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 b9c7d00b8b36bb5a560ea87dda5c12645aafa9e9..39d4ec1ccd9a7089ed584de293f56ea6117bc321 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,4 +1,5 @@
 ---
+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 dc7f22008a76a2b9bc99d010f47bdab11a3bb6b9..75b02d2c1eff883b3f057126f489f53cbeebcf12 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,4 +1,5 @@
 ---
+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 a6102f8f936fb5dd19202b682b4a4c0fc25960d0..0e621ecc2e10250e0660e49be12c86f8852ffa02 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,4 +1,5 @@
 ---
+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 e8539fa483b07d1b18a54186614dd86a6384a620..3f92cc19b40f636b10281f35c5efd6db891c2b14 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,4 +1,5 @@
 ---
+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 b3b1cb0b54e71c834ad5eea22002d15b4e7a7476..5062c9a35406ec5f434b8ca7bf8dbf1966d764dc 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,4 +1,5 @@
 ---
+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 006e345f0f04e8b8f05d018814c59b679041c34a..e0ea4b403f0c01c427f70945959fbd7bee8113b0 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,4 +1,5 @@
 ---
+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 273a98da172f3a960326c02857d8c70f61972dc6..6afdaf4040e3588a1aeac03edf6db64c17a0cfc4 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,4 +1,5 @@
 ---
+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 17ce7101133a41f2c1cafefccb67bb93402483a9..c06852f1ceb4b3bc6c812d552d7eb21b20113cf9 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,4 +1,5 @@
 ---
+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 cde5800cf60cd14fbfc714a4c16785ae11b80f88..d3ab117e0d8c4ce8f63338a415c4f914a2877591 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,4 +1,5 @@
 ---
+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 53757c27ca205085d969d06b409864e55c0c1720..c5a8796d0c740c4c61d07360f299eb0bd3a913f9 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,4 +1,5 @@
 ---
+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 9d79661bf2717d465a553de90e71d0030fea366c..5dba13c43395f2c6824513f75f418c33ef3c09e2 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,4 +1,5 @@
 ---
+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 492c50c4838c8adbad3233de1510f113473077a2..2a9c92b0840532fa3578b144c458a5d4de269897 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,4 +1,5 @@
 ---
+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 edd385da9ce059b504b3c12e98389fdc976a2453..2d2b9fd4fe8442e70c5673d4a230e5aedee6ba91 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,4 +1,5 @@
 ---
+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 dc08952bb18adfe5a1292d09c013e3f0303c83f3..66589c662c54ffe35d7a08bb59286530c452913e 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,4 +1,5 @@
 ---
+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 c685e2772151fbccb81ed20175b8d0a973f67a5a..0ebdabe70afdacde77310c5f1c83aad8743316ed 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,4 +1,5 @@
 ---
+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 e421203a1956266f5762672b540484048bcb488f..9e27c5d1ad40d48156b75d8ea7bcf5d78b7c9179 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,4 +1,5 @@
 ---
+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 67dd8f83475df9115d87f6b1374b9964e544d413..47b33835640f22fed4704af4d313bb12e981ec9b 100644
--- a/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
+++ b/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
@@ -1,4 +1,5 @@
 ---
+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 7a2b6a882a123ab687cbd86dde74654bb6c918a5..1560e2ba43d86047f9b6b7be582d25c46fe860e5 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,4 +1,5 @@
 ---
+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 ca524c7a500134639364f0c285fe40b227469234..ec90382290112ed11d39bf09e3bb961dfe46118c 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,4 +1,5 @@
 ---
+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 9b4ec4f0909819acae7b4b249f53182bb3c65169..770edde3753923dad053077cd57fc0f2d6e9a9de 100644
--- a/config/metrics/counts_28d/20210520111133_total.yml
+++ b/config/metrics/counts_28d/20210520111133_total.yml
@@ -1,4 +1,5 @@
 ---
+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 04edbaf1ec1f84cf1b865c261945a80de04e0450..89ab784a6a2dd263bfe5bb30257b181bca390057 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,4 +1,5 @@
 ---
+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_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 6b8e1976ce007a0da66a0b4456281623e36d2d53..f671827b16567c9bd8400ea74ddaee3a58f74745 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,4 +1,5 @@
 ---
+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 d81d1e9696665901d63e49442fb4dcecd98c3534..4a069e68145f10e072958763a56a69c41be50856 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,4 +1,5 @@
 ---
+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 63d2eee8f4c46747e9b70a503f6b2115bc6e50d4..1a5886b8d49d8c95890807fc4340559635ad9a54 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,4 +1,5 @@
 ---
+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 aaf56f066f9bec1514ddec20016b6b32f80b5dd1..24ac0a96342adcc742bcd0914f43726fec1a4b03 100644
--- a/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 726936cb49a11a0a3b541b79ea7d3a7c55b632e0..e5e1b1f7ed387f3eb7c1cdedbf12d2e92c4bf519 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,4 +1,5 @@
 ---
+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 928dd409445837dd2d37124bb642b2e6e50162d4..f62235853e3d3df775b41fde7a47bbe5d7b3fcf0 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,4 +1,5 @@
 ---
+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 9e1b3ae8dde52b574d4c0631901e5e76e523a31a..df2f021f07c3f36be22a78cc81a2536cec3e72d8 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,4 +1,5 @@
 ---
+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 a81b1f82c3d8462360ef4264b19322cd1bcb72e3..bd58ea45c74956bea42818cdc126e39c51af9d90 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,4 +1,5 @@
 ---
+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
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 4349c4111a8f81e23668d53b307046d05fbd67bb..13ae581e63bbec5c44f1dbb02383c02dd14aa6f5 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,4 +1,5 @@
 ---
+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 30c2b4fb2e54f206b79b303efb0187745479631d..8d772114c2676250d074fac6d0f775d954186b85 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,4 +1,5 @@
 ---
+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 5867d24ad1aaffd9899ddd0af72065848f028959..6a7c6772d12a0222700c626966423e19cad10c72 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,4 +1,5 @@
 ---
+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 b659ed722659a0f94cd9e11e332860d503b0be62..cdb10c77bd470b7e6b94f6a7e124ac81b9f6150c 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,4 +1,5 @@
 ---
+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 7d9bdb2fe0533658cb49fec5d51bed96c784b8cd..564af0eb72b616ea3ea004786c749e90edd23b31 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,4 +1,5 @@
 ---
+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 c00c652a27b3e96d4fe47d6a0ebf2f28294bc3b3..0b8a269de01dff659aa0695f7df073accbb88767 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,4 +1,5 @@
 ---
+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 675ddb66f561b5ea9de1da9ec139450bb65a5fcb..115a699f700f44fde12e671fc27b6c55b2698d08 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,4 +1,5 @@
 ---
+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 857a2cf17e95a6023891a40d149559851f32436e..1975ab36cf0a7f86af6ff62e960f9617b806664c 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,4 +1,5 @@
 ---
+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 3c3cd7b617127249c6786f5f5bf33266b86924cf..f188681b7e6aa512ac8536f0896a27cbaef841da 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,4 +1,5 @@
 ---
+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 75c9ec54cffcc54b57a7db90a056dfdc72e3605a..71aa5985af7c84bd862c20e9a52795cc349e3a8e 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,4 +1,5 @@
 ---
+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 17a8146bdca1857fe6f68ae4ac8873ffb9176421..ad6ed7d10939cf4255fbb1531bd16f7e532031ef 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,4 +1,5 @@
 ---
+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 3ef008c12bb349867ddaa40b960cebf6b9aa004e..25cb8ce505f80a65f30ddacbbacdaf6eb7522a5a 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,4 +1,5 @@
 ---
+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 60bd21f811a5f41f3c77dac768a680d697b168e1..606a5dbbea22ef5223fa7649ae1a4662e2aa2941 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,4 +1,5 @@
 ---
+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 7607950a441d68610d40b107212c33d878f5cf11..af0ba37686317b9215bb338a18b07d4d66b70a25 100644
--- a/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
+++ b/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 530e14603001f58ac0cd80f7bb3cc995894d8e19..fb889331ead0103453a873310de7ead659a3415d 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,4 +1,5 @@
 ---
+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 1c37c704affc0bd5c8a8acb554d1f488da818fe7..13e01bf4a3ee23dea816003860f8ef69451c2879 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,4 +1,5 @@
 ---
+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 71ad56b44eecbd8eda64238d08a4950a274c93eb..25711f674b9bce8804fe6a8c2cf511928a7f3186 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,4 +1,5 @@
 ---
+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 5bbbc62c897e669ba4dc2248936c3e32c6c18cea..87259fa97fedae075607cfd01b5b6881ea7f50d1 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,4 +1,5 @@
 ---
+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 f099dfc8fdeed002d7094ae072b95cd5bf13e4fc..f4c3c1eb1e9686ac6536433be6ab75277ee470d0 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,4 +1,5 @@
 ---
+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 09a1c7622f366168c6905899f83f9ccccb5ce123..04764533ffef98236bb1341312a89d99cbc1b388 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,4 +1,5 @@
 ---
+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 1f5631f6a1efcd6f73554d189d30e7ba86e87586..8bd376c8d0ee8cb941d59388932f759d2c0f4358 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,4 +1,5 @@
 ---
+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 c2733d2e1760f11af3fe056219c31ce5657c66b7..c9c7ea0e28ad79e2d04d3015524f0e8c91e88574 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,4 +1,5 @@
 ---
+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 ab4f0481916e40a6dfdf60eaff037e121cb09813..3f0042c3f897190138142e3376022070c70eb421 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,4 +1,5 @@
 ---
+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 cac8cbdefe64a4d63d421655d3f9bcb68644e4d7..3b84275a572750a78021531becdc382558f8cd39 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,4 +1,5 @@
 ---
+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 904b57212f655b109e4bc376adfe4dc5ae080a4e..7f5432e205ac2c2ef23134b90f2b0537676c50f7 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,4 +1,5 @@
 ---
+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 66c749f678c9f6b0f8ba63a85acb13d94a3ae40f..02ddf7986bc98487d8253852799b02bd20cee990 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,4 +1,5 @@
 ---
+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 cb8eac4a20cbf1209b426e5f1621c09e16e40885..a372b9e068e4a3a1bf8bf9368f30454e0987e9e8 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,4 +1,5 @@
 ---
+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 1106d2a5f48690cc5db9eabcd59eafa9ca8e858e..a08dd85c39c57886b841b22f7769b6faf68fb975 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,4 +1,5 @@
 ---
+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 a597ee6d0937f29721ef88f48483c7b75b1a1f68..f618155abb751e6e10021e41766f8dccfa6b48f8 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,4 +1,5 @@
 ---
+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 b747ede0a8e42e737260629530b42927cdd7da4f..724370ed549ba2fe9dc90a47e885e3d071a84d8c 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,4 +1,5 @@
 ---
+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 dd3be4eddb1369ef323b0f6ff720f63b428ff331..ab49f7e70e6970b1575002d38066ea34075f29f5 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,4 +1,5 @@
 ---
+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 ff7a3c1e0407d16d9033d8a19dc003400551c972..61d7875b205c15a7319fefd683fe9293a8d18ec5 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,4 +1,5 @@
 ---
+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 71983a1ddb46d4b7c3c3bf493a3e783ec0627fbc..79407c70dd5063af2cce523302d8e364cff88b19 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,4 +1,5 @@
 ---
+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 9c75d0b6b6309827d1d92591a1a6cc53435e3229..4281d78ae7d8c1c56f355b976a141c61cacb3408 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,4 +1,5 @@
 ---
+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 36ee2fae2dea819927067ad138748f9877af1091..f3a6812cf6d007c9f2ae0d8859ff159cee7bb160 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,4 +1,5 @@
 ---
+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 fb9f7841d7cba5057aec4d89b70f09987e1fe920..ad7fdda598478d0804d8887d61a85e9651ddc22e 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,4 +1,5 @@
 ---
+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 986015c578da8e3f21711733a09e3b3893a5051f..8d1bed247b9366b186a760fe56bf416ead246db0 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,4 +1,5 @@
 ---
+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 41ce86d586290a3dd6e36be4572760a485b62b90..34a0e306822139b3205f3a421a535b36f57a09e8 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,4 +1,5 @@
 ---
+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 d276e45bc648c3fdfc8887168970ef65e783c76f..37df169972c82cc00debdaf980ac93dac79c4a14 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,4 +1,5 @@
 ---
+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 64a0f936ec6d265076c9371e69a6015d90933014..437d115fadda6b7068515a690346e9277c5ecd2e 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,4 +1,5 @@
 ---
+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 b793fde042b9ce626f21cbd20af464aa05c1562a..b51f8afc673eaf70a1081b229f57dfa80c98a72c 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,4 +1,5 @@
 ---
+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 2dcc0eddc5695ec4daf2e1854a75bc552de54083..3bfb7aae868cf2b57e6af25ca088ba76babbd688 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,4 +1,5 @@
 ---
+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 3be8f0646e7c3de53b1fd0c7f8823f4eb5ebfba2..e42797908c42ca4def959c424ccd5f5c78cbb19f 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,4 +1,5 @@
 ---
+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 b4fb4d5bd63cda6f792286d34a7ca111670d8c97..d98f25c1b20dee83faf9138c8150082c4578569d 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,4 +1,5 @@
 ---
+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 7f2f70411dc7dd133feff5e50434c9eb5976ae73..c88a0eabefab3c05f7cc5cef12a059608dc6db76 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,4 +1,5 @@
 ---
+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 791fc680ac06a09842b3384d672cca7d8d8fa938..a633eadcea267acc4df7b93053f52e6aaa9db487 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,4 +1,5 @@
 ---
+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 9afa4daf2686d34ca5a9e808e2419d8ca3992fa5..a1423d961c87300ff0d01617f67d63f2f873ce09 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,4 +1,5 @@
 ---
+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 6de0bc2168cb39519d458e6b6aa372d3d2fbe40f..cdc010c89d3754713551eb5c3a862561f38ab28e 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,4 +1,5 @@
 ---
+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 73ec2542682b6d563fed58ea8da0780703731c3b..6128830827f5b5415f469285f1082740f065d8e9 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,4 +1,5 @@
 ---
+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 b1e6d34c412d509a4d4b237bab0c73c51d74643f..06a0481802ce6eef39a49f3cda234f8c0491be96 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,4 +1,5 @@
 ---
+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 51f3f6584b63f8611e1bdcee9c1f8ecb8f4bcaaa..f6c0e1fac843c54111512778af0630c2c5e7574f 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,4 +1,5 @@
 ---
+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 2a699bc67d52b2aeba8721d9f74325cc6f45fea7..1405f7966cc2fe8ea21a91df47505256fa5d167b 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,4 +1,5 @@
 ---
+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 1457453aa04d09e3122a3628c3a2918ab9834000..8861790546315192e06904eca41df1d2b389634a 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,4 +1,5 @@
 ---
+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 eacf55f9984de9de90ce0672136c5bb3b30a5107..ef16ec406d9aa290e57e97dee6f4d8f23bef98e9 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,4 +1,5 @@
 ---
+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 7f8bfa07f0ab13eb8a43ee66f7e93642e44f7b7f..3c89bb79fdf9329f9ce5f0b39090f16c1b9126a3 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,4 +1,5 @@
 ---
+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 4f1c6f2e57648c6442a4708054798ff8a90bfc60..ad7f4adb5ea201f90f54aa6e340ba6dcb880efaa 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,4 +1,5 @@
 ---
+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 7802ebf2d97f3ae4d651dba1b8c1b3f7449f05f6..edc1b2efc5973a766959fdcf9b958dd5917c769e 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,4 +1,5 @@
 ---
+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 0023d75bf4c3972104d2fe7957e30ea3812da7a8..85b12d6af6b515b39c3d3da845719849440c0006 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,4 +1,5 @@
 ---
+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 59d0779c7d4e247ae8bb1a7508fe6aeb37b02162..2dcb9cb42c8f12cba802e07c692e2e566a2cdf36 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,4 +1,5 @@
 ---
+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 a8dbfcf2555b2ce51dae04e5bcea3d1db2bfedc6..4ef1a406ce0e53b916b890381303103f08f92ea7 100644
--- a/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
+++ b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 edc9becd5fb200c0b9dc5694d5b59ffd0a4393d7..a32968621af0ec16bca1b14d2f5f73c7111c8a55 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,4 +1,5 @@
 ---
+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 d92701b864cf8fe871b2d0f74951d9b44d6c99ef..034394c338a95ab690c57a06d0ecd48f2926ca72 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,4 +1,5 @@
 ---
+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 51c3c4a61e04938e05f9a31c38707273eef46a83..ddeb9b88df8457afea707cb147655a4fa4a969f9 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,4 +1,5 @@
 ---
+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 fe5f5f3c9d5e867cb23059eae6a2c382425a69a9..f002171bf96ebe3bb8404ffffa8914f131051d5c 100644
--- a/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
+++ b/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 c8b4a45f7f9abf81c498a349e387a59f0792758a..05012ed36d840310e652cd71db68dbe5c500d50a 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,4 +1,5 @@
 ---
+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 6a02c7721e92699625edc5a96596fc0d2f474e71..f7fbf7e722a13ff25414c9583c035e0496403be1 100644
--- a/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 1afed34d3d2aac5d34b7c27733cbd1d69469be88..3fb5f7f250486458a5fe58573b7368b64c27e50a 100644
--- a/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
+++ b/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 9536278ed5c646d00e457a378095f51079a28ec6..7119cec20832a606f36e52c711a4474a1f9f2515 100644
--- a/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 0661fda695429b9c91f7111e867b33a0028ade99..a317c83e75eb83cb0710b4556a3133b960535d99 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,4 +1,5 @@
 ---
+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 42cb960a4ef73ad3bac43b2f4afae293c0aff937..39495ccca3cb43c8b5d1387ddc306af997f4473f 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,4 +1,5 @@
 ---
+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 9e94ec9940e478346f740608c191b731e151d4dc..f6c15cf447a1de0a92902d4f4d4ddccda4effce3 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,4 +1,5 @@
 ---
+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 bd5720ee00b1500dd581593f704dc3a4465f6ab7..a079996d0b2d1cfdd8ae383add041dac3003b153 100644
--- a/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
+++ b/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 4d324611eae5e1bc5730d78ac5fbdc0f72ca8f01..edba1aa2ca3d5c9a22e24bd773c36bb798d69773 100644
--- a/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 ba24c06603c89e9ca9c9155255dfc05a58c04345..91b47b48d6a0328c8e2fe339aa54e76200dfbab0 100644
--- a/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
+++ b/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 3ab9b124c2ae33702e619675ff6861df5266638c..29a485623c31456b65ccfbe431dda8fb39ab6a8b 100644
--- a/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 42b76831a0bbb9ad470978543e3075a152e3b9d1..4a6f7b6db71062da58410b01c739036050d25b5d 100644
--- a/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 b77a75d1a0e4f481dd35402a3df0ca607d05e94f..6380019b82357139b0ff04afe844863af45d3810 100644
--- a/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
+++ b/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 f2bfe3b8e2ccdfc1b100300dc0985b0b78f72e55..fc19bfc5aba88172e7b1e59f6ce89d9162e6d5b6 100644
--- a/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
+++ b/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 5fdb11355f57304df58bb5e1ac6cdb839e58f984..72344d83c3c9ef2d7b4ca84fca6566c073095049 100644
--- a/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
+++ b/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 c4e0e3606af1cc9d6e9473c61c1b4f5bc578eae5..cbc0a5cb301824a61ad66b1b97795a58ffc92902 100644
--- a/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 55559fb7715a0e39c73e64ec5f36c9384ca635ac..8aa6aa0c2f28af5f8cbaa2b3924561f7fe6567d1 100644
--- a/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
+++ b/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 d6f304bba5c031dfdf126801bc3e33db0700a33e..e461d58c4994d86cf118dc71c65c785e07574b76 100644
--- a/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
+++ b/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 f9347596f77d097b2e9c3c54e49308cef1c46e06..e8b81447916e34d8ab97b7ab926a17a40b359d8b 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,4 +1,5 @@
 ---
+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 73a99e634710cf1cf69c47ab65604c37e7eb1b17..7c65f6868bf510668fef6c47d1c82b5f9b2d23a7 100644
--- a/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
+++ b/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 5ffbd8904b16a196450c7693aedd8ab3648132e2..a8ac0715b2221412c1cf48ed68a5b830bf9321ef 100644
--- a/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
+++ b/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 aa4ee33ff27624e449d3404d8cde10f74dc2f1d7..e7e396da7fc858e68cda96c255158af75d98338f 100644
--- a/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 684b3aa9af5aa468293a3b90b3af3842dc808097..b934268b88e670de4f37d382787d7d3daba1120f 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,4 +1,5 @@
 ---
+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 5f25769f4da86d4cbda2feaba378588402df5234..e18ae75971543b8785226c27d5f91ac8a64bb760 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,4 +1,5 @@
 ---
+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 d2edc411e818f3742e8914ca1d0082a085fa2394..6d78357297647c05f962a1895b0c2190e0ae2d7d 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,4 +1,5 @@
 ---
+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 0b0e1ef7c838cdabdd888e16dde574ae4a52ae67..86458cb813f973569bfd35a16084a551117a46f1 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,4 +1,5 @@
 ---
+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 fdf9aac26871c674bacac51ce0952c44905f9530..eff4a6bc9ebc0d0264a7e1874fc19442aa473b69 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,4 +1,5 @@
 ---
+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 b566f3bed65cf552bf73e24dcc4d54d487bd5477..a64b3eec3b4b12799d3edb21bbeff3723f6dd058 100644
--- a/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
+++ b/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 f6d18267bfe5ab7217c2881b8aef1379571d8ab6..dcbb2ce8aaaa166942acff92b4273e3d5e5848a2 100644
--- a/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
+++ b/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 afadfd2bb139b3cc35f43c9344d4e4438017764d..1752363a6e6ffacd54df73fe4d6be10985eb3ec1 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,4 +1,5 @@
 ---
+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 b826cfd2057224768ee97a35ae61d8811560dc50..478b32079e7e031ba7ce73e513df55ce5ee6811b 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,4 +1,5 @@
 ---
+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 55848c908da4e6da3b1b9fdec8d0c9c7fb4f75a5..3e02aebcf626b9ee22a5a637184a2430873ce408 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,4 +1,5 @@
 ---
+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 8fbe345f451057f7a7637504d1ae18ea6b932d21..0d5b43552fe53b1ad4fc41060ccaef46ea0cabad 100644
--- a/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
+++ b/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 fb32d9645c3278b964af1219b8b8753b49538875..3725e008de5621bf9f71dfad6da7c338e9291c71 100644
--- a/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
+++ b/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 8ebf21a4d5fc45b9fbf93cf3dadf972bd965ad13..b2983522af50a966754a71bb09c92111910ce7a4 100644
--- a/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
+++ b/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 fc3b92381c0311fe53f1da15131d6e92f635838d..03c3a7fd3ae9e204a6deac4dd9c7645d19e7fd67 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,4 +1,5 @@
 ---
+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 32f4957e2be85011a13b74d0924ba7b9659182c7..67cf9ffadf25812157364bd15c0717af584023d1 100644
--- a/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
+++ b/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 30ccc93b33a9df05418b1455659c113105671472..2732afe133ae029b071358887ef33df2cf633d2b 100644
--- a/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 2d5ea7669b16292c63a6f22b0f8c7fb3123b797d..8a1b27e26c947a4d6d804348bcc6fc54c90e675a 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,4 +1,5 @@
 ---
+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 278a71ba4b7ed684885b5354479fdc7f1a64e7e8..d772d84280396ead02977d25e6014c4d7cb4354e 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,4 +1,5 @@
 ---
+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 ea248000bad1a5d1a8f388f95faa476e0dffb3f2..5d8182c97a61d0976e5a99b2a2b56bb7147cbca4 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,4 +1,5 @@
 ---
+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 ae787a569577dbee5a169ccb0ed5f6bdc65e5245..823d3c64177c9f89912530f3e46d2fb1821133b4 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,4 +1,5 @@
 ---
+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 f0e3d4599acd5aa046d49d0d6048e290cc9a6a00..3e16e38d814854695b6e339ab6e55b6159761e15 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,4 +1,5 @@
 ---
+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 ae1b5364e9967db8b2550811f41c6c9d2c821544..e89b4b48b82a6ef3606faed19c1b55165676975a 100644
--- a/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
+++ b/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 e0721034639716a707be7ba5b863c8731ef9dd08..cbce70d915e1f304eb37eb3002e347379c800672 100644
--- a/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
+++ b/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 6180cdda935ea8169de0c83df6c76a850f93ac3e..72e438d22274edc90d136bbd83840c564365a25d 100644
--- a/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
+++ b/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 22cc7a3d2e9937a565b3dacb565ee72a0885ff9f..783565854e84515777eb3082a8d29b11b783a2f5 100644
--- a/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
+++ b/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 e887858fe9623847a8be5f51dd7481582b49442c..ea8ebc2b18facbfeab866598a6dbac9f9daf2e96 100644
--- a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 37744671757766f6698e97ee0ba8c5bb7fbf26f2..34cd3645bfeb9f49b968669205878234df2b5cb4 100644
--- a/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 6f6dc87783a51cbc41468d44dfda0b24e347dd6d..95919f7919ceddbed30a65200741c9b18c9d03c6 100644
--- a/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 cc125283f2ca3ff2ec38e5cf3efab8400ae8fd17..c7ce2c729e1ce032c73ea59ca2e879bf1e97eebb 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,4 +1,5 @@
 ---
+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 7443c3d599fbe7a84c039d82ea8d9a6fa3d69f80..12530d0be66e9e1522de0fb1e71f2b482b26ceee 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,4 +1,5 @@
 ---
+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 d4d6a7139360e330590a649c42bd0ed7acf23166..117be73d66f2f623a16fd8c83237d391238b5fa9 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,4 +1,5 @@
 ---
+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 3fefa5bdda94da028d45910c421adb842b09a485..9c5823b3e7c647a369a5fd9b78477073cd17ce77 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,4 +1,5 @@
 ---
+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 e14c0a39399e47254c58bbcf19ea049a080275b6..baf098dd19ba37fd196915722feecd4ded4349b9 100644
--- a/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 d6d2858976070346fbd7f18f07b2ee7ba1599ef8..21cbad1ae9007b94bafa2efa78be6de394f0ad80 100644
--- a/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
+++ b/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
@@ -1,4 +1,5 @@
 ---
+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 68c75dd579b32016c0388144a7703047942b4321..f032e8a855895eeb7e85852b71a83f96c46210dd 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,4 +1,5 @@
 ---
+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 f97747932a5e086267d4291472e26f264f001762..dfd86a895316c26b9250c66609c2613d9d72766f 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,4 +1,5 @@
 ---
+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 e220ecfb3fa32fe395fe956301dbecc475525fd8..aa377215ccf39721a4886c097a85e0c395fb97a6 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,4 +1,5 @@
 ---
+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 07db3a24ab96e25d44acdc178b723864360617fe..df529bd5a02280ff6ff50fba5aebc91448bbcffc 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,4 +1,5 @@
 ---
+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 faef58e57b7c2d2bb0eb0f874d257bd19aa55e48..05fbef8aa3cd75e676743ff72bd2f0244d1ee25f 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,4 +1,5 @@
 ---
+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 83962fbbb761b27ab053e6825a1e8faab7c5f654..e6a44c96fd4c86c5a84d98b2da52c8aadb726a61 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,4 +1,5 @@
 ---
+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 2269498bea02f49bfe88a0f0d0a492077bfc9132..ecbfced908e0e4c6b05ac84f5c6e6fa7d4a9f6db 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,4 +1,5 @@
 ---
+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 618fed879516f62482ab3fc73330bd0d86ce635e..75cc991fcdcdd3d2939ddb4d0905dddbb609b268 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,4 +1,5 @@
 ---
+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 5c2e8f2a66ce758852d84e7ab4af5fb3af046ac0..b2da2ef75b185be8f3767ed4dad9620d3480c03d 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,4 +1,5 @@
 ---
+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 4d686094bade18be1d6e2f282f66c7680d19853f..bbbf03fe665e3018e5258e730f5cbe93a8c1c0e7 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,4 +1,5 @@
 ---
+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 bf7f754995824a941d8b6ea2dcf7978ffc09e279..094246b285cfa83872da7b61825e77fbdbd01fbd 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,4 +1,5 @@
 ---
+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 9fb4d36abc7f1e43884e0096a3ccd9a823b89a64..f9942bdf336fe870e4699fa75bc7542e9fce8821 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,4 +1,5 @@
 ---
+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 a149c7cc7a58dc109ff3a5905a3ead196edc19eb..e80cd9600be68e8c90a2f42259b06b191e5601e7 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,4 +1,5 @@
 ---
+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 d376ac6501ea29d1ed6d2c11493124fd616c3312..c3468ebdc66bb6612d866cce6aebc4ddc2f9e199 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,4 +1,5 @@
 ---
+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 af747413f41fc6bdefb612212598b3613d29ebef..67b23dad449e2d89030380113369082edc17ade4 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,4 +1,5 @@
 ---
+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 5a99e741a7dbd196d58368447e04b2be2f4be5dd..0684c51dfabeaa08fd461cdeb474256f491b43b0 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,4 +1,5 @@
 ---
+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 8c946ccb418ac55a6e32c7fac1611d01323d3a19..bcee92c4764fc9be472d4903dae9541b28fd4787 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,4 +1,5 @@
 ---
+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 0716e3b702a2282b9750c0f807a313a119406131..3705c1e782de9a71905d076a970aec52f1227ef5 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,4 +1,5 @@
 ---
+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 f0a45edae216f385f90b311a50c2dda93545fd58..c01eca8df0569182a83ae2b6b6dd298f6a57b4f3 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,4 +1,5 @@
 ---
+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 f1abdb24875d9d7611b4ddd19229829edec2c76c..470c80e147ece8747cb87bbfac0a38d87ac51337 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,4 +1,5 @@
 ---
+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 76ab0f54c3457d5754fac3a55834933eed427dbe..3dff97bda92a10bbaf2f956b097090feedc9d052 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,4 +1,5 @@
 ---
+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 4e2a71a45936795a6d73c813b179130b9501de1b..40b9601282eb488c24741bcd2b5aa6a64646e6fa 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,4 +1,5 @@
 ---
+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 9b4c6cb0318211c5bec27f3c11540960b46d78c3..d629bdf63e31db74e5b8f6ea27fcf221bd8e0a3c 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,4 +1,5 @@
 ---
+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 c6935a76319a9ed41544be2568fe95ccc5391809..93a0b2b1e6a6cc282cdbe4162da7c442966c4d7f 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,4 +1,5 @@
 ---
+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 d9007dc1f8dea18755507478c70f76f77e57a281..bb6ef10ac48a931bada201d718680a742a72cfc0 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,4 +1,5 @@
 ---
+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 f35cacdb4c91c4471bbad2700e3a3eb0d4b47b39..dc08b474904d867659085c2ff60743a75335a2b6 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,4 +1,5 @@
 ---
+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 6f7c9c18aa1b38d7d289c060570f46feae1af7ba..2025f9fa64cce2db3fc0782dc2f6e16686126907 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,4 +1,5 @@
 ---
+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 cd92e9282efb5cb0ec5db835f9cdba7deceb6d8a..88c55330deffd65b234e39e5ea1f91f46456c09c 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,4 +1,5 @@
 ---
+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 e6c21b023426b96ce92414014dcb1772c541c084..9885ecabc44724a47fc68d557f04036be19df134 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,4 +1,5 @@
 ---
+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 3fde366906939086589514f661abeae34f73ff5a..f96fcbd6e8efd71f3a39bcbe36d64b05b255e06f 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,4 +1,5 @@
 ---
+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 7d76be2711b441d16bc324c064cbbce2e25ee4cf..49bd40188462c779ba330772112c07b9f672105c 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,4 +1,5 @@
 ---
+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 edcd164636ab7a0943ff563062f914abe525a1f4..b508344d8278ecf6fd87cf9f096d07c1359f28b5 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,4 +1,5 @@
 ---
+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 5c0ec45371139fc26b6202be98cbe5883e6d719b..0653882895898e57d591204e46eb2cf2047eb9a2 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,4 +1,5 @@
 ---
+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 af6daafa7dd7eb3951fa250b7521ec8b90513eba..cf195eee8424017a6fe10b1d84658eb3ea117f1c 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,4 +1,5 @@
 ---
+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 609bebc4087022cf5e86c49acdaa0e19820926a7..cbe8915fd43365f2895b54a8b59e5adb9c6ed49d 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,4 +1,5 @@
 ---
+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 0f78eb35621b8bd023d6790fe0d7f499360ef5ce..f0e19bd65a769adbaa6d8c5bfb410a659027e3f6 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,4 +1,5 @@
 ---
+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 0cf568469ee1a21c7bb610843a188dbf005c6388..ec2383abceccb89561b3b69624538d3c56a021ab 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,4 +1,5 @@
 ---
+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 b36b49e33aeae36693c079a01f6974e5c1622a3b..9e9bb85098720a31e39ba1921d1daeddf97e2df6 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,4 +1,5 @@
 ---
+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 3809462ab0794be6681c92fc96ccd71542e28c14..b0ae90703c152b7de55f8be38fc924fb4bc6cdc8 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,4 +1,5 @@
 ---
+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 cfaa46f0dae34aef140e6a87d6a43022ce2ad95c..b5462f5afa4a67e59a7fd58cb21d67fd202badb3 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,4 +1,5 @@
 ---
+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 b044acc90fa9713ed21c80679d80099c36bec1dc..625f0ee8839349d269864d104fd05a6c0dfca2df 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,4 +1,5 @@
 ---
+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 98a07acb5d0eca50004f95269e8e0281dc88d74d..2f2acedfebe02e01eddb7fe3c1d82d13181aa61a 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,4 +1,5 @@
 ---
+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 8dc2aed0989446e89b19812974d0b5d64a92c719..7ba0cb93c43bfec18e055626252bed1a2f4236b2 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,4 +1,5 @@
 ---
+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 e5e25e10db12101d105e037be3229187e4c74778..ce8820ccc87d88cccf433012253d5969863ce05a 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,4 +1,5 @@
 ---
+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 e7c354fdbf6a8fd4901efba20c38a3566e5675b1..fed1dcb357a987c6bb2c8e8e41f9757fc1c4e387 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,4 +1,5 @@
 ---
+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 8ee42570d494b11673360bbbd3a9737ca8b79cc9..f14ac4a7acfcff448884d47a9d8fe8fd65bd933f 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,4 +1,5 @@
 ---
+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 29dd1a69cf0f23ea9f57b4f18bfeebddefe01e2e..d98430a800e372a91b96490c883e76cd873de186 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,4 +1,5 @@
 ---
+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 5a4e18afa156b343ed3b9117875c4a3236d6a551..2170cc9c973bc001728b5130997a2624f09e8527 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,4 +1,5 @@
 ---
+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 ebb116c53a6cdc65fbb069d6a3cde0429ad051e1..91a234553790cada9d7248adac508a5c9781fa71 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,4 +1,5 @@
 ---
+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 02a8c435a3512c0b5c62a2665dc4a2653ea008c4..a7dd78aca70937e73ce6bda321b3fc81e1b28dea 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,4 +1,5 @@
 ---
+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 f262cb31b685500d7ab53aeeed83ff136c6ed1e0..86a165f9d30828a96728b3f54a5bdc7f6a671cbe 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,4 +1,5 @@
 ---
+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 e3a8d4b4b8ecbcc06d78c04cb618d0b51704d54d..1c8a9679fa791af6f191b8bef8e010fd8d4c544e 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,4 +1,5 @@
 ---
+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 91edf71803320298be0a1b68aacbcae38970030d..1a76c1c69fdbdf94387cf6677941fa917afef19b 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,4 +1,5 @@
 ---
+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 71a7c0ebbf1a471165a1ca88ede84bf63d763bef..8f1ca0fb40cf24d78a95bd3997df136094e84181 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,4 +1,5 @@
 ---
+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 210165bbaaa695e7883ddc51fd9c8199ffc85134..c0fe97815d97b431aabb75df69e677e7f22aab6c 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,4 +1,5 @@
 ---
+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 8d4623c2510dba30f4cb59c95388c4bd249d4cb7..83d68d739a41eed37cded4e0c8ff1a97ceb4ccb8 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,4 +1,5 @@
 ---
+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 ef4eb268704fde3a0f6340a7cacba6dd3c745c91..c8d7354cb9b92f1dd1af46727164e3f564198d85 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,4 +1,5 @@
 ---
+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 7be92f4cb64f9dd96bd05c47dec1961662935dce..08cc03a78ae4c6f2d362d975f31656d08ade4058 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,4 +1,5 @@
 ---
+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 fb173ceb63bde9acec6080b448d9273070e31c79..14a590de64ad400803e392a6cf8aed374538553b 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,4 +1,5 @@
 ---
+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 4a4fd9ffd75e82bbc3ceab073a31c781bb5b7f22..6859319d83a73e2ecd710651ff967457295892c7 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,4 +1,5 @@
 ---
+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 13be2a26bfbd56d4e892f6c52091e5c52def805e..8307e3a309913ce4287afd73e843fe4a085513f8 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,4 +1,5 @@
 ---
+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 b975aa627f1acb132a89c16553a8a499f4d958b7..250cfc6506e7cc1cb133340669bfa7545a4a36f8 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,4 +1,5 @@
 ---
+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 7e7c13e74ca86b6b775001140b51b19ff69e7e71..6ee4f87b7bac39fd29daf9ba2f7dc5bb2860dfe4 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,4 +1,5 @@
 ---
+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 b4654a63e32957ea179503d1ed273d1e541507e9..8b2fbd61c44d847d9eb3c68af89eefdfd3be785c 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,4 +1,5 @@
 ---
+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 337281d2af22b1dc8b8da8d2a70fdad46ab24616..2edbc10c9c4db534acfd8f48c64c5b16f0e91130 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,4 +1,5 @@
 ---
+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 562cde194194f208a0c30776031bfe1fdf6a439d..cac5da844904ddd42d7584517a0769759f17dbac 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,4 +1,5 @@
 ---
+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 ae79de32461daea5c2ebc1e91cc918fce43ab2c0..30a2cb6b3670a3a7b32dbe254795efd88482bf2c 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,4 +1,5 @@
 ---
+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 057e209785d0c09c0fcd407748a5d6ef9f9b89b5..c4bb5e47a1f1f2c76e17c36708223e2494e73ec4 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,4 +1,5 @@
 ---
+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 0cbd500018104c6bc905748274b98d672c1814b9..abe346f1942b4a19e72c022438485f1ce1de08c1 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,4 +1,5 @@
 ---
+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 5f292bfec2769b9c08aae4bc20360e1449b619a8..57ddf4ac3c27b3c11080dcc496c9ba7309f7134a 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,4 +1,5 @@
 ---
+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 35da1f85c9a588dfb0993b4be64ae3393dae0e19..1b5fd14efb7664af3b1ff6efead186474cb94550 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,4 +1,5 @@
 ---
+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 7dd45a43a119ad71c35c024031477a32fdc6a5f2..33b8c06fb931eaef97147f097ee43e5c51f24c5c 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,4 +1,5 @@
 ---
+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 5b9dcea99a38557bb244f212654399fdca1605ab..6acc548b2e751e94373ceacce8b45ba9fe2624e0 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,4 +1,5 @@
 ---
+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 5eac345e5862717df0ca2727676c502879b2b8f1..944b5102af23f0fd492e4eea94b1f46e28d05f7f 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,4 +1,5 @@
 ---
+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 c0bd8b6b224efc7489cc3936eeedab202d706390..caa1953117648e4e7659bdc39cf3f2f2d8053ee2 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,4 +1,5 @@
 ---
+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 4935d03684663183d9d021dc5d7eb84eaf38ccf9..013ac9ecb14f5cbf2dccead25222bbb4d2d4287e 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,4 +1,5 @@
 ---
+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 5516ee24fc364cd0decbb73996b8c0a35c70d230..f4ade05ed511c51ba0fd852f10f76910c57a7924 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,4 +1,5 @@
 ---
+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 2cca9adda79098926a43f3df96c7069a6d2cf77b..11aad6e8af1ad862d1582051f3a6b2a21fd40cce 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,4 +1,5 @@
 ---
+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 05448c69986e760670928931a910f7971c2a73ba..b6929fd771f8e51f24503122ff0c30720341a6de 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,4 +1,5 @@
 ---
+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 2e97e1fae317b3cdc3866a4eb330995e2119f862..0dd6837c8b8e8ee66f4a079f20c68459f6c2e924 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,4 +1,5 @@
 ---
+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 1e7b666ff8f33089613742f0e5790f3f10416cb2..94a310dbac4551ee23b22e956130ea5879793b73 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,4 +1,5 @@
 ---
+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 60dfc6980b71a72fdd1205ff27aca5e5655b4462..44597d4910b606c9b04531c06867ae7f9f818bd6 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,4 +1,5 @@
 ---
+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 050ca64f03c20a01bdc2abce7981e5e1e48767dd..b4aeac34554d0a27ef17a346949f925132e71e54 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,4 +1,5 @@
 ---
+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 eb73d4841b45def4f43d9ff5c50317dfacb27ede..56f03ad3b139fef2955201c7bfa6aec1124ef8b3 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,4 +1,5 @@
 ---
+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 4159716f9194348a6fca42a6b8add212802755a1..8fae98e570528b452efdcd0bc3cb000b5d252495 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,4 +1,5 @@
 ---
+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 0c53c7733b195dbfac5cf9f305e44044da69d5e5..5e15350bd1e128539fd15611be73a8a99fe156f5 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,4 +1,5 @@
 ---
+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 3d956eea357d6f81223d8e105b556cfb31564a8f..c16bd2b5db527530ba63c186c746224d84555793 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,4 +1,5 @@
 ---
+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 97067bcc02f2f6f103e61f80daa1a579905ea6d1..abaaa79d3e87c5922d714eb843aebc0037378108 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,4 +1,5 @@
 ---
+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 094d2ee6ce89748e762587d95c712b39c7022c55..3f7e646cf8396061036f9a1a2ac294a8d46d1a8d 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,4 +1,5 @@
 ---
+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 c58b03ce909bb01e668f0e986fdf9cf851fe891e..0966c15bdd5fed8b8232e3fb833e0308cd57e8cb 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,4 +1,5 @@
 ---
+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 b0a04b9bff5d4656450fb3810e12e0735dd3d4ce..f987b89f7787aca510e7e067b3c7183ec5c75300 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,4 +1,5 @@
 ---
+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 64f3f452d790329e558f4af83028c256c7ccab61..ac02305439d4844cbb35fe64fe7e7c4b36adad86 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,4 +1,5 @@
 ---
+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 fe0bd0ba9067b135f0de330ed21894d30692597e..3cb400fcb05f3efed1534a168027fc6ecd1ff079 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,4 +1,5 @@
 ---
+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 eb1a803ad0868e821ec60b76cc350c6587a835f4..bbe90e2b8090f622ef59bae6fb25e00b4494da81 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,4 +1,5 @@
 ---
+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 efed507fca3db5de689e63adef35ad361bfd394d..98c66534ed9cae65da1cbb35f760f92c47d4be7c 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,4 +1,5 @@
 ---
+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 0452b4a418bdde6e383b0130bcf34f4cfdf3c25b..cd837f9812a9ae39c2de82598584619aa1d72541 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,4 +1,5 @@
 ---
+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 da3b2f7bccd7b5fcf5aa073b9c1231f1388961f5..259bc4f43571905848e82a34a88920dfec05c7d1 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,4 +1,5 @@
 ---
+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 0ab87e2917e76b18dbe2fb9543806f91b8dd8a10..7151effc4386054a70b62066c4957d95d6b9a7cf 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,4 +1,5 @@
 ---
+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 417483200e3a19c079ddcda4daee77ae277c4c0d..211c3bee0fc7f6fedb778f704658b9a4302e5bdd 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,4 +1,5 @@
 ---
+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 3f1e1badc6e15b03773ca260d59b5e0cc526b9fd..020d10a7900fed95bf94fd3d65d2b3dbfb8699c5 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,4 +1,5 @@
 ---
+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 1ebc70f497c3c6f3f08501c57ddf0ae9d33951a6..7eeb3280389c7cf2b6ad610f75717148d8ac6a40 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,4 +1,5 @@
 ---
+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 6d7f47cede47162b802ec2041602370d201f338e..d0b6ac4df676639113b1a3a395792dc56adc3a89 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,4 +1,5 @@
 ---
+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_all/20210201124934_deployments.yml b/config/metrics/counts_all/20210201124934_deployments.yml
index 53b31b2b9ac94f9f3c2e940eae4d8535012547c2..c4be64fb54cc38805ecba3380597c7040b3b968b 100644
--- a/config/metrics/counts_all/20210201124934_deployments.yml
+++ b/config/metrics/counts_all/20210201124934_deployments.yml
@@ -1,4 +1,5 @@
 ---
+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 9732b34c771ad4b872d81e32ac2a56310ef24250..59ca951c28147bc2f5a5686492fef2b45e722c22 100644
--- a/config/metrics/counts_all/20210204124930_servers.yml
+++ b/config/metrics/counts_all/20210204124930_servers.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 c1ada3babcd7aa368cab5c502f9095235580a361..02a9e3db56450f01598ebdaddeaac9f3e796c4d2 100644
--- a/config/metrics/counts_all/20210204124932_clusters.yml
+++ b/config/metrics/counts_all/20210204124932_clusters.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 ce8674574f2eaf701d8930fa84b24104844755b2..fd58874e98830bb46166e69488e95af45b0c7886 100644
--- a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
+++ b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
@@ -1,4 +1,5 @@
 ---
+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 3a263f167d6ae04b4f70804d76ffcaab49989721..14c97a9b8b988548653216a68352e2793d0b210e 100644
--- a/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
+++ b/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
@@ -1,4 +1,5 @@
 ---
+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 c33fb10c4cbd4fa28420bbe992f81331c5253975..0995d26c9ed941b1b9cb0b71b056bfa2f6248912 100644
--- a/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
+++ b/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
@@ -1,4 +1,5 @@
 ---
+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 1600feeb834e9d9dba1582258bdc328650698856..4bed3379057e97e9a41bf1f3fd3cd7abee79ce71 100644
--- a/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
+++ b/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
@@ -1,4 +1,5 @@
 ---
+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 2e5883b6fbf4068cc3ddfea4734626a1e04e5364..b0cb18358ca2c13e7c577aa9dbd7fc6560ff0922 100644
--- a/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
+++ b/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
@@ -1,4 +1,5 @@
 ---
+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 7596572eaf1ef6159b83c988b56ffd1b1d8f72e8..a6dfe768e208f63dae6c498a9c57153596acba1b 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,4 +1,5 @@
 ---
+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 bbd3bfca2b285e69c8d569a28073f8a963408a3f..5fd57bdb0193eaa790c7731d25bf5ad7cf18dae8 100644
--- a/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
+++ b/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
@@ -1,4 +1,5 @@
 ---
+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 08e89517b8dba9d9323d1207cc6a57beace60b77..6b92fa1aa1e7434c1e8629dafa5c2e65bcd91b5e 100644
--- a/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
+++ b/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
@@ -1,4 +1,5 @@
 ---
+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 cc0a21b1cb3547575a90a9a3053205f943044630..c2c41f002698796c4e7fe557ea1af413ee0dfa0d 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,4 +1,5 @@
 ---
+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 9f778fb43240f8e1dbbecfbe5fb7d018eb14d32b..519149b839ec67a243b266405d5a7775bc8ec13c 100644
--- a/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
@@ -1,4 +1,5 @@
 ---
+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 d0bfba1cae24c7a749932e2249a427d2ecffc3fb..503eff4de83c5ffd038e5a86c4f3f6307d3c0386 100644
--- a/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
+++ b/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
@@ -1,4 +1,5 @@
 ---
+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 e9a534911bb2a13deeb6bdacc1d3411e963b4b1b..87a2a8517c5ff02fa67bada098c7e8ba84d78aa0 100644
--- a/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
@@ -1,4 +1,5 @@
 ---
+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 299fbfa3b7fb49887721a747f2a95235d3ab6eca..9c435cf5fdb3974c0b0427eefc49d2f6fff4d7c9 100644
--- a/config/metrics/counts_all/20210216175026_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 cfe0b3e361ef1de9887f8f0e4d7580d07c519fd4..34c62fbadc506d408a87091d717118dc5b52d850 100644
--- a/config/metrics/counts_all/20210216175037_suggestions.yml
+++ b/config/metrics/counts_all/20210216175037_suggestions.yml
@@ -1,4 +1,5 @@
 ---
+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 b3514e64df8544da21fb02f383bd8e3a9d355298..58eea5961f5798658950c2d358116960a5b8a297 100644
--- a/config/metrics/counts_all/20210216175039_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175039_merge_requests.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 b53fbb14ffcddfc9799417aeed44ba9ad493df02..7dd45570b1bb2f2f41fec578dd8167814dd946db 100644
--- a/config/metrics/counts_all/20210216175041_merge_request_comment.yml
+++ b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
@@ -1,4 +1,5 @@
 ---
+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 38d1d72339be9394c813b3e247e2772483977877..ca9d632f7fbaabe6db25e2d3ace21ad6535ddff5 100644
--- a/config/metrics/counts_all/20210216175043_merge_request_create.yml
+++ b/config/metrics/counts_all/20210216175043_merge_request_create.yml
@@ -1,4 +1,5 @@
 ---
+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 51715e14584f3b4190a3444046fabd5a9d136269..4fe94585cb5f12b65f7af3e6b0d06a20835991da 100644
--- a/config/metrics/counts_all/20210216175045_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175045_merge_requests.yml
@@ -1,4 +1,5 @@
 ---
+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 507200a0ac8aa0367b944fc5d6037b64d0d1f327..eecdbbce928ff99b86e0b970af8bc13f28629d32 100644
--- a/config/metrics/counts_all/20210216175053_suggestions.yml
+++ b/config/metrics/counts_all/20210216175053_suggestions.yml
@@ -1,4 +1,5 @@
 ---
+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 e0c55e89f30beac73d56b8b2a238c8866908ee97..051271c0ef7294fb2ac4ebb9a22c6772c887beab 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,4 +1,5 @@
 ---
+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 8149967d22e36cd7d66732544396f381de0d79e3..996ea2eb75834536f73f997484374a28533913ee 100644
--- a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
+++ b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 863ea73cbeeefa27918fd43d9cbe0d0aa3115500..ec14d9fb13684daf4970403c9aed5b2707e72ab2 100644
--- a/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
+++ b/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
@@ -1,4 +1,5 @@
 ---
+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 2d3689a0e8b9f2e6e868c6c7369079871d22c7bc..ad0ac652f38478d4dee8eb7cbd2f32c593a05fdc 100644
--- a/config/metrics/counts_all/20210216175232_clusters.yml
+++ b/config/metrics/counts_all/20210216175232_clusters.yml
@@ -1,4 +1,5 @@
 ---
+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 58db69494d685582eb4f3e95c85255493049ad38..ce24bd621f00991c25042b1c501a892904a1be0e 100644
--- a/config/metrics/counts_all/20210216175234_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175234_clusters_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 3e4d16b313e637872aa7151bae7ff8cf5aee22a5..0ed0d6cf7500394d4ad5d16420f701dd1ffc1c3c 100644
--- a/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 ccb13f9cbd09b945f87d1414c2b68471e7400b53..5012ead035b79eedd00b4ff4d278954787d5af2a 100644
--- a/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 d73499479b1cf37a5b73a1aead49bd87d6097c5e..f7bca6e41e390909a5839ae39dd110c7ae790345 100644
--- a/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 1226218d7ddd530333998fbf2430bbca63163af5..c565d98e49a081c129ed49315da445200adbfd3e 100644
--- a/config/metrics/counts_all/20210216175242_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175242_clusters_disabled.yml
@@ -1,4 +1,5 @@
 ---
+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 6d83aa114c57058c4f735a11323f1f781465bb97..287bdca078b4d855d977f0a9b7c92f5da1ae2cc7 100644
--- a/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
@@ -1,4 +1,5 @@
 ---
+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 696c3ef7703ad8765505e4459a280f76943dcf4c..68b61ff5b46220b5d67a3f43e1b43cc395ecd50d 100644
--- a/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
@@ -1,4 +1,5 @@
 ---
+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 f138e81e8a12ea3d145586b58a2166498a82c926..073850f5463b9e31f650805699afaf7660d467c8 100644
--- a/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
@@ -1,4 +1,5 @@
 ---
+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 3a876aace2301569eef98ac6987eed744db97e04..4fca68d6f71824ea0d6931e8d23b6917785c4d86 100644
--- a/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
+++ b/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
@@ -1,4 +1,5 @@
 ---
+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 6c0d06f67a8707ebd39f9a426c3c0d8954d8ce5f..4d8427593a11573d62e77ee454d70bb508cd5c43 100644
--- a/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
+++ b/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
@@ -1,4 +1,5 @@
 ---
+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 c0ec787ba3245716795527040cd686167ae3efcb..fe7c132d82f31f80b7139a89e808c7df0a1dd5dc 100644
--- a/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
+++ b/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
@@ -1,4 +1,5 @@
 ---
+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 df3791476a68710c21c6ed7d2dc2de167d49347c..1e3a96d31527d25139a24d5a8a428dc19fefc5a3 100644
--- a/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
+++ b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
@@ -1,4 +1,5 @@
 ---
+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 312b3a0959a450219ed17ad23ff545abb01d34db..0651d1f90a89cda71bbea72d0397cb4fc6ae8a35 100644
--- a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
+++ b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
@@ -1,4 +1,5 @@
 ---
+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 2850bf19272fd807dc3a71ad9228a13e2121260c..b86d5852c7b2f0b3d1f1dd9b6f04a4182da258ec 100644
--- a/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
@@ -1,4 +1,5 @@
 ---
+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 9a51decb60e9fafc88ef7d12e56f54ed2b70aa3a..1dea299b5ff64800dbf28c442e1781ccb6c6185e 100644
--- a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
+++ b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
@@ -1,4 +1,5 @@
 ---
+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 11acda094ea97b9e39861d722de5d33c151ac209..808540ba88f8641cc409ef71d13dfb7a4f6d13af 100644
--- a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
@@ -1,4 +1,5 @@
 ---
+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 a8ba5b65187bd74729eb6c331820f8408ac7bcac..34e28262f761e97d40db7f91055a6546fa173523 100644
--- a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
@@ -1,4 +1,5 @@
 ---
+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 b8fb5c94cefa3b6812cf5b5eeb2ff6333934813c..42b16eacd6e9d025ca4891b1fe4add5e818e48d9 100644
--- a/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
+++ b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
@@ -1,4 +1,5 @@
 ---
+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 547631db2f1aee1714c39a57899a987a33e220e0..b1ef839ac4303d4c97c7c2f739f7579f214e3e15 100644
--- a/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
+++ b/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
@@ -1,4 +1,5 @@
 ---
+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 c7c7f8c9adb01e5a7d18fa57f8ec57bdfe3476b6..392d44e655392232df0af6fe7871868fe4d880e5 100644
--- a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
+++ b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
@@ -1,4 +1,5 @@
 ---
+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 fc86315d64507d50e3d91ba10e8b64864bd1cc0d..6f2571e3710046676fa173264ed90f1ed208ed4d 100644
--- a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
+++ b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 38e3c790cec58c03e461cd0aba4c7c01951b116f..6c0ea2d0c58605c469d8ad0ee90120f31f5f3dc4 100644
--- a/config/metrics/counts_all/20210216175314_clusters_management_project.yml
+++ b/config/metrics/counts_all/20210216175314_clusters_management_project.yml
@@ -1,4 +1,5 @@
 ---
+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 00810d9908646bf71e1f5790611a504495c92bd0..2d9ceed4c569a223aeb9a6f130e7b3fbbd01c913 100644
--- a/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 905c78f88dfb361beac3dd1a7c3c06f3d68ad8c2..140dbaad91119576689948b7402a9e480d4a11ed 100644
--- a/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 7bb3b409fbb0279473a33ba8e783f82e6cf1e68a..8f242395e68f859929321690dfa13cee365fbd4d 100644
--- a/config/metrics/counts_all/20210216175324_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175324_terraform_reports.yml
@@ -1,4 +1,5 @@
 ---
+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 92f89b8a325a807d506fb2bf8e79e8667f933419..2bb13be07c5df41dc973a3a33e72e9f10e172230 100644
--- a/config/metrics/counts_all/20210216175326_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175326_terraform_states.yml
@@ -1,4 +1,5 @@
 ---
+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 c60571672833c18327187067014eb15e51939fde..ce9a919460a6e16eb40683f1d6967c108686b733 100644
--- a/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
@@ -1,4 +1,5 @@
 ---
+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 3f7814f7fea0a3efedb2fc5f2dc9771f6ec801fb..46301cbf2f398c29a11ec056cdc481902022e499 100644
--- a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
+++ b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
@@ -1,4 +1,5 @@
 ---
+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 fd0cd902e8c3424feb5c680a9833226c504c57cf..89eb556a996f03869b6133ed6ef21f1df178e789 100644
--- a/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
+++ b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
@@ -1,4 +1,5 @@
 ---
+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 8774a62b4754f80518ab7bc5e7b81c02cdf3f568..a7101c89a2c5b47687501a051de6107c3432e788 100644
--- a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
+++ b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
@@ -1,4 +1,5 @@
 ---
+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 ada40d5fcfaf8cace162b285666592a83d21f427..d32374df6a8788ff979a9de421518549a5df1c84 100644
--- a/config/metrics/counts_all/20210216175337_clusters_management_project.yml
+++ b/config/metrics/counts_all/20210216175337_clusters_management_project.yml
@@ -1,4 +1,5 @@
 ---
+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 35e94edf5096d992c2ea73fc343dcac67a7c6999..7547ea1c8ed77d3645db6588e2df4d9c8a0b83b8 100644
--- a/config/metrics/counts_all/20210216175339_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175339_clusters_disabled.yml
@@ -1,4 +1,5 @@
 ---
+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 c2a921eeb2be5fe8087e3f5e3a3f71ecd48e714a..77ffd392775085e78eb0404d2a35b10514b0805f 100644
--- a/config/metrics/counts_all/20210216175341_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175341_clusters_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 ab180d2102d4a8ac2761eb6a32b09ff45109c367..833ca0494dbef81990625a6c5827843674965b5c 100644
--- a/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
+++ b/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
@@ -1,4 +1,5 @@
 ---
+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 354cacc46a9c965d6cc82ae68c19e8834cc90fd6..c25be58930f5525a9ab2cbb63eef9e909d83dd2e 100644
--- a/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
+++ b/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
@@ -1,4 +1,5 @@
 ---
+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 2c5386ad7b5b636c4b0320499a8fe8b71ade4487..cc0f4efad5603db4b53c0470c24e8e552b21df93 100644
--- a/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
+++ b/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
@@ -1,4 +1,5 @@
 ---
+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 6b2151405977e561a675d132282fd912ed055e80..d90a85a149d72515ed430c82a22c72ffa3445a1d 100644
--- a/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
@@ -1,4 +1,5 @@
 ---
+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 3b43c90e06148425773d2004907b803882afab89..e038d6980a3858d1a56a17a0b437e355de44f6d5 100644
--- a/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 7ee008a09bcb18ce293e173b1c5593418c793ce4..4aa9989d95099e2107db50284eda0ef0d6061f72 100644
--- a/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
@@ -1,4 +1,5 @@
 ---
+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 8a251f403470ed72fce24bd28dea183156734692..d953b58a6e0413ddf6ccf3aeacf310c0089cac7e 100644
--- a/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 3dcecf724d28656f1cd1c223ea9513389e945e8e..85334120c7807982293140d1f967e2765a8aa5c5 100644
--- a/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
@@ -1,4 +1,5 @@
 ---
+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 4fec74ce9fa5f3a0b6fe08a334332292d7494c70..c94c1f8cbd8097ad2566a7cfae183ce7035f030d 100644
--- a/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 0edd5cf3bbc74423b80b4ef89a1f20ca3c711ab3..e09bf71d2cfa3eaf2bd971e14ad7333494d7a3a7 100644
--- a/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
@@ -1,4 +1,5 @@
 ---
+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 a5607b54d0576eb8aa71da065f5e5966a1b2a96f..3f3d67c8468bd12720144df3926567590bee69ea 100644
--- a/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
+++ b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 b8f5b8e8371675e53fb6350069574c9771545be3..68d10085870a714052b2a435558f68c9d0bc5539 100644
--- a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
+++ b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 36605f8cd92ca161d087f9ce295bf64ae97b53c2..68e0646146d609ae73e771a52264a625fb435c02 100644
--- a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
+++ b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 d254fedced47691c9fb80fcf1ad40612da903ef6..175cd176b0994722fe4295ad393baa542e1eafbd 100644
--- a/config/metrics/counts_all/20210216175448_network_policy_drops.yml
+++ b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 0ab1020eadfdaee583c656dd7c37011b32d238c0..2f0c1ef7ed897d8b8e974d7b12bd89fe7c816116 100644
--- a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
+++ b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 ecff09422671c796702b813c9252dbebf11fdca9..ded87a1272e97463b7cd8e3dce041c0024568115 100644
--- a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
+++ b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 230a4b45f7e4113638c5433b0eabc875a16aca9b..136607eab26cacb2ac607887aea5ea0332df1eac 100644
--- a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
+++ b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 1953965935723f32ba0dc7eb139e2c7c13cc9d72..9530a9937631287c5bbc99b9491997f9c5c71f72 100644
--- a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
+++ b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 29aaaaa3e02376d397dc94e22adc06d77c4bc99c..aca8b1d12907d0cb4cc4ac9cdc8ce16ec49c0db6 100644
--- a/config/metrics/counts_all/20210216175510_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175510_ci_builds.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 c619524508356a0da172984d6d1216e087858ecd..87933eb686c9e622f630e06b090c6845b98e8735 100644
--- a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 dde3fe3b962f3c3482de49bd16584757ff783b08..5736f89369f6851201f9a0aaaa84bcc7cbf15091 100644
--- a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 39fa444351f40ad3933a74a7b2693d0ef5d43f15..ccf24beccc07c0eab5698a741efd56a25e5f2da1 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,4 +1,5 @@
 ---
+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 003cf90d75a402a34317edb8384fb991e79a15dc..d00e0f0777c4c1636f55ff3eb3551961d4f57c82 100644
--- a/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
@@ -1,4 +1,5 @@
 ---
+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 7264940d5a4b65226592f11d89816f0b9bc44aa8..d0004bf8902cbc446aa6e00f79ba5c8a9e0d3c41 100644
--- a/config/metrics/counts_all/20210216175520_ci_runners.yml
+++ b/config/metrics/counts_all/20210216175520_ci_runners.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.ci_runners
 description: Total configured Runners in project
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175521_ci_triggers.yml b/config/metrics/counts_all/20210216175521_ci_triggers.yml
index 409794377cd65a807e331977c6f7e17b30f6bb16..024f004389e8c73cf1cf34a33da451b1ce3c5974 100644
--- a/config/metrics/counts_all/20210216175521_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175521_ci_triggers.yml
@@ -1,4 +1,5 @@
 ---
+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 57237d36c0d0ec376749179ae8ba2e4359f82707..923fc5426ef6eff9975baa956b1363b6c3c7b8ce 100644
--- a/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
@@ -1,4 +1,5 @@
 ---
+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 702c08ae2863b4b78dc7b21f780ffa8bb788c6e0..08ca3cd8016f84aada5fe25e8cbf93ca65bafcab 100644
--- a/config/metrics/counts_all/20210216175525_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175525_ci_builds.yml
@@ -1,4 +1,5 @@
 ---
+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 53bbb30717d7b9bff393cf8824d7f808b096c115..1ad849f6a28491a2ebe557153de5aed76ef23acc 100644
--- a/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
@@ -1,4 +1,5 @@
 ---
+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 e888c9a6fd2d4fa0a7cd2f0c8cf371793a345080..85368582dd99b597f08562d2b4f03fca897e5421 100644
--- a/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
@@ -1,4 +1,5 @@
 ---
+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 af5ecbf5a6382d82a35c928f6ec2ae2a272fcc2f..381c16ff446ba64961c7d4cafffbb534b80c2813 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,4 +1,5 @@
 ---
+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 1dcc5e885c71e3ef1f5df79dbe2726a50b6e067e..2e54d756869a5b64af22fcc384a1e326f61d2305 100644
--- a/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
@@ -1,4 +1,5 @@
 ---
+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 7ee753f6d3202196f5ebe54faade5f0ce471212e..b1585df984ec897a3426bff65b01bec7d7f6f8f7 100644
--- a/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
@@ -1,4 +1,5 @@
 ---
+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 a3bcc7eafbe25effc6b7ea8edf900dee9fdc38cd..1815adef5ba5fa19529f495ca9348e852a3dffe6 100644
--- a/config/metrics/counts_all/20210216175537_ci_pipelines.yml
+++ b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
@@ -1,4 +1,5 @@
 ---
+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 5b533f1e726bfc24ab0c2f787ae3ac111d296e00..9ef3dfa56b449df48ab5ee10f5bc631e120c3fa0 100644
--- a/config/metrics/counts_all/20210216175539_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175539_ci_triggers.yml
@@ -1,4 +1,5 @@
 ---
+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 8672e18dbfa07289ac3abb7fb55b90215cdfec64..449350ae6f15f3e119e5568b23c6671bcc68189b 100644
--- a/config/metrics/counts_all/20210216175612_dast_jobs.yml
+++ b/config/metrics/counts_all/20210216175612_dast_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 900cd5b37b7e6fc93eb5e20b0666e16b0adae9d7..02bb0a95125f45175b0f2d4ad8553dddce341bc0 100644
--- a/config/metrics/counts_all/20210216175614_user_dast_jobs.yml
+++ b/config/metrics/counts_all/20210216175614_user_dast_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 ad7d9de8f12fc81980ed4d1f92c3d407d259e361..b829a85929054dbe1568ae443ff7f3c432cf9840 100644
--- a/config/metrics/counts_all/20210216175621_web_hooks.yml
+++ b/config/metrics/counts_all/20210216175621_web_hooks.yml
@@ -1,4 +1,5 @@
 ---
+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 efb8771ee35eec9923a5b98210b562c672448f4d..75b17cf26940770b853b2e894de66514a35a4ade 100644
--- a/config/metrics/counts_all/20210216175623_projects_asana_active.yml
+++ b/config/metrics/counts_all/20210216175623_projects_asana_active.yml
@@ -1,4 +1,5 @@
 ---
+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 574dcd21ba5a0e551aa17a7d5750eb4a6f14ccb9..04a4c42ac42dc53d8639ebfcb0be9de8d4c15c78 100644
--- a/config/metrics/counts_all/20210216175625_groups_asana_active.yml
+++ b/config/metrics/counts_all/20210216175625_groups_asana_active.yml
@@ -1,4 +1,5 @@
 ---
+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 f66dc3d3d18bd1fea7df9e4654f31a133a1740eb..280bd2a65cebdef16113ef575edf42cc6a8c83cb 100644
--- a/config/metrics/counts_all/20210216175627_templates_asana_active.yml
+++ b/config/metrics/counts_all/20210216175627_templates_asana_active.yml
@@ -1,4 +1,5 @@
 ---
+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 b88ebad2b62c981f994ad9d6d8f1125df2ca2811..ddc4ebd81e0acafa594c222721cf6d7be7ffb656 100644
--- a/config/metrics/counts_all/20210216175628_instances_asana_active.yml
+++ b/config/metrics/counts_all/20210216175628_instances_asana_active.yml
@@ -1,4 +1,5 @@
 ---
+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 8288135e4a6d1049f4b6d76867a7ca356257424a..7c81aece0259a7e2ffbd78b3d035e68438f557f2 100644
--- a/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
@@ -1,4 +1,5 @@
 ---
+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 bef134521f92619db3376ffd45d0fd22ffc31af1..059d530bf9a211ff6551cfd0baf8ea3274c6d6af 100644
--- a/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
@@ -1,4 +1,5 @@
 ---
+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 802410374c12b0fcd5259e91a95891bbd4d0b53b..d4a18e98a79c6d696dc6c1fd00b3c26acd2a628d 100644
--- a/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
@@ -1,4 +1,5 @@
 ---
+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 f1dd893728952867706483ca4bcec2a6cb309c54..fbca5a637b4a68349f1c43ba054bf97ee5975891 100644
--- a/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
@@ -1,4 +1,5 @@
 ---
+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 48ac16aaf82718aafe502a8f4addd7bc05e63db1..d8c37f776646e3e5c8c9a5ce9c90146e6511e734 100644
--- a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
@@ -1,4 +1,5 @@
 ---
+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 4f625b6867928e074253345ad3899fe938c6bffe..d1af8c2820f1db2166d027a411521f2ef2c9cd4a 100644
--- a/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
@@ -1,4 +1,5 @@
 ---
+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 15a55d66d5d222f9191ff6e9542dccc14d0b8fb9..1e8ce793e0a8ee248de98e852aaa38a6aaccb993 100644
--- a/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
@@ -1,4 +1,5 @@
 ---
+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 e39ef4e175d43ce72dd24c20c75cf0a0d7b9fb87..91654462c1a76b60e984a9acee0cdcc9aaa1ba6a 100644
--- a/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
@@ -1,4 +1,5 @@
 ---
+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 45094301a0ced8bb2667c9637a9f27257e2464d4..ce1cf9ddace800c75b04c4668ebf10baacd42023 100644
--- a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 ab3e27f05214bc67008211b6262a0267ecf07007..12cdc11d195e2960f6a258b4b517ce2b82c566c6 100644
--- a/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
@@ -1,4 +1,5 @@
 ---
+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 f09b32f4efd09d151497ebb622ee70b7653bc60d..da8243e1dd6d3dbaa3831f5a5ea3e8edb5499367 100644
--- a/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
@@ -1,4 +1,5 @@
 ---
+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 98faf222d71f223d4fc0a211a244d611add22acc..3e5bc70a99eae53854d5a5b79feac5fc72ee4a45 100644
--- a/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
@@ -1,4 +1,5 @@
 ---
+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 2e18cde5cd4c9777eb02895e6a1386903de16b87..50546cbf76bead1a4312b99df9c402adf91f61e6 100644
--- a/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
@@ -1,4 +1,5 @@
 ---
+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 83c793f9992736c0a8b6c338e923482f6596794d..32635663d6897051784348808db739dd60d13877 100644
--- a/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
@@ -1,4 +1,5 @@
 ---
+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 917d26db38c024aed648f557a609b9194a9da9fc..a8541fc21f07f21fd225120f559cb139e5274814 100644
--- a/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
@@ -1,4 +1,5 @@
 ---
+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 adfac50edb8b3b6da70b4d3df77773b58562245d..3816cc2a245b130f195b5e0542e4d22b14b183aa 100644
--- a/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
@@ -1,4 +1,5 @@
 ---
+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 f93bab2acb52a13956380dd2dd8c7d5d0fb4a628..5bdf964f80cedfdaa25f89ce8df2e11dc0561838 100644
--- a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
@@ -1,4 +1,5 @@
 ---
+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 732eda5f97e6a1d6606e60d1c050b33751fbdfc3..ec008d0f91cfc8e27ac2bb37a4d8fccb5511565c 100644
--- a/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
@@ -1,4 +1,5 @@
 ---
+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 6098f9827860cfea27160409f1a125b1ad3577df..63bc30268f3214927766f738016f2b92ad8d11d5 100644
--- a/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
@@ -1,4 +1,5 @@
 ---
+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 261a73b5009c02287e07dfb034fe7047f1f43be0..1521204b5dc4dace179e4470318dcede0b7cad81 100644
--- a/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
@@ -1,4 +1,5 @@
 ---
+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 3ebdf5cb7e8b08d50020cc7b00ec8eeddec52149..40f061c242d7be36c40a1db062127664455a4e14 100644
--- a/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
@@ -1,4 +1,5 @@
 ---
+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 6dc86fc2e78db0ac2e171c3e1bba2f2f0f419de4..c82114a75db9cfc007449be9d1d9915388b80e5b 100644
--- a/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
@@ -1,4 +1,5 @@
 ---
+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 7a4caddc9fae0fa0e9a474e6167eb1a7b3db3213..9270e03557dbca57483fab5ceb5500f5543168c7 100644
--- a/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
@@ -1,4 +1,5 @@
 ---
+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 91ca8b112a16def306f67ea07eff6c26e352b674..e503d9042b6c88ee3dff78f2677c5d1f913bfe9a 100644
--- a/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
@@ -1,4 +1,5 @@
 ---
+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 9b032b2ccdba0e8207b1ba4564624a9e42bcabb2..85e23182bf2fc521b8562c014a26486e64abbcbd 100644
--- a/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
@@ -1,4 +1,5 @@
 ---
+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 dbd3ca666cba7e48a144d0c54ba892fbd2f482d9..327747aa559beae420dca9c545b29f7d90918fd9 100644
--- a/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
@@ -1,4 +1,5 @@
 ---
+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 e6955d37aaf8e004bdeef7464e56ab1ce581b618..f8e938349f9fb0358e838c81d346139abaaf0993 100644
--- a/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
@@ -1,4 +1,5 @@
 ---
+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 14ce92b9755767cf2497448d60ae43a44ba29308..fb55d4d3d5572be63ddf3f7bf39268b688ee9896 100644
--- a/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
@@ -1,4 +1,5 @@
 ---
+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 72bb63ea683e55ca82a7fc4aa3c2e6b152d14a8d..4bbaf6e6554a798c4eb3ecb0802ee454b3573300 100644
--- a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
@@ -1,4 +1,5 @@
 ---
+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 7d3b91b253c54ec251b4a305fa19c9d58d45e3f8..c6771e6137615ce26850c3ccd7c2367e5b9a7b9e 100644
--- a/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
@@ -1,4 +1,5 @@
 ---
+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 fc00c5bc800b70a2f47a67a494d8b037e5b4460d..778c0de4dc4e3232d7ca1d6a7532321494e0b682 100644
--- a/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
@@ -1,4 +1,5 @@
 ---
+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 3d62a32e0f81ae31dbc38e93ec38fcf935852a44..df30cd7ec1f8e37cfc13c9ff5d24ec4b4c580a4b 100644
--- a/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
@@ -1,4 +1,5 @@
 ---
+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 9c74e8ed7612a37b2e753394529a5149e2cf1264..0a4e7d99d88bf03d132d8083f2176fd0c69c562b 100644
--- a/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
@@ -1,4 +1,5 @@
 ---
+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 de84d268e6e710eee50fbf5c35a2f60b2fdc3b9d..87d0c93843e1397d45e352a9feaa6340a63b1348 100644
--- a/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
@@ -1,4 +1,5 @@
 ---
+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 88889827cd5f28465ea1034f206c8c580b180f24..8f94952cc10e792d0426b7a3c6ea5dc2f0a2deb9 100644
--- a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
@@ -1,4 +1,5 @@
 ---
+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 6a441e394b8d0acd46b04c4f89bfb89554761229..f2628ced407ae6d956ae835a0b736940834b5cc9 100644
--- a/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
@@ -1,4 +1,5 @@
 ---
+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 e94deefbe4f2f866e308f2fd53e263ba9cc1eb87..a70966d46a0cd5d31eeb20618d6611452553652f 100644
--- a/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
@@ -1,4 +1,5 @@
 ---
+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 a73868e398b4b0db3d0e0ffbe479adfec998f54a..95c6a39294b17d6ab3a3c5f37a8c693b53f69894 100644
--- a/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
@@ -1,4 +1,5 @@
 ---
+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 891bbb3377722b6605b6f661924a566d1612b960..fbb968ad54d37786d54fea3dd061b643a79dd44f 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,4 +1,5 @@
 ---
+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 6abbcb5554b4b3e3d33bf2689d81c604b98264cb..8345051c503c5d6fd31351e1108474dab8a72709 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,4 +1,5 @@
 ---
+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 59eb025f651ade201b9130a6f6dcee3040bee127..f9ef9d86fd435884d3461cb81c5ed8f9fea45515 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,4 +1,5 @@
 ---
+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 364f8ce53bb59296c02d3e2eab0cc8ba87e16bd5..dfc66da3950038ca8a0b33cb81c18a1783d5c2fb 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,4 +1,5 @@
 ---
+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 6df170a48e0dd9a5088b636473843a10f77300d1..4df6406a9e23386718d7629fabf33935ddab0012 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,4 +1,5 @@
 ---
+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 f4dc9dcbc724622b87697c6423bbb49b1f58b389..d87dc02e454b065bada341ea4e600050b0e480ac 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,4 +1,5 @@
 ---
+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 b564bc70e73c3e0a4b9cb88fcb5d9d06b6fa97b8..8b122d7876095d348418ef25613e776209a60d6e 100644
--- a/config/metrics/counts_all/20210216175753_projects_discord_active.yml
+++ b/config/metrics/counts_all/20210216175753_projects_discord_active.yml
@@ -1,4 +1,5 @@
 ---
+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 fb24c471210d29d8896c9f4fad1fc77eaec33fb8..f00f412dd4e10a185a9af4a46a14b6f38636a5b2 100644
--- a/config/metrics/counts_all/20210216175755_groups_discord_active.yml
+++ b/config/metrics/counts_all/20210216175755_groups_discord_active.yml
@@ -1,4 +1,5 @@
 ---
+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 e5a1082ca20e51a5d5f83df86f9cb74f3e965314..116bd46a26c714ad9098a76b6b3176edb9a370b8 100644
--- a/config/metrics/counts_all/20210216175756_templates_discord_active.yml
+++ b/config/metrics/counts_all/20210216175756_templates_discord_active.yml
@@ -1,4 +1,5 @@
 ---
+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 039919523fec0443ea6581ca00ec42a2396c9dc8..4220913f48650bb306eec609dad7e3f2dd985487 100644
--- a/config/metrics/counts_all/20210216175758_instances_discord_active.yml
+++ b/config/metrics/counts_all/20210216175758_instances_discord_active.yml
@@ -1,4 +1,5 @@
 ---
+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 b897c248629f322e787b7ab87914dc442f8887ba..7f7adba910a4eeb82224384fa4bf3e276f27404f 100644
--- a/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
+++ b/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
@@ -1,4 +1,5 @@
 ---
+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 3cdb961ba2f85a86225771343ac2532d22ef0003..3a30d9edc8121e832215de74a6d451422c42f1de 100644
--- a/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
+++ b/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
@@ -1,4 +1,5 @@
 ---
+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 cd9459478db6d7dd43c454de30dac7b1310ec436..0d9f2a8a1c25d1098721f00cc7cf0642ee9d373a 100644
--- a/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 c5487775c577842c4776d307376f0ffe385b7475..d663e7cce1dd3d3e6bdcab1c02da7e460c4d992b 100644
--- a/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
@@ -1,4 +1,5 @@
 ---
+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 09ac9cacefa05b75fbaa5eef9ffb5c481f8565e8..deec873fe42244a5d32738cfea8a6e3c0b47e37b 100644
--- a/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
@@ -1,4 +1,5 @@
 ---
+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 c3a77a9c57700325a3f848fae8132952b154f034..7e0b4cdf5c34d30b2d747545ec73098ff4407ca6 100644
--- a/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
@@ -1,4 +1,5 @@
 ---
+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 130072f42d13fa576f52c2d159d3b3545da8e325..9e180a77a1afb2f30bb6ecb1e826c088a02041d6 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,4 +1,5 @@
 ---
+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 74e6d5c41bd79b090c71a6ccb7ba78f2aaef858a..2a988b3f3bdb736d12a6c9e140a75b5d14757c8a 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,4 +1,5 @@
 ---
+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 8da08899b88335cf8e129d14fb98a96a440cc4ed..8b45d688c7e308b47e13d973aa15f295abea8948 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,4 +1,5 @@
 ---
+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 0c6bdeae9b404bb694f59cd4651c1bae92b14300..395cdca20972f5c52914662a200f1e952193ddb4 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,4 +1,5 @@
 ---
+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 93d77a190080db2a608fd547e060665e6ee73747..0b8ded8075020d01291eebb3f5a5a02f69e52fec 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,4 +1,5 @@
 ---
+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 c526b9f18e94548c24f63c7bdec690b8d3aac1da..bbd1e8352a89abd105d5f08976bbafc4f69ae1aa 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,4 +1,5 @@
 ---
+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 02581759ec3bb8b74519e1481b6af28d58cbbd8a..a7c697c42bc3ac55afe5986fa7ba96a8c497735c 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,4 +1,5 @@
 ---
+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 a49c9a880483919df831f0ee2a2f99239d294546..921c3b93f63b2ae317e0ebde3fc342968180a910 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,4 +1,5 @@
 ---
+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 fa19cf0e9bee3e221c5a5f2fbffc2d030f7b263c..5a0eacc0c14456ec4c6bb99093be2ea352297b2a 100644
--- a/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
@@ -1,4 +1,5 @@
 ---
+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 6ee99ca89dac5a45fecf2ccfe50d6fb04fb4f227..230ed723a54a790809f82e88a5dc655c54fbe740 100644
--- a/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
@@ -1,4 +1,5 @@
 ---
+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 6d8b451b3084dce4ed845504ca4f509a9bee4fde..8c20f6fa5c65ba216553dd4ac1edb50788fe9c99 100644
--- a/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
@@ -1,4 +1,5 @@
 ---
+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 a83e2f27a5841f970e9689cea2a742b575a6b360..621535489a9770ae5459a758deff8cde3f73348a 100644
--- a/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
@@ -1,4 +1,5 @@
 ---
+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 84836a95ae390af453758e07d3b46df42e31711e..86a1a7666719bbfb97cbfc5cdf363356a59c9206 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,4 +1,5 @@
 ---
+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 f7ee76248249fddb9aac1dc646587164695f456e..06105bbd524eb2a90412bb440dd542430931fb50 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,4 +1,5 @@
 ---
+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 4520ef6b86914ee837d5659228a7c7652d34eb14..ea0a59427bc48398d7838c948a2d359690c3b7cf 100644
--- a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
@@ -1,4 +1,5 @@
 ---
+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 d678e3174df6797fb82929424c2c1a0c13e93857..17796bfe960bcbdacb95837de962b5eb18eeca0a 100644
--- a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
@@ -1,4 +1,5 @@
 ---
+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 f4765aa34f33bd691c7550ac8f9bc87759e27de8..5934b7ac5739c1af38c399ada16747b64c314c74 100644
--- a/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
@@ -1,4 +1,5 @@
 ---
+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 89a862d4cc87ff37e40716aa0bf50fc271999c02..816c14b8c9d5115b16d403a11758710f7f0d33bd 100644
--- a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
@@ -1,4 +1,5 @@
 ---
+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 836ecbc0576230f8960acd56b01ccddf73bbe501..c7d1e8b2c8ebc1b1eeb75bbb7fa1f145d08cb505 100644
--- a/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
@@ -1,4 +1,5 @@
 ---
+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 8af2e0733ac2f544c925f2be60c94c7ce6a68e64..c0ba0088c162745db5126e7de01382ff34cbd91a 100644
--- a/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
@@ -1,4 +1,5 @@
 ---
+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 63c913a65a0e9acdb55a469c6f4c059dd295fdbb..86dfd299126d77c36bece59991430ac97d21e540 100644
--- a/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
@@ -1,4 +1,5 @@
 ---
+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 ae34972f2e9dbd71ce8d486ae4495da6294f0d53..24e3c0fc0efa9ac5d3d92780cd0c5a84da2c06dc 100644
--- a/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
@@ -1,4 +1,5 @@
 ---
+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 ecfffa98a04ea734c8a7893876402bfa9aba3cc7..70da2527614687f5af772a6ab8a5810fdc37de26 100644
--- a/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
@@ -1,4 +1,5 @@
 ---
+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 5227013eb5158e83e27f71101f79e19dc922b64b..b89f32c3c959ce8f9d86b069af23d87b98363213 100644
--- a/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
@@ -1,4 +1,5 @@
 ---
+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 64e54c864bd41f748fbd745e9e6ec32f4981f40d..a2fc27b6fbdfa1bd8dae7036b19beeb8aac48ebc 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,4 +1,5 @@
 ---
+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 3889c6e9a104f4b92ac8b8df1fba3eab53ca7ce1..e46c6482dea05efbab6df5ccb853d20894174f06 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,4 +1,5 @@
 ---
+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 e6b0c781cb52a82b361c9aa6f345968a9b14931f..799521be83cbfd62abfd36c2f071ee9c3fa6d05e 100644
--- a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
@@ -1,4 +1,5 @@
 ---
+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 4a55850b70d77b853d47d58b74f15ef063faefc1..c354a3ad03dd45f436fe22ea02e32bde80fd0b37 100644
--- a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
@@ -1,4 +1,5 @@
 ---
+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 d022ac8261dc12294a48211bc8598f4c36119a93..18612ed28eacdf87688f5eacd9ac9e50abdf6249 100644
--- a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
@@ -1,4 +1,5 @@
 ---
+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 c5460aecb21b9c3823e67376344335e3a536c9ca..225c0ce84937f228625c9c1b07a2a5eab4bb816f 100644
--- a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
@@ -1,4 +1,5 @@
 ---
+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 5056947f70f9f68c8263a200a76cfd205773de39..e87f2c43338dbd257aa579fa1f13425772eb27e9 100644
--- a/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
@@ -1,4 +1,5 @@
 ---
+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 2069d8d703b7585118f5c2c843264c7df4019a8a..9092c8d76433bf85b4e782c1d09838dbfe2a19dd 100644
--- a/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
@@ -1,4 +1,5 @@
 ---
+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 d761968d629d987fc07ebae212f45133ad522883..f3f1a2e0c60950035859b303ffad7058e6755503 100644
--- a/config/metrics/counts_all/20210216175921_projects_irker_active.yml
+++ b/config/metrics/counts_all/20210216175921_projects_irker_active.yml
@@ -1,4 +1,5 @@
 ---
+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 caa1d1eae8c32fbccec0932fbd145abeedf54517..f4ce06c3f46ff675168eb243ec8a65dcfdad4191 100644
--- a/config/metrics/counts_all/20210216175923_groups_irker_active.yml
+++ b/config/metrics/counts_all/20210216175923_groups_irker_active.yml
@@ -1,4 +1,5 @@
 ---
+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 e3d8b04f66c325c3be60eecf9810444a5b14a0a7..f8e0543e255a1ece45e831aec61f299f527cb5f8 100644
--- a/config/metrics/counts_all/20210216175924_templates_irker_active.yml
+++ b/config/metrics/counts_all/20210216175924_templates_irker_active.yml
@@ -1,4 +1,5 @@
 ---
+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 b6a7a07e83f8ed0c3b09dcedace31bcea8a54a00..0a47027beacfec76518144bdc6ada7cf63c0b89d 100644
--- a/config/metrics/counts_all/20210216175926_instances_irker_active.yml
+++ b/config/metrics/counts_all/20210216175926_instances_irker_active.yml
@@ -1,4 +1,5 @@
 ---
+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 2a140890847df402e9801b292de60e4f08147985..5c7436821f4334432fd331826b0dea6a037503ab 100644
--- a/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
+++ b/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
@@ -1,4 +1,5 @@
 ---
+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 4d023a1324c09760d98433388390e54a030c3d10..5ea531dec902a081a27ab068513bb9b931cbaf6f 100644
--- a/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
+++ b/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
@@ -1,4 +1,5 @@
 ---
+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 5562d5b346245ed27c8ed97df9e54132fd3b0e73..0d75ad60268305e4a25ffd3f621e0b6348d98244 100644
--- a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 08617343a108aae98763e9c75229f2170c2d151c..2c5223c9d3296c2f7b0e1b2310bd8a9e8aa6e89e 100644
--- a/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
@@ -1,4 +1,5 @@
 ---
+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 13f0d1547ad99b8858f97659704353e64a936de5..6817fc10cdb979e6afb1f0e5a44c20b8e531f2a6 100644
--- a/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
@@ -1,4 +1,5 @@
 ---
+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 8b03256b5ce75ff891ec21cbb60049ecb5b97661..dd8c64e551af020466d79cbd3180829d4763228c 100644
--- a/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
@@ -1,4 +1,5 @@
 ---
+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 8726b9bbfb7c52f9f624fdeb39bcc6812a6afa04..855a66e0683d5794dbca74de1736b5251e116479 100644
--- a/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
@@ -1,4 +1,5 @@
 ---
+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 1e5d400a3855c2cde892bf95471a2aa5fa98dff4..d3fff6d20819e9144e8975d881dcbdb0bf4504cf 100644
--- a/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
@@ -1,4 +1,5 @@
 ---
+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 4bc46c3ca2ab229ccbc72fbcb6fa4db133b49df3..f97ee2b04f1f66caa1e2c1e1471dd705ffa0c904 100644
--- a/config/metrics/counts_all/20210216175943_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 0b8923f669c07827284e611282dd84f1a037327a..3b6dbb13cda813e23c908808e84953eab1dbbfda 100644
--- a/config/metrics/counts_all/20210216175945_groups_jira_active.yml
+++ b/config/metrics/counts_all/20210216175945_groups_jira_active.yml
@@ -1,4 +1,5 @@
 ---
+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 be7b2c43d2e908c0476395259bf59103a0fe60bf..1f594a22f201bc2fb95cb5f09d9b495f3e75cfbc 100644
--- a/config/metrics/counts_all/20210216175946_templates_jira_active.yml
+++ b/config/metrics/counts_all/20210216175946_templates_jira_active.yml
@@ -1,4 +1,5 @@
 ---
+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 8b10ec30d5ff0c8c20481c9fe36f75dade0a9239..dfe5242dd35c6cabeb52a2093da549a4de256243 100644
--- a/config/metrics/counts_all/20210216175948_instances_jira_active.yml
+++ b/config/metrics/counts_all/20210216175948_instances_jira_active.yml
@@ -1,4 +1,5 @@
 ---
+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 6e3d01b03822fdf240b962f2142381e4bf714222..d1fc604e1de5dc3de1715a7b7529d1c6e215d287 100644
--- a/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
+++ b/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
@@ -1,4 +1,5 @@
 ---
+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 21148f3b62b4696eb989d8cfce66143fa92a9c18..e94b051cb8f130a1579184af4478454e302fdbf4 100644
--- a/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
+++ b/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
@@ -1,4 +1,5 @@
 ---
+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 dc81192fd9d4706ffa30a4ed57ee4f6025e88ef9..45c54c82b60d691b1fe3985f0da80d4c38bff84e 100644
--- a/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
@@ -1,4 +1,5 @@
 ---
+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 1a7a8fb69f65ddb1bb72faf2f6fe19802202c803..21672075af2382251df6e8440e1d7a9ce5bbd5df 100644
--- a/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
@@ -1,4 +1,5 @@
 ---
+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 f1ec412d47c3f65f54bf89b230c3a7990e1ad4be..56dbdde346d021079a48ed13b1aaa23ebcdf9e8a 100644
--- a/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
@@ -1,4 +1,5 @@
 ---
+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 8d1bab49e618f3aa15a65e307dec7f8564636b47..f52e3d338a7828f52c41e8eea5941c12683c7fe4 100644
--- a/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
@@ -1,4 +1,5 @@
 ---
+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 64dcfaa0d8d5d9e5a12cf28253869341f1b88dba..e465b4cbef41a86de441f8404e48e1fc3c4f0288 100644
--- a/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
@@ -1,4 +1,5 @@
 ---
+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 b6d522952171f3331b41524adcda575c6af3fe18..06de03969039d5f22df3e4a7a1aac55d8cceb68a 100644
--- a/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
@@ -1,4 +1,5 @@
 ---
+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 5174090a00f79baf8f71203d3331da7e819e1e97..9a85ae8312c44e89dd49a4b865c7ac00dffb9ffc 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,4 +1,5 @@
 ---
+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 f7d2e6d99bc693b5ae81ff1d1d003425e04f445a..6f4f6650546cd7fe3ddb516938518c818b25b50a 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,4 +1,5 @@
 ---
+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 375908862a60b1ea533873ce386115ae4e630594..43a5f62686991523fa5068d1ed31e9af0d3dce11 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,4 +1,5 @@
 ---
+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 f0cb0cd24f9ec0bebf0adf63c9325df3161bf64a..53aa6d27527cc19ac71063a8c4ba7b301bf59191 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,4 +1,5 @@
 ---
+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 b79a39c6c13648ece92e503684237d6abc5e3870..891fac7c787a7a07d65f07894ff16d0c6bbfa93b 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,4 +1,5 @@
 ---
+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 f9f9a438ad295bf87039ad39bddb7117696b863c..c8c36866d441bf82d297e26be2394333c9429843 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,4 +1,5 @@
 ---
+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 e248d714da4eb0b3faff705d5f490d4faddd8e1a..560b42cde77caa7f81afefb9986e4303e3bfbf80 100644
--- a/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
@@ -1,4 +1,5 @@
 ---
+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 6d53d5675eda889ceffa548b23ee2af9c97131df..dc7371d17457e399a54f2f123694000a898ec919 100644
--- a/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
@@ -1,4 +1,5 @@
 ---
+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 bde0e661245c152a3d38b7786e084d3084ca3002..370419aff592f944421ea4c608b3a1cc64e9681d 100644
--- a/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
@@ -1,4 +1,5 @@
 ---
+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 eff8128377541f61479b9d3c457d08ee034d40c1..610d09a68b5bb12e83b9572caad03ff586d2d356 100644
--- a/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
@@ -1,4 +1,5 @@
 ---
+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 ac3c4bad7c0dc83837b2695d7f5822836d7e7f9a..a2c085f30e582a79c99d96416e5d015729af625c 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,4 +1,5 @@
 ---
+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 6a39f71d40b0e7646348beeae4c1f579e89b7b0a..be22c7830f3cc832bbff984cea741bf2c0e7aeba 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,4 +1,5 @@
 ---
+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 108c883b16a0e92b9b268f0822e9b707c7be1207..ec5ac451d718b22853b0e977d0a5cc292976dd45 100644
--- a/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
@@ -1,4 +1,5 @@
 ---
+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 635b98063b62043c6ce0f27888f8c00dea30842e..0d75f771ea0e316e9fd3b217e3d06adf98b4ecea 100644
--- a/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
@@ -1,4 +1,5 @@
 ---
+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 80c06a4666db254b6f90889a257aa0dc1d36c89f..61d9f15add083811f98b5e7d8a1880bb240b6d1d 100644
--- a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
@@ -1,4 +1,5 @@
 ---
+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 15fc1ebef92c8ff96bc427d84b9f35295d77f811..ae4f5f06814301a7e656529da7cccfcca8a72117 100644
--- a/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
@@ -1,4 +1,5 @@
 ---
+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 6bb67500dd8405185e663ee9f82dbbde791de91c..08d464c22138468d93ad2b4cff2cb8f35b0b9ed4 100644
--- a/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
@@ -1,4 +1,5 @@
 ---
+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 c47f2e3d363a0d267c164f128c3e4e13bc21bcbd..569a7eb830646a5ec5d464d75cc0219a89110073 100644
--- a/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
@@ -1,4 +1,5 @@
 ---
+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 6f358cd4945e7928a94d9166937c344bc84edc27..3b45c9f9947b9fd01981770cd454a19e96d2ef2d 100644
--- a/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
@@ -1,4 +1,5 @@
 ---
+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 be9042317fc6887f9c2158c2854bee75fe2e7f53..fddcd9a914685dd492c8346f296e52d7e421f93c 100644
--- a/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
@@ -1,4 +1,5 @@
 ---
+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 84fe24687e2c61a4ce47fe91d8441a8d3e7f7c3e..701d75a96846441d6ec1606fffdece63817ff82d 100644
--- a/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
@@ -1,4 +1,5 @@
 ---
+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 8206ba25598a19632f9b28790d34de67fabc7305..178baadc0709f68923f3af719f7f7cb624ce3275 100644
--- a/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
@@ -1,4 +1,5 @@
 ---
+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 ff16dcbe7cea112666f1576a0b6402ff4291bf5d..cd7e583c50ebfcd9e9440a1e02a470d7c1aeef25 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,4 +1,5 @@
 ---
+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 d16cccfe6d84b67dd6644769360f008317d30025..cce5ac08de0f69614a6c803547a2fa4d9b6c6a20 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,4 +1,5 @@
 ---
+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 12d1ce1de385c054f9978fb6bd119f79a9be1d17..99326cea857577f777ce708b3878dfa7d5ad482e 100644
--- a/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
@@ -1,4 +1,5 @@
 ---
+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 a52c3edc3396d9b0aee7737ad0410ff53422eaed..7045d5e34b36d9bf1bbd7d9eb34a63cb1ad7cb3d 100644
--- a/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
@@ -1,4 +1,5 @@
 ---
+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 eae2d8b28226309afafcc4da6b97250a3715504c..7be62a78316d0e0d533b9fd3bd4760f8247c402e 100644
--- a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
@@ -1,4 +1,5 @@
 ---
+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 eade998165cec3c9829c07dd424d08c8d0ca0070..1c5a93d709aee648cc497c2479ee147048feb499 100644
--- a/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
@@ -1,4 +1,5 @@
 ---
+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 5d6f67a94b77858e6f0ac3149ed82f2a04ec48e5..472d2aa43fbb89487a1ae1bd2768394972645a48 100644
--- a/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
@@ -1,4 +1,5 @@
 ---
+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 8377d6030000ac2a40eaa1dd8ed01a5174eb05cb..184aea3687d1806274a8bc1c1aec8e64fd675f60 100644
--- a/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
@@ -1,4 +1,5 @@
 ---
+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 fb9a2146ebc9003ef964d8d54da6dc1aae1ebdfe..d3185fc46ac5282295b1b99139f530cba8f7abe0 100644
--- a/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
@@ -1,4 +1,5 @@
 ---
+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 0cf7c1bd57223b4fcb4314fd9b00465b0c7dff8f..c44a4d69fe99fa7cdcd632592068022c945a64f0 100644
--- a/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
@@ -1,4 +1,5 @@
 ---
+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 fdee417531f8706759116a77d11729c49dfd2c55..a3e72973cc57b09391f102fe0009d62078d77819 100644
--- a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
@@ -1,4 +1,5 @@
 ---
+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 bde6cf54e35738cedfa918501383b20ae4fd45ef..b327d19929ac6eebc33d0ded2d668186501af4f0 100644
--- a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
@@ -1,4 +1,5 @@
 ---
+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 44856dfe64709043ce75a0601a9553a70392faee..7326ed1cc0b952246bcc5ad1b5a8c8141b7b86bc 100644
--- a/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
@@ -1,4 +1,5 @@
 ---
+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 8e1ff124e435afd104fc03e10163f56472fabe55..bb235f34c2a4a63da3e321ca80c6ddcbd949f3da 100644
--- a/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
@@ -1,4 +1,5 @@
 ---
+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 228827a60c6f9c39fe253ff5fd920c9f7b48c6dc..9fdafd52921b84fc4f5de170d75996c7bed8aa67 100644
--- a/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
@@ -1,4 +1,5 @@
 ---
+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 10de4fb97433ba1f8c76472c41d15ebb7b4334c4..2fa05ce7c92c6ae975d991ba8c598aacf73f1d79 100644
--- a/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
@@ -1,4 +1,5 @@
 ---
+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 89efedbc7fc814c23498f7239ba433037228d75f..87819195ab2a6b1d891c767f564f1beabba73278 100644
--- a/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
@@ -1,4 +1,5 @@
 ---
+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 a10db3fa2ad9b25e9a441f200143f4d904526673..45a9c7e654401a59359d86b71986f0faec51fe95 100644
--- a/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
@@ -1,4 +1,5 @@
 ---
+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 6809afa4d4a8618799b460d9d8207f9c11161360..8b2dff7e6b7502a6688985c5b6ba771d3ccc183b 100644
--- a/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
@@ -1,4 +1,5 @@
 ---
+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 9ae0bc0bfd7289f4311e201fe1140bd480ef6499..79afa2e049f5061fb06ff510f702589aef6af07d 100644
--- a/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
@@ -1,4 +1,5 @@
 ---
+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 3a5bec84a580eb90a2e11abbadac3939e4bf43db..5e7a9c2a9470e6b800635abf9eff51f5c1deeba1 100644
--- a/config/metrics/counts_all/20210216180122_projects_slack_active.yml
+++ b/config/metrics/counts_all/20210216180122_projects_slack_active.yml
@@ -1,4 +1,5 @@
 ---
+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 c63632dd59be38d1c89f34e878b79eac92b11bd7..c37e9f9140a1997ba4571082ae6c77cd056a5822 100644
--- a/config/metrics/counts_all/20210216180124_groups_slack_active.yml
+++ b/config/metrics/counts_all/20210216180124_groups_slack_active.yml
@@ -1,4 +1,5 @@
 ---
+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 0bee63532a4489e1372093cefd000de8069a79a8..29d0395f65fc27a4f8b9482db787cdf7945d26de 100644
--- a/config/metrics/counts_all/20210216180126_templates_slack_active.yml
+++ b/config/metrics/counts_all/20210216180126_templates_slack_active.yml
@@ -1,4 +1,5 @@
 ---
+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 3a74a68251d89d0229ec7de2bc21ebd70ae93c54..cc5b7bf37cfe86ae786c998fc13e72c9b7fa2b49 100644
--- a/config/metrics/counts_all/20210216180127_instances_slack_active.yml
+++ b/config/metrics/counts_all/20210216180127_instances_slack_active.yml
@@ -1,4 +1,5 @@
 ---
+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 304d780314fcfc7dfcaea8be2ef7938bdbdf3b2d..3a74804a708e531d79c5657f0fc39e19eced6e1e 100644
--- a/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
@@ -1,4 +1,5 @@
 ---
+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 ebb7b88d10b5c8b9a446c505a1003724dbf68153..2c3b609c62c52160f25bdc6f8a7afcdab133fe08 100644
--- a/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
@@ -1,4 +1,5 @@
 ---
+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 06c45e120404aebf5c8c55aa8740b276a9f55669..123e54a476e69240f9b21e2aec20c5897bf53f33 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,4 +1,5 @@
 ---
+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 e277c4b7d41e5e312247d7fe798dbc04821d914c..6d89c7b9989f08efeb70413899a743fd6b7e6e3b 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,4 +1,5 @@
 ---
+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 3751024afddef1588bdb049a3e4be2e08ba2e734..af55e77278978a3ade2753d5341ae623ef08c163 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,4 +1,5 @@
 ---
+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 69717f5a91727a0092e7f9b92b864adee723ca44..a8f1e42d1f6677babaac9bf0dfffb6f9ede9f10c 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,4 +1,5 @@
 ---
+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 20bd18be435cba8f5928c8123ceceb15053ff1ba..c1abf8a275d478647fc2e81fc2bdcd1f3ade50de 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,4 +1,5 @@
 ---
+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 6dc9498c679b87f2f7fc5786c94fe98f85bbf5d9..27ed427d86fb0c9ad242f6648cbdbad810c3073f 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,4 +1,5 @@
 ---
+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 2011d5cd7cc6cbbb79e01ac51f65c1f92718c681..9447e14440b936ac6399a3a4668da79c347d65f8 100644
--- a/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
@@ -1,4 +1,5 @@
 ---
+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 2a12be8c9c518abfebbffe771a97e79bde4748b2..70b294116bf6af0dd463e4cf135ab0e876320101 100644
--- a/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
@@ -1,4 +1,5 @@
 ---
+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 528873a71392182c1dcf3dff1927229f5ca6403c..ab4d34d5f61ee878433bef7534e9b55bde91bd34 100644
--- a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
@@ -1,4 +1,5 @@
 ---
+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 13beb25b4f744f404f2e873c35b6ad5a1dead8d3..cd481476f0d3c0f388a1f11973b31ded64178fe2 100644
--- a/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
@@ -1,4 +1,5 @@
 ---
+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 0e3b2af2e45da6f7acfa4fa6f3b5c35c61d33e17..74deb0be57354e42c983b19f7af51f45f84ac278 100644
--- a/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
@@ -1,4 +1,5 @@
 ---
+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 026d6a2789cb0029cf2c0396e6e5ddacb89882d2..9a5cc4b349a9ffb3bc966ff27954124928baf3d1 100644
--- a/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
@@ -1,4 +1,5 @@
 ---
+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 4d1d728ef32ef806c5171b70dbf56473abca4a25..a82810eabb57886e083791cc8040a51a14e97449 100644
--- a/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
@@ -1,4 +1,5 @@
 ---
+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 d926c2f81d5ec246f128d9ea243f60fef1ce35ce..e8a59d383ca36c457879998e9a8722e9c2653817 100644
--- a/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
@@ -1,4 +1,5 @@
 ---
+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 a96ab7ff2569a229caf905a6972fb2d9528c07c8..cc897bec2b749df3900353dd16b02bb03d43295f 100644
--- a/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
@@ -1,4 +1,5 @@
 ---
+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 1fc4f19b77f5058cc694736ca08e25aa6ba62326..dc4102b2ef9aaa56a45078ef6caeea319a3e450f 100644
--- a/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
@@ -1,4 +1,5 @@
 ---
+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 6af475ee5b03a6bd899af6b17d025b0a2239ad00..46940eb87ba9b102eeb97d857857f80139dab43f 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,4 +1,5 @@
 ---
+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 01e4782ec20ec7c122d5194e351e5a1018c7d72c..399cbb4118d9a7605baaf52f6859d244a750e079 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,4 +1,5 @@
 ---
+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 c862462337113e37f2421643c70255032d542e19..2da0d946e6b558f8ff38b9bcf1f6700c9990ef7f 100644
--- a/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
@@ -1,4 +1,5 @@
 ---
+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 4b4c0b0835f6210e3586351ff4c09d4429705a10..4377a6a8ae91ba33117a76b3c7dc834761ae8671 100644
--- a/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
@@ -1,4 +1,5 @@
 ---
+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 4cb97212de3fd81de7d73fcf6946403a1fc32410..5b4bbfd087d98673004668708f290e99f19257dc 100644
--- a/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
@@ -1,4 +1,5 @@
 ---
+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 bf8277ce740042e160acdbed4dd6c2022419fdca..89cedc88728b03e66cc90a9e39b1a7e22817ca4e 100644
--- a/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
@@ -1,4 +1,5 @@
 ---
+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 bf09ee1e791178e0fb286464b5ad0024ee03b33a..5f6fc503ee5ac1ff310290269ee94f0311ea46c6 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,4 +1,5 @@
 ---
+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 3d1a01b4c92b0c0e8b88185fd953e195d24220b2..0f941e2bae136d7f3e0cc0c421ebbf538f22c276 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,4 +1,5 @@
 ---
+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 8693bbeabc2668343a825e7101c7fc609730e7bb..4e41172f89927c2c19386f3193f970c7e2fcaf72 100644
--- a/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
@@ -1,4 +1,5 @@
 ---
+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 9c0b4c7404d468b03e12de823edc1c09aa8aeea8..e7898df41b6a5c3e0a7079ee0aa0516cbfac244d 100644
--- a/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
@@ -1,4 +1,5 @@
 ---
+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 7b852f69b7ffd396fdfdeaabb5de24f881b92590..5c9e2b5035a0879302172687ce65dbd143cce895 100644
--- a/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
@@ -1,4 +1,5 @@
 ---
+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 33eb2139a20cad41161bc58c98df52e03106cb41..539dfa823e2a817565c7bedc338fd3a09811f090 100644
--- a/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
@@ -1,4 +1,5 @@
 ---
+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 f68a00494298a87959eab90516498331f81f651d..ffe45fa90677ce77164c454eb36c5a4836d29c64 100644
--- a/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
@@ -1,4 +1,5 @@
 ---
+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 a758fdb63e55ac38187fbbd78bc424f7c3de7d93..0a9419cda7c9546800418335eca71f3ae53e335a 100644
--- a/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
@@ -1,4 +1,5 @@
 ---
+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 503a76eb05a28b1a72b0446cd6b980f71c821b6e..fb87a3398ca35d99034fed711d813f2e108960a8 100644
--- a/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
+++ b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 1b79cde456b63d0a7218eaab333dc9ad9bc6c809..8a2f4699779bb4a488bf8e152aad7e17671f2435 100644
--- a/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
+++ b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 33e42e555585fb661bf7750d656c9d00ce385e91..b4f9c70b4e7d9c56b6ea096b958327bfb94bf21f 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,4 +1,5 @@
 ---
+data_category: Optional
 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 5866c2e8eab7b9f8392041d8ea485e011706e682..d9c5c6134fde0be7bbc3a8a4127c81d4c67e3f46 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,4 +1,5 @@
 ---
+data_category: Optional
 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 fa112c2ebed3d9833f7088d39c0818608a4f2025..e92774f3ef12c18eafe646f2928c63a7973b368c 100644
--- a/config/metrics/counts_all/20210216180239_personal_snippets.yml
+++ b/config/metrics/counts_all/20210216180239_personal_snippets.yml
@@ -1,4 +1,5 @@
 ---
+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 d0921d1a365a9fc7b13792893d228dce699ce1bc..913c5be4317cf148d0c8033dfbdd89767ab5cb50 100644
--- a/config/metrics/counts_all/20210216180241_project_snippets.yml
+++ b/config/metrics/counts_all/20210216180241_project_snippets.yml
@@ -1,4 +1,5 @@
 ---
+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 7b3953e92d33cb3ae313f337d56211de14db2a36..72df60b6cd1267253afd33311ee540cc02c48d14 100644
--- a/config/metrics/counts_all/20210216180242_web_ide_commits.yml
+++ b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
@@ -1,4 +1,5 @@
 ---
+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 d6b8c0b4626f4831a3c70c4877bc10e38486eb93..203601234f7f91c0c87ae5151e37a28ca36c779b 100644
--- a/config/metrics/counts_all/20210216180244_web_ide_views.yml
+++ b/config/metrics/counts_all/20210216180244_web_ide_views.yml
@@ -1,4 +1,5 @@
 ---
+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 6361f63ac81e313c622b78535813a6d4314b62ea..9b9593776cbc26a9ebe4c346de00c59bfbad3b5f 100644
--- a/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
+++ b/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
@@ -1,4 +1,5 @@
 ---
+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 bd8cc0ea82967b3c275dc5062c12a75b5a1a0495..a7230288a3dc8ff6914357a60c8c72d7be9596ac 100644
--- a/config/metrics/counts_all/20210216180248_web_ide_previews.yml
+++ b/config/metrics/counts_all/20210216180248_web_ide_previews.yml
@@ -1,4 +1,5 @@
 ---
+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 8e92d080abebf9d5675a98294c846fc63a35f269..9547d6be9ec714503af99c0480198abeb4ca25e8 100644
--- a/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
+++ b/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
@@ -1,4 +1,5 @@
 ---
+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 b4d38b2060f3760f39ac0679b3f9efce55fdcf96..0b5738cf4f6e84c5b04b87bc61361ae319decf07 100644
--- a/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
+++ b/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
@@ -1,4 +1,5 @@
 ---
+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 012d04f0ad0005be7ac2ecabba1aa548c37d2b22..d3e954f88032d18ce941f368ec749eefd62cd311 100644
--- a/config/metrics/counts_all/20210216180253_snippet_comment.yml
+++ b/config/metrics/counts_all/20210216180253_snippet_comment.yml
@@ -1,4 +1,5 @@
 ---
+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 3b48c9cb4b71315daf32879a7d40848e9bff3828..1402963f70dc3aa5e0429e0c22e1eb61bcd56bf3 100644
--- a/config/metrics/counts_all/20210216180255_snippet_create.yml
+++ b/config/metrics/counts_all/20210216180255_snippet_create.yml
@@ -1,4 +1,5 @@
 ---
+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 993f03f300740413080c56f800e940f8a909b9f5..b766ae4194faf8f7b1fedc994c1c4143929c25d0 100644
--- a/config/metrics/counts_all/20210216180257_snippet_update.yml
+++ b/config/metrics/counts_all/20210216180257_snippet_update.yml
@@ -1,4 +1,5 @@
 ---
+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 afaf4170a223c3d69601cfc92fd2b54b3170b4a8..d69379885cdd5c46c4d7e6b43a224ee488512496 100644
--- a/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
+++ b/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
@@ -1,4 +1,5 @@
 ---
+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 eb7deaac1bd54dc0aa11ba3d33608b317abc1a55..cc16b87efa45fdb1e804131afdec780a8c3a872d 100644
--- a/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
+++ b/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
@@ -1,4 +1,5 @@
 ---
+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 8a0c28cc904b307921daea85f02600cc625c77eb..5c3a0b2ae6e6d08680a83448cf28236f92f8f7ac 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,4 +1,5 @@
 ---
+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 0239da156096ae6d6457b67fdf95926854ba9094..4453f13dc0927f86f9b9f7afb1d287cb9e108864 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,4 +1,5 @@
 ---
+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 c78d77b9e550365177a8352cd7d0651c068c01c4..bbefefbdf01b1020a041f3b57e3d5133825075ac 100644
--- a/config/metrics/counts_all/20210216180306_snippets.yml
+++ b/config/metrics/counts_all/20210216180306_snippets.yml
@@ -1,4 +1,5 @@
 ---
+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 dd31cda76b83e1dcbf1405032bc9dbcf076d142c..cec9bd481db4ff44e3927ea15d7886d7359c28c5 100644
--- a/config/metrics/counts_all/20210216180316_snippets.yml
+++ b/config/metrics/counts_all/20210216180316_snippets.yml
@@ -1,4 +1,5 @@
 ---
+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 31d9650c54e9fad88670cd39ae5b0f45a29462ed..c2e93cfd5cf2722b65241d46063f68e1ac5df4b7 100644
--- a/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml
+++ b/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml
@@ -1,4 +1,5 @@
 ---
+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 deef6c0f6d404960ac3cfe98b5693f2b645ec96c..8e7a97ab7d6090769c0ca39b974dd675423b8d20 100644
--- a/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml
+++ b/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml
@@ -1,4 +1,5 @@
 ---
+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 ab35c608bcba932b67cdeec18971d8c329845a2b..6b65fdb17e6e7a97c72d677ecb3f3d28c086b020 100644
--- a/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml
+++ b/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 04b1177dacf737b2ca11cdef9c32185eee00cc9e..2c67a918e7d0cab9d9bc7a0dd83e6164a094f2eb 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,4 +1,5 @@
 ---
+data_category: Optional
 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 57922524ccfbd662eb89a7185e381c5d9e979458..6dfda67824db9e8b7c4381ca338d17889674541d 100644
--- a/config/metrics/counts_all/20210216180410_pool_repositories.yml
+++ b/config/metrics/counts_all/20210216180410_pool_repositories.yml
@@ -1,4 +1,5 @@
 ---
+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 6248b0966638dc47e32a90d56d59b6ded519f6c3..dec74f68373bea655b535cc4f635b40e806484c8 100644
--- a/config/metrics/counts_all/20210216180413_all_searches.yml
+++ b/config/metrics/counts_all/20210216180413_all_searches.yml
@@ -1,4 +1,5 @@
 ---
+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 1eb21d02f9d19282fe02e5072486bcd26ddeeef1..01ae91462a73044f4895883c9f2b6ebe02af7d8e 100644
--- a/config/metrics/counts_all/20210216180414_navbar_searches.yml
+++ b/config/metrics/counts_all/20210216180414_navbar_searches.yml
@@ -1,4 +1,5 @@
 ---
+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
diff --git a/config/metrics/counts_all/20210216180416_i_search_total.yml b/config/metrics/counts_all/20210216180416_i_search_total.yml
index 2c59b083293719de0ff47778703c4348cd4b5045..00371ea9e4b43d874b9f6a8a86bffe76d227b342 100644
--- a/config/metrics/counts_all/20210216180416_i_search_total.yml
+++ b/config/metrics/counts_all/20210216180416_i_search_total.yml
@@ -1,4 +1,5 @@
 ---
+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 f077d6a5f518979db4ba07b0188b26737bc6fc0d..47f131d7cc05d1edc09404de32129fcdc3ad37cd 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,4 +1,5 @@
 ---
+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 41a13b471573f56423e4dd82152cddf951540b5d..2f9474833285c359ba7130f95669fa4b33c57d52 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,4 +1,5 @@
 ---
+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 fa3b1167c2bc66449f8080a6775d931839638d62..5b6daa1cf325054ea937274ca8aa8748d9e7d58d 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,4 +1,5 @@
 ---
+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 c8a2e2c8244a435fbacf5ebc2adf7c42c9f64dcd..6db1b13b869455a8597fdc65479ad6f6eb4e4570 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,4 +1,5 @@
 ---
+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 4c782a4da177e535df8ccf996356009383a3d646..240b5ba0658b59702cb1a426469f8ba64dbbbf5a 100644
--- a/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
+++ b/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
@@ -1,4 +1,5 @@
 ---
+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 ac6d1f6be3195a57066b4b34c327aaec187b4ce2..2b9370adc13dae036718d6cafb5412a21f6cd011 100644
--- a/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
+++ b/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
@@ -1,4 +1,5 @@
 ---
+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 638f9634d04eac8f58621da49f02db1cef75fe7a..2a7970405fc0d4351b63ca5f89f3b75673ff68c0 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,4 +1,5 @@
 ---
+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 3d17db99772c84ab6121f23134789cd5e89f0de7..63c5e548000ee1a57ccb7f729e80b01a98b45e25 100644
--- a/config/metrics/counts_all/20210216180447_incident_issues.yml
+++ b/config/metrics/counts_all/20210216180447_incident_issues.yml
@@ -1,4 +1,5 @@
 ---
+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 24f4ab2077f80cd1a302e1bad5349db2688c9a02..b17a1a54a1e7741ca60cef4609e9c5a195d85586 100644
--- a/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
+++ b/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
@@ -1,4 +1,5 @@
 ---
+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 b59278bcc45c47db6798f353ec807da56414c5d2..a39e19e8074827e0d7f566d0e0798ca391901a25 100644
--- a/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
+++ b/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
@@ -1,4 +1,5 @@
 ---
+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 cbd63ff1c8b03dcf0d783c767c7659751053a830..a873a1a9497df2c8a1dd403e485f7b21b7c22db9 100644
--- a/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
+++ b/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
@@ -1,4 +1,5 @@
 ---
+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 620b829ac44fe39841acb7c79b146030431dc1c2..138dba197a553c81d47367f74970c624658c6f3f 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,4 +1,5 @@
 ---
+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 fe877fedb124a0bd14f7cfb20827a5c8f526c2e1..408136edb7321767f1cd83ef4cc9d14be93a29c9 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,4 +1,5 @@
 ---
+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 6364f526a9217cf011a6589c0ddbd9d7f6943f0a..c636819a7599f58a807b6d2661780cb8fc34aa78 100644
--- a/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
+++ b/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
@@ -1,4 +1,5 @@
 ---
+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 8616db19bb7a22ee9486216095878fce8b3e97f7..c93b4b912741563e8399ecead8a2f4f09f262eba 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,4 +1,5 @@
 ---
+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 3cb079a0bef30fa222129b169e026a4639501fc2..06fe3da737191fc28f7b389d93dc820e3b6b1ebc 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,4 +1,5 @@
 ---
+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 ce194b6916b8eaadbfc53a8247098285cb32fd74..70c8a60ebcf758fce98a6b879cab95a3da247e64 100644
--- a/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
+++ b/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
@@ -1,4 +1,5 @@
 ---
+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 69b9592e58f86825ddbc17f050a07832472e00c1..092266e07d93d87fe4adcfe815caead656d04c1b 100644
--- a/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
+++ b/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
@@ -1,4 +1,5 @@
 ---
+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 47c20ec6cfb2e65dc7627895210985394576ff75..f9ae15e7c89f1bbb5ce7ecc5c3bb5a763ded1651 100644
--- a/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
+++ b/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.projects_imported_from_github
 description:
 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 893b92b1f121a34adee44296241d75b5dcaf7dd9..a951a6dedb4c7c89897b29174afcdfaa024abe2e 100644
--- a/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
+++ b/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.create.projects_imported_from_github
 description:
 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 f8629496cb680f692c54b84bdabb9f6cc47bee76..266b1eb34f6a790f639dfef40e2065834f3ca519 100644
--- a/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
+++ b/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
@@ -1,4 +1,5 @@
 ---
+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 8d2501d2c829506ef13137d14728765f21744e92..258596516c66e03f2324e4b660b3b17076ed9f9b 100644
--- a/config/metrics/counts_all/20210216180634_gitlab.yml
+++ b/config/metrics/counts_all/20210216180634_gitlab.yml
@@ -1,4 +1,5 @@
 ---
+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 1c4fa2c62feac5572d82eac2daeb64d06e149984..76509b970834dfdb6e54ff2de6a8da2a7c460674 100644
--- a/config/metrics/counts_all/20210216180636_gitlab_v1.yml
+++ b/config/metrics/counts_all/20210216180636_gitlab_v1.yml
@@ -1,4 +1,5 @@
 ---
+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 624b004155dc99dd24f7c14ce2f3be1e6c4ef69d..3fd5b1bb7280a8cb6c63e41f88ff9385d2c9f678 100644
--- a/config/metrics/counts_all/20210216180638_gitlab_project.yml
+++ b/config/metrics/counts_all/20210216180638_gitlab_project.yml
@@ -1,4 +1,5 @@
 ---
+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 39a878962d2d9aa5a76f91c2aa6f4fbc1eb26e8f..4197eb9d2116a98aa7ecfb9173d66daa02e6b328 100644
--- a/config/metrics/counts_all/20210216180639_gitlab.yml
+++ b/config/metrics/counts_all/20210216180639_gitlab.yml
@@ -1,4 +1,5 @@
 ---
+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 c7ce1a7f1b3fb4dcff76ee49a94696984f3fd0b6..80a971ad997272d31a7d564a00595cce3e221158 100644
--- a/config/metrics/counts_all/20210216180641_github.yml
+++ b/config/metrics/counts_all/20210216180641_github.yml
@@ -1,4 +1,5 @@
 ---
+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 e05e4e526fffc8d11ae1654600c52473549e34d6..08c500fb71913429f477ed3d963bf26115812aad 100644
--- a/config/metrics/counts_all/20210216180643_bitbucket.yml
+++ b/config/metrics/counts_all/20210216180643_bitbucket.yml
@@ -1,4 +1,5 @@
 ---
+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 88f618ac228bd7ea0c9c67093b0a93ac59b6f4e5..9ec0e200755e19694db89f4f89e343ec2b11b812 100644
--- a/config/metrics/counts_all/20210216180645_bitbucket_server.yml
+++ b/config/metrics/counts_all/20210216180645_bitbucket_server.yml
@@ -1,4 +1,5 @@
 ---
+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 d70b478659dda42233410c2f4a35ee5bf0b92191..7439358b8bb767e3056d5f618fc4cbfa08087dd7 100644
--- a/config/metrics/counts_all/20210216180647_gitea.yml
+++ b/config/metrics/counts_all/20210216180647_gitea.yml
@@ -1,4 +1,5 @@
 ---
+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 19c19e6cc6322178fcc79183a44422e0d71ac3b1..56c0230294473cb00148751a1df81182753dfb1e 100644
--- a/config/metrics/counts_all/20210216180649_git.yml
+++ b/config/metrics/counts_all/20210216180649_git.yml
@@ -1,4 +1,5 @@
 ---
+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 6c89c68b34c5e4f21f226ce23a23d5e7b32133ea..21281acc75a692ecff7d18f06cae94a2da2e605f 100644
--- a/config/metrics/counts_all/20210216180650_manifest.yml
+++ b/config/metrics/counts_all/20210216180650_manifest.yml
@@ -1,4 +1,5 @@
 ---
+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 d1c84d6c795bb259f8041047c0d957a3fffbd9f4..ca10c73e2edfc9fd1ba6e71cc7febcd0b44adc32 100644
--- a/config/metrics/counts_all/20210216180652_gitlab_migration.yml
+++ b/config/metrics/counts_all/20210216180652_gitlab_migration.yml
@@ -1,4 +1,5 @@
 ---
+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 6e72bc630bdb5758362ad5139857ef685c22e9ca..2fe43e1b47186a027f71c802f5b8600cd354c85e 100644
--- a/config/metrics/counts_all/20210216180654_jira.yml
+++ b/config/metrics/counts_all/20210216180654_jira.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 8a52d04b6153ec136e5d8cfee7d8c8ac01eade51..f270f505fdb8143d2f7d7a78ab6994ff0437f3e1 100644
--- a/config/metrics/counts_all/20210216180656_fogbugz.yml
+++ b/config/metrics/counts_all/20210216180656_fogbugz.yml
@@ -1,4 +1,5 @@
 ---
+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 51559f87ae291175287abf6912446f9fa5e46b66..6c485a575fd1d0936a4e088b94ee48c771b6d84a 100644
--- a/config/metrics/counts_all/20210216180658_phabricator.yml
+++ b/config/metrics/counts_all/20210216180658_phabricator.yml
@@ -1,4 +1,5 @@
 ---
+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 bed309794ebc6ec548ebd1b2aca5c4ee32335309..2bf71cc3a20b6172dc78bf827ef66be10a0dab23 100644
--- a/config/metrics/counts_all/20210216180700_csv.yml
+++ b/config/metrics/counts_all/20210216180700_csv.yml
@@ -1,4 +1,5 @@
 ---
+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 109a722738ec9ed3aff305870fcd6ef227c6f13b..01e006f75c641176678112eeae68625514ae8722 100644
--- a/config/metrics/counts_all/20210216180702_group_import.yml
+++ b/config/metrics/counts_all/20210216180702_group_import.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.manage.group_imports.group_import
 description: Count of group imports 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 74c7e66adfc6c95bbd6297ab65c6794929c980a5..cf40dc841ec0cfcea43f0d829af710b4f6d15cb7 100644
--- a/config/metrics/counts_all/20210216180703_gitlab_migration.yml
+++ b/config/metrics/counts_all/20210216180703_gitlab_migration.yml
@@ -1,4 +1,5 @@
 ---
+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 86ada114d551a4b36614085c2f862ccba8825506..69f8ec18d14cfe38ede2245cde1274058b99d3bd 100644
--- a/config/metrics/counts_all/20210216180705_total.yml
+++ b/config/metrics/counts_all/20210216180705_total.yml
@@ -1,4 +1,5 @@
 ---
+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 86972e06d13a2eaf15bc25541fa69dad4e8577ad..9a0e3fa5fbf11572679603c19dd8ece0dd69a4e6 100644
--- a/config/metrics/counts_all/20210216180707_gitlab_project.yml
+++ b/config/metrics/counts_all/20210216180707_gitlab_project.yml
@@ -1,4 +1,5 @@
 ---
+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 d297c5d6bf5cbb1d163b519826017b9609a65253..6bfc09b0d42e13288062818f7a9d807e8daa1978 100644
--- a/config/metrics/counts_all/20210216180709_gitlab.yml
+++ b/config/metrics/counts_all/20210216180709_gitlab.yml
@@ -1,4 +1,5 @@
 ---
+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 580f759024c26703fa2cc4deae36e0e09010924d..807ef20c4eba408da830ad638032a3ee30881a18 100644
--- a/config/metrics/counts_all/20210216180711_github.yml
+++ b/config/metrics/counts_all/20210216180711_github.yml
@@ -1,4 +1,5 @@
 ---
+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 c70147afc3cf7f914dffea976adf070a29931f0a..fb9e0d8343910a873fc2aa081e234d3a43f4b141 100644
--- a/config/metrics/counts_all/20210216180713_bitbucket.yml
+++ b/config/metrics/counts_all/20210216180713_bitbucket.yml
@@ -1,4 +1,5 @@
 ---
+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 007bdcb8ecb71053ff6c56e357284f170cde15be..99321d76dfdf8d905a5980b334cba4b942fb4041 100644
--- a/config/metrics/counts_all/20210216180715_bitbucket_server.yml
+++ b/config/metrics/counts_all/20210216180715_bitbucket_server.yml
@@ -1,4 +1,5 @@
 ---
+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 514f5a37d85f6441da5f45aedcb6e3d7816341b0..a4a7ef23052d62e94cb5cbb3f300ce48eb82559b 100644
--- a/config/metrics/counts_all/20210216180716_gitea.yml
+++ b/config/metrics/counts_all/20210216180716_gitea.yml
@@ -1,4 +1,5 @@
 ---
+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 f6f46eb2996f614908f52de66b3dc0ba9c71d4a5..13befec6b07b11365652cf9b06b6afaf5805bf75 100644
--- a/config/metrics/counts_all/20210216180718_git.yml
+++ b/config/metrics/counts_all/20210216180718_git.yml
@@ -1,4 +1,5 @@
 ---
+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 16807405705aa8501cebb74cd4bfb97683872aea..dcc9cc8df92b598fe7fe93c7a3b64aa4190dcc06 100644
--- a/config/metrics/counts_all/20210216180720_manifest.yml
+++ b/config/metrics/counts_all/20210216180720_manifest.yml
@@ -1,4 +1,5 @@
 ---
+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 3a4ec34775773a26dcc08c099f37cb324c91e486..420fc4635dfa6440b6a177281f49d0131bf844e9 100644
--- a/config/metrics/counts_all/20210216180722_jira.yml
+++ b/config/metrics/counts_all/20210216180722_jira.yml
@@ -1,4 +1,5 @@
 ---
+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 a94517cb4e31fa418bf69901372266896ec2f4f5..1e1d587e434f251d234c542012ef721a07e204f5 100644
--- a/config/metrics/counts_all/20210216180724_fogbugz.yml
+++ b/config/metrics/counts_all/20210216180724_fogbugz.yml
@@ -1,4 +1,5 @@
 ---
+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 ebff13d3a25a30ed6a08d726cb40573b35a5a793..1f4b2ed04606693564e3cc4fb5b7147e356bf19d 100644
--- a/config/metrics/counts_all/20210216180726_phabricator.yml
+++ b/config/metrics/counts_all/20210216180726_phabricator.yml
@@ -1,4 +1,5 @@
 ---
+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 4c4b5f660a3cb31ceae6fd2737ce7dbcd2c11034..a50733d361e206beda57970584d61b044558625a 100644
--- a/config/metrics/counts_all/20210216180727_csv.yml
+++ b/config/metrics/counts_all/20210216180727_csv.yml
@@ -1,4 +1,5 @@
 ---
+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 3ce8e475d38fbc27541db1a818bfa169cbd832e2..47f4a54cf8e0b2c36dcf9eab9e95790ba63abbdb 100644
--- a/config/metrics/counts_all/20210216180729_groups_imported.yml
+++ b/config/metrics/counts_all/20210216180729_groups_imported.yml
@@ -1,4 +1,5 @@
 ---
+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 90f20d719976e36579ffe5ec3a4529a7fee5fe6e..a789d1ead6c5dbb980ac22ca4e31dfda0fe5d214 100644
--- a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
+++ b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
@@ -1,4 +1,5 @@
 ---
+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 ad257389f1f3c8a9bb019e57a7f3ecf09c54780c..3f5bd8804de349a13c44bc99a202f2d531406a9a 100644
--- a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
+++ b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
@@ -1,4 +1,5 @@
 ---
+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 83379f14ba07b65b9d5f05ec076d929efad3a7b5..40815a1f9befc19d615b11273748b064317cf429 100644
--- a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
+++ b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
@@ -1,4 +1,5 @@
 ---
+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 bd631db3e6c5d6f5d96de53d8da32a5dc611b34c..0b847692c91545a8ce4093ec1a21f35fdce4d2c4 100644
--- a/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
+++ b/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
@@ -1,4 +1,5 @@
 ---
+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 1a11c45f22a1bed27e898dc874affe214673add1..9c279bd9ac9676bb55192017c11bd389c1c5fb57 100644
--- a/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
+++ b/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
@@ -1,4 +1,5 @@
 ---
+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 0cbdac33f1ea16539c2ff1557b6bb04018c2782a..c15b0dded7f89390094ca33c72254afdd2b8bfaa 100644
--- a/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
+++ b/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
@@ -1,4 +1,5 @@
 ---
+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 db2cfd470ab09ff20cb4436b9fe7ecf98d8b2e32..e760e1f29ef074c5cde757d1356737d797400673 100644
--- a/config/metrics/counts_all/20210216180750_groups.yml
+++ b/config/metrics/counts_all/20210216180750_groups.yml
@@ -1,4 +1,5 @@
 ---
+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 03027fd8e24b03d5c2c87acd1f6058eb691dbca6..57273262561b77a5fc9b973dc5e272bf5220776d 100644
--- a/config/metrics/counts_all/20210216180752_keys.yml
+++ b/config/metrics/counts_all/20210216180752_keys.yml
@@ -1,4 +1,5 @@
 ---
+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 e580df4d51143b2cbcab14bb08985087793b06c4..ced420e9865bd7215d47cd27908a36b7aee7404b 100644
--- a/config/metrics/counts_all/20210216180754_events.yml
+++ b/config/metrics/counts_all/20210216180754_events.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.manage.events
 description:
 product_section: dev
diff --git a/config/metrics/counts_all/20210216180756_groups.yml b/config/metrics/counts_all/20210216180756_groups.yml
index 4a813247d21601db0ffe1bebecc302b33e1a9b84..86a57dc8e459c32341997d2a6928ed2fc89e3a92 100644
--- a/config/metrics/counts_all/20210216180756_groups.yml
+++ b/config/metrics/counts_all/20210216180756_groups.yml
@@ -1,4 +1,5 @@
 ---
+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 262f88e27139eaf66c8c80009cfe85eff426392d..fbc42eee84a4809d78bd34d260725616493d8cc5 100644
--- a/config/metrics/counts_all/20210216180758_users_created.yml
+++ b/config/metrics/counts_all/20210216180758_users_created.yml
@@ -1,4 +1,5 @@
 ---
+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 6a92f8686652e220523c82d52f853d744014ba68..9bbec19b9dc9fd9058304c8fb62e4d5b5d45da6b 100644
--- a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
+++ b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
@@ -1,4 +1,5 @@
 ---
+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 a3a5f2d8ffb15f4bfdd25c9e50e11d1601aea375..a97c555acabfec9e49cca2f51d7da38dc314bd6c 100644
--- a/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 abcd64de00ffbd24dec8db921ce1eb8c39f02375..c0771c4cc5fb8327d8d69f51e701eafaf6744d10 100644
--- a/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
@@ -1,4 +1,5 @@
 ---
+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 c751569efc9ef9901a7d92a8cc9b39ab8decf289..435b988918eabb3175eb67791a4628b7118fd927 100644
--- a/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
@@ -1,4 +1,5 @@
 ---
+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 50b4230ce3b25b37a350952964508c6998bc3146..ea76bec86c32f867aee69ba8915f45bd4a526e65 100644
--- a/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
@@ -1,4 +1,5 @@
 ---
+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 66a696d21872263e284565d2a7db725a1babf0cf..0be177459ca460ba56ba175695159e8035072686 100644
--- a/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
@@ -1,4 +1,5 @@
 ---
+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 4ed70e76fa7460ad80f51e046c6ba34892b82cd5..5dcc4f0a0a869b0d743f8741234d3a6bcf88e33b 100644
--- a/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
@@ -1,4 +1,5 @@
 ---
+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 c430b2531990eec9533a62cf7aaf5ec10d3522c0..ad4bd9bde9658790677d6378fb3ee93aec462ad2 100644
--- a/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
@@ -1,4 +1,5 @@
 ---
+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 039d4dcb7cb8d8d423a35fb3829a149af18d8aeb..fa99f4f9861aa8629bfe915fbca6da3e9265baf9 100644
--- a/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
@@ -1,4 +1,5 @@
 ---
+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 71988b43ed8bb7c03f47421ee6d46d67270ea828..2427fbe95b5120a898fbc7d4f45726f2922d1118 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,4 +1,5 @@
 ---
+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 1af33097b7f0b5a23d726f44314b37683bd3116b..01d4aa22ff23eac69ca13e62d566201545ac1cc3 100644
--- a/config/metrics/counts_all/20210216180945_clusters.yml
+++ b/config/metrics/counts_all/20210216180945_clusters.yml
@@ -1,4 +1,5 @@
 ---
+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 c59ea4b8a8529f727b665b6b41a3ce6aae526344..7ce1bab9e403df41c751d5072a4a7cec5ff7eebd 100644
--- a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
@@ -1,4 +1,5 @@
 ---
+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 4881fce06a381f72bb53206d89025c753c18ad58..b42af45f82129e93974e058aaa629bd3e067d767 100644
--- a/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
@@ -1,4 +1,5 @@
 ---
+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 26c5073cae1326fb84942fd78083e349bac56891..ec0ac4b1f6702070dd829f527d1238acebb13a73 100644
--- a/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 3e86ba6c54c8e244c69f4984ee77d9b9f91c47a8..f9e62f5fcc127ce231a7fec810d292c036278c28 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,4 +1,5 @@
 ---
+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 b17b029852ce249c261954cef7c44b73afac7343..6882c1150943b25cb4212e7bbdf320347cfab08c 100644
--- a/config/metrics/counts_all/20210216181009_lfs_objects.yml
+++ b/config/metrics/counts_all/20210216181009_lfs_objects.yml
@@ -1,4 +1,5 @@
 ---
+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 8d81edaa55fc8d03b25fdefd0a63db01f61b211c..b170aa2c14fcc05e4dfabd0940215f53fa89407a 100644
--- a/config/metrics/counts_all/20210216181011_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
@@ -1,4 +1,5 @@
 ---
+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 2934ebdc3d7b662f40533df9fa00a949c56edee3..6aaa7d161e0332804f08843a2b8839dbfa1d3b71 100644
--- a/config/metrics/counts_all/20210216181012_packages.yml
+++ b/config/metrics/counts_all/20210216181012_packages.yml
@@ -1,4 +1,5 @@
 ---
+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 dbc5e4c0d0a28c7ef6a8eafd333cf761bbd3d875..423da76d94a21ef35dd2fc2545a2c9f8d382c8a7 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,4 +1,5 @@
 ---
+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 a71a36f19caa25c761eeef78ec8388fdcdd77c55..c75684d655c5d21eb39a5f325cd18730ac0aa76d 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,4 +1,5 @@
 ---
+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 7cf495c6091ccd8ee43b3fef3ecc4175a821fb1d..5f435cdb3c69d7cc89c9888e9a871096ab3e9e48 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,4 +1,5 @@
 ---
+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 143d47835aa1c9872d045c08929f344f7143751c..c5332f4c32cd9b9a3b4ce2f32c34e1925f5f45ee 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,4 +1,5 @@
 ---
+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 27ae7c56c24cd43096dcba1dce469b8f34ed6289..662c7808c372f1b4ef16f39f93acfeb3754c597c 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,4 +1,5 @@
 ---
+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 2c1c00ec9653951bc45aa86df7ce656d88d92d52..657647f124c4dd08a2454eb7bfd90a38a472c30f 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,4 +1,5 @@
 ---
+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 b735f009dae033506ffadd7df81d09e792739236..b25c6c2dbf713753c99c9984af115042b39ff7ba 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,4 +1,5 @@
 ---
+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 a14f17039e9c5a247f904620d842b43997f74677..6b4eca32468eea28a97ad5734b269222d624d5ea 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,4 +1,5 @@
 ---
+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 daf4551b16d3f779bdff34fa8243760df1b45ffe..9e83a06612f1f507049c1d48faf29b702981bb8d 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,4 +1,5 @@
 ---
+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 f67df5897fff8a325ae8676e24904017274b6b76..a987f9be6e6091a4dde231b1c248e71bdf4f6bc4 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,4 +1,5 @@
 ---
+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 5ac7179b486512df472ce83492d9da0b201aa31b..84ad8ccbdd4e4dccf13669885031a62dc750fb2a 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,4 +1,5 @@
 ---
+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 25ce0d633e4e752968c4fc9456e31e3e92e87f90..267e4967e1c85b40b0b918a2fad9b9da5a3c2ee4 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,4 +1,5 @@
 ---
+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 f8df648b170c65acd3083097964551b602cfef15..908a9d75c2b206e06c561d25743287cd6d831dcd 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,4 +1,5 @@
 ---
+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 29926d961e47afc11da4f00fb19a4ce0f250eca6..f4138f6f5662f6b3e6690b666524560253fc5698 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,4 +1,5 @@
 ---
+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 28e905f980bef681afc9f2f5b58c2880dcad195a..3fada355ac194bda98a40f7da7041671e5a2712e 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,4 +1,5 @@
 ---
+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 db0db2762d41bda4c4bc6ab67346d8fa241fc059..4578b6234429e590193006a73168030787ade180 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,4 +1,5 @@
 ---
+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 c1854ea634aae50f56dc452ec3e7b98595a0b280..1bc6632c56c3392d46c4e4981e31574dd7beef94 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,4 +1,5 @@
 ---
+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 983687d7a6cec9607afcb00a6658042a7c905750..818f8fa4b5e0dedf52dc956c00ec298875a889f0 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,4 +1,5 @@
 ---
+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 23f0b9b3b47bac1a76713d988f75091a0e80ee6c..c0eaa5d4524455e9eee4d1e0374cfc1b4a6ce790 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,4 +1,5 @@
 ---
+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 29fc84d1b1c927c800d6584c293d4e02127dd8c8..9411672a8acc71f844de5f4da36b3c658cd2b4b0 100644
--- a/config/metrics/counts_all/20210216181051_vendor.yml
+++ b/config/metrics/counts_all/20210216181051_vendor.yml
@@ -1,4 +1,5 @@
 ---
+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 fb006b7f9ece676694fdc27d90c2c8a95457d9e2..cb7c7905b5d5494cbfdc0e2741e14d25032e3e2e 100644
--- a/config/metrics/counts_all/20210216181055_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181055_projects_with_packages.yml
@@ -1,4 +1,5 @@
 ---
+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 8875b0bbc8121155a13dd65fe5091ba9ea8b439a..5ba83036fae40c8ec6fca08c57a9592adbc8ec84 100644
--- a/config/metrics/counts_all/20210216181102_issues.yml
+++ b/config/metrics/counts_all/20210216181102_issues.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 e12bdcabe41543076b652aa2cbd69bf1e54c1864..6bf565b6f03d344d77cc18245d4df5fca3616c09 100644
--- a/config/metrics/counts_all/20210216181104_label_lists.yml
+++ b/config/metrics/counts_all/20210216181104_label_lists.yml
@@ -1,4 +1,5 @@
 ---
+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 29e6bad41ee76467772b19c0d2b135d104202040..7acb409c7879b4c45bbe8a202afcfe929ecbbdf0 100644
--- a/config/metrics/counts_all/20210216181108_milestones.yml
+++ b/config/metrics/counts_all/20210216181108_milestones.yml
@@ -1,4 +1,5 @@
 ---
+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 c72d51b4cb9aeab6bfc7bb8ca4ae835c3d17aa9e..568e0539dcbef613badac1321687bea5d424566c 100644
--- a/config/metrics/counts_all/20210216181109_uploads.yml
+++ b/config/metrics/counts_all/20210216181109_uploads.yml
@@ -1,4 +1,5 @@
 ---
+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 328b0fcd991a8a04b69b4574d1f4cc08f4850753..1011990edc4f3c75f6019741141e603a867ada5b 100644
--- a/config/metrics/counts_all/20210216181111_labels.yml
+++ b/config/metrics/counts_all/20210216181111_labels.yml
@@ -1,4 +1,5 @@
 ---
+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 0046fe630bba070d8542840013a2ad39e4343993..035214da96280fee77824f831be62ca18566f35f 100644
--- a/config/metrics/counts_all/20210216181113_notes.yml
+++ b/config/metrics/counts_all/20210216181113_notes.yml
@@ -1,4 +1,5 @@
 ---
+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 3843184aa100502c4e6b01602941068f6b74238b..31fb798b4fc4289192db24cabd9ea1eef30f1bc4 100644
--- a/config/metrics/counts_all/20210216181115_issues.yml
+++ b/config/metrics/counts_all/20210216181115_issues.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 93e699fda604fce039fec983a0ee6c1702f5dad4..9dc9a2b7b70d6a1ec8ba28c3f91912b14999eda3 100644
--- a/config/metrics/counts_all/20210216181117_notes.yml
+++ b/config/metrics/counts_all/20210216181117_notes.yml
@@ -1,4 +1,5 @@
 ---
+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 6cabd4eaf8b3281ffbb8f36699d826004f27133e..053525815f28dc72d0d1660a29f2e0d4dd30a8e1 100644
--- a/config/metrics/counts_all/20210216181119_projects.yml
+++ b/config/metrics/counts_all/20210216181119_projects.yml
@@ -1,4 +1,5 @@
 ---
+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 679a8eb339475419b4d5ec748495c8fab7531c70..d6eedbb82880d4810f55184bbf56769b68f92e47 100644
--- a/config/metrics/counts_all/20210216181121_todos.yml
+++ b/config/metrics/counts_all/20210216181121_todos.yml
@@ -1,4 +1,5 @@
 ---
+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 867a772eb231242e20b0c4df37dd096e63dfb4e4..1558207c2e0b17cb71e776995ed2ece58ceee77b 100644
--- a/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
@@ -1,4 +1,5 @@
 ---
+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 47e80110c664523a4c3eeea9e543628779566520..d9bf957ee47c0ad80506f656b7a10072d12cd234 100644
--- a/config/metrics/counts_all/20210216181124_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216181124_service_desk_issues.yml
@@ -1,4 +1,5 @@
 ---
+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 f0a5f3f711a44d9872b82a525ed48e18948c67c3..5b090a239583725a26b4687b967f3fc4ecfcfe08 100644
--- a/config/metrics/counts_all/20210216181126_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.plan.projects_jira_active
 description:
 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 cb5f0a0f5baa61447ffa074bb6d45ebdc9e93c13..fe4065871a7f71c3566dfe0086c63f4eda523e6f 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,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.plan.projects_jira_dvcs_cloud_active
 description:
 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 aae3322de1982b1ee3e543c1045dd4f604e44204..77df3bac77e86c6cd6ea43d0868ac54fd9e6150a 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,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.plan.projects_jira_dvcs_server_active
 description:
 product_section: dev
diff --git a/config/metrics/counts_all/20210216181134_epics.yml b/config/metrics/counts_all/20210216181134_epics.yml
index 5d6825f083031be7d44293e44881b62205c667db..3643a5f14c3a28027143b631e26f73179816cfd6 100644
--- a/config/metrics/counts_all/20210216181134_epics.yml
+++ b/config/metrics/counts_all/20210216181134_epics.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.plan.epics
 description:
 product_section: dev
diff --git a/config/metrics/counts_all/20210216181135_label_lists.yml b/config/metrics/counts_all/20210216181135_label_lists.yml
index 8385157a13f6d5afa179cb555a1b72f464393b90..7d2899b7da9c2b71937b22c7cfe1c674913fe2fb 100644
--- a/config/metrics/counts_all/20210216181135_label_lists.yml
+++ b/config/metrics/counts_all/20210216181135_label_lists.yml
@@ -1,4 +1,5 @@
 ---
+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 9ff71ff0e3b8959b7a4eeb0c6cd42056656536e4..9b424c243be04dfd0dfa294006f50eea4bca320c 100644
--- a/config/metrics/counts_all/20210216181249_feature_flags.yml
+++ b/config/metrics/counts_all/20210216181249_feature_flags.yml
@@ -1,4 +1,5 @@
 ---
+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 ddf55cc62821d09a8ddb159e47c1a7f2d4381e60..500b4c0dd31442ae691479ee94f9e3b782eba8ea 100644
--- a/config/metrics/counts_all/20210216181252_boards.yml
+++ b/config/metrics/counts_all/20210216181252_boards.yml
@@ -1,4 +1,5 @@
 ---
+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 3e15f602f06c4b911bc3d7fef149b141dce5ae36..b8b678c41383dbc1481d7f2c8f7d4cbcea675190 100644
--- a/config/metrics/counts_all/20210216181254_projects.yml
+++ b/config/metrics/counts_all/20210216181254_projects.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 bf3f34500c5e58a9ef32dda5a80dfece7d1e8e2f..647a014070e6a8fbe4a04f8f896aaf4ed39f6c7f 100644
--- a/config/metrics/counts_all/20210216181256_todos.yml
+++ b/config/metrics/counts_all/20210216181256_todos.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 c18888edb23375dc52865dab0bb29b7ced89b8fb..1fe81b25b4e36989d5c310d456a18b0fb1d2c4e0 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,4 +1,5 @@
 ---
+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 df04f5d06692d6d3a8f77f57b9aab9947c356515..e276c2caec716cf7fdbac212a6013fcfff31280c 100644
--- a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
+++ b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
@@ -1,4 +1,5 @@
 ---
+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 b8e031dd744eadda225a610361613177b102b90b..99fb076dbe5ae4b04aedace349cbb62e90ee4aa8 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,4 +1,5 @@
 ---
+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 ce4034aca60d9ca7e65bc89e1e9c2c3d09fac58a..fcd6a193ca2fcd5c5d57c7f001623cc1a8c338b7 100644
--- a/config/metrics/counts_all/20210216181908_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216181908_deploy_keys.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.deploy_keys
 description:
 product_section: ops
diff --git a/config/metrics/counts_all/20210216181911_successful_deployments.yml b/config/metrics/counts_all/20210216181911_successful_deployments.yml
index 2eedd96e4b6844794fd50c1c4532985d836ed5f2..7ce7f26a17c87d351e6e57eab43ad8f865b1ee6c 100644
--- a/config/metrics/counts_all/20210216181911_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181911_successful_deployments.yml
@@ -1,4 +1,5 @@
 ---
+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 3ef38fff2d3ad3a2d37b10d88fc369a369cfa499..83cce6392b574a57ccf426f02ef7dbf6451bdfca 100644
--- a/config/metrics/counts_all/20210216181912_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181912_failed_deployments.yml
@@ -1,4 +1,5 @@
 ---
+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 cae8fb0d85bc04e2423bdac173ad4c74840ba126..efb8570a3e66f4c6dc98df1e74f7d32f695cc55c 100644
--- a/config/metrics/counts_all/20210216181914_environments.yml
+++ b/config/metrics/counts_all/20210216181914_environments.yml
@@ -1,4 +1,5 @@
 ---
+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 8890c0af74e4e43f1a77272dbe938cdb9da60006..09a8f842a062bb7e262a0b53b74a2c8b6e4e705a 100644
--- a/config/metrics/counts_all/20210216181916_in_review_folder.yml
+++ b/config/metrics/counts_all/20210216181916_in_review_folder.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.in_review_folder
 description:
 product_section: ops
diff --git a/config/metrics/counts_all/20210216181918_releases.yml b/config/metrics/counts_all/20210216181918_releases.yml
index 190a2ae92bcfd06eb33231f5385ed2aacfc9d2a9..5ce068be420fc7e9b66c2b16d404bc4bfc3dba2b 100644
--- a/config/metrics/counts_all/20210216181918_releases.yml
+++ b/config/metrics/counts_all/20210216181918_releases.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.releases
 description: Unique release tags
 product_section: ops
diff --git a/config/metrics/counts_all/20210216181926_deployments.yml b/config/metrics/counts_all/20210216181926_deployments.yml
index 626b9b0b29bceb6cecdfd22cb701107aa16c180f..6cc7e7d757511cf7a736678d61a08af45ee23e26 100644
--- a/config/metrics/counts_all/20210216181926_deployments.yml
+++ b/config/metrics/counts_all/20210216181926_deployments.yml
@@ -1,4 +1,5 @@
 ---
+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 eec1fafa71c88e7544d1915db8ccb4f56d7b84aa..7cd10c9540af35542fcb76c05a1481eb3e68da67 100644
--- a/config/metrics/counts_all/20210216181928_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181928_failed_deployments.yml
@@ -1,4 +1,5 @@
 ---
+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 9beda5cb6dbe4483a35bf05fd5e04c7141830e33..bcb81558888cc8cc7d2c13856c177155a3b9222b 100644
--- a/config/metrics/counts_all/20210216181930_releases.yml
+++ b/config/metrics/counts_all/20210216181930_releases.yml
@@ -1,4 +1,5 @@
 ---
+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 48103574cfd2fd9739ba642d8d03119d1dde6769..4f59431b5ab0962f02dd520b91eb31996706100f 100644
--- a/config/metrics/counts_all/20210216181932_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181932_successful_deployments.yml
@@ -1,4 +1,5 @@
 ---
+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 7640b27eb46b64b2f6d166f261605e3eaa295979..4aaccd68c8738936ba6da7aa31749180729dac1a 100644
--- a/config/metrics/counts_all/20210216181946_pages_domains.yml
+++ b/config/metrics/counts_all/20210216181946_pages_domains.yml
@@ -1,4 +1,5 @@
 ---
+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 3e84a694e960923ed514b5c324a9cc69f6d15e80..61751d2aed3e63fa46464a2e45a1379e31ae0ace 100644
--- a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
@@ -1,4 +1,5 @@
 ---
+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 4d520d3430f675378e717a3f3855fb41b344813a..b5c5ed10672a7f41cc847cc332e67b4dea9cd027 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,4 +1,5 @@
 ---
+data_category: Optional
 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 c784bc57a0048375d53f17e90dd1e53506f98e45..1a644d04d929c9374e5f221527c46431d4ea9946 100644
--- a/config/metrics/counts_all/20210216182002_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 b7d7c08196a581bae3587874f3dce7ccfd86b980..82ef272d2d1b1bd767064dc12e09c1a509b37fad 100644
--- a/config/metrics/counts_all/20210216182004_commit_comment.yml
+++ b/config/metrics/counts_all/20210216182004_commit_comment.yml
@@ -1,4 +1,5 @@
 ---
+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 980314f6829270aa54e9f3f473e692291c34efb5..aecc9429dbc87980fc2c0362c36a275a1658d03e 100644
--- a/config/metrics/counts_all/20210216182006_source_code_pushes.yml
+++ b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
@@ -1,4 +1,5 @@
 ---
+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 c7af2e13af28015a55272d6af9accc601d1fc7b6..a05b821dd2676b4492193b67ba61a45e3b7874b0 100644
--- a/config/metrics/counts_all/20210216182010_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216182010_deploy_keys.yml
@@ -1,4 +1,5 @@
 ---
+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 449b56b6994206d6ea1cbd6cc8e57296aed060ef..6096dccad1873470fdac7ce23abd38e039e18784 100644
--- a/config/metrics/counts_all/20210216182012_keys.yml
+++ b/config/metrics/counts_all/20210216182012_keys.yml
@@ -1,4 +1,5 @@
 ---
+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 7ddcdde577caf39acb3978cae55598cd929fb328..3639ddb0b2e5afe8f30edcfe284e8898c146f57b 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,4 +1,5 @@
 ---
+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 78ba2fed801a91d1f59cc0d737be77752b6de791..0ba200e71f671fa5f3b8ae928fa6e39e29a5b12f 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,4 +1,5 @@
 ---
+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 e3b25e3bd374dc2e2c398eb759e26b583fb1f2ee..6826ebf8d4bf2228c084b527e41457c2d1f3e028 100644
--- a/config/metrics/counts_all/20210216182017_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
@@ -1,4 +1,5 @@
 ---
+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 aaf41b37c2bc3473344fe71919526c53e0feea3e..50b2f67ad775ff513eccf2ecaaf305f987e9a3dd 100644
--- a/config/metrics/counts_all/20210216182112_sast_jobs.yml
+++ b/config/metrics/counts_all/20210216182112_sast_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 9f56f021bf37d8d6e22bcfdd6b2e7e5a7ad895b1..83b72fd97eb45c02dad4f44eb576eabb4e0bbc11 100644
--- a/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml
+++ b/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.secret_detection_jobs
 description: Count of 'secret-detection' CI jobs fro the month.
 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 829d35a6e10095b80dd0fbaa9bcd1c1102b101df..a958e854f0d9474696d81503d0d8c8842d51546c 100644
--- a/config/metrics/counts_all/20210216182116_user_sast_jobs.yml
+++ b/config/metrics/counts_all/20210216182116_user_sast_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.secure.user_sast_jobs
 description: Count of SAST jobs
 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 2559a67f4ad04ab68b71cc320fcf6fbf08905d33..28567ef1b52d4eb2f0f9611170fd40d1c6f50eb5 100644
--- a/config/metrics/counts_all/20210216182118_user_secret_detection_jobs.yml
+++ b/config/metrics/counts_all/20210216182118_user_secret_detection_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.secure.user_secret_detection_jobs
 description: Count of Secret Detection Jobs
 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 cae090955c108f159375192f3b1d8e10bcd73a4d..aef5e02d715de80bdf53d0f8c4e6aa651d89ac9c 100644
--- a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
+++ b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
@@ -1,4 +1,5 @@
 ---
+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 66ec14d7c4d64dec447c33bed4ab24e24765ac5b..4d515f303446ead63ea049eda1b7ee837765e9f6 100644
--- a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
@@ -1,4 +1,5 @@
 ---
+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 1bc3803d82fe35ba15fc39a4e4d20936193e215f..93ca67dc3ce77b18c42c6c9ec0acd9301b3415b6 100644
--- a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
@@ -1,4 +1,5 @@
 ---
+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 8842e75f87582675036359f387609c94b1ae5da8..a6289208f8d796aca75df610f1e4f070ea4fa68b 100644
--- a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
@@ -1,4 +1,5 @@
 ---
+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 be281f262900fc46017501041340762bd9d2e4f5..22f56981921e07500830b0ce6e4512da63694060 100644
--- a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
@@ -1,4 +1,5 @@
 ---
+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 2c2d2aa6cb19ffbbf0e13f3b508c6f36c9ac5ad1..f54966e566727d570ffa613710e6d0358a7c85e9 100644
--- a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
@@ -1,4 +1,5 @@
 ---
+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 324b461ceea4bb22d66c624e93b96e6122dc6947..7d04dd3529f5985b8a3c08e17ddcf814e32478b5 100644
--- a/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
@@ -1,4 +1,5 @@
 ---
+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 057906ecffd9b3a0eb8ef449649f084cbcb119d9..a18cce03cd2b62978d8a2773a48a9c67d4ef3802 100644
--- a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
@@ -1,4 +1,5 @@
 ---
+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 164466c69ba8661e18c0623806e37d32b7af366b..21e14873f14661aa53bfe2815bb4edbc5b7394a6 100644
--- a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
@@ -1,4 +1,5 @@
 ---
+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 3bda8e71ac6f833399ade36b3ec2ce33a1ba459e..3061917fc4c16b44edf19256a19954586f183a1f 100644
--- a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
@@ -1,4 +1,5 @@
 ---
+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 57cda20793bee80aa88770773dc574e58705e139..5942a6cecee5146bdb3c7b333dbea8656d667831 100644
--- a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
@@ -1,4 +1,5 @@
 ---
+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 108ff88ee520da680cc4983abe22f66db0ae9582..ff075f9fa4c24ddf008a23a2e99a5b7bfb987a68 100644
--- a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
@@ -1,4 +1,5 @@
 ---
+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 dd9902c0b4104face15803101a5f46c548300a65..e8d30fe06da760a6d67a75622cb80302da6658f5 100644
--- a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
@@ -1,4 +1,5 @@
 ---
+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 cce2dedb709c0168bd94b06900d60a8793f09f6a..edcb3cf0bd287adb34d402ac4b7c179b35f28a35 100644
--- a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
@@ -1,4 +1,5 @@
 ---
+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 b41982786a98323c801cf956a2eac690fd73d6d1..26586a7a8e0e25a77205d9308316f909ddcd126e 100644
--- a/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
@@ -1,4 +1,5 @@
 ---
+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 786ecefcf1c956c3544a2827e877389441c6bb67..da5595571b00185c9acd467a54d2e2bf068e96d5 100644
--- a/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
@@ -1,4 +1,5 @@
 ---
+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 13d5f4cc80926c45e9bfc90466019825b2d2fba5..8176ad143c3d66055ea7dfa23534c0c1842f94a6 100644
--- a/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
@@ -1,4 +1,5 @@
 ---
+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 836d02ef76849ad957c8d003ccc82804a9bab380..5b9043aad7966638cf6465ae1cf5d1d8cf467b7d 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,4 +1,5 @@
 ---
+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 723399c5d0426cbd4608f9f5ce0e842e1ee69e24..5d0138e409124865f45da379023796d041b9fbf1 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,4 +1,5 @@
 ---
+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 f2addef450d5731e8b823928e51d18a3198ae18d..63cd3fecf7c5fb80aa4f57f88415e9daac8738a2 100644
--- a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
@@ -1,4 +1,5 @@
 ---
+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 282fd487d3d6326277cae0c2111d7c3b03c05a7d..fe9baa116302ff15cd5d3b91da79d727af8a605d 100644
--- a/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
@@ -1,4 +1,5 @@
 ---
+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 e3f70b4a6795a8d017c8951561dd5eb2f4178f2e..00fa0215ac519c59f38108b4994662780f00da5d 100644
--- a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
@@ -1,4 +1,5 @@
 ---
+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 fed7a283e1418be38c53cbebeacac3ed092ab7af..b58943d95d1529f334c617307d3363ec093c0992 100644
--- a/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
@@ -1,4 +1,5 @@
 ---
+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 690d27ecb638d711bc484ddd9c7573a54d1d01fc..91b93d10ead01b741f00aa4680ecc994e586f819 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,4 +1,5 @@
 ---
+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 a22e3be20a4f9c0d75891c6aa22a127c4a0dcee0..a1ef1252dfaee7b801a0e52d537a213d336e8b01 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,4 +1,5 @@
 ---
+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 3ad8d02cb1d644308cc2a623996ea4aefc752ef2..da0a9cbe25bc7ad1dd2f061b52700b94301512d7 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,4 +1,5 @@
 ---
+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 e6d056f6cc3e9489baa6a3a4766c952b7fa8e0f4..2b02ebf2acad30160dcf42e6214a6aa51e104804 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,4 +1,5 @@
 ---
+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 7aaa3d5d9d0666659e6cb233c8bb0ad3852567ea..f52332c224890be835b8388f38d1ae5e370989c0 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,4 +1,5 @@
 ---
+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 9baa6d0b535b6ad53468c212acbdbe24b19817b2..ddc7c9708c563b6c20446ab813b17b4e89a15278 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,4 +1,5 @@
 ---
+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 9465a30e6a5c00b2832a49924a777dc7869b8a04..1c7b96191687434593b63b37c8f42f917b00f246 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,4 +1,5 @@
 ---
+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 6bc0ea5925624efcb8c5f3951162dccb09eb5fcf..c87ed74070dfb78deb52dc1bf8356c0ee9cb45de 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,4 +1,5 @@
 ---
+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 d475ea39438b636d3afbd136f39eafc5ab0bb213..a98b839d2999d7610eba3840b4b76260842ddfdb 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,4 +1,5 @@
 ---
+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 7a9070b623a0e3713e015dca3abc045d95202860..cbf3b097b6f208a39710c836961b7934d026f319 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,4 +1,5 @@
 ---
+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 11402a7b5e74961122d20a674bb86429fb83a120..d939cbcd9315de3345793a08fcde502d27353f8c 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,4 +1,5 @@
 ---
+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 25fd4257ed23287cff650c753a77c8fd70c9622a..e0f63656b3cbf48e4f362e656d4af8e5879f3a2c 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,4 +1,5 @@
 ---
+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 c4017a636a5620d2a19b3f8baf647d22567fe06e..ecf1ca05da88b9989cde3665531a92218e4757d6 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,4 +1,5 @@
 ---
+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 7af47fe182d7f0159d38bf8404f13f0cd869c458..7c91339b28265625a408e4013b86d482c488552a 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,4 +1,5 @@
 ---
+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 11196fc56c398a795a4848e6e957c7cf9fe7e105..012d756ff294776e19376038e18169379cecfaa0 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,4 +1,5 @@
 ---
+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 00650c4a139faa001e29e421c32b3d6968cfa61a..8babf39989a4425ffd2d8b434f2985327caaf1bc 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,4 +1,5 @@
 ---
+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 f8240096bb953fe94e3b2938649b10504480d146..1abc0fbc116a9e09fc134c9a30d6a1ad8436f9a5 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,4 +1,5 @@
 ---
+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 012d7d2bf39e5e623eecfc4c82f708bfa97ccc4f..279caecac846007094f91d4885d6266f69ef7d02 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,4 +1,5 @@
 ---
+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 fda3a7065e18c15eb05292e0c62fb4d8593cf39a..fd67e83e7e6a36516f923f4d8ed2932543159c31 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,4 +1,5 @@
 ---
+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 34b718a2497c9f625d3971e2cf4f5899d3f22495..6dc7c95f21a205c97cd101ddaa24ecc9210730e0 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,4 +1,5 @@
 ---
+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 5c39995a1b28d7a33d1264ce865518ebedfa5f8d..25b9ef192b5bfa436fcaaca49ae501e9e2f0857b 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,4 +1,5 @@
 ---
+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 c856484e69184893941ec38e75b4830347325634..7950eb474a301cc3dcec3fb27e2daf7a5c8e96d1 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,4 +1,5 @@
 ---
+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 e4bfe9f50d6f669094cde91443b43e13ef0f7abd..ff959ac3e985469955c7c757d19324e261698326 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,4 +1,5 @@
 ---
+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 6bfc5255e9fde708c1527c928feaa8e89d6543d1..767b4c5b2b15dc628ebcdcccd8b825dc1a7bb271 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,4 +1,5 @@
 ---
+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 43c8d16986d600b086f232f5bc21d5056e4b7977..5f358229c127a372fbe07b70be06de74e1aceab7 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,4 +1,5 @@
 ---
+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 3c95516325e9371c182677718632265740505ffc..7a978c4849c960f8a1ae4490f5f9ff994675a978 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,4 +1,5 @@
 ---
+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 d1843778ad9b66436a3462497fffa6dbd768be48..2681085ac8d07a050f54ebf828384a236eb0e45a 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,4 +1,5 @@
 ---
+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 2c3ca5d1dfb615b611ca81d09a9031e5109360c7..dd410f89789af25b7cd75f06be16095a75318c75 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,4 +1,5 @@
 ---
+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 639ecf0b0fb6682e16f75fbbd2332cbbfce22468..e93e3a358ca8facfab3547b505c11d546a8f0277 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,4 +1,5 @@
 ---
+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 815c2b0194d8c7ff31aaa8f54a2a0cbd75b385f7..a9c614feac944d4d854a3fba2cafb1281dae5aa5 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,4 +1,5 @@
 ---
+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 1cd5ec0e63f5bebe08874097d63439109b1cdd5f..c80830ee7b1000458d114e1e5ae5711a85827717 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,4 +1,5 @@
 ---
+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 06f2b212ecc0f92775c41b28c28af3e7c3cfb1f2..1f2c87db111be83e4ea914190876648c504a2170 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,4 +1,5 @@
 ---
+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 2cbe0345ccc33f3ffb4cf01bb8056288ee2777ec..c95aac148f611a3a44b56b233e945a5335e0412c 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,4 +1,5 @@
 ---
+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 879cfd64e03d7aafbe8ffcb6f17454e4c88215a3..b4bad0722a9009e9e9dba4948d5a2963fb01bd85 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,4 +1,5 @@
 ---
+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 048286d10bf5b26e9f671569c592186ad9da2ed2..b20ebc21ff127dacb29724a3a66c76d672f012f2 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,4 +1,5 @@
 ---
+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 58e7b47407be6c4006b060f3daf2d59ca2b80768..f2e6d384210ee0c80f1a67bfa7bb7f96d8020adf 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,4 +1,5 @@
 ---
+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 d7cac5b13f11ecdd77a1bae8ba245972b38edbad..7ade34665442402c72d200b90a408a8c83d9f794 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,4 +1,5 @@
 ---
+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 a4008091a8aa357ef0141d3a306812695892f253..80e829663284a950bd1751c91121c3b8609dd7a0 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,4 +1,5 @@
 ---
+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 5e4f76b1badc20785771426344bc3bd5240f6908..68cb565988435b2de231b7cdb3c120b2f764fb2b 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,4 +1,5 @@
 ---
+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 6205204cb5a983002bbeaf04a4cacace8a965550..f8193329f772a17e9aa5039b59ab64eae05e83f0 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,4 +1,5 @@
 ---
+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 bb2bac41a08c067db5f273d9739d656cca2fe40c..adad2ea44515839b5471edcd4a6507d72dfb8593 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,4 +1,5 @@
 ---
+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 42c579ba3bedd259b7854fbdc99b085aa0582a0d..dcd35a737d8138c88494d114f119ebcfd097019a 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,4 +1,5 @@
 ---
+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 06b6e8de0b0005d3a89708b7f0a572220b51d7ff..54b4320cae92bd24fc5440a4a649ebc2202c545b 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,4 +1,5 @@
 ---
+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 98bd5734c3bf78ea911e7d4788d590908a405bdc..336f343a7fc883b801ee3627076c00526c6f174b 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,4 +1,5 @@
 ---
+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 963ceae076df87d1f48662672dd088e399aed7ab..3fb42a6f916ef5dca9c96ed01502fb930a6be705 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,4 +1,5 @@
 ---
+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 14021b24575b1dcff76cc370eedfc3305f323412..0a9be3d713a69392e4aa25faee3aedf08ee79583 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,4 +1,5 @@
 ---
+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 4991ccbd835eee2dd96ac72cfb6487795985aa69..666dc88da469f2cc6877d6479987c37025b9581c 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,4 +1,5 @@
 ---
+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 f9d6124b57a2011342709f26084f45c32fa827f4..41bb80ec9e02adff2d35c4892f980008024fad80 100644
--- a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
+++ b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
@@ -1,4 +1,5 @@
 ---
+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 77fe44a1836c913edefec69ceb0a916649b9a022..432458bb3713551024206733c154e8a9781e4f2c 100644
--- a/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml
+++ b/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml
@@ -1,4 +1,5 @@
 ---
+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 fc0ed6e5429b6afda5caaff88218e5ed351ce585..a4a5197aec2400bde43d0ca5a3b52659c09c711f 100644
--- a/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml
+++ b/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml
@@ -1,4 +1,5 @@
 ---
+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 bb2be873f575faf11276c119faf9238e2f021bf1..efe0e1c5bfe6e507a7fae87a6b78983e90e3871e 100644
--- a/config/metrics/counts_all/20210216183400_omniauth_providers.yml
+++ b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
@@ -1,4 +1,5 @@
 ---
+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 a2daf5c329956932f73aeb198bf6b8b206c7d7a9..2d1aed6115a904e499e3185102da5c360341efbd 100644
--- a/config/metrics/counts_all/20210216183402_two-factor.yml
+++ b/config/metrics/counts_all/20210216183402_two-factor.yml
@@ -1,4 +1,5 @@
 ---
+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 42ac42195a12db65ac4a0e51dbc409b35541a755..28aa20c33ad9a51a2c276a9ebe1842fe4d8082ac 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,4 +1,5 @@
 ---
+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 663a15dbdaac47b9ce309970d868d41617381c98..b0e93f089891ec5785e158d1222a5a0fa95f3a95 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,4 +1,5 @@
 ---
+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 0a0b1684b501724b0cdbb20e5856908cb9fdddf4..21267298f1acb23b75a868b9e605389b8eeef243 100644
--- a/config/metrics/counts_all/20210216183408_standard.yml
+++ b/config/metrics/counts_all/20210216183408_standard.yml
@@ -1,4 +1,5 @@
 ---
+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 d644033c5cc2c069e328f7f3822483f3b1f99c22..24fd143171c74e6d1fc27d634403fd89f092b14f 100644
--- a/config/metrics/counts_all/20210216183410_google_oauth2.yml
+++ b/config/metrics/counts_all/20210216183410_google_oauth2.yml
@@ -1,4 +1,5 @@
 ---
+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 b7f7eea5f71a0f579167eea9734937256eecd940..4a41246c947f5368634097bbcfa62ef3325780ae 100644
--- a/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml
+++ b/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.secure.user_coverage_fuzzing_jobs
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_all/20210216183904_g_compliance_dashboard.yml b/config/metrics/counts_all/20210216183904_g_compliance_dashboard.yml
index 03e450d34381fd5bd2286456721f645a29595756..8447a8742af923ccfe6e5a9052c51f108cbbc33f 100644
--- a/config/metrics/counts_all/20210216183904_g_compliance_dashboard.yml
+++ b/config/metrics/counts_all/20210216183904_g_compliance_dashboard.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: compliance_unique_visits.g_compliance_dashboard
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_all/20210216183906_g_compliance_audit_events.yml b/config/metrics/counts_all/20210216183906_g_compliance_audit_events.yml
index bd4ef926805f4978da1a5290b8b53680856b7d4a..bb836d6b510b91f06500fc78313278cbbe6464d3 100644
--- a/config/metrics/counts_all/20210216183906_g_compliance_audit_events.yml
+++ b/config/metrics/counts_all/20210216183906_g_compliance_audit_events.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: compliance_unique_visits.g_compliance_audit_events
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_all/20210216183908_i_compliance_audit_events.yml b/config/metrics/counts_all/20210216183908_i_compliance_audit_events.yml
index c7581cc01dc6a84b21474ef5d6795c09c03b10f6..69f38276682a27a918cc86d6451931fee4ea57cf 100644
--- a/config/metrics/counts_all/20210216183908_i_compliance_audit_events.yml
+++ b/config/metrics/counts_all/20210216183908_i_compliance_audit_events.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: compliance_unique_visits.i_compliance_audit_events
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_all/20210216183910_i_compliance_credential_inventory.yml b/config/metrics/counts_all/20210216183910_i_compliance_credential_inventory.yml
index af0d841786364c5fd1a9ce59ff9a991eb4674fd6..eca419bcd0ac66a1bbf493fa48b7ab87a86bb198 100644
--- a/config/metrics/counts_all/20210216183910_i_compliance_credential_inventory.yml
+++ b/config/metrics/counts_all/20210216183910_i_compliance_credential_inventory.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: compliance_unique_visits.i_compliance_credential_inventory
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_all/20210216183912_a_compliance_audit_events_api.yml b/config/metrics/counts_all/20210216183912_a_compliance_audit_events_api.yml
index caf8da049d55ff1c318d18274f0997e0c8585a66..35762ed8a8f9f4d2ef71de14f43df27474820b2b 100644
--- a/config/metrics/counts_all/20210216183912_a_compliance_audit_events_api.yml
+++ b/config/metrics/counts_all/20210216183912_a_compliance_audit_events_api.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: compliance_unique_visits.a_compliance_audit_events_api
 description: ''
 product_section: ''
diff --git a/config/metrics/counts_all/20210216183914_compliance_unique_visits_for_any_target.yml b/config/metrics/counts_all/20210216183914_compliance_unique_visits_for_any_target.yml
index fb67caaa03e5bb371cdba186378afd3e583e3308..8a875b80cdb7ec1d301e0a52522ade52f474395f 100644
--- a/config/metrics/counts_all/20210216183914_compliance_unique_visits_for_any_target.yml
+++ b/config/metrics/counts_all/20210216183914_compliance_unique_visits_for_any_target.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: compliance_unique_visits.compliance_unique_visits_for_any_target
 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 8e6075b4aad510ada104c80840b6b2f5e91a781e..448d5cb0fba2398b0dcb03e509402361cd05c20b 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,4 +1,5 @@
 ---
+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 d1080bdf043f0391de52f78b44071d4eda3633e4..c7364ce866339bf30d7cc8ccdb01cc04a3fd267d 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,4 +1,5 @@
 ---
+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 6650167f2648abb7009861f61b1bb53d622b8a3e..05584e02c45e71ba0b2c314651053ef8d375db8a 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,4 +1,5 @@
 ---
+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 ae13c280d89de9808fee1db2d0bc77a5bd991d9b..5962998fef3aab177c4bd32d997bace48cb45da2 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,4 +1,5 @@
 ---
+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 15859a10f5989d92926e0543fd5e269284dcc674..59b933c812f149fa4123a7a8519da013effa366f 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,4 +1,5 @@
 ---
+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 d766fd5efac37685c043a6128ab5922a51db3c41..859f436ee6987992dafeebcc365597fbb830b846 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,4 +1,5 @@
 ---
+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 4f923f250d08339ebd0929bca1f6cd6a36ba84be..9a890ee943aee41de9b0cbf5f9cc37fb57bb3490 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,4 +1,5 @@
 ---
+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 25b6c0f4e936816f8f584226cab5a905311d2108..82b7447bd481e979c3c3fa880069aa77ed97c243 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,4 +1,5 @@
 ---
+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 d1a818fe3e123197646d975e87d0a1a3b0c389fb..2447a5c18809a5dafb7f6a3af3132a3f0a233ba7 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,4 +1,5 @@
 ---
+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 2a6a56a1f5ac59a1e16568a2ef8e34b54cb4ff8e..8838e57a7a389bec728226dbd5ac2593bb8f2941 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,4 +1,5 @@
 ---
+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 f66bb2c85c9f1c6eccc65c8eabf81c53793e5664..2435c75973a038ddabe745f6b499b3cf3e2c0232 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,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.ci_runners_instance_type_active
 name: "count_active_instance_ci_runners"
 description: Total active group 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 c6abe0905a4719d5f0015228f09c286cc722f21e..afe7a4fe62a352a51816f996d6e387a70880f2a2 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,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.ci_runners_group_type_active
 name: "count_active_group_ci_runners"
 description: Total active instance 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 fda2b529b30f309e9eb8ffde50bab91a07aca754..ce221f1f34344839ca397fa9b2dffdd78c7bf3aa 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,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.ci_runners_project_type_active
 name: "count_active_project_ci_runners"
 description: Total active 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 201ffaeb415838a6e44dcfed91f3a14eebcc6013..4d2dc2d9a75ce8fffdb9fafef22f62e14429b865 100644
--- a/config/metrics/counts_all/20210502050942_ci_runners_online.yml
+++ b/config/metrics/counts_all/20210502050942_ci_runners_online.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.ci_runners_online
 name: "counts_online_runners"
 description: Total online Runners
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 920ec24e9e74b07e3212b6a759fadbf06542c46c..5c8a4a11d0b398479518e8aeac465301eca27b88 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,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.ci_runners_instance_type_active_online
 name: "count_instance_active_online_ci_runners"
 description: Total active and online 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 e88530d97c8dc377369d30195d42a2f3d649c63e..48c98352d74939fe51876920e7c22e9a02198748 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,4 +1,5 @@
 ---
+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 7ce3ee6ce8b780610edbe5f52f75ee2a3009f57b..80d326dc91c2cca2cf8a617375c305fdad851dd7 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,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.ci_runners_project_type_active_online
 name: "count_project_active_online_ci_runners"
 description: Total active and online 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 52dd38bab8dad3d4cdd69f239d3178aa907f2c1b..133b85c00e4978f55d9fe67a41aa136015a5270c 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,4 +1,5 @@
 ---
+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 65440e73542d8cefd4196a682c747848dc5f550b..70531344912a257d7a052d04d3f7af0ad9ca02d8 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,4 +1,5 @@
 ---
+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 3701f0a3ba30a6a2eacf6889e02eedd03450e378..9f6fff093d3180557c3cba74298c6d006e6e95fc 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,4 +1,5 @@
 ---
+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 70c0257481d16b4c584a23f1b6b12c21f9a1d029..da16bdfc514e3c086ae78b675a95bc7159062594 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,4 +1,5 @@
 ---
+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 8d8eb4630d3fd79a900b5aa31d80b3e5438aaab3..ce00d9d1ba4d977c26544107c1471b36175c6574 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,4 +1,5 @@
 ---
+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 965efa418833c7f7815f7f52b925e137cbe228c6..6eae1b19cbba53779b93a0ff344a3851dfad08fc 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,4 +1,5 @@
 ---
+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 2e5bbc29d2c5f03a10f3dbce5b04b0ceeb9c2246..bc66d1bdb477c08af75de191a139ef7ea443c46b 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,4 +1,5 @@
 ---
+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 23ed471a295ebaf576b3b14e5ad091a70c26a8d6..525ab313b17aa02d3e81ccaca09fb65e4059855d 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,4 +1,5 @@
 ---
+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 992b39fbd1cbbed6af584114a04f63aad37463e6..2279f54232ae98cee9cf50fa26c3291ffa95b779 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,4 +1,5 @@
 ---
+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 bd9378867e6cbb5503dfb4c7a9abb7777c8866f3..a346e17801a2175de54626ffad4b159715ee3cdf 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,4 +1,5 @@
 ---
+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 5b74bfd8d8c03b4c43d1c47e4ea2d29e6b41d811..573a8e4c18c92379a0d03f9cc5310c33ed8bfb26 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,4 +1,5 @@
 ---
+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 e30f41d003ac611dc0120c8f2d981b9877646a5d..39e4b91f52c0932ff814a8da83d54fd6836c43d2 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,4 +1,5 @@
 ---
+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 555c0f1e47fb647355c3f26e1b061dfbbac9116a..e9e9a82cd02d6b7c7f226aeafc8e450f699d4b75 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,4 +1,5 @@
 ---
+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 23d8a6be3433d7e0fa507481e8f7277a7c51f9ef..dec668f44f0b0b8e01b8f29a4d32ca24e5d42514 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,4 +1,5 @@
 ---
+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 794eaaf01c8f9f8b1eb42bd3f2e8028663f803f9..09ca27a198bc6cec4a3e7168bb19fe1d889214c9 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,4 +1,5 @@
 ---
+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 d8172d035b3c4ef5b8de974907f8eebbbfba495f..c706faef430c2d0da42971d83885f7fa02782126 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,4 +1,5 @@
 ---
+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 f781a32cd65f6a0adcb443a8490a554f58605f73..5708ba432b5c19b84180f3e7a8fc489913d5b4bf 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,4 +1,5 @@
 ---
+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 a79425144ac0180c96714992e62eb2f6f05f10ea..ff1ec072cebd1306cd6259a952b46af672d8da2c 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,4 +1,5 @@
 ---
+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 d84f9b6d794b5bae445654badd386376fde3f0d1..8337c962466f3ed934eacef1afb74d59ffbeec2c 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,4 +1,5 @@
 ---
+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 35a9797f2fe3ff0513f04e1632debd6f6ce118ef..182b1b5f0d77a3717f7147ee4e89577110a7d9b6 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,4 +1,5 @@
 ---
+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 79c2b1362c03e216aa4c52aa622788fe3cbb501b..aeaa6e43f50e7d860cc24ac00b86f8ef1b7d2cfa 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,4 +1,5 @@
 ---
+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 b4e08bd5d9060771a739d0e104e7ab6f3552f133..a1ebe73131555e70cdccbf8d13e8c4790fe41433 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,4 +1,5 @@
 ---
+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 175c7171dba132058baaeab4a84b729e834f41f5..9d9cdfb0577dda5bc0b453a68911e2ea3cbd4a27 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,4 +1,5 @@
 ---
+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 d6ec214b836368a8baed65e740451ca19f3e7c1f..ffe99a1d4c3f66b7d6154429d3370c9ebafe420a 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,4 +1,5 @@
 ---
+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 cfeb30a8ca60b06479914f89d226b7a4273192f1..2f61cfa937616e19791e955cae6fbf30646bb933 100644
--- a/config/metrics/counts_all/20210514141520_project_imports_total.yml
+++ b/config/metrics/counts_all/20210514141520_project_imports_total.yml
@@ -1,4 +1,5 @@
 ---
+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 1ec944c3d7a69d37794aa9ddb8d543cfc1ba9784..cbebbdc4eb02447e09f254e84e449b5e29b973e6 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,4 +1,5 @@
 ---
+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 f8a2b99b87ebb1ca5e732c3191424cf2ef070408..d85eeefe9e6db222703bfdd558ea787354f8eb9e 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,4 +1,5 @@
 ---
+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/license/20210201124932_recorded_at.yml b/config/metrics/license/20210201124932_recorded_at.yml
index 88f27fff377d9868028eb4697734e4a77d60d300..c0f80b31fdc610df811ccc34c918ad0c5ff9b2d4 100644
--- a/config/metrics/license/20210201124932_recorded_at.yml
+++ b/config/metrics/license/20210201124932_recorded_at.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: recorded_at
 description: When the Usage Ping computation was started
 product_section: growth
diff --git a/config/metrics/license/20210204124829_active_user_count.yml b/config/metrics/license/20210204124829_active_user_count.yml
index 3987b6504f19aa669def830db79958941876e2ed..bd2ca01ba27da0d337262332e6ff0be2fc11753a 100644
--- a/config/metrics/license/20210204124829_active_user_count.yml
+++ b/config/metrics/license/20210204124829_active_user_count.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: active_user_count
 description: The number of active users existing in the instance. This is named the instance_user_count in the Versions application.
 product_section: growth
diff --git a/config/metrics/license/20210204124928_version.yml b/config/metrics/license/20210204124928_version.yml
index 9aea9f8fde588458d1a8cf2cd071ed517ca60231..5c34c0ae146c069e6f956650fbe0cb7cb74358eb 100644
--- a/config/metrics/license/20210204124928_version.yml
+++ b/config/metrics/license/20210204124928_version.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: gitaly.version
 description: Version of Gitaly
 product_section: growth
diff --git a/config/metrics/license/20210204124936_version.yml b/config/metrics/license/20210204124936_version.yml
index ef87a6ed9e660833edfee670ae19f5836af65c62..2fe130ff780ea3ab52916eaff5cc2be2321ccf47 100644
--- a/config/metrics/license/20210204124936_version.yml
+++ b/config/metrics/license/20210204124936_version.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: gitlab_pages.version
 description: The version number of GitLab Pages
 product_section: growth
diff --git a/config/metrics/license/20210204124938_recording_ce_finished_at.yml b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
index d07580730c1cb54cfa37f3dfe07d5fc923b0503c..a0d3e4681cfabe6fe7f308a14a4ebca8dd207903 100644
--- a/config/metrics/license/20210204124938_recording_ce_finished_at.yml
+++ b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 5e5c1ad05ec52872003b14bc23ee927910762aa2..a3de7da331f5a891aa7ac2681f5efd72955340ef 100644
--- a/config/metrics/license/20210216175601_version.yml
+++ b/config/metrics/license/20210216175601_version.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 6e907b4a823b70f3ce7f1c2fa7e6634d7ba8a211..669f983a505fc7f73f7335db8d3eefd6470d31bb 100644
--- a/config/metrics/license/20210216175602_installation_type.yml
+++ b/config/metrics/license/20210216175602_installation_type.yml
@@ -1,4 +1,5 @@
 ---
+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 c267c2e9bca7d6fb684b7d496ac6a9bdd154ce8b..a95dcd5c13f698c706fb677b36a09c61bcccc3fd 100644
--- a/config/metrics/license/20210216181053_version.yml
+++ b/config/metrics/license/20210216181053_version.yml
@@ -1,4 +1,5 @@
 ---
+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 ff501697e95cb3f7e65cc3818312004107f385c2..d25ec6ac08a15792b57ab790130aad533a114868 100644
--- a/config/metrics/license/20210216183237_version.yml
+++ b/config/metrics/license/20210216183237_version.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 66a9e5fd52a7b3c965dcf40f6742ccf4f5968a9d..0a26d0afb68ecb92c21510dfadddc001fc291217 100644
--- a/config/metrics/settings/20210201124935_database_adapter.yml
+++ b/config/metrics/settings/20210201124935_database_adapter.yml
@@ -1,4 +1,5 @@
 ---
+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 dc6db53f8ab79a43f01140ee2799c6c51388c615..f1426cd220d073f543d2ab181bbb9fe17531586f 100644
--- a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
+++ b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 5cccb84ec10dd0a9f25c91c7ec2f1dc29a24eba6..4f5d2fde9e70ce02bff5129d0f797140b19fdd87 100644
--- a/config/metrics/settings/20210204124858_container_registry_enabled.yml
+++ b/config/metrics/settings/20210204124858_container_registry_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 f06b89477a4510d08eb55245d8829bf1ac6b741e..a567dd3bf510c038b9d1d6c13e93a27174beca51 100644
--- a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
+++ b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 2b6f1d41413ac458571a97d9a46261b56aa469db..d1737989b800c5ab3c7350f3baa0cb264ef7ef7a 100644
--- a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
+++ b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 a5ae02910c6949a57f4105bacb1098f359d99fec..aa7d697acfdfae4a09559cb7ed0bf080c1795164 100644
--- a/config/metrics/settings/20210204124904_gravatar_enabled.yml
+++ b/config/metrics/settings/20210204124904_gravatar_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 589897fb15b6ff920732fa0f77843b4465287417..d1dcdaec10615d88170f76ffccbf07a44912bd1b 100644
--- a/config/metrics/settings/20210204124906_ldap_enabled.yml
+++ b/config/metrics/settings/20210204124906_ldap_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 14303726d1f575ec0b78c0d8a75168bd42c44a89..ed72e557ad77f5c5707d7b8c64a9bf5879ebb738 100644
--- a/config/metrics/settings/20210204124908_mattermost_enabled.yml
+++ b/config/metrics/settings/20210204124908_mattermost_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 67d1515abc5645f59d4b5f2d1ff30eaa1d5917a7..2943913bcbb2cca41a41889b3aac4ee5e9ba0282 100644
--- a/config/metrics/settings/20210204124910_omniauth_enabled.yml
+++ b/config/metrics/settings/20210204124910_omniauth_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 0e8ce8568580dccbead3cb1edf44927d3bfb84c3..bf33f8e4454135a2a934ae9b0adf515e50afcd4d 100644
--- a/config/metrics/settings/20210204124912_prometheus_enabled.yml
+++ b/config/metrics/settings/20210204124912_prometheus_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 61b99f55452b72eed99c5ddd93ffb40b2dd332f8..df4a4f1edaa05f9c061d5be37d6203025f439dba 100644
--- a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
+++ b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 ba61de920de5eacc1e4df5f054d07cddf1e5f214..35f834511b28133c0501f09c3e545cbe5491c99f 100644
--- a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
+++ b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 b63a571c6b9e17c5592fd07cc45ec3a13b7624b8..40b16f33b0b9875245443ee3994c6fc823d3f040 100644
--- a/config/metrics/settings/20210204124918_signup_enabled.yml
+++ b/config/metrics/settings/20210204124918_signup_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 80f247d91462abf9b42a88c128a43989a1e7de67..869f7c894832cb129b70a352613f976d106297c6 100644
--- a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
+++ b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 c7e971f1a27875d342e5f4db713b1de025d0344a..9660614bd46677d051dc75ce5722754c896b7638 100644
--- a/config/metrics/settings/20210204124922_grafana_link_enabled.yml
+++ b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: grafana_link_enabled
 description: Whether Grafana is enabled
 product_section: growth
diff --git a/config/metrics/settings/20210204124934_enabled.yml b/config/metrics/settings/20210204124934_enabled.yml
index def857192eb9c478ce0668d465c06c994f5a9cef..24ba7606e085525b811927df9371dcbc2a8ba6f0 100644
--- a/config/metrics/settings/20210204124934_enabled.yml
+++ b/config/metrics/settings/20210204124934_enabled.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: gitlab_pages.enabled
 description: Whether GitLab Pages is enabled
 product_section: growth
diff --git a/config/metrics/settings/20210216174829_smtp_server.yml b/config/metrics/settings/20210216174829_smtp_server.yml
index c3aa121a826a6a49f8608abe5a6fb137e4fb96f4..1b264834821ae89abe81c053aef87ab8f718dd4b 100644
--- a/config/metrics/settings/20210216174829_smtp_server.yml
+++ b/config/metrics/settings/20210216174829_smtp_server.yml
@@ -1,4 +1,5 @@
 ---
+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 a2552d1f465b13f439bade3ed74743e87c24bf9a..6cde08e1983390aa5c7fa76ae86d490f1841be3a 100644
--- a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
+++ b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 58d61ad5d881369b12794d407830d35e9a3b5b2b..6d5843b35f21234bb25d694d340f04c2b1df9606 100644
--- a/config/metrics/settings/20210216175604_edition.yml
+++ b/config/metrics/settings/20210216175604_edition.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 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 dfc7222ebcf43faa5bf94a1b4b3dfd2526edd262..2cd0949c9f55b46393e4dfe967475241110fed94 100644
--- a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
+++ b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 378ae0e2ee42210b9efbbb3d5dfffb36d69b04f7..468a899863778c123f1faeee88136943cb41fc3b 100644
--- a/config/metrics/settings/20210216175609_version.yml
+++ b/config/metrics/settings/20210216175609_version.yml
@@ -1,4 +1,5 @@
 ---
+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 72e13f785d4d2c6cf88672b50061e296a8822530..71ceb75ab84941c4188030d8cfd6d2a790d64fe8 100644
--- a/config/metrics/settings/20210216180314_gitpod_enabled.yml
+++ b/config/metrics/settings/20210216180314_gitpod_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 c5f7e230767c6a2a0338cba7658e9c313bfc9620..9a52788d2e328e6889701326e80868e5169a7fef 100644
--- a/config/metrics/settings/20210216180836_enabled.yml
+++ b/config/metrics/settings/20210216180836_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 3e5fbdf1acd02d8487bf3b15a73ec581dfa4b236..1e8c0bf8d30a6b92289be5ca9c645bc073e43d0d 100644
--- a/config/metrics/settings/20210216180838_enabled.yml
+++ b/config/metrics/settings/20210216180838_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 4356fe775d8635a9ea8f98aaf786c97a4499af91..a0859d7d5a65d95cbe24f7dfd9ccc44170ac22c6 100644
--- a/config/metrics/settings/20210216180840_direct_upload.yml
+++ b/config/metrics/settings/20210216180840_direct_upload.yml
@@ -1,4 +1,5 @@
 ---
+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 4570a701b537b32e4c4e78ae8eae4fcc8958c43c..9386a1a8301926bfae8102d901c08272e7d91e8b 100644
--- a/config/metrics/settings/20210216180841_background_upload.yml
+++ b/config/metrics/settings/20210216180841_background_upload.yml
@@ -1,4 +1,5 @@
 ---
+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 fcaea534daba305b2f0b04a234b8cfd79bd2ae09..2c9e074f9ef16539695e4c892bcb452d0ef111bc 100644
--- a/config/metrics/settings/20210216180843_provider.yml
+++ b/config/metrics/settings/20210216180843_provider.yml
@@ -1,4 +1,5 @@
 ---
+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 dc29c7211fd593b0ba51977dc688b5d862a42768..a9c3382786190bcbd56f49ca898945b40064a76a 100644
--- a/config/metrics/settings/20210216180845_enabled.yml
+++ b/config/metrics/settings/20210216180845_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 c5be296e19f5d79924ab058c3476370771b8f5f9..ca404dc8b6652d652c1752e66f5039b0c504f8ca 100644
--- a/config/metrics/settings/20210216180847_enabled.yml
+++ b/config/metrics/settings/20210216180847_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 cdce6e0329ce9e65c2ae894b8aca3639bd35faa7..37e77067336ecd87ff75e97fb08fc6ae904eb13a 100644
--- a/config/metrics/settings/20210216180849_direct_upload.yml
+++ b/config/metrics/settings/20210216180849_direct_upload.yml
@@ -1,4 +1,5 @@
 ---
+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 67852d9f039598df075c103697a0bb6664cee262..5c231d544bf1e9722c97a59b406175fb4e093dd8 100644
--- a/config/metrics/settings/20210216180851_background_upload.yml
+++ b/config/metrics/settings/20210216180851_background_upload.yml
@@ -1,4 +1,5 @@
 ---
+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 5c8439695101d37f827f12e7c9724df096cf591a..8675e023caf631b74effa5ee03b3a88bffe457a4 100644
--- a/config/metrics/settings/20210216180852_provider.yml
+++ b/config/metrics/settings/20210216180852_provider.yml
@@ -1,4 +1,5 @@
 ---
+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 40656fdfe2c66b93e59f857163e26106bb59d889..51aebd0f029b5453681f212e92e7c0cd4b2b37ff 100644
--- a/config/metrics/settings/20210216180854_enabled.yml
+++ b/config/metrics/settings/20210216180854_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 1892882d5bb4c9fb93100e827e7def3f92ceb90a..842a6042ae6e33a9f2c92979d25d6ea05bbf89a1 100644
--- a/config/metrics/settings/20210216180856_enabled.yml
+++ b/config/metrics/settings/20210216180856_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 f2b11a4e4a75f7fcd58181a2b9ec4e723519a0f5..c2d680102e606cffdade824c65afa9568909c90c 100644
--- a/config/metrics/settings/20210216180858_direct_upload.yml
+++ b/config/metrics/settings/20210216180858_direct_upload.yml
@@ -1,4 +1,5 @@
 ---
+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 9cb4e2ed10e5102fbb7e64f3fd490e7d7cb529e8..9d4b16ba4416d2d88613ab2e19fe8f02e60ebcb3 100644
--- a/config/metrics/settings/20210216180900_background_upload.yml
+++ b/config/metrics/settings/20210216180900_background_upload.yml
@@ -1,4 +1,5 @@
 ---
+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 2e9e11b9301c06b2f26b60f014c370e959b481cc..1ec1949ef11bb9c8cd216764a82c65a2efcaff72 100644
--- a/config/metrics/settings/20210216180902_provider.yml
+++ b/config/metrics/settings/20210216180902_provider.yml
@@ -1,4 +1,5 @@
 ---
+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 7c7f4f7bf5705fdc21a5c3a9c9975ee42810fc97..7ebcbd048376cd035949fefdefa25b75af034009 100644
--- a/config/metrics/settings/20210216180903_enabled.yml
+++ b/config/metrics/settings/20210216180903_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 fa5d70567e84a7436d6ca70a0842c8d5793d4c5c..f967861ae0bedb9f27d6836337d70ad3041141fa 100644
--- a/config/metrics/settings/20210216180905_enabled.yml
+++ b/config/metrics/settings/20210216180905_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 8d2523f2e8f0a4d320330aee1a7a996acad2ca4a..ca8cfa003c32a81a63c3dc55af66565650d95469 100644
--- a/config/metrics/settings/20210216180907_direct_upload.yml
+++ b/config/metrics/settings/20210216180907_direct_upload.yml
@@ -1,4 +1,5 @@
 ---
+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 466c630717b22a5970c4d5100bd46efdcf4ad002..783baa1f30da67950c388e5225813ed5b6927626 100644
--- a/config/metrics/settings/20210216180909_background_upload.yml
+++ b/config/metrics/settings/20210216180909_background_upload.yml
@@ -1,4 +1,5 @@
 ---
+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 75e5cda1f2bc4eece7e435743e6fc359c65354d0..4066f83afdb8fba9e6567406f6f880dc3eaa0912 100644
--- a/config/metrics/settings/20210216180911_provider.yml
+++ b/config/metrics/settings/20210216180911_provider.yml
@@ -1,4 +1,5 @@
 ---
+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 806be543ad2849dc3d4b6589a2b4742ca1fbbe90..e19001746d887ad72094ae2463dfd23314573dde 100644
--- a/config/metrics/settings/20210216180913_enabled.yml
+++ b/config/metrics/settings/20210216180913_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 fb16bfe1e484335183b983c7d8729bde6942cee3..0cb84815e26c74663d4466dbb31c23753a4dbf21 100644
--- a/config/metrics/settings/20210216180915_enabled.yml
+++ b/config/metrics/settings/20210216180915_enabled.yml
@@ -1,4 +1,5 @@
 ---
+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 f743723e6c39b25ea220a5d4d13c8f643c3ef948..41adb02d6c6b03015fdeac17ffdd891e51104909 100644
--- a/config/metrics/settings/20210216180916_direct_upload.yml
+++ b/config/metrics/settings/20210216180916_direct_upload.yml
@@ -1,4 +1,5 @@
 ---
+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 ede74fba29e088ad53902bf795b7f22632ab3f48..9c5ded4f95649651a1ee30a908323c0ccb78cd05 100644
--- a/config/metrics/settings/20210216180918_background_upload.yml
+++ b/config/metrics/settings/20210216180918_background_upload.yml
@@ -1,4 +1,5 @@
 ---
+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 4f94e0d07bcdba0161b5e17667b2b7a6efd33f84..da5d1dc0c1bb686f24f7c09107b4dbcbf7280c5b 100644
--- a/config/metrics/settings/20210216180920_provider.yml
+++ b/config/metrics/settings/20210216180920_provider.yml
@@ -1,4 +1,5 @@
 ---
+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 3585fda1771fc9f8bbcc6a7c0fe9bd9afc4bbb42..242f2818ac63bc2251b452b3ae7fc7e13326ccc6 100644
--- a/config/metrics/settings/20210216183241_filesystems.yml
+++ b/config/metrics/settings/20210216183241_filesystems.yml
@@ -1,4 +1,5 @@
 ---
+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 28905c62ce0cfb8b82ca8e9fd3c635668715d115..19b920ea7e3e73c002983f828c0f7be253fc5a55 100644
--- a/config/metrics/settings/20210216183248_pg_system_id.yml
+++ b/config/metrics/settings/20210216183248_pg_system_id.yml
@@ -1,4 +1,5 @@
 ---
+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 41b65a1bd6a0cc975e362d983d9effa39d041230..6f1cd9be7246a83416664b6024e8196641b00969 100644
--- a/config/metrics/settings/20210225045628_operating_system.yml
+++ b/config/metrics/settings/20210225045628_operating_system.yml
@@ -1,4 +1,5 @@
 ---
+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 8fe1e1edc0bfc7d7e92a8fc730626acc781a7a5c..f760abae6dc2c1be6e0562ecde022015b7257f29 100644
--- a/config/metrics/settings/20210321224827_gitaly_apdex.yml
+++ b/config/metrics/settings/20210321224827_gitaly_apdex.yml
@@ -1,4 +1,5 @@
 ---
+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 5fa9b4754724b6cb54a66009cc5eed22b8c1f0a2..c998b37d039f5171c39f0df4ef3772edb6467886 100644
--- a/config/metrics/settings/20210323120839_topology.yml
+++ b/config/metrics/settings/20210323120839_topology.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: topology
 description: Topology data
 product_section: enablement
diff --git a/ee/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml b/ee/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml
index 50a6b1a3c2787ed318c4a6b8c581fe81ca317cec..05aa97d98f8e27de9c2e9cf7103a6a4980055f6e 100644
--- a/ee/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.g_analytics_contribution_monthly
 description: Unique visitors to /groups/:group/-/contribution_analytics by month
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml b/ee/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml
index 1bd34acc0e5c2d62c05b8003d27a194dea1f7ba7..d87cfa9aad7bc95c976c2be9e56e0ce749b48e0c 100644
--- a/ee/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.g_analytics_insights_monthly
 description: Unique visitors to /groups/:group/-/insights/ by month
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml b/ee/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml
index 93bf51a8ecb841949c2f8fa0a22794485de32984..01724ae661e570e6853a5c755a700f6596e9f750 100644
--- a/ee/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.g_analytics_issues_monthly
 description: Unique visitors to /groups/:group/-/issues_analytics by month
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml b/ee/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml
index c2a2c563fc00e275b025708d04db67d6ca6d0c93..adb0586beadaa17eed2816cb6d9c6661891f3217 100644
--- a/ee/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.g_analytics_productivity_monthly
 description: Unique visitors to /groups/:group/-/analytics/productivity_analytics by month
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml b/ee/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml
index cc9ec5df38ac29f12521cdc9c88f0eb8d94947b7..620a9a2b952727e22c4bebbf48733d6b0a04dc3d 100644
--- a/ee/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.g_analytics_valuestream_monthly
 description: Unique visitors to /groups/:group/-/analytics/value_stream_analytics by month
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml b/ee/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml
index 12ff9f40b9482dafb0088ff7093a727520ef4a0a..f98fd6aa986801a8aacb9d01e68baca6c2a9bff4 100644
--- a/ee/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.p_analytics_code_reviews_monthly
 description: Unique visitors to /:group/:project/-/analytics/code_reviews by month
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml b/ee/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml
index 1ee4109d84e7882f99ba2197510f50972fbb26d4..b0ee242372c1670c02c5ee888e51f0170a05a735 100644
--- a/ee/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.p_analytics_insights_monthly
 description: Unique visitors to /:group/:project/insights/ by month
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml b/ee/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml
index a34934bac7121cd1dde00d4fdd8b33db33a5a65b..d6d8bf074d878a5e605b6a531cdf152cba233296 100644
--- a/ee/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.p_analytics_issues_monthly
 description: Unique visitors to /:group/:project/-/analytics/issues_analytics by week
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml b/ee/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml
index 86b4f956dc2e899da1caad2a5976c9f2a84ab057..e646a842de9360c0c8717c1faea0fbfc55317091 100644
--- a/ee/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.p_analytics_repo_monthly
 description: Unique visitors to /:group/:project/-/graphs/master/charts by month
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml b/ee/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml
index f7758d7b2ae296f83d19db7af2e5279445d5a122..a382d0332553d6323ca8703f1dec5ac58e23d544 100644
--- a/ee/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.p_analytics_merge_request_monthly
 description: Unique visitors to /:group/:project/-/analytics/merge_request_analytics by month
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216175103_merge_requests_with_added_rules.yml b/ee/config/metrics/counts_28d/20210216175103_merge_requests_with_added_rules.yml
index c426ea8b86d47fd45137b9ea62b91f7bb2fc7ed7..0038342bcc653a254659f3bd3dbafb29302560ef 100644
--- a/ee/config/metrics/counts_28d/20210216175103_merge_requests_with_added_rules.yml
+++ b/ee/config/metrics/counts_28d/20210216175103_merge_requests_with_added_rules.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.create.merge_requests_with_added_rules
 description: Merge requests with added rules
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216175105_merge_requests_with_optional_codeowners.yml b/ee/config/metrics/counts_28d/20210216175105_merge_requests_with_optional_codeowners.yml
index 07a6503ad777626c7190ba38cf2e2e122f422784..3c86e618334456a0d089ec5c977b403c897f3c2d 100644
--- a/ee/config/metrics/counts_28d/20210216175105_merge_requests_with_optional_codeowners.yml
+++ b/ee/config/metrics/counts_28d/20210216175105_merge_requests_with_optional_codeowners.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.create.merge_requests_with_optional_codeowners
 description: Count of merge requests with optional codeowner approval rules
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216175107_merge_requests_with_required_codeowners.yml b/ee/config/metrics/counts_28d/20210216175107_merge_requests_with_required_codeowners.yml
index e38454f165811a98f4e42b25715fae2f6c35dcb4..1c3ae4aa39e119d53e66ab97f93dd8a47d4d0b5e 100644
--- a/ee/config/metrics/counts_28d/20210216175107_merge_requests_with_required_codeowners.yml
+++ b/ee/config/metrics/counts_28d/20210216175107_merge_requests_with_required_codeowners.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.create.merge_requests_with_required_codeowners
 description: Count of merge requests with required codeowner approval rules
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216175222_user_dependency_scanning_jobs.yml b/ee/config/metrics/counts_28d/20210216175222_user_dependency_scanning_jobs.yml
index 98b27f7651b93dfe6e80c98d48a6388db766bd89..1c46aae8e2e28715c9f1bf023d0fbb51caeadbed 100644
--- a/ee/config/metrics/counts_28d/20210216175222_user_dependency_scanning_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216175222_user_dependency_scanning_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.secure.user_dependency_scanning_jobs
 description: Monthly number of users creating Dependency Scanning jobs
 product_section: sec
diff --git a/ee/config/metrics/counts_28d/20210216175224_user_license_management_jobs.yml b/ee/config/metrics/counts_28d/20210216175224_user_license_management_jobs.yml
index c4ca78ef5545d14922191563a082f6a74de8e0a2..5a2059c318472f3ed0eddf8d3104f68a600eb50a 100644
--- a/ee/config/metrics/counts_28d/20210216175224_user_license_management_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216175224_user_license_management_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.secure.user_license_management_jobs
 description: Monthly number of users running License Scanning jobs
 product_section: sec
diff --git a/ee/config/metrics/counts_28d/20210216175226_dependency_scanning_pipeline.yml b/ee/config/metrics/counts_28d/20210216175226_dependency_scanning_pipeline.yml
index dd4d0e4693a3ee12f9241dc20b784ec2b02f5e89..7b6b7e810f0203f1d721a1bdd78b99def1837ea8 100644
--- a/ee/config/metrics/counts_28d/20210216175226_dependency_scanning_pipeline.yml
+++ b/ee/config/metrics/counts_28d/20210216175226_dependency_scanning_pipeline.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.secure.dependency_scanning_pipeline
 description: Count of pipelines with successful Dependency Scanning jobs
 product_section: sec
diff --git a/ee/config/metrics/counts_28d/20210216175436_projects_slack_notifications_active.yml b/ee/config/metrics/counts_28d/20210216175436_projects_slack_notifications_active.yml
index 37d5758726bd9eabd369bd6bcab2776f1ac4e768..21fe3bb79a5ef06073c8f0d30e6051adfcc5a573 100644
--- a/ee/config/metrics/counts_28d/20210216175436_projects_slack_notifications_active.yml
+++ b/ee/config/metrics/counts_28d/20210216175436_projects_slack_notifications_active.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.configure.projects_slack_notifications_active
 description: Unique projects created in the past 28 days that have Slack notifications enabled
 product_section: ops
diff --git a/ee/config/metrics/counts_28d/20210216175437_projects_slack_slash_active.yml b/ee/config/metrics/counts_28d/20210216175437_projects_slack_slash_active.yml
index ba20d49994f92b8866d60b6241ea79800a9a78b8..fd90ae432fe2129c0d6e5407e5bad111e94d2683 100644
--- a/ee/config/metrics/counts_28d/20210216175437_projects_slack_slash_active.yml
+++ b/ee/config/metrics/counts_28d/20210216175437_projects_slack_slash_active.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.configure.projects_slack_slash_active
 description: Unique projects created in the past 28 days that have Slack ‘/’ commands enabled
 product_section: ops
diff --git a/ee/config/metrics/counts_28d/20210216175505_user_container_scanning_jobs.yml b/ee/config/metrics/counts_28d/20210216175505_user_container_scanning_jobs.yml
index 4c722baad9c08de958e3c3ab63b066be35807fe5..966acaf3346902847a9ddac30722942d072ff812 100644
--- a/ee/config/metrics/counts_28d/20210216175505_user_container_scanning_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216175505_user_container_scanning_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.secure.user_container_scanning_jobs
 description: Distinct count per user of Container Scanning jobs run monthly
 product_section: sec
diff --git a/ee/config/metrics/counts_28d/20210216175507_container_scanning_pipeline.yml b/ee/config/metrics/counts_28d/20210216175507_container_scanning_pipeline.yml
index 9d7cd5f17211acdfae57b88f61d8d45ee6cd91f7..e384f6fbd54afc055def9ab577e362f80608f040 100644
--- a/ee/config/metrics/counts_28d/20210216175507_container_scanning_pipeline.yml
+++ b/ee/config/metrics/counts_28d/20210216175507_container_scanning_pipeline.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.secure.container_scanning_pipeline
 description: Pipelines containing a Container Scanning job
 product_section: sec
diff --git a/ee/config/metrics/counts_28d/20210216175558_projects_reporting_ci_cd_back_to_github.yml b/ee/config/metrics/counts_28d/20210216175558_projects_reporting_ci_cd_back_to_github.yml
index 35cdd5b8d8c4863b5a6b2009e7b8037cba5d908f..28ced687645777e57c7b337e4ac610da4c15e43c 100644
--- a/ee/config/metrics/counts_28d/20210216175558_projects_reporting_ci_cd_back_to_github.yml
+++ b/ee/config/metrics/counts_28d/20210216175558_projects_reporting_ci_cd_back_to_github.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.verify.projects_reporting_ci_cd_back_to_github
 description: Projects with a GitHub repository mirror pipeline enabled
 product_section: ops
diff --git a/ee/config/metrics/counts_28d/20210216180359_coverage_fuzzing_pipeline.yml b/ee/config/metrics/counts_28d/20210216180359_coverage_fuzzing_pipeline.yml
index 85566aa3011a2b08ec8ef432d9f93b8f495b5d19..b5f6ae5d3f96f4db2473b9f7d3a5e9e8da370ec2 100644
--- a/ee/config/metrics/counts_28d/20210216180359_coverage_fuzzing_pipeline.yml
+++ b/ee/config/metrics/counts_28d/20210216180359_coverage_fuzzing_pipeline.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.secure.coverage_fuzzing_pipeline
 description: Counts of Pipelines that have at least 1 coverage-guided Fuzz Testing
   job
diff --git a/ee/config/metrics/counts_28d/20210216180401_api_fuzzing_pipeline.yml b/ee/config/metrics/counts_28d/20210216180401_api_fuzzing_pipeline.yml
index f811ea0f77c4ce81e6eac99f6f9ece7b7937192b..262c3a40b3bd07759cebe5d7f48313b37e46f16d 100644
--- a/ee/config/metrics/counts_28d/20210216180401_api_fuzzing_pipeline.yml
+++ b/ee/config/metrics/counts_28d/20210216180401_api_fuzzing_pipeline.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.secure.api_fuzzing_pipeline
 description: Counts of Pipelines that have at least 1 API Fuzzing Testing job
 product_section: sec
diff --git a/ee/config/metrics/counts_28d/20210216180427_i_search_advanced_monthly.yml b/ee/config/metrics/counts_28d/20210216180427_i_search_advanced_monthly.yml
index 27a5b8dff876a7cb69304964192f13fdd83a4e57..8ae4f63a8ebbd8458678c879b0e3bde724f64517 100644
--- a/ee/config/metrics/counts_28d/20210216180427_i_search_advanced_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216180427_i_search_advanced_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.search.i_search_advanced_monthly
 description: Calculated unique users to perform Advanced searches by month
 product_section: enablement
diff --git a/ee/config/metrics/counts_28d/20210216180607_incident_management_incident_published_monthly.yml b/ee/config/metrics/counts_28d/20210216180607_incident_management_incident_published_monthly.yml
index 0454958a9829d6f48ce6e632d088ae37e3a09488..e014887167e2dca25e5df37916d41579f777c29a 100644
--- a/ee/config/metrics/counts_28d/20210216180607_incident_management_incident_published_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216180607_incident_management_incident_published_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_published_monthly
 description: Count of unique users that published incidents per month
 product_section: ops
diff --git a/ee/config/metrics/counts_28d/20210216180820_ldap_keys.yml b/ee/config/metrics/counts_28d/20210216180820_ldap_keys.yml
index 309a9cd65c21ba992f587f654c2489aa62ee47f0..95262a6f15c2a7d457d9b6bfc25bbce25182cd02 100644
--- a/ee/config/metrics/counts_28d/20210216180820_ldap_keys.yml
+++ b/ee/config/metrics/counts_28d/20210216180820_ldap_keys.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.ldap_keys
 description: Number of users creating keys synced as part of LDAP for last 28 days.
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216180822_ldap_users.yml b/ee/config/metrics/counts_28d/20210216180822_ldap_users.yml
index 66d1bbf32ebb07e2d30f689cdd6c0f81495f9cfd..ba07c82a2732956860b33efd6b4be7a1b3cf6962 100644
--- a/ee/config/metrics/counts_28d/20210216180822_ldap_users.yml
+++ b/ee/config/metrics/counts_28d/20210216180822_ldap_users.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.ldap_users
 description: Number of users that are linked to LDAP
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216180824_value_stream_management_customized_group_stages.yml b/ee/config/metrics/counts_28d/20210216180824_value_stream_management_customized_group_stages.yml
index d253586433c6898f774944f8e10dda4b4ebd10aa..6e363a8e571359e56b5a70f99e2db9084c916986 100644
--- a/ee/config/metrics/counts_28d/20210216180824_value_stream_management_customized_group_stages.yml
+++ b/ee/config/metrics/counts_28d/20210216180824_value_stream_management_customized_group_stages.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.value_stream_management_customized_group_stages
 description:
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216180825_projects_with_compliance_framework.yml b/ee/config/metrics/counts_28d/20210216180825_projects_with_compliance_framework.yml
index 6b33af074b77ecbbc9a503ceb0e84a18ced7702c..61dba766ecd39567eabb6d8543500bda9ec77031 100644
--- a/ee/config/metrics/counts_28d/20210216180825_projects_with_compliance_framework.yml
+++ b/ee/config/metrics/counts_28d/20210216180825_projects_with_compliance_framework.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.projects_with_compliance_framework
 description:
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216180827_ldap_servers.yml b/ee/config/metrics/counts_28d/20210216180827_ldap_servers.yml
index 4bc85ccb066721595e77f8b460953c53fa710f2d..93507ec0edbb0c31af504755ffac989ae40604ba 100644
--- a/ee/config/metrics/counts_28d/20210216180827_ldap_servers.yml
+++ b/ee/config/metrics/counts_28d/20210216180827_ldap_servers.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.ldap_servers
 description: Number of LDAP servers configured
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216181156_assignee_lists.yml b/ee/config/metrics/counts_28d/20210216181156_assignee_lists.yml
index da6a69bd6e9a1bfdd1bd5749c22d5c05acb35836..a94cf276156d99a47e6b8ab259abdf0f437c098c 100644
--- a/ee/config/metrics/counts_28d/20210216181156_assignee_lists.yml
+++ b/ee/config/metrics/counts_28d/20210216181156_assignee_lists.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.plan.assignee_lists
 description: Count of MAU creating assignee lists on Boards 
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216181201_milestone_lists.yml b/ee/config/metrics/counts_28d/20210216181201_milestone_lists.yml
index 009e3a291d25257f386550bd2ecc5e3dfdd52644..9d0d05d9c0c3b563be3b6f39f5960260cd70113f 100644
--- a/ee/config/metrics/counts_28d/20210216181201_milestone_lists.yml
+++ b/ee/config/metrics/counts_28d/20210216181201_milestone_lists.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.plan.milestone_lists
 description: Count of MAU created milestone lists on Boards 
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216181341_g_project_management_issue_iteration_changed_monthly.yml b/ee/config/metrics/counts_28d/20210216181341_g_project_management_issue_iteration_changed_monthly.yml
index b9ab290ac1c2d41b6a3954e20ce9aae01a0de303..f5ca67184f6a66069e1a53557ea083fefca88012 100644
--- a/ee/config/metrics/counts_28d/20210216181341_g_project_management_issue_iteration_changed_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181341_g_project_management_issue_iteration_changed_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_iteration_changed_monthly
 description: Count of MAU changing an issue's iteration
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216181345_g_project_management_issue_weight_changed_monthly.yml b/ee/config/metrics/counts_28d/20210216181345_g_project_management_issue_weight_changed_monthly.yml
index 34a766f16d6659b7e31d7c8f4b8434520755de98..53fc2ba86744efe29a994598118c1976a64a8168 100644
--- a/ee/config/metrics/counts_28d/20210216181345_g_project_management_issue_weight_changed_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181345_g_project_management_issue_weight_changed_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_weight_changed_monthly
 description: Count of MAU changing an issue's weight
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216181414_g_project_management_issue_added_to_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181414_g_project_management_issue_added_to_epic_monthly.yml
index 63f4a557de274e3f5115c74f6ba6ed9027dd5198..b665a6f41d7d8b4170704d468fe9dec96160ea15 100644
--- a/ee/config/metrics/counts_28d/20210216181414_g_project_management_issue_added_to_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181414_g_project_management_issue_added_to_epic_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_added_to_epic_monthly
 description: Count of MAU adding an issue to an epic
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216181416_g_project_management_issue_removed_from_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181416_g_project_management_issue_removed_from_epic_monthly.yml
index 8dc441b3c988fb5fad7893bdb61e3abbf095e3d6..137c772e5197b03f508eb37ed40d5bab41c3aae3 100644
--- a/ee/config/metrics/counts_28d/20210216181416_g_project_management_issue_removed_from_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181416_g_project_management_issue_removed_from_epic_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_removed_from_epic_monthly
 description: Count of MAU removing an issue from an epic
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216181420_g_project_management_issue_changed_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181420_g_project_management_issue_changed_epic_monthly.yml
index 5940d2832690bcb8d46b4a792e47586de6a3e6d6..c622193671430c0374331b11be2796886418126d 100644
--- a/ee/config/metrics/counts_28d/20210216181420_g_project_management_issue_changed_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181420_g_project_management_issue_changed_epic_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_changed_epic_monthly
 description: Count of MAU changing the epic on an issue
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216181457_g_project_management_issue_health_status_changed_monthly.yml b/ee/config/metrics/counts_28d/20210216181457_g_project_management_issue_health_status_changed_monthly.yml
index cae4828b3bd78eb1f00531c19ba5a33cc93d3d1f..f683db465ffff2e9e003719525597e2af2307957 100644
--- a/ee/config/metrics/counts_28d/20210216181457_g_project_management_issue_health_status_changed_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181457_g_project_management_issue_health_status_changed_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_health_status_changed_monthly
 description: Count of MAU changing the health status on an issue
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml b/ee/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
index 83c97930be7daadd9223278886b0ca1197f89b0b..4491c1a67478c1ef04c68d493e29665c63d71034 100644
--- a/ee/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_multiple_monthly
 description: Count of MAU using the `/assign @user1 @user2` quick action
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216181534_i_quickactions_child_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181534_i_quickactions_child_epic_monthly.yml
index 08a5bd3a3489d1566d0fc89ff2f8885351fc49ac..d015fa06c8bbd6025de8794f93f8751caa14222d 100644
--- a/ee/config/metrics/counts_28d/20210216181534_i_quickactions_child_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181534_i_quickactions_child_epic_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_child_epic_monthly
 description: Count of MAU using the `/child_epic` quick action 
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216181538_i_quickactions_clear_weight_monthly.yml b/ee/config/metrics/counts_28d/20210216181538_i_quickactions_clear_weight_monthly.yml
index 45a2d7c4de4acc122666adb792190882e4608a1b..93b5f4d224434712562c219965efa10ba2cda859 100644
--- a/ee/config/metrics/counts_28d/20210216181538_i_quickactions_clear_weight_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181538_i_quickactions_clear_weight_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_clear_weight_monthly
 description: Count of MAU using the `/clear_weight` quick action
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216181618_i_quickactions_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181618_i_quickactions_epic_monthly.yml
index 188bbb80baa2fa1ad8a78d72515c5e942d06f0ea..9d8425d2d369d9fd6ed26e9fa8ea4bb570ca6b98 100644
--- a/ee/config/metrics/counts_28d/20210216181618_i_quickactions_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181618_i_quickactions_epic_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_epic_monthly
 description: Count of MAU using the `/epic` quick action
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216181626_i_quickactions_iteration_monthly.yml b/ee/config/metrics/counts_28d/20210216181626_i_quickactions_iteration_monthly.yml
index 32c689904481fa37c6e697c5f35d11d20c8cf864..2b442c45fecaaaad188b6d9f8141d8a0a3d87a57 100644
--- a/ee/config/metrics/counts_28d/20210216181626_i_quickactions_iteration_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181626_i_quickactions_iteration_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_iteration_monthly
 description: Count of MAU using the `/iteration` quick action
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216181648_i_quickactions_parent_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181648_i_quickactions_parent_epic_monthly.yml
index 7214175d399bd793a6ce31dc5434d114e5883ab1..50e0fdecd6b4eb0a77bc23f87a6446ee05f8de28 100644
--- a/ee/config/metrics/counts_28d/20210216181648_i_quickactions_parent_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181648_i_quickactions_parent_epic_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_parent_epic_monthly
 description: Count of MAU using the `/parent_epic` quick action
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216181652_i_quickactions_promote_monthly.yml b/ee/config/metrics/counts_28d/20210216181652_i_quickactions_promote_monthly.yml
index 126462cbad1bb0ceed084857fc60c75ee809ba8c..8e5f44c06ff57355e98540cf4a24d3354df9f09c 100644
--- a/ee/config/metrics/counts_28d/20210216181652_i_quickactions_promote_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181652_i_quickactions_promote_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_promote_monthly
 description: Count of MAU using the `/promote` quick action
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml b/ee/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml
index cca806cdbe0ccdcc0eb878fa58b23bd5ce0ebccd..41634a259dbd185c6da52e7e35dde37719556dc4 100644
--- a/ee/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_publish_monthly
 description: Count of MAU using the `/publish` quick action
 product_section: ops
diff --git a/ee/config/metrics/counts_28d/20210216181718_i_quickactions_remove_child_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181718_i_quickactions_remove_child_epic_monthly.yml
index 3edcb75aa369a66eca4f7a2f310ee2f8747fc0e7..b6976c51d8fc433cd8b93ad5a1dede8064776d7d 100644
--- a/ee/config/metrics/counts_28d/20210216181718_i_quickactions_remove_child_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181718_i_quickactions_remove_child_epic_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_child_epic_monthly
 description: Count of MAU using the `/remove_child_epic` quick action 
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216181725_i_quickactions_remove_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181725_i_quickactions_remove_epic_monthly.yml
index 65e1e9c579468f16f6902e59d0ed621f5a11ee3c..4ef0c900ade0947b8055db2f465da45430562d87 100644
--- a/ee/config/metrics/counts_28d/20210216181725_i_quickactions_remove_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181725_i_quickactions_remove_epic_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_epic_monthly
 description: Count of MAU using the `/remove_epic` quick action 
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216181732_i_quickactions_remove_iteration_monthly.yml b/ee/config/metrics/counts_28d/20210216181732_i_quickactions_remove_iteration_monthly.yml
index f3313b06dfb5fa6f43060d15ff8c84869a42802b..4ecb7e8eb165d3e305fa646794e75d921c78e393 100644
--- a/ee/config/metrics/counts_28d/20210216181732_i_quickactions_remove_iteration_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181732_i_quickactions_remove_iteration_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_iteration_monthly
 description: Count of MAU using the `/remove_iteration` quick action
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216181740_i_quickactions_remove_parent_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181740_i_quickactions_remove_parent_epic_monthly.yml
index 23869dd39e259202af30c76e3089a7e5e92d135d..25adafd335feedbedc95781cf216ff68caf7a745 100644
--- a/ee/config/metrics/counts_28d/20210216181740_i_quickactions_remove_parent_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181740_i_quickactions_remove_parent_epic_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_parent_epic_monthly
 description: Count of MAU using the `/remove_parent_epic` quick action 
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216181857_i_quickactions_weight_monthly.yml b/ee/config/metrics/counts_28d/20210216181857_i_quickactions_weight_monthly.yml
index ea06f196ad4487eceb7e637ee7b80d1cf775ae17..d256d345d6ff7567a2b3148308f6252ff3417bd8 100644
--- a/ee/config/metrics/counts_28d/20210216181857_i_quickactions_weight_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181857_i_quickactions_weight_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_weight_monthly
 description: Count of MAU using the `/weight` quick action 
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml b/ee/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml
index c3f091843c4ffadaf1c8bcad24a089e8995f019f..29a03a8b60aea65bce58bc9b8843eebd2ff5622c 100644
--- a/ee/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml
+++ b/ee/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.release.projects_mirrored_with_pipelines_enabled
 description:  Count creator_id from projects with repository mirroring enabled.
 product_section: ops
diff --git a/ee/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml b/ee/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml
index 4228060e4583a4327ec5e40e53d0065b0b62f728..5d42a8ad08932f62a7964a56b67c7af2a0893907 100644
--- a/ee/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml
+++ b/ee/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.create.projects_enforcing_code_owner_approval
 description: Count of total projects that require approval by code owners for code changes
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml b/ee/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml
index 2f8946c19b56c560e5628e1fce6c864cc47e91de..c4700e98c6038642de6adf4d61aa6125c2cea026 100644
--- a/ee/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml
+++ b/ee/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.create.projects_with_sectional_code_owner_rules
 description: Count of projects using code owners with code owners section feature
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216182047_merge_requests_with_overridden_project_rules.yml b/ee/config/metrics/counts_28d/20210216182047_merge_requests_with_overridden_project_rules.yml
index 3f8d68657178eb035b4efcad9611326df9103f09..4325208fce4c37f2d5e81b4cc957f30a5ae5ddb7 100644
--- a/ee/config/metrics/counts_28d/20210216182047_merge_requests_with_overridden_project_rules.yml
+++ b/ee/config/metrics/counts_28d/20210216182047_merge_requests_with_overridden_project_rules.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.create.merge_requests_with_overridden_project_rules
 description: Number of merge requests which have overriden rules created at the project level
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml b/ee/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml
index 03dbd564fcf8954a303a10323582b1c265be4524..61b5006f6aee4b9e5dc15fa564a15c1d128d2a3a 100644
--- a/ee/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml
+++ b/ee/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.create.projects_with_repositories_enabled
 description: Count of users creating projects that have a matching Git repository, result of a Git push action, for last 28 days.
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216182053_users_using_path_locks.yml b/ee/config/metrics/counts_28d/20210216182053_users_using_path_locks.yml
index cb8dc20767c5228e4acee2e5531038b54bfd3ba7..2bc36ee215592a19ab97bd47934d21f61d319eec 100644
--- a/ee/config/metrics/counts_28d/20210216182053_users_using_path_locks.yml
+++ b/ee/config/metrics/counts_28d/20210216182053_users_using_path_locks.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.create.users_using_path_locks
 description: Number of users creating path_locks in last 28 days.
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216182054_users_using_lfs_locks.yml b/ee/config/metrics/counts_28d/20210216182054_users_using_lfs_locks.yml
index 7448ffab338751c16de74d969bf64f34d61e31e3..93f084f24164b77dfb9b76dab17cc7ef827d1193 100644
--- a/ee/config/metrics/counts_28d/20210216182054_users_using_lfs_locks.yml
+++ b/ee/config/metrics/counts_28d/20210216182054_users_using_lfs_locks.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.create.users_using_lfs_locks
 description: Number of unique users who have locked files or directories using LFS via the command line
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216182056_approval_project_rules.yml b/ee/config/metrics/counts_28d/20210216182056_approval_project_rules.yml
index 8fc0a98c074fed37d90746a7235e4f69a3e52f7b..f1a34afd0cb381240cc9dc24d6f793414772dd9c 100644
--- a/ee/config/metrics/counts_28d/20210216182056_approval_project_rules.yml
+++ b/ee/config/metrics/counts_28d/20210216182056_approval_project_rules.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.create.approval_project_rules
 description: Total number of project approval rules
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216182058_approval_project_rules_with_target_branch.yml b/ee/config/metrics/counts_28d/20210216182058_approval_project_rules_with_target_branch.yml
index fa7e73664838d5f7117d287a581d50250f374ee6..63040bab62cf2811a6dff23cbf8c97be3d73b34c 100644
--- a/ee/config/metrics/counts_28d/20210216182058_approval_project_rules_with_target_branch.yml
+++ b/ee/config/metrics/counts_28d/20210216182058_approval_project_rules_with_target_branch.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.create.approval_project_rules_with_target_branch
 description: Number of project approval rules scoped to a specific repo branch.
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216182139_i_testing_metrics_report_widget_total_monthly.yml b/ee/config/metrics/counts_28d/20210216182139_i_testing_metrics_report_widget_total_monthly.yml
index 3994b4fcb405d020e0f49edc99176455fe5f1cfa..febdffd09102d3e2a74b92997e062e1518e3b0ba 100644
--- a/ee/config/metrics/counts_28d/20210216182139_i_testing_metrics_report_widget_total_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216182139_i_testing_metrics_report_widget_total_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.testing.i_testing_metrics_report_widget_total_monthly
 description: Count of unique users per month who expanded the metrics report
   MR widget
diff --git a/ee/config/metrics/counts_28d/20210216182143_i_testing_group_code_coverage_visit_total_monthly.yml b/ee/config/metrics/counts_28d/20210216182143_i_testing_group_code_coverage_visit_total_monthly.yml
index 3b1c66f02e7be189f94bc9eadd658298f301cfc7..818863c9a336b4ff74fb27b53f6573468082f40d 100644
--- a/ee/config/metrics/counts_28d/20210216182143_i_testing_group_code_coverage_visit_total_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216182143_i_testing_group_code_coverage_visit_total_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.testing.i_testing_group_code_coverage_visit_total_monthly
 description: Count of unique users per month who visited the group code coverage
   page
diff --git a/ee/config/metrics/counts_28d/20210216182147_i_testing_full_code_quality_report_total_monthly.yml b/ee/config/metrics/counts_28d/20210216182147_i_testing_full_code_quality_report_total_monthly.yml
index ebdf3182f1bbcccf6c8091eba73c6320073c0bc4..21c68107535a6f9857b947f840de22bd54ffdcc9 100644
--- a/ee/config/metrics/counts_28d/20210216182147_i_testing_full_code_quality_report_total_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216182147_i_testing_full_code_quality_report_total_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.testing.i_testing_full_code_quality_report_total_monthly
 description: Count of unique users per week|month who visit the full code quality
   report
diff --git a/ee/config/metrics/counts_28d/20210216182151_i_testing_web_performance_widget_total_monthly.yml b/ee/config/metrics/counts_28d/20210216182151_i_testing_web_performance_widget_total_monthly.yml
index d2f658b19cc4ea7a6698b3d5659e80a92376bb9f..e7d963a76460c71ba792168812845c18087c253e 100644
--- a/ee/config/metrics/counts_28d/20210216182151_i_testing_web_performance_widget_total_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216182151_i_testing_web_performance_widget_total_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.testing.i_testing_web_performance_widget_total_monthly
 description: Count of unique users per month who expanded the browser performance
   report MR widget
diff --git a/ee/config/metrics/counts_28d/20210216182153_i_testing_group_code_coverage_project_click_total_monthly.yml b/ee/config/metrics/counts_28d/20210216182153_i_testing_group_code_coverage_project_click_total_monthly.yml
index c4f2fe0c69f4f6186c28c2fa226993ce43abf155..ac9b34482f58315efd2184d6152e9ff8ff4fb2f6 100644
--- a/ee/config/metrics/counts_28d/20210216182153_i_testing_group_code_coverage_project_click_total_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216182153_i_testing_group_code_coverage_project_click_total_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.testing.i_testing_group_code_coverage_project_click_total_monthly
 description: Aggregated count of unique users who have clicked from group code coverage page to an individual project page each month.
 product_section: ops
diff --git a/ee/config/metrics/counts_28d/20210216182156_i_testing_load_performance_widget_total_monthly.yml b/ee/config/metrics/counts_28d/20210216182156_i_testing_load_performance_widget_total_monthly.yml
index 341083b8280b062101cde9e2721d83ad79f1e452..9e607708f1809ea96a4d6e4a3b592c51de617afb 100644
--- a/ee/config/metrics/counts_28d/20210216182156_i_testing_load_performance_widget_total_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216182156_i_testing_load_performance_widget_total_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.testing.i_testing_load_performance_widget_total_monthly
 description: Count of unique users per month who expanded the load performance
   report MR widget
diff --git a/ee/config/metrics/counts_28d/20210216182200_i_testing_metrics_report_artifact_uploaders_monthly.yml b/ee/config/metrics/counts_28d/20210216182200_i_testing_metrics_report_artifact_uploaders_monthly.yml
index 2d5b195301848594eb5f17251219ab12c93fbb8e..babec8503ba066b45c52a231406504f11cf5488c 100644
--- a/ee/config/metrics/counts_28d/20210216182200_i_testing_metrics_report_artifact_uploaders_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216182200_i_testing_metrics_report_artifact_uploaders_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.testing.i_testing_metrics_report_artifact_uploaders_monthly
 description: Tracks number of metrics reports uploaded monthly.
 product_section: ops
diff --git a/ee/config/metrics/counts_28d/20210216182209_user_preferences_group_overview_security_dashboard.yml b/ee/config/metrics/counts_28d/20210216182209_user_preferences_group_overview_security_dashboard.yml
index 5fc2dd9bdf5f2a832bdc7c134abb109f2ebb25e8..d7cf3ac9740639c268e01fda2608c92574d3b6cf 100644
--- a/ee/config/metrics/counts_28d/20210216182209_user_preferences_group_overview_security_dashboard.yml
+++ b/ee/config/metrics/counts_28d/20210216182209_user_preferences_group_overview_security_dashboard.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.secure.user_preferences_group_overview_security_dashboard
 description: Users who set personal preference to see Security Dashboard on Group
   information page
diff --git a/ee/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml b/ee/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml
index dc33cf6f7a866db3e9565fe48759ebaef4a2c9b2..1b8dae92b0e2c9ae482f0ec3e0cbd1497ae01ba5 100644
--- a/ee/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml
+++ b/ee/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts_monthly.aggregated_metrics.i_testing_paid_monthly_active_user_total
 description: Aggregated count of users who have engaged with a Premium or Ultimate tier testing feature per month.
 product_section: ops
diff --git a/ee/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml b/ee/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml
index f2f341030125e635e1592db8cce6a66af351373e..1abd6d6e35b11575a9eaa997449f7a84e2f6721a 100644
--- a/ee/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml
+++ b/ee/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.create.total_number_of_path_locks
 description: Number of paths/directories manually locked through the UI
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml b/ee/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml
index 7b628aeecdbc383559e29a06488f2a389800cf41..8ef2f668db79d7562139d9854a0ad1a6c92235e6 100644
--- a/ee/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml
+++ b/ee/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.create.total_number_of_locked_files
 description: The total number of files which have been locked via the GitLab UI
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml b/ee/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml
index 7b4fd20a34dc5499adfc966acba997e15fae74d3..0dd5c20025ba2722ae813488f8e524260eeb0869 100644
--- a/ee/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml
+++ b/ee/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.create.approval_project_rules_with_more_approvers_than_required
 description: Number of approval rules with more approvers than required.
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml b/ee/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml
index 49f07d63b3cb16d384b00627da0c8060c05b00f0..61641d050bf2c375ba58da475be861e0b94b3445 100644
--- a/ee/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml
+++ b/ee/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.create.approval_project_rules_with_less_approvers_than_required
 description: Number of approval rules with fewer approvers than required.
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml b/ee/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml
index 03317f93375f1485af7bb38e717479c8e015de09..2ab4f12ea2afcc2303fdbac97cf07caee9cfef2a 100644
--- a/ee/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml
+++ b/ee/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.create.approval_project_rules_with_exact_required_approvers
 description: Number of approval rules with the exact number of required approvers.
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml b/ee/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml
index e38fa21e649b4de21473a3615c691eafc7f1ac56..da7c67e9473392e8980e916d446967a59b2f6ccd 100644
--- a/ee/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml
+++ b/ee/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.secure.dependency_scanning_scans
 description: Monthly number of users running Dependency Scanning Scans
 product_section: sec
diff --git a/ee/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml b/ee/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml
index 1fa21f2b9d96c123f988036cfaeb2c13ee84f2d4..e09d4b2b762ce2d8e4c45f85939f728928973345 100644
--- a/ee/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.ci_secrets_management.i_ci_secrets_management_vault_build_created_monthly
 description: Monthly active users creating pipelines that that have the Vault JWT with it.'
 product_section: ops
diff --git a/ee/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml b/ee/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml
index fa4bd1e50415c6d30e20e4b8e655c348623673fa..abe94b8c44ca2d892f25f3201644831c165f2242 100644
--- a/ee/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_list_issues_monthly
 description: 'Count of Jira Issue List visits by month'
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml b/ee/config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml
index 3cb71dfc9de54ad6199879877e9ce2604e743018..9f2fb5e107e83b2f7789ea21a66570c78d688262 100644
--- a/ee/config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_create_issue_monthly
 description: Number of users creating Jira issues by month
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210305144719_g_product_planning_epic_created_monthly.yml b/ee/config/metrics/counts_28d/20210305144719_g_product_planning_epic_created_monthly.yml
index 0704aea1542db0cda02fd7ce050eb5ac93680553..ba11ffb9ece90873371cf798694ed25a50f9a78c 100644
--- a/ee/config/metrics/counts_28d/20210305144719_g_product_planning_epic_created_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210305144719_g_product_planning_epic_created_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210310163213_g_project_management_epic_closed_monthly.yml b/ee/config/metrics/counts_28d/20210310163213_g_project_management_epic_closed_monthly.yml
index aef6cd08a293192ab60e20719f4593491a219a92..877fe3fee96050e655f5ba9da5cac5f9638ce143 100644
--- a/ee/config/metrics/counts_28d/20210310163213_g_project_management_epic_closed_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210310163213_g_project_management_epic_closed_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210310164247_g_project_management_epic_reopened_monthly.yml b/ee/config/metrics/counts_28d/20210310164247_g_project_management_epic_reopened_monthly.yml
index 2bb876fe5c24d3c6257ac531fd481b0c49a9725e..3cf0eddfe44fc991456a143c3a9e44bd51a90958 100644
--- a/ee/config/metrics/counts_28d/20210310164247_g_project_management_epic_reopened_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210310164247_g_project_management_epic_reopened_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210310203049_g_project_management_epic_confidential_monthly.yml b/ee/config/metrics/counts_28d/20210310203049_g_project_management_epic_confidential_monthly.yml
index 673bad8028487bd4bb9f0a03329744d6cbdc21e3..a19b544639424a9308b0e1406fd299f6524e7e5c 100644
--- a/ee/config/metrics/counts_28d/20210310203049_g_project_management_epic_confidential_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210310203049_g_project_management_epic_confidential_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210312093611_g_project_management_epic_visible_monthly.yml b/ee/config/metrics/counts_28d/20210312093611_g_project_management_epic_visible_monthly.yml
index 546332156c2b1a3a8bf6b5bf97ad70037acfceaa..a903fced90252102dee63a7ad399e1fa5a1a4a77 100644
--- a/ee/config/metrics/counts_28d/20210312093611_g_project_management_epic_visible_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210312093611_g_project_management_epic_visible_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210312101935_g_project_management_users_updating_epic_titles_monthly.yml b/ee/config/metrics/counts_28d/20210312101935_g_project_management_users_updating_epic_titles_monthly.yml
index f6be9424f976b364573707ffe481cbf23662822f..3c39179babdf787909b3453cacea718d1df7a01b 100644
--- a/ee/config/metrics/counts_28d/20210312101935_g_project_management_users_updating_epic_titles_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210312101935_g_project_management_users_updating_epic_titles_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210312102051_g_project_management_users_updating_epic_descriptions_monthly.yml b/ee/config/metrics/counts_28d/20210312102051_g_project_management_users_updating_epic_descriptions_monthly.yml
index f7dbed24166233f4552425d1636b50e7d00863a2..b256ea35e8261862f8e31073c9963a87ef5767bf 100644
--- a/ee/config/metrics/counts_28d/20210312102051_g_project_management_users_updating_epic_descriptions_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210312102051_g_project_management_users_updating_epic_descriptions_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210312144719_g_product_planning_epic_issue_added_monthly.yml b/ee/config/metrics/counts_28d/20210312144719_g_product_planning_epic_issue_added_monthly.yml
index ed97cd0098f7666c2ac5a2548c1fa05c6aeec452..f74ffd7188cfb1b58bb39556756d4b38fabc8bc3 100644
--- a/ee/config/metrics/counts_28d/20210312144719_g_product_planning_epic_issue_added_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210312144719_g_product_planning_epic_issue_added_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210312195730_g_project_management_epic_labels_monthly.yml b/ee/config/metrics/counts_28d/20210312195730_g_project_management_epic_labels_monthly.yml
index 7f533a2abda89e3358d72ac3c1e85c91cc700470..3462411c46891d150f9d39b2a12ee90c36b92991 100644
--- a/ee/config/metrics/counts_28d/20210312195730_g_project_management_epic_labels_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210312195730_g_project_management_epic_labels_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210314215451_g_project_management_users_creating_epic_notes_monthly.yml b/ee/config/metrics/counts_28d/20210314215451_g_project_management_users_creating_epic_notes_monthly.yml
index e442365617e6ea20bd946fa8dd163b7abb06bf77..42216df99bf71570ac5527475349915d59d2ec6d 100644
--- a/ee/config/metrics/counts_28d/20210314215451_g_project_management_users_creating_epic_notes_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210314215451_g_project_management_users_creating_epic_notes_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210314234202_g_project_management_users_updating_epic_notes_monthly.yml b/ee/config/metrics/counts_28d/20210314234202_g_project_management_users_updating_epic_notes_monthly.yml
index 3e932e2e1569c3d862e315a6860bda139ddd68a8..da7f6ead04699bb902a3d38f2501abe1dd191a3d 100644
--- a/ee/config/metrics/counts_28d/20210314234202_g_project_management_users_updating_epic_notes_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210314234202_g_project_management_users_updating_epic_notes_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210315034808_g_project_management_users_destroying_epic_notes_monthly.yml b/ee/config/metrics/counts_28d/20210315034808_g_project_management_users_destroying_epic_notes_monthly.yml
index de5f9da5c040d33967109ff6e3cd54a2c177df2a..f6d363cf59d8a8a72a7c168649e0afdd8893cb79 100644
--- a/ee/config/metrics/counts_28d/20210315034808_g_project_management_users_destroying_epic_notes_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210315034808_g_project_management_users_destroying_epic_notes_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210315055439_g_project_management_users_setting_epic_start_date_as_inherited_monthly.yml b/ee/config/metrics/counts_28d/20210315055439_g_project_management_users_setting_epic_start_date_as_inherited_monthly.yml
index 06dee0ee6e24f80764ca386f7310f9396b709cf5..f94c455d950fac941ec2f21d76cd0202d6a83e12 100644
--- a/ee/config/metrics/counts_28d/20210315055439_g_project_management_users_setting_epic_start_date_as_inherited_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210315055439_g_project_management_users_setting_epic_start_date_as_inherited_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210315055624_g_project_management_users_setting_epic_start_date_as_fixed_monthly.yml b/ee/config/metrics/counts_28d/20210315055624_g_project_management_users_setting_epic_start_date_as_fixed_monthly.yml
index 086ea7ef58d7a522d601ffa7b4710d2297f46c6c..ea31356d636e1c51e312e4e50348cf54f5dd6c32 100644
--- a/ee/config/metrics/counts_28d/20210315055624_g_project_management_users_setting_epic_start_date_as_fixed_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210315055624_g_project_management_users_setting_epic_start_date_as_fixed_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210318183733_epics_usage_total_unique_counts_monthly.yml b/ee/config/metrics/counts_28d/20210318183733_epics_usage_total_unique_counts_monthly.yml
index 3ea2f45925a08d60cabc1d0fea954cc26e93820f..271496af61877d028c2317f0f51e4c8fb98697f0 100644
--- a/ee/config/metrics/counts_28d/20210318183733_epics_usage_total_unique_counts_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210318183733_epics_usage_total_unique_counts_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.epics_usage.epics_usage_total_unique_counts_monthly
 description: Total monthly users count for epics_usage
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210325060315_g_project_management_users_setting_epic_due_date_as_inherited_monthly.yml b/ee/config/metrics/counts_28d/20210325060315_g_project_management_users_setting_epic_due_date_as_inherited_monthly.yml
index 978517b09a1bd434c669269b44e354a6bdfa0344..cafd8e47a902b1fe1df6a118f24e35b73030d5f2 100644
--- a/ee/config/metrics/counts_28d/20210325060315_g_project_management_users_setting_epic_due_date_as_inherited_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210325060315_g_project_management_users_setting_epic_due_date_as_inherited_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210325060507_g_project_management_users_setting_epic_due_date_as_fixed_monthly.yml b/ee/config/metrics/counts_28d/20210325060507_g_project_management_users_setting_epic_due_date_as_fixed_monthly.yml
index 5ce9336475414a1cc19decd0bdfcd697913e972a..ea5774a29db5f61baa8de7a97777b4c6fe802d7c 100644
--- a/ee/config/metrics/counts_28d/20210325060507_g_project_management_users_setting_epic_due_date_as_fixed_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210325060507_g_project_management_users_setting_epic_due_date_as_fixed_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210329043509_g_project_management_users_updating_fixed_epic_start_date_monthly.yml b/ee/config/metrics/counts_28d/20210329043509_g_project_management_users_updating_fixed_epic_start_date_monthly.yml
index 2a100ce61778d929523d02775b78401d4427bbdd..404636b7b96f7aacf37f7a30a4cbeee5c8b27627 100644
--- a/ee/config/metrics/counts_28d/20210329043509_g_project_management_users_updating_fixed_epic_start_date_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210329043509_g_project_management_users_updating_fixed_epic_start_date_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210329043548_g_project_management_users_updating_fixed_epic_due_date_monthly.yml b/ee/config/metrics/counts_28d/20210329043548_g_project_management_users_updating_fixed_epic_due_date_monthly.yml
index 421f63b5681722b6c43cb5258df6a6fa00bfb41a..1190b61a647261ee357e856cddea81e03388aaf6 100644
--- a/ee/config/metrics/counts_28d/20210329043548_g_project_management_users_updating_fixed_epic_due_date_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210329043548_g_project_management_users_updating_fixed_epic_due_date_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210331193236_g_project_management_issue_promoted_to_epic_monthly.yml b/ee/config/metrics/counts_28d/20210331193236_g_project_management_issue_promoted_to_epic_monthly.yml
index 66e352bfe13cd71f1792d642d6c837c4ff82e61b..bb7b93109400eed713e281dd734e605904b5801c 100644
--- a/ee/config/metrics/counts_28d/20210331193236_g_project_management_issue_promoted_to_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210331193236_g_project_management_issue_promoted_to_epic_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210401092244_i_analytics_dev_ops_adoption_monthly.yml b/ee/config/metrics/counts_28d/20210401092244_i_analytics_dev_ops_adoption_monthly.yml
index 965c65b65d75c8dcd1ddfc8b018e3fb7c0476924..34ed256d8ef8a50788ff1a2444f92e374a7f2757 100644
--- a/ee/config/metrics/counts_28d/20210401092244_i_analytics_dev_ops_adoption_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210401092244_i_analytics_dev_ops_adoption_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.i_analytics_dev_ops_adoption_monthly
 name: users_viewing_analytics_instance_devops_adoption_monthly
 description: Counts visits to DevOps Adoption page per month
diff --git a/ee/config/metrics/counts_28d/20210401183230_g_project_management_epic_issue_removed_monthly.yml b/ee/config/metrics/counts_28d/20210401183230_g_project_management_epic_issue_removed_monthly.yml
index 529f41aaa79214666953a6a6ddd14c6228b291ee..220c312ad1e16a2a84e86609189793b60c40b530 100644
--- a/ee/config/metrics/counts_28d/20210401183230_g_project_management_epic_issue_removed_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210401183230_g_project_management_epic_issue_removed_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210405190240_g_project_management_epic_issue_moved_from_project_monthly.yml b/ee/config/metrics/counts_28d/20210405190240_g_project_management_epic_issue_moved_from_project_monthly.yml
index a7c53fc4dc73336c5f1691d4accad7aa9367aed5..92a7fdd5c3bf6d178b4a5ddc9d364fab17e4feee 100644
--- a/ee/config/metrics/counts_28d/20210405190240_g_project_management_epic_issue_moved_from_project_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210405190240_g_project_management_epic_issue_moved_from_project_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210405222005_i_incident_management_oncall_notification_sent_monthly.yml b/ee/config/metrics/counts_28d/20210405222005_i_incident_management_oncall_notification_sent_monthly.yml
index f4cc417df3152f33807127f5d662ca9ba8ba8dbd..08a4b585080303875ff1c2f78b2d1cc68b95be4c 100644
--- a/ee/config/metrics/counts_28d/20210405222005_i_incident_management_oncall_notification_sent_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210405222005_i_incident_management_oncall_notification_sent_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.incident_management_oncall.i_incident_management_oncall_notification_sent_monthly
 description: Count of unique users to receive a notification while on-call
 product_section: ops
diff --git a/ee/config/metrics/counts_28d/20210413174710_g_project_management_epic_destroyed_monthly.yml b/ee/config/metrics/counts_28d/20210413174710_g_project_management_epic_destroyed_monthly.yml
index 78e99b65d2847fc6ce3022145745fae731de4f75..a86524869d88ef95185b48b322f545b22d4a0cb3 100644
--- a/ee/config/metrics/counts_28d/20210413174710_g_project_management_epic_destroyed_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210413174710_g_project_management_epic_destroyed_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210419105414_users_viewing_analytics_group_devops_adoption_monthly.yml b/ee/config/metrics/counts_28d/20210419105414_users_viewing_analytics_group_devops_adoption_monthly.yml
index 6b9dd1b1863d457606aeac1606bb11de4809b25e..8d746799d00a864f558c5a19af912e2ebb3568f7 100644
--- a/ee/config/metrics/counts_28d/20210419105414_users_viewing_analytics_group_devops_adoption_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210419105414_users_viewing_analytics_group_devops_adoption_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.users_viewing_analytics_group_devops_adoption_monthly
 description: Counts visits to DevOps Adoption page per month
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210421080207_g_project_management_users_checking_epic_task_monthly.yml b/ee/config/metrics/counts_28d/20210421080207_g_project_management_users_checking_epic_task_monthly.yml
index d73e01ca7386d537a2c8f69866fcbf0004108952..40a5835dc370637b32480d7f3d20ffc65b6d5d94 100644
--- a/ee/config/metrics/counts_28d/20210421080207_g_project_management_users_checking_epic_task_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210421080207_g_project_management_users_checking_epic_task_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210421102516_g_project_management_users_unchecking_epic_task_monthly.yml b/ee/config/metrics/counts_28d/20210421102516_g_project_management_users_unchecking_epic_task_monthly.yml
index 5ba6d90c4b0f601484179d292c3837292fafa909..b1d55561778b6d2754dd63f7f01488f5c62ec570 100644
--- a/ee/config/metrics/counts_28d/20210421102516_g_project_management_users_unchecking_epic_task_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210421102516_g_project_management_users_unchecking_epic_task_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210423011841_g_project_management_users_updating_epic_parent_monthly.yml b/ee/config/metrics/counts_28d/20210423011841_g_project_management_users_updating_epic_parent_monthly.yml
index 87b46819d60c432173ea8233db6d41f2b6bfa75e..f22e35f4b284fdb8a7ebe8f9329e853c0da3d91f 100644
--- a/ee/config/metrics/counts_28d/20210423011841_g_project_management_users_updating_epic_parent_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210423011841_g_project_management_users_updating_epic_parent_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210428072511_g_project_management_users_creating_epic_boards_monthly.yml b/ee/config/metrics/counts_28d/20210428072511_g_project_management_users_creating_epic_boards_monthly.yml
index 199fd7fd60b2b9fea733f43228e9c6dcb2472160..c03f40a5ef3402b8f63ff2e428fbaa1c0eb3805c 100644
--- a/ee/config/metrics/counts_28d/20210428072511_g_project_management_users_creating_epic_boards_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210428072511_g_project_management_users_creating_epic_boards_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210428073329_g_project_management_users_viewing_epic_boards_monthly.yml b/ee/config/metrics/counts_28d/20210428073329_g_project_management_users_viewing_epic_boards_monthly.yml
index 0bffc7f8004bb2d4cee3d5eabf3b1d32c4e4e33e..909798d52ac16c164b1a75a38aae7bfef62abd26 100644
--- a/ee/config/metrics/counts_28d/20210428073329_g_project_management_users_viewing_epic_boards_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210428073329_g_project_management_users_viewing_epic_boards_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210428073607_g_project_management_users_updating_epic_board_names_monthly.yml b/ee/config/metrics/counts_28d/20210428073607_g_project_management_users_updating_epic_board_names_monthly.yml
index 1a5f4340a59042f4f97ed495b57dfcddb3579e89..77bb8209ab34b089abaaac620a666a4484f2737c 100644
--- a/ee/config/metrics/counts_28d/20210428073607_g_project_management_users_updating_epic_board_names_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210428073607_g_project_management_users_updating_epic_board_names_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210430174100_g_project_management_epic_cross_referenced_monthly.yml b/ee/config/metrics/counts_28d/20210430174100_g_project_management_epic_cross_referenced_monthly.yml
index 2f3e2abb54e8f74bdf5f38a5fac88ca1c262284b..93f0a88400a5c42bd4c86459c912c0c037353b4e 100644
--- a/ee/config/metrics/counts_28d/20210430174100_g_project_management_epic_cross_referenced_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210430174100_g_project_management_epic_cross_referenced_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_28d/20210503011217_g_project_management_users_awarding_epic_emoji_monthly.yml b/ee/config/metrics/counts_28d/20210503011217_g_project_management_users_awarding_epic_emoji_monthly.yml
index 9f56e440440fce1ddd97f1786a8d1c92252d4c6c..23a0108d62ad3554063393c48daf0be2b5e951a0 100644
--- a/ee/config/metrics/counts_28d/20210503011217_g_project_management_users_awarding_epic_emoji_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210503011217_g_project_management_users_awarding_epic_emoji_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.epics_usage.g_project_management_users_awarding_epic_emoji_monthly
 description: Counts of MAU awarding emoji on epic
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210505071850_g_project_management_users_removing_epic_emoji_monthly.yml b/ee/config/metrics/counts_28d/20210505071850_g_project_management_users_removing_epic_emoji_monthly.yml
index 14099a71bcb38f569776a9c8e35356084e12cd12..e78516dd047c9b90135bfcffe4ba81b08f2cd341 100644
--- a/ee/config/metrics/counts_28d/20210505071850_g_project_management_users_removing_epic_emoji_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210505071850_g_project_management_users_removing_epic_emoji_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.epics_usage.g_project_management_users_removing_epic_emoji_monthly
 description: Counts of MAU removing emoji on epic
 product_section: dev
diff --git a/ee/config/metrics/counts_28d/20210507165054_custom_compliance_frameworks.yml b/ee/config/metrics/counts_28d/20210507165054_custom_compliance_frameworks.yml
index 2c778f02a4e65dbfab8ce437407e31a39948892e..ed9102a14ac72ecf24e03fadff14f076a0f038f8 100644
--- a/ee/config/metrics/counts_28d/20210507165054_custom_compliance_frameworks.yml
+++ b/ee/config/metrics/counts_28d/20210507165054_custom_compliance_frameworks.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.custom_compliance_frameworks
 name: "count_compliance_management_frameworks"
 description: Monthly count of all custom compliance framework labels
diff --git a/ee/config/metrics/counts_28d/20210507171840_epic_boards_usage_total_unique_counts_monthly.yml b/ee/config/metrics/counts_28d/20210507171840_epic_boards_usage_total_unique_counts_monthly.yml
index feafcef7281bf6a4f09bc5c7d1e0225af0b83725..b60a2dd40c9a250a100e7ad5b2b7c4180a96eda4 100644
--- a/ee/config/metrics/counts_28d/20210507171840_epic_boards_usage_total_unique_counts_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210507171840_epic_boards_usage_total_unique_counts_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.epic_boards_usage.epic_boards_usage_total_unique_counts_monthly
 name: "0"
 description:
diff --git a/ee/config/metrics/counts_28d/20210608191652_g_project_management_users_epic_issue_added_from_epic_monthly.yml b/ee/config/metrics/counts_28d/20210608191652_g_project_management_users_epic_issue_added_from_epic_monthly.yml
index b60c365a4d20600341c3d0c7fad5b9997704ac7f..6a550dbec711cde99785ca26dcd3d763e8a52ebc 100644
--- a/ee/config/metrics/counts_28d/20210608191652_g_project_management_users_epic_issue_added_from_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210608191652_g_project_management_users_epic_issue_added_from_epic_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.epics_usage.g_project_management_users_epic_issue_added_from_epic_monthly
 description: Number of users creating an issue from an epic
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216174912_g_analytics_contribution_weekly.yml b/ee/config/metrics/counts_7d/20210216174912_g_analytics_contribution_weekly.yml
index 8622e914c1c04167cd615b26fa936518f5eb86d1..fa90365bae27f3268f9d8c4070f99bf376b9c11e 100644
--- a/ee/config/metrics/counts_7d/20210216174912_g_analytics_contribution_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174912_g_analytics_contribution_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.g_analytics_contribution_weekly
 description: Unique visitors to /groups/:group/-/contribution_analytics by week
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216174916_g_analytics_insights_weekly.yml b/ee/config/metrics/counts_7d/20210216174916_g_analytics_insights_weekly.yml
index 7113183d63c5c83c04beb39dedca406e8626b252..12db95639ac389e87be86b60a765d9840590d01f 100644
--- a/ee/config/metrics/counts_7d/20210216174916_g_analytics_insights_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174916_g_analytics_insights_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.g_analytics_insights_weekly
 description: Unique visitors to /groups/:group/-/insights/ by week
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216174919_g_analytics_issues_weekly.yml b/ee/config/metrics/counts_7d/20210216174919_g_analytics_issues_weekly.yml
index 5f7829ccebe06d8c608ec2085b13f21c53bcf0c0..f2f2bbca60dc6c089df10be5ae94305108c9eeb8 100644
--- a/ee/config/metrics/counts_7d/20210216174919_g_analytics_issues_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174919_g_analytics_issues_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.g_analytics_issues_weekly
 description: Unique visitors to /groups/:group/-/issues_analytics by week
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216174923_g_analytics_productivity_weekly.yml b/ee/config/metrics/counts_7d/20210216174923_g_analytics_productivity_weekly.yml
index 0416798d476241ef22f37278be5990627fd4a7ed..be8dee7fd45f33ddc244e7db30f9f4b00512e403 100644
--- a/ee/config/metrics/counts_7d/20210216174923_g_analytics_productivity_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174923_g_analytics_productivity_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.g_analytics_productivity_weekly
 description: Unique visitors to /groups/:group/-/analytics/productivity_analytics by week
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216174927_g_analytics_valuestream_weekly.yml b/ee/config/metrics/counts_7d/20210216174927_g_analytics_valuestream_weekly.yml
index e33cd2da081e193938708c12fb3f37598751a905..d87fedd9d513e3a0441c62211d3a0acd28848a80 100644
--- a/ee/config/metrics/counts_7d/20210216174927_g_analytics_valuestream_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174927_g_analytics_valuestream_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.g_analytics_valuestream_weekly
 description: Unique visitors to /groups/:group/-/analytics/value_stream_analytics by week
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216174931_p_analytics_pipelines_weekly.yml b/ee/config/metrics/counts_7d/20210216174931_p_analytics_pipelines_weekly.yml
index bdc0b90006d5859ab84714e6e0ca3bd1e84140e4..4307fb5d49cbcde5c31e67440940c1132ff65277 100644
--- a/ee/config/metrics/counts_7d/20210216174931_p_analytics_pipelines_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174931_p_analytics_pipelines_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.p_analytics_pipelines_weekly
 description: Unique visitors to /groups/:group/-/analytics/ci_cd by week
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216174935_p_analytics_code_reviews_weekly.yml b/ee/config/metrics/counts_7d/20210216174935_p_analytics_code_reviews_weekly.yml
index c097d261e7efb671f246a2ab128395fdcf3a7079..4b6d85c068f839c614a60066f461c89c74c8a658 100644
--- a/ee/config/metrics/counts_7d/20210216174935_p_analytics_code_reviews_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174935_p_analytics_code_reviews_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.p_analytics_code_reviews_weekly
 description: Unique visitors to /:group/:project/-/analytics/code_reviews by week
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216174939_p_analytics_valuestream_weekly.yml b/ee/config/metrics/counts_7d/20210216174939_p_analytics_valuestream_weekly.yml
index 063c82fe108fb2a24c3ee0170d9a50a248bcd7d5..b36d7931b7fcf2431d583a3d7e158cb93f4015ee 100644
--- a/ee/config/metrics/counts_7d/20210216174939_p_analytics_valuestream_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174939_p_analytics_valuestream_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.p_analytics_valuestream_weekly
 description: Unique visitors to /:group/:project/-/value_stream_analytics by week
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216174943_p_analytics_insights_weekly.yml b/ee/config/metrics/counts_7d/20210216174943_p_analytics_insights_weekly.yml
index def1823579590a2c0683eeee0e34fb9676036f80..a20582cd1fe77e2eca98878990a2b222ae48d36c 100644
--- a/ee/config/metrics/counts_7d/20210216174943_p_analytics_insights_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174943_p_analytics_insights_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.p_analytics_insights_weekly
 description: Unique visitors to /:group/:project/insights/ by week
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216174947_p_analytics_issues_weekly.yml b/ee/config/metrics/counts_7d/20210216174947_p_analytics_issues_weekly.yml
index 1c641ae247d5c0b0007385a23e205bba71e34901..924c5ea1883d46276c745c16c3d923464a21808d 100644
--- a/ee/config/metrics/counts_7d/20210216174947_p_analytics_issues_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174947_p_analytics_issues_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.p_analytics_issues_weekly
 description: Unique visitors to /:group/:project/-/analytics/issues_analytics by week
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216174951_p_analytics_repo_weekly.yml b/ee/config/metrics/counts_7d/20210216174951_p_analytics_repo_weekly.yml
index ed1509a98b4214b04dc9749d91f136ac8416cde6..e72a4e1dbdfa46562c2b3cbf952353a6fba23267 100644
--- a/ee/config/metrics/counts_7d/20210216174951_p_analytics_repo_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174951_p_analytics_repo_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.p_analytics_repo_weekly
 description: Unique visitors to /:group/:project/-/graphs/master/charts by week
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216174955_i_analytics_cohorts_weekly.yml b/ee/config/metrics/counts_7d/20210216174955_i_analytics_cohorts_weekly.yml
index 9741c95607fa21c1b75d9fb9c2b545e78066da6a..13e72026ab00238300888ce3c5104509a7c347f4 100644
--- a/ee/config/metrics/counts_7d/20210216174955_i_analytics_cohorts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174955_i_analytics_cohorts_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.i_analytics_cohorts_weekly
 description:
 product_section: fulfillment
diff --git a/ee/config/metrics/counts_7d/20210216174958_i_analytics_dev_ops_score_weekly.yml b/ee/config/metrics/counts_7d/20210216174958_i_analytics_dev_ops_score_weekly.yml
index d68f45532916df5d4f9051e1ffb69c9104d536a9..663959ad76a82ecd67ba914287d32f59ce435dcd 100644
--- a/ee/config/metrics/counts_7d/20210216174958_i_analytics_dev_ops_score_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174958_i_analytics_dev_ops_score_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.i_analytics_dev_ops_score_weekly
 description: Unique visitors to /admin/dev_ops_report by week
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216175002_g_analytics_merge_request_weekly.yml b/ee/config/metrics/counts_7d/20210216175002_g_analytics_merge_request_weekly.yml
index e33a496e1b44aff507044f3120ebd8f79c5425ff..dd307cbcacb1cabf0119978c3d9cb09ec1c0a649 100644
--- a/ee/config/metrics/counts_7d/20210216175002_g_analytics_merge_request_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216175002_g_analytics_merge_request_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.g_analytics_merge_request_weekly
 description:
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216175006_p_analytics_merge_request_weekly.yml b/ee/config/metrics/counts_7d/20210216175006_p_analytics_merge_request_weekly.yml
index 7cc9930415c0189d176210edc602c1745d3f7e8b..177fd3b18be97350aea7681aefc58af1923feba2 100644
--- a/ee/config/metrics/counts_7d/20210216175006_p_analytics_merge_request_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216175006_p_analytics_merge_request_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.p_analytics_merge_request_weekly
 description: Unique visitors to /:group/:project/-/analytics/merge_request_analytics by week
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216180425_i_search_advanced_weekly.yml b/ee/config/metrics/counts_7d/20210216180425_i_search_advanced_weekly.yml
index a885f8d6137275ea9e75b633a15ba26c283dd362..9df132c562c00d76f3223ce525464fe7ccf93d37 100644
--- a/ee/config/metrics/counts_7d/20210216180425_i_search_advanced_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216180425_i_search_advanced_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.search.i_search_advanced_weekly
 description: Calculated unique users to perform Advanced searches by week
 product_section: enablement
diff --git a/ee/config/metrics/counts_7d/20210216180605_incident_management_incident_published_weekly.yml b/ee/config/metrics/counts_7d/20210216180605_incident_management_incident_published_weekly.yml
index 65f61af2ee5bf211da93dc495e1f655f4c374562..3d81776461afa3f0c737b1d37d2ba0f8251cdf9b 100644
--- a/ee/config/metrics/counts_7d/20210216180605_incident_management_incident_published_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216180605_incident_management_incident_published_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_published_weekly
 description: Count of unique users that published incidents per week
 product_section: ops
diff --git a/ee/config/metrics/counts_7d/20210216181339_g_project_management_issue_iteration_changed_weekly.yml b/ee/config/metrics/counts_7d/20210216181339_g_project_management_issue_iteration_changed_weekly.yml
index c89f7567e87c874e50d74f8c91ba182f4d1e1b8f..7952277ce8bcfefe97db7125729b6c84858ab43f 100644
--- a/ee/config/metrics/counts_7d/20210216181339_g_project_management_issue_iteration_changed_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181339_g_project_management_issue_iteration_changed_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_iteration_changed_weekly
 description: Count of WAU changing an issue's iteration
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216181343_g_project_management_issue_weight_changed_weekly.yml b/ee/config/metrics/counts_7d/20210216181343_g_project_management_issue_weight_changed_weekly.yml
index 53c76fea4184a3057c0b8cf9b0dda3505901dd60..853d9289e7ccb750fbca0ad6a9175de53abb41ec 100644
--- a/ee/config/metrics/counts_7d/20210216181343_g_project_management_issue_weight_changed_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181343_g_project_management_issue_weight_changed_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_weight_changed_weekly
 description: Count of WAU changing an issue's weight
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216181413_g_project_management_issue_added_to_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181413_g_project_management_issue_added_to_epic_weekly.yml
index 2a44dffec99a82e6bd4227b86b9c826673fc9b9c..12b1681c87801190f80d566cba7ecc46bb304793 100644
--- a/ee/config/metrics/counts_7d/20210216181413_g_project_management_issue_added_to_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181413_g_project_management_issue_added_to_epic_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_added_to_epic_weekly
 description: Count of WAU adding an issue to an epic
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216181418_g_project_management_issue_changed_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181418_g_project_management_issue_changed_epic_weekly.yml
index b478c3ba8eb43a5e7f2ea43e94762503e5af39bf..505bd13ac35f2b674e0a74154c4e18bd9990d2b1 100644
--- a/ee/config/metrics/counts_7d/20210216181418_g_project_management_issue_changed_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181418_g_project_management_issue_changed_epic_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_changed_epic_weekly
 description: Count of WAU changing the epic on an issue
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216181455_g_project_management_issue_health_status_changed_weekly.yml b/ee/config/metrics/counts_7d/20210216181455_g_project_management_issue_health_status_changed_weekly.yml
index c894b31a4b9906f65bcf4fbb8ab2d7fa6eddf34d..39f179c3ba567ef79c9ae336582d320a51b35629 100644
--- a/ee/config/metrics/counts_7d/20210216181455_g_project_management_issue_health_status_changed_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181455_g_project_management_issue_health_status_changed_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_health_status_changed_weekly
 description: Count of WAU changing the health status on an issue
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml b/ee/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
index b97d6150b693b78938ee3759975be04170a62786..3d6eca5ee39eed57b23b8051489e4ee9db14b5a4 100644
--- a/ee/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_multiple_weekly
 description: Count of WAU using the `/assign @user1 @user2` quick action
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216181532_i_quickactions_child_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181532_i_quickactions_child_epic_weekly.yml
index 51eead2895123315beaef61e88def5bcd8dd2564..6f78b61778cbac754c0eb4543914c3861e116581 100644
--- a/ee/config/metrics/counts_7d/20210216181532_i_quickactions_child_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181532_i_quickactions_child_epic_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_child_epic_weekly
 description: Count of WAU using the `/child_epic` quick action 
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216181536_i_quickactions_clear_weight_weekly.yml b/ee/config/metrics/counts_7d/20210216181536_i_quickactions_clear_weight_weekly.yml
index c4c3bff88a45160643aa82e78ebff682b5100300..31b5f42dd160f1f851749a324541c71b98f03d5c 100644
--- a/ee/config/metrics/counts_7d/20210216181536_i_quickactions_clear_weight_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181536_i_quickactions_clear_weight_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_clear_weight_weekly
 description: Count of WAU using the `/clear_weight` quick action
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216181617_i_quickactions_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181617_i_quickactions_epic_weekly.yml
index 2d88f438776b9c5d706e53f98b5d2691fcfaace3..f1d876eaf465a81cdd3f1c0429fb4a38d062c8a4 100644
--- a/ee/config/metrics/counts_7d/20210216181617_i_quickactions_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181617_i_quickactions_epic_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_epic_weekly
 description: Count of WAU using the `/epic` quick action
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216181624_i_quickactions_iteration_weekly.yml b/ee/config/metrics/counts_7d/20210216181624_i_quickactions_iteration_weekly.yml
index f90c4686c58e24e2ade974a811daf2b5eb589d6d..0948bffb43a34ad9fab0f29dbdf8ef408d2ef4a8 100644
--- a/ee/config/metrics/counts_7d/20210216181624_i_quickactions_iteration_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181624_i_quickactions_iteration_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_iteration_weekly
 description: Count of WAU using the `/iteration` quick action
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216181646_i_quickactions_parent_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181646_i_quickactions_parent_epic_weekly.yml
index 128284909e457358d16a412aa8c2828a7981820a..93b6ccd85989c960f0ea51dd0c893658e6d61147 100644
--- a/ee/config/metrics/counts_7d/20210216181646_i_quickactions_parent_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181646_i_quickactions_parent_epic_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_parent_epic_weekly
 description: Count of WAU using the `/parent_epic` quick action
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216181650_i_quickactions_promote_weekly.yml b/ee/config/metrics/counts_7d/20210216181650_i_quickactions_promote_weekly.yml
index 39778d135779fc96401baa365192c4128b6f3f0e..e979a0c4dcbbce256ad0a2b9206a8fa4df688795 100644
--- a/ee/config/metrics/counts_7d/20210216181650_i_quickactions_promote_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181650_i_quickactions_promote_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_promote_weekly
 description: Count of WAU using the `/promote` quick action
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216181654_i_quickactions_publish_weekly.yml b/ee/config/metrics/counts_7d/20210216181654_i_quickactions_publish_weekly.yml
index 911fff2135090d3541d39659386fb6cf78f1e7d1..cf9081ef6d5f9780fb7170e27d0ef4c57994b558 100644
--- a/ee/config/metrics/counts_7d/20210216181654_i_quickactions_publish_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181654_i_quickactions_publish_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_publish_weekly
 description: Count of WAU using the `/publish` quick action
 product_section: ops
diff --git a/ee/config/metrics/counts_7d/20210216181716_i_quickactions_remove_child_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181716_i_quickactions_remove_child_epic_weekly.yml
index 2e682b43a12443526d01d3f255c6e61af79600b8..3f9f2030f1f3c3480b5e72343bd25f4a2ad01b0c 100644
--- a/ee/config/metrics/counts_7d/20210216181716_i_quickactions_remove_child_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181716_i_quickactions_remove_child_epic_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_child_epic_weekly
 description: Count of WAU using the `/remove_child_epic` quick action 
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216181723_i_quickactions_remove_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181723_i_quickactions_remove_epic_weekly.yml
index 4bc08b012e192de5b8952f18ae23e17e5bcd0dcd..04acf0b24b3c89e0f0217422f7090ff0bd82949b 100644
--- a/ee/config/metrics/counts_7d/20210216181723_i_quickactions_remove_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181723_i_quickactions_remove_epic_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_epic_weekly
 description: Count of WAU using the `/remove_epic` quick action 
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216181731_i_quickactions_remove_iteration_weekly.yml b/ee/config/metrics/counts_7d/20210216181731_i_quickactions_remove_iteration_weekly.yml
index a091f7943eb6dd3ba35b053045a0c2f3d3bc478c..853c9c21a8405803c3502bb0b78acea95ede3d93 100644
--- a/ee/config/metrics/counts_7d/20210216181731_i_quickactions_remove_iteration_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181731_i_quickactions_remove_iteration_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_iteration_weekly
 description: Count of WAU using the `/remove_iteration` quick action
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216181738_i_quickactions_remove_parent_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181738_i_quickactions_remove_parent_epic_weekly.yml
index 3e7ba4bee7b04de145b83d1f57d8239dcb6559c5..bdf572a0474096f878bcd3ca95b8247e2d306c01 100644
--- a/ee/config/metrics/counts_7d/20210216181738_i_quickactions_remove_parent_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181738_i_quickactions_remove_parent_epic_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_parent_epic_weekly
 description: Count of WAU using the `/remove_parent_epic` quick action 
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216181856_i_quickactions_weight_weekly.yml b/ee/config/metrics/counts_7d/20210216181856_i_quickactions_weight_weekly.yml
index 1098f920210c117a9757f0e2929f9cc2a7c7b5aa..63e0ab53cd9d0954f557755d2fa4b2a98aa2a891 100644
--- a/ee/config/metrics/counts_7d/20210216181856_i_quickactions_weight_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181856_i_quickactions_weight_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.i_quickactions_weight_weekly
 description: Count of WAU using the `/weight` quick action 
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216182138_i_testing_metrics_report_widget_total_weekly.yml b/ee/config/metrics/counts_7d/20210216182138_i_testing_metrics_report_widget_total_weekly.yml
index 8fde7e2225b07fe6d8b6135ff12ad46674e60ec6..b8251e1c2f14bb2f4d9ee270c4052407bc82515e 100644
--- a/ee/config/metrics/counts_7d/20210216182138_i_testing_metrics_report_widget_total_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216182138_i_testing_metrics_report_widget_total_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.testing.i_testing_metrics_report_widget_total_weekly
 description: Count of unique users per week who expanded the metrics report
   MR widget
diff --git a/ee/config/metrics/counts_7d/20210216182141_i_testing_group_code_coverage_visit_total_weekly.yml b/ee/config/metrics/counts_7d/20210216182141_i_testing_group_code_coverage_visit_total_weekly.yml
index c9ad476f0650632ba80da6e7ce894a9e47b1fb78..fa65391a93f5fc810aa12377b87455c6b192b112 100644
--- a/ee/config/metrics/counts_7d/20210216182141_i_testing_group_code_coverage_visit_total_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216182141_i_testing_group_code_coverage_visit_total_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.testing.i_testing_group_code_coverage_visit_total_weekly
 description: Count of unique users per week who visited the group code coverage
   page
diff --git a/ee/config/metrics/counts_7d/20210216182145_i_testing_full_code_quality_report_total_weekly.yml b/ee/config/metrics/counts_7d/20210216182145_i_testing_full_code_quality_report_total_weekly.yml
index 940b601e31dfebd63e573d9b299079ff068f07a9..19171f2709d5340f2726f463de6e5f1051d7dc3b 100644
--- a/ee/config/metrics/counts_7d/20210216182145_i_testing_full_code_quality_report_total_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216182145_i_testing_full_code_quality_report_total_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.testing.i_testing_full_code_quality_report_total_weekly
 description: Count of unique users per week who visit the full code quality
   report
diff --git a/ee/config/metrics/counts_7d/20210216182149_i_testing_web_performance_widget_total_weekly.yml b/ee/config/metrics/counts_7d/20210216182149_i_testing_web_performance_widget_total_weekly.yml
index 3b2d77b992bb6fada883f54ea4ee560e72d3a3b4..a0ef16cf9ee43237eae3b63ce6d8b374884bd51f 100644
--- a/ee/config/metrics/counts_7d/20210216182149_i_testing_web_performance_widget_total_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216182149_i_testing_web_performance_widget_total_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.testing.i_testing_web_performance_widget_total_weekly
 description: Count of unique users per week who expanded the browser performance
   report MR widget
diff --git a/ee/config/metrics/counts_7d/20210216182154_i_testing_load_performance_widget_total_weekly.yml b/ee/config/metrics/counts_7d/20210216182154_i_testing_load_performance_widget_total_weekly.yml
index 35553e59429c4a55ac0cf98c7fef82e106d085f9..9f88ee88d4d933941408fe336d6b602c68882f8f 100644
--- a/ee/config/metrics/counts_7d/20210216182154_i_testing_load_performance_widget_total_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216182154_i_testing_load_performance_widget_total_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.testing.i_testing_load_performance_widget_total_weekly
 description: Count of unique users per week who expanded the load performance
   report MR widget
diff --git a/ee/config/metrics/counts_7d/20210216182158_i_testing_metrics_report_artifact_uploaders_weekly.yml b/ee/config/metrics/counts_7d/20210216182158_i_testing_metrics_report_artifact_uploaders_weekly.yml
index cb82ba14dffc9c0580a5a0976f1b471be9153257..04f234830456569704232c8f9b000df77affa58e 100644
--- a/ee/config/metrics/counts_7d/20210216182158_i_testing_metrics_report_artifact_uploaders_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216182158_i_testing_metrics_report_artifact_uploaders_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.testing.i_testing_metrics_report_artifact_uploaders_weekly
 description: Count of unique users per week who trigger a pipeline that uploads a metrics report.
 product_section: ops
diff --git a/ee/config/metrics/counts_7d/20210216183211_compliance_features_track_unique_visits_union.yml b/ee/config/metrics/counts_7d/20210216183211_compliance_features_track_unique_visits_union.yml
index 9fd2fe0966cb0c30501f14a92741a27cc6e67886..c83484ab1af83ed8d6d6c9743f4769387b129539 100644
--- a/ee/config/metrics/counts_7d/20210216183211_compliance_features_track_unique_visits_union.yml
+++ b/ee/config/metrics/counts_7d/20210216183211_compliance_features_track_unique_visits_union.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts_weekly.aggregated_metrics.compliance_features_track_unique_visits_union
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216183219_i_testing_paid_monthly_active_user_total.yml b/ee/config/metrics/counts_7d/20210216183219_i_testing_paid_monthly_active_user_total.yml
index cef8b75e52ae507c68168908be2770fb1f5ccda3..e42d43433954d437d91c91020ce107d45a4fb56d 100644
--- a/ee/config/metrics/counts_7d/20210216183219_i_testing_paid_monthly_active_user_total.yml
+++ b/ee/config/metrics/counts_7d/20210216183219_i_testing_paid_monthly_active_user_total.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts_weekly.aggregated_metrics.i_testing_paid_monthly_active_user_total
 description: Aggregated count of users who have engaged with a Premium or Ultimate tier testing feature per week.
 product_section: ops
diff --git a/ee/config/metrics/counts_7d/20210216183920_search_unique_visits_for_any_target_weekly.yml b/ee/config/metrics/counts_7d/20210216183920_search_unique_visits_for_any_target_weekly.yml
index 371f79a2d6487ff29f255fbf99fa08a06118b3e5..04e3f50259ffef3cab4bfea1e9cb482ff891110f 100644
--- a/ee/config/metrics/counts_7d/20210216183920_search_unique_visits_for_any_target_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183920_search_unique_visits_for_any_target_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: search_unique_visits.search_unique_visits_for_any_target_weekly
 description: Total unique users for i_search_total, i_search_advanced, i_search_paid for recent 7 days. This metric is redundant because advanced will be a subset of paid and paid will be a subset of total. i_search_total is more appropriate if you just want the total
 product_section: enablement
diff --git a/ee/config/metrics/counts_7d/20210216183924_g_compliance_dashboard_weekly.yml b/ee/config/metrics/counts_7d/20210216183924_g_compliance_dashboard_weekly.yml
index b88ce806764c71828e1a71b559227e1c0cd3d457..a6964c3c1b4281a15503b42671030f5abf781268 100644
--- a/ee/config/metrics/counts_7d/20210216183924_g_compliance_dashboard_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183924_g_compliance_dashboard_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.compliance.g_compliance_dashboard_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216183928_g_compliance_audit_events_weekly.yml b/ee/config/metrics/counts_7d/20210216183928_g_compliance_audit_events_weekly.yml
index 937659905e12ce2157b6b6af6be7fc655036e837..d15a56861de5eb16483e8b582e7effd3a292b1a9 100644
--- a/ee/config/metrics/counts_7d/20210216183928_g_compliance_audit_events_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183928_g_compliance_audit_events_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.compliance.g_compliance_audit_events_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216183932_i_compliance_audit_events_weekly.yml b/ee/config/metrics/counts_7d/20210216183932_i_compliance_audit_events_weekly.yml
index 738fa740f246cc36b516ef25b471b17537c65ef4..748a609e4b5ea198a0efc26b5888aae763959974 100644
--- a/ee/config/metrics/counts_7d/20210216183932_i_compliance_audit_events_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183932_i_compliance_audit_events_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.compliance.i_compliance_audit_events_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216183936_i_compliance_credential_inventory_weekly.yml b/ee/config/metrics/counts_7d/20210216183936_i_compliance_credential_inventory_weekly.yml
index c973be57f87a465ad37f0c19596889102e16c004..26c24211220b55654d0161cad1c5009c843e9b2d 100644
--- a/ee/config/metrics/counts_7d/20210216183936_i_compliance_credential_inventory_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183936_i_compliance_credential_inventory_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.compliance.i_compliance_credential_inventory_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216183940_a_compliance_audit_events_api_weekly.yml b/ee/config/metrics/counts_7d/20210216183940_a_compliance_audit_events_api_weekly.yml
index 3c1c551670226e59fa406626b63fb4b1631bd39d..9a89a4d5ceca5a3af06eff02ce5336b8181abe6d 100644
--- a/ee/config/metrics/counts_7d/20210216183940_a_compliance_audit_events_api_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183940_a_compliance_audit_events_api_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.compliance.a_compliance_audit_events_api_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216183944_compliance_total_unique_counts_weekly.yml b/ee/config/metrics/counts_7d/20210216183944_compliance_total_unique_counts_weekly.yml
index 5054fdb43cc16297b9f0eaf7fdd74ad5bda798c9..7fec3158a440d8e5fb9ad79fcb4070d13fc91fa3 100644
--- a/ee/config/metrics/counts_7d/20210216183944_compliance_total_unique_counts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183944_compliance_total_unique_counts_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.compliance.compliance_total_unique_counts_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216184033_i_search_paid_weekly.yml b/ee/config/metrics/counts_7d/20210216184033_i_search_paid_weekly.yml
index 56a7490c8f76a0c8a45e282c1cb9d8434c864b9c..2a5e7a6630c33d3f31379ac901ebec8256f60ffd 100644
--- a/ee/config/metrics/counts_7d/20210216184033_i_search_paid_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184033_i_search_paid_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.search.i_search_paid_weekly
 description: Calculated unique users to perform a search with a paid license enabled by week
 product_section: enablement
diff --git a/ee/config/metrics/counts_7d/20210216184132_i_testing_group_code_coverage_project_click_total_weekly.yml b/ee/config/metrics/counts_7d/20210216184132_i_testing_group_code_coverage_project_click_total_weekly.yml
index a4f2194df8bf1e3187f4d1446705d259a57de768..7ac67fc195009e1e790ef9f359144987caaa99fd 100644
--- a/ee/config/metrics/counts_7d/20210216184132_i_testing_group_code_coverage_project_click_total_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184132_i_testing_group_code_coverage_project_click_total_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.testing.i_testing_group_code_coverage_project_click_total_weekly
 description: Aggregated count of unique users who have clicked from group code coverage page to an individual project page each week.
 product_section: ops
diff --git a/ee/config/metrics/counts_7d/20210216184138_testing_total_unique_counts_weekly.yml b/ee/config/metrics/counts_7d/20210216184138_testing_total_unique_counts_weekly.yml
index e86c3b76f3d9f099abe69215fc75fe942ab9ca3b..0a3ad483a5f94dd42cc2edea47a4f506dfe55579 100644
--- a/ee/config/metrics/counts_7d/20210216184138_testing_total_unique_counts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184138_testing_total_unique_counts_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.testing.testing_total_unique_counts_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216184221_g_project_management_issue_removed_from_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216184221_g_project_management_issue_removed_from_epic_weekly.yml
index c8429dd8541231cd0486b011bebae0fb7409cd84..8bd019a2604ceeef722656ab9e0041c3da500322 100644
--- a/ee/config/metrics/counts_7d/20210216184221_g_project_management_issue_removed_from_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184221_g_project_management_issue_removed_from_epic_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_removed_from_epic_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216184249_i_ci_secrets_management_vault_build_created_weekly.yml b/ee/config/metrics/counts_7d/20210216184249_i_ci_secrets_management_vault_build_created_weekly.yml
index b9524cc276d2b29d0ee2dfd309ee9be6ff6f468a..68f751e407465553d784e9934103d07690e41ac4 100644
--- a/ee/config/metrics/counts_7d/20210216184249_i_ci_secrets_management_vault_build_created_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184249_i_ci_secrets_management_vault_build_created_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.ci_secrets_management.i_ci_secrets_management_vault_build_created_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml b/ee/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml
index 96d2eedb293f7916cc75073e4d200da9129af85a..8ec761491709a684a44c9dec875005e5e300122d 100644
--- a/ee/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.terraform.p_terraform_state_api_unique_users_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml b/ee/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml
index 78a523553558f16371623318d938ef41317e99a9..cb44c20883c9097f8960580aa8c6a344f1359f5e 100644
--- a/ee/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml b/ee/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
index bad965de92937f19fe236a20a63a7f9fc4615263..942a1ce80c496d3a4e8ec7894f57ea3e5ab9d78d 100644
--- a/ee/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_build_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml b/ee/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
index a49251355d7f375a741d73b42c455d6a22cfc0b5..f19a503063356255354c80beb13b0d1646ff28b2 100644
--- a/ee/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_deploy_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml b/ee/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml
index 26cf95feeaefd7ebda56cbceac6cf36acdafe219..cd231e5add58eaddb1f600b4430f90c9f83e941e 100644
--- a/ee/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_sast_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml b/ee/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml
index ebb8d6205f778fd36d785f10280476687a39c248..cd62d38306016f4f01f510b8de0c8038e72c738d 100644
--- a/ee/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_secret_detection_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml b/ee/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml
index a818a799055f3ec1f5ce60cfb38c2da751314a7d..1a5d5763f9bf4533c7cc21a643f5d2d057f31b44 100644
--- a/ee/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216184532_p_ci_templates_auto_devops_build_weekly.yml b/ee/config/metrics/counts_7d/20210216184532_p_ci_templates_auto_devops_build_weekly.yml
index 6431d5f437b91d4a42088b228f75e1968de5fdaa..040dd92e28eda74a9927f1cc086fc8f43099b274 100644
--- a/ee/config/metrics/counts_7d/20210216184532_p_ci_templates_auto_devops_build_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184532_p_ci_templates_auto_devops_build_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_build_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml b/ee/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
index c7d770b34fd0d19c45bbca578824f9f9827915a0..ffdc0f24f81cd4ed30f06cb0d93457bd368d74b0 100644
--- a/ee/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml b/ee/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
index 3d751acdef71abc17b156a488f2826476cad40c6..0d7ee1087cdcc0ea59ac70cc396731002ecd72c5 100644
--- a/ee/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_latest_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml b/ee/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml
index 106d6691cbb3d74929d158b2c27386c44a84621f..21e87e023561e89c4e8ca6b172fe687c4a6a8bad 100644
--- a/ee/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_sast_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml b/ee/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml
index d32a8e88d8a1ce07ea465f074939057a931fa560..0c94c95fe310e1180f531f29e299b2c67c209b4a 100644
--- a/ee/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_secret_detection_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml b/ee/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml
index 8c152ff7af7bf5d721d8428aedf47fef94bd855a..75ddd352d0ccaf072734a5666b156157cbda1a71 100644
--- a/ee/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_base_latest_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml b/ee/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
index b13bce850abf89d90dfd76b0c587107024fc3c11..a244ea88ed2dbaf9bf0eb22624c69075be042705 100644
--- a/ee/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.quickactions.quickactions_total_unique_counts_weekly
 description: ''
 product_section: ''
diff --git a/ee/config/metrics/counts_7d/20210216184947_i_ecosystem_jira_service_list_issues_weekly.yml b/ee/config/metrics/counts_7d/20210216184947_i_ecosystem_jira_service_list_issues_weekly.yml
index f442e79d653fbf71e5fb5cda107f61f01a6bd355..432b6a04793a46c0bac253e1fe03ac8ae2b5c482 100644
--- a/ee/config/metrics/counts_7d/20210216184947_i_ecosystem_jira_service_list_issues_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184947_i_ecosystem_jira_service_list_issues_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_list_issues_weekly
 description: 'Count of Jira Issue List visits by week'
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210216184951_i_ecosystem_jira_service_create_issue_weekly.yml b/ee/config/metrics/counts_7d/20210216184951_i_ecosystem_jira_service_create_issue_weekly.yml
index c5c7107879715896921dfc1f6647a9f3ebae3a1b..2763b6decd9fca0ac2289b8dfcc34b441d64b38d 100644
--- a/ee/config/metrics/counts_7d/20210216184951_i_ecosystem_jira_service_create_issue_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184951_i_ecosystem_jira_service_create_issue_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_create_issue_weekly
 description: Number of users creating Jira issues by week
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210305145820_g_product_planning_epic_created_weekly.yml b/ee/config/metrics/counts_7d/20210305145820_g_product_planning_epic_created_weekly.yml
index 4c7c76ebbd405b69814af510970654299d8c52db..ee1200713e711d8910c705036d7d7ac90f986109 100644
--- a/ee/config/metrics/counts_7d/20210305145820_g_product_planning_epic_created_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210305145820_g_product_planning_epic_created_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210309194425_git_fetch_event_count_weekly.yml b/ee/config/metrics/counts_7d/20210309194425_git_fetch_event_count_weekly.yml
index 204b205a1ba64bb89b5897f25c816cf82122e9ea..7427ddbbfa3d25e8635bc4377590b0de24ab227b 100644
--- a/ee/config/metrics/counts_7d/20210309194425_git_fetch_event_count_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210309194425_git_fetch_event_count_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.enablement.counts.geo_node_usage.git_fetch_event_count_weekly
 description: Number of Git fetch events from Prometheus on the Geo secondary
 product_section: enablement
diff --git a/ee/config/metrics/counts_7d/20210310162703_g_project_management_epic_closed_weekly.yml b/ee/config/metrics/counts_7d/20210310162703_g_project_management_epic_closed_weekly.yml
index 96dbe2f6729167125f96af0e4c6fbce250ff882d..cbb880209c043d32a68e7957613d88712cc9ea5b 100644
--- a/ee/config/metrics/counts_7d/20210310162703_g_project_management_epic_closed_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210310162703_g_project_management_epic_closed_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210310164112_g_project_management_epic_reopened_weekly.yml b/ee/config/metrics/counts_7d/20210310164112_g_project_management_epic_reopened_weekly.yml
index 8962503eca09bb696839dcfe50669982f2bf6b6d..fb34dcb0f263c8741f3d0c9afa39eb401f845fcd 100644
--- a/ee/config/metrics/counts_7d/20210310164112_g_project_management_epic_reopened_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210310164112_g_project_management_epic_reopened_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210310203225_g_project_management_epic_confidential_weekly.yml b/ee/config/metrics/counts_7d/20210310203225_g_project_management_epic_confidential_weekly.yml
index 1f387ff1edfebd462b6accd72e9d8b1c0a968653..c5ca0cdbb90f780e0c77203e7da537a302ee8b5a 100644
--- a/ee/config/metrics/counts_7d/20210310203225_g_project_management_epic_confidential_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210310203225_g_project_management_epic_confidential_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210312093243_g_poject_management_epic_visible_weekly.yml b/ee/config/metrics/counts_7d/20210312093243_g_poject_management_epic_visible_weekly.yml
index 1d45c8d50d1f74c064af04fb80097557103b094f..a06a9b3e567a49296d1edd155730c5b95ee8adef 100644
--- a/ee/config/metrics/counts_7d/20210312093243_g_poject_management_epic_visible_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210312093243_g_poject_management_epic_visible_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210312101753_g_project_management_users_updating_epic_descriptions_weekly.yml b/ee/config/metrics/counts_7d/20210312101753_g_project_management_users_updating_epic_descriptions_weekly.yml
index f36f7abfaaa54505d7754a2377a97bb03c51a168..1fde35d4697dd127629380ff5ecb0b888db2cf0b 100644
--- a/ee/config/metrics/counts_7d/20210312101753_g_project_management_users_updating_epic_descriptions_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210312101753_g_project_management_users_updating_epic_descriptions_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210312101826_g_project_management_users_updating_epic_titles_weekly.yml b/ee/config/metrics/counts_7d/20210312101826_g_project_management_users_updating_epic_titles_weekly.yml
index a5a64c1abe9d4c4913bb1a3b41e7702ce3baa55b..e39cd47282654212c6ae65c2d8db9573067e492d 100644
--- a/ee/config/metrics/counts_7d/20210312101826_g_project_management_users_updating_epic_titles_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210312101826_g_project_management_users_updating_epic_titles_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210312181918_g_product_planning_epic_issue_added_weekly.yml b/ee/config/metrics/counts_7d/20210312181918_g_product_planning_epic_issue_added_weekly.yml
index c63ef6084636f00e8e5da310d9e1b63362e96514..04edccfb1d2abdf05eec93a2a1b841bbccd5b5e2 100644
--- a/ee/config/metrics/counts_7d/20210312181918_g_product_planning_epic_issue_added_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210312181918_g_product_planning_epic_issue_added_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210312195849_g_project_management_epic_labels_weekly.yml b/ee/config/metrics/counts_7d/20210312195849_g_project_management_epic_labels_weekly.yml
index c957f65e23fc5c3ddde3a9279b3ab233dec36cab..5a836a5f36f76d83305df08dbebb0d864acee638 100644
--- a/ee/config/metrics/counts_7d/20210312195849_g_project_management_epic_labels_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210312195849_g_project_management_epic_labels_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210314231518_g_project_management_users_creating_epic_notes_weekly.yml b/ee/config/metrics/counts_7d/20210314231518_g_project_management_users_creating_epic_notes_weekly.yml
index ba15813e5d73bba6914a14d303b1d3f28586e147..4c7e1f7c3569f3ab05049bddcc64647fdc5b580a 100644
--- a/ee/config/metrics/counts_7d/20210314231518_g_project_management_users_creating_epic_notes_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210314231518_g_project_management_users_creating_epic_notes_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210314234041_g_project_management_users_updating_epic_notes_weekly.yml b/ee/config/metrics/counts_7d/20210314234041_g_project_management_users_updating_epic_notes_weekly.yml
index 701751a8dedcdb28a969d49fb2a1c030a4ecde20..58a4b6c4aaee0484609096747c939d83ba9da71e 100644
--- a/ee/config/metrics/counts_7d/20210314234041_g_project_management_users_updating_epic_notes_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210314234041_g_project_management_users_updating_epic_notes_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210315034846_g_project_management_users_destroying_epic_notes_weekly.yml b/ee/config/metrics/counts_7d/20210315034846_g_project_management_users_destroying_epic_notes_weekly.yml
index 4e8eb7f76b7d9f202c91364911a8736360d88c4d..d8ebdaa591c0ae3e6a62516725cfc9f8e6ce6bc0 100644
--- a/ee/config/metrics/counts_7d/20210315034846_g_project_management_users_destroying_epic_notes_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210315034846_g_project_management_users_destroying_epic_notes_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210315054905_g_project_management_users_setting_epic_start_date_as_fixed_weekly.yml b/ee/config/metrics/counts_7d/20210315054905_g_project_management_users_setting_epic_start_date_as_fixed_weekly.yml
index 67e7ce66584b6370c8ff8cb210d634d0dd58b89d..098bede7906951aae6c9c97a6be890a20e354fec 100644
--- a/ee/config/metrics/counts_7d/20210315054905_g_project_management_users_setting_epic_start_date_as_fixed_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210315054905_g_project_management_users_setting_epic_start_date_as_fixed_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210315055342_g_project_management_users_setting_epic_start_date_as_inherited_weekly.yml b/ee/config/metrics/counts_7d/20210315055342_g_project_management_users_setting_epic_start_date_as_inherited_weekly.yml
index d746afd8ed9de61c5790d10869328270dd316cce..90fe22376e1f2ef5d98f9830fcf442c5caa39ccb 100644
--- a/ee/config/metrics/counts_7d/20210315055342_g_project_management_users_setting_epic_start_date_as_inherited_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210315055342_g_project_management_users_setting_epic_start_date_as_inherited_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210318183220_epics_usage_total_unique_counts_weekly.yml b/ee/config/metrics/counts_7d/20210318183220_epics_usage_total_unique_counts_weekly.yml
index c11b2659ca37c422a2447463260a11521dddd041..0f013c77cdd602321576a2cf77f7d953397f3b45 100644
--- a/ee/config/metrics/counts_7d/20210318183220_epics_usage_total_unique_counts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210318183220_epics_usage_total_unique_counts_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.epics_usage.epics_usage_total_unique_counts_weekly
 description: Total weekly users count for epics_usage
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210325060623_g_project_management_users_setting_epic_due_date_as_fixed_weekly.yml b/ee/config/metrics/counts_7d/20210325060623_g_project_management_users_setting_epic_due_date_as_fixed_weekly.yml
index 2d178bd29787f5dc75452d344f41361c304cf04e..9e9540a883891e0626608ee96c3931fd82360857 100644
--- a/ee/config/metrics/counts_7d/20210325060623_g_project_management_users_setting_epic_due_date_as_fixed_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210325060623_g_project_management_users_setting_epic_due_date_as_fixed_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210325060903_g_project_management_users_setting_epic_due_date_as_inherited_weekly.yml b/ee/config/metrics/counts_7d/20210325060903_g_project_management_users_setting_epic_due_date_as_inherited_weekly.yml
index f4452abd181247a71b025147d82930f8ef372dde..6e0a029ad5b647a9d688b49a3ea9ed6af9b1f7b0 100644
--- a/ee/config/metrics/counts_7d/20210325060903_g_project_management_users_setting_epic_due_date_as_inherited_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210325060903_g_project_management_users_setting_epic_due_date_as_inherited_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210329042536_g_project_management_users_updating_fixed_epic_due_date_weekly.yml b/ee/config/metrics/counts_7d/20210329042536_g_project_management_users_updating_fixed_epic_due_date_weekly.yml
index 99442124ab8f010084345bdc02686a20700fa64c..22244143e03dc5b101bf714d19c7dfddf525121d 100644
--- a/ee/config/metrics/counts_7d/20210329042536_g_project_management_users_updating_fixed_epic_due_date_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210329042536_g_project_management_users_updating_fixed_epic_due_date_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210329043402_g_project_management_users_updating_fixed_epic_start_date_weekly.yml b/ee/config/metrics/counts_7d/20210329043402_g_project_management_users_updating_fixed_epic_start_date_weekly.yml
index 7a57e0e822801520c9417b8b361df5efc9df08be..b0b5a1c69954364239c20fb61ec316b8f715b524 100644
--- a/ee/config/metrics/counts_7d/20210329043402_g_project_management_users_updating_fixed_epic_start_date_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210329043402_g_project_management_users_updating_fixed_epic_start_date_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210331192332_g_project_management_issue_promoted_to_epic_weekly.yml b/ee/config/metrics/counts_7d/20210331192332_g_project_management_issue_promoted_to_epic_weekly.yml
index 44335e1401d294b63cba0f974e19a487430654a8..171005237d03d943df673eb36aa388de5353b36f 100644
--- a/ee/config/metrics/counts_7d/20210331192332_g_project_management_issue_promoted_to_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210331192332_g_project_management_issue_promoted_to_epic_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210401092244_i_analytics_dev_ops_adoption_weekly.yml b/ee/config/metrics/counts_7d/20210401092244_i_analytics_dev_ops_adoption_weekly.yml
index eee5448dd9e3aafa86e116d55da59211a0ddbdb9..50a762be6aced306897176cd5bcaf75876478fc6 100644
--- a/ee/config/metrics/counts_7d/20210401092244_i_analytics_dev_ops_adoption_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210401092244_i_analytics_dev_ops_adoption_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # See Usage Ping metrics dictionary docs https://docs.gitlab.com/ee/development/usage_ping/metrics_dictionary.html
 key_path: redis_hll_counters.analytics.i_analytics_dev_ops_adoption_weekly
 name: users_viewing_analytics_instance_devops_adoption_weekly
diff --git a/ee/config/metrics/counts_7d/20210401182457_g_project_management_g_project_management_epic_issue_removed_weekly.yml b/ee/config/metrics/counts_7d/20210401182457_g_project_management_g_project_management_epic_issue_removed_weekly.yml
index 2b4e86a901843e616b0230c157b0b032fcdfa20f..3f659fcbf4b082557d4b12df15aaecd3010c6d6f 100644
--- a/ee/config/metrics/counts_7d/20210401182457_g_project_management_g_project_management_epic_issue_removed_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210401182457_g_project_management_g_project_management_epic_issue_removed_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210405185814_g_project_management_epic_issue_moved_from_project_weekly.yml b/ee/config/metrics/counts_7d/20210405185814_g_project_management_epic_issue_moved_from_project_weekly.yml
index b42cef9216e515804c65c779038e2bc3178c2859..bf988b7f53ccce73b0745abeb33330e4f7cb7f7a 100644
--- a/ee/config/metrics/counts_7d/20210405185814_g_project_management_epic_issue_moved_from_project_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210405185814_g_project_management_epic_issue_moved_from_project_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210405220139_i_incident_management_oncall_notification_sent_weekly.yml b/ee/config/metrics/counts_7d/20210405220139_i_incident_management_oncall_notification_sent_weekly.yml
index 68a42e753d7f6949bee7b04e679d56d8783bc799..87515528296b9f52cf36b6f888b552c2168dc58e 100644
--- a/ee/config/metrics/counts_7d/20210405220139_i_incident_management_oncall_notification_sent_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210405220139_i_incident_management_oncall_notification_sent_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.incident_management_oncall.i_incident_management_oncall_notification_sent_weekly
 description: Count of unique users to receive a notification while on-call
 product_section: ops
diff --git a/ee/config/metrics/counts_7d/20210413174449_g_project_management_epic_destroyed_weekly.yml b/ee/config/metrics/counts_7d/20210413174449_g_project_management_epic_destroyed_weekly.yml
index e7a6805c588018748380493cbdeb625517a10532..e52b72e4ff40d7023f53a1143efc7d9a0c02b361 100644
--- a/ee/config/metrics/counts_7d/20210413174449_g_project_management_epic_destroyed_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210413174449_g_project_management_epic_destroyed_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210419105408_users_viewing_analytics_group_devops_adoption_weekly.yml b/ee/config/metrics/counts_7d/20210419105408_users_viewing_analytics_group_devops_adoption_weekly.yml
index 989b4491862a2ae98a26fc4023e7050e0c332d48..1b3fdcb2b3a94f82fb925c581a57a5c9acfa0c7b 100644
--- a/ee/config/metrics/counts_7d/20210419105408_users_viewing_analytics_group_devops_adoption_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210419105408_users_viewing_analytics_group_devops_adoption_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.analytics.users_viewing_analytics_group_devops_adoption_weekly
 description: Counts visits to DevOps Adoption page per week
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210421075943_g_project_management_users_checking_epic_task_weekly.yml b/ee/config/metrics/counts_7d/20210421075943_g_project_management_users_checking_epic_task_weekly.yml
index 607e7d2b4e473af39db61a499ce8d6b514790745..d13ed4cb0e2098327c1ab78dac51ade98f17b6ea 100644
--- a/ee/config/metrics/counts_7d/20210421075943_g_project_management_users_checking_epic_task_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210421075943_g_project_management_users_checking_epic_task_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210421102812_g_project_management_users_unchecking_epic_task_weekly.yml b/ee/config/metrics/counts_7d/20210421102812_g_project_management_users_unchecking_epic_task_weekly.yml
index 70bcdd741b29a1285c3b8655ef6ac48b7df01cce..26d56baa398c006cd15ccf9fbee8c4ca24b1aa30 100644
--- a/ee/config/metrics/counts_7d/20210421102812_g_project_management_users_unchecking_epic_task_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210421102812_g_project_management_users_unchecking_epic_task_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210423012053_g_project_management_users_updating_epic_parent_weekly.yml b/ee/config/metrics/counts_7d/20210423012053_g_project_management_users_updating_epic_parent_weekly.yml
index eddb666b8c1e98839ed7c1596de92b8b3f1110a5..e634f48b60ab25db01e1d5a278d4af26aeac90d8 100644
--- a/ee/config/metrics/counts_7d/20210423012053_g_project_management_users_updating_epic_parent_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210423012053_g_project_management_users_updating_epic_parent_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210428072508_g_project_management_users_creating_epic_boards_weekly.yml b/ee/config/metrics/counts_7d/20210428072508_g_project_management_users_creating_epic_boards_weekly.yml
index ee95be3b445a18e4b86e644c0dcdd54016df2d8c..27d1cae33182de0dc5f147c044121a070d188336 100644
--- a/ee/config/metrics/counts_7d/20210428072508_g_project_management_users_creating_epic_boards_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210428072508_g_project_management_users_creating_epic_boards_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210428073327_g_project_management_users_viewing_epic_boards_weekly.yml b/ee/config/metrics/counts_7d/20210428073327_g_project_management_users_viewing_epic_boards_weekly.yml
index 23168f3705a7c846b73ef4bb4c167c13074e8286..384639b764f6c5faf54c5540ee1b047942184224 100644
--- a/ee/config/metrics/counts_7d/20210428073327_g_project_management_users_viewing_epic_boards_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210428073327_g_project_management_users_viewing_epic_boards_weekly.yml
@@ -1,4 +1,5 @@
 # Name of this metric contains g_project_management prefix
+data_category: Optional
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
 key_path: redis_hll_counters.epic_boards_usage.g_project_management_users_viewing_epic_boards_weekly
diff --git a/ee/config/metrics/counts_7d/20210428073604_g_project_management_users_updating_epic_board_names_weekly.yml b/ee/config/metrics/counts_7d/20210428073604_g_project_management_users_updating_epic_board_names_weekly.yml
index 39a0049f7d86987fb86902eea15188bc679a881f..438c69135d271d90f5d56ad57aa2ac0a0ad45381 100644
--- a/ee/config/metrics/counts_7d/20210428073604_g_project_management_users_updating_epic_board_names_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210428073604_g_project_management_users_updating_epic_board_names_weekly.yml
@@ -1,4 +1,5 @@
 # Name of this metric contains g_project_management prefix
+data_category: Optional
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
 key_path: redis_hll_counters.epic_boards_usage.g_project_management_users_updating_epic_board_names_weekly
diff --git a/ee/config/metrics/counts_7d/20210430173650_g_project_management_epic_cross_referenced_weekly.yml b/ee/config/metrics/counts_7d/20210430173650_g_project_management_epic_cross_referenced_weekly.yml
index 7f733743ba2df281e44960a0603fb9ec18122e90..b69d1c55bbf10601a3f7e25b3e6096489b3f9a04 100644
--- a/ee/config/metrics/counts_7d/20210430173650_g_project_management_epic_cross_referenced_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210430173650_g_project_management_epic_cross_referenced_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 # Name of this metric contains g_project_management prefix
 # because we are using the same slot from issue_tracking to
 # allow data aggregation.
diff --git a/ee/config/metrics/counts_7d/20210503011355_g_project_management_users_awarding_epic_emoji_weekly.yml b/ee/config/metrics/counts_7d/20210503011355_g_project_management_users_awarding_epic_emoji_weekly.yml
index f2a11a8cad513c38583072c9b929a8ad760c1b8f..db3447e4efc8cd3141708f51ccdc49d446f972b0 100644
--- a/ee/config/metrics/counts_7d/20210503011355_g_project_management_users_awarding_epic_emoji_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210503011355_g_project_management_users_awarding_epic_emoji_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.epics_usage.g_project_management_users_awarding_epic_emoji_weekly
 description: Counts of WAU awarding emoji on epic
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210505071932_g_project_management_users_removing_epic_emoji_weekly.yml b/ee/config/metrics/counts_7d/20210505071932_g_project_management_users_removing_epic_emoji_weekly.yml
index 443b899cba4b1c1e4abc58cd0f5d9a38d20a77c2..e8481106e2eb704a218ecf594f116e0f5144f4d1 100644
--- a/ee/config/metrics/counts_7d/20210505071932_g_project_management_users_removing_epic_emoji_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210505071932_g_project_management_users_removing_epic_emoji_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.epics_usage.g_project_management_users_removing_epic_emoji_weekly
 description: Counts of WAU removing emoji on epic
 product_section: dev
diff --git a/ee/config/metrics/counts_7d/20210507171838_epic_boards_usage_total_unique_counts_weekly.yml b/ee/config/metrics/counts_7d/20210507171838_epic_boards_usage_total_unique_counts_weekly.yml
index 38e9cf4eb74ea187359b27181624049c1b4d08e6..53498b32e760a5103289fbff7b6bfb6317d573c4 100644
--- a/ee/config/metrics/counts_7d/20210507171838_epic_boards_usage_total_unique_counts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210507171838_epic_boards_usage_total_unique_counts_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.epic_boards_usage.epic_boards_usage_total_unique_counts_weekly
 name: "0"
 description:
diff --git a/ee/config/metrics/counts_7d/20210604110603_git_push_event_count_weekly.yml b/ee/config/metrics/counts_7d/20210604110603_git_push_event_count_weekly.yml
index 03d122f240f0c738fabed107047cea6e5b09b527..aad4356675859e38c5b0c59408405b054aad217f 100644
--- a/ee/config/metrics/counts_7d/20210604110603_git_push_event_count_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210604110603_git_push_event_count_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.enablement.counts.geo_node_usage.git_push_event_count_weekly
 description: Number of Git push events from Prometheus on the Geo secondary
 product_section: enablement
diff --git a/ee/config/metrics/counts_7d/20210608191647_g_project_management_users_epic_issue_added_from_epic_weekly.yml b/ee/config/metrics/counts_7d/20210608191647_g_project_management_users_epic_issue_added_from_epic_weekly.yml
index 72a3045924f95f35a885bd33f6d6dfa160561a1a..e5d68ce6059499b1dcf3980aa71a8a7e91e2a7cb 100644
--- a/ee/config/metrics/counts_7d/20210608191647_g_project_management_users_epic_issue_added_from_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210608191647_g_project_management_users_epic_issue_added_from_epic_weekly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.epics_usage.g_project_management_users_epic_issue_added_from_epic_weekly
 description: Number of users creating an issue from an epic
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210201124936_geo_nodes.yml b/ee/config/metrics/counts_all/20210201124936_geo_nodes.yml
index 4429d88da3e202a7564ffff207acce55fc5d5384..484357bb8a2bc133c816751e8be75f41beb9ebfe 100644
--- a/ee/config/metrics/counts_all/20210201124936_geo_nodes.yml
+++ b/ee/config/metrics/counts_all/20210201124936_geo_nodes.yml
@@ -1,4 +1,5 @@
 key_path: counts.geo_nodes
+data_category: Optional
 description: Total number of sites in a Geo deployment
 product_section: enablement
 product_stage: enablement
diff --git a/ee/config/metrics/counts_all/20210204124854_license_management_jobs.yml b/ee/config/metrics/counts_all/20210204124854_license_management_jobs.yml
index 95241d7804ec7dd2bc248fea020116d5d83c21c1..3837fbca4e3f76bb305a6ee6fe83efb8c1d3f516 100644
--- a/ee/config/metrics/counts_all/20210204124854_license_management_jobs.yml
+++ b/ee/config/metrics/counts_all/20210204124854_license_management_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.license_management_jobs
 description: Count of License Scanning jobs run
 product_section: sec
diff --git a/ee/config/metrics/counts_all/20210216174822_ldap_group_links.yml b/ee/config/metrics/counts_all/20210216174822_ldap_group_links.yml
index dada4909a970703359596a1236c0e9c9cd69cfde..7acdee45c2c9bcbbd5a1f8fa90cbf69b822813ac 100644
--- a/ee/config/metrics/counts_all/20210216174822_ldap_group_links.yml
+++ b/ee/config/metrics/counts_all/20210216174822_ldap_group_links.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.ldap_group_links
 description: Number of groups that are synced via LDAP group sync `https://docs.gitlab.com/ee/user/group/index.html#manage-group-memberships-via-ldap`
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216174824_ldap_keys.yml b/ee/config/metrics/counts_all/20210216174824_ldap_keys.yml
index 049fb1673c4dad8fea9c57f48ca5c435b1c75a30..30dff3532298161ea3a46b911f51f923c466f3dc 100644
--- a/ee/config/metrics/counts_all/20210216174824_ldap_keys.yml
+++ b/ee/config/metrics/counts_all/20210216174824_ldap_keys.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.ldap_keys
 description: Number of keys synced as part of LDAP `https://docs.gitlab.com/ee/administration/auth/ldap/#ldap-sync-configuration-settings`
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216174826_ldap_users.yml b/ee/config/metrics/counts_all/20210216174826_ldap_users.yml
index 3ae28ca8cc0c116448d592b3639093bfd239483c..6ce18f3e5b6b42c7bdb3cdcf9fb10c6fbaba63fd 100644
--- a/ee/config/metrics/counts_all/20210216174826_ldap_users.yml
+++ b/ee/config/metrics/counts_all/20210216174826_ldap_users.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.ldap_users
 description: Number of users that are linked to LDAP
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml b/ee/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml
index 0d480f437f5866f233d73adf917523ce4e62de0e..2ba9e0bad64084ab5553bbdc937bbbd5a0823ce4 100644
--- a/ee/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml
+++ b/ee/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.productivity_analytics_views
 description: Total visits to /groups/:group/-/analytics/productivity_analytics all time
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216174836_g_analytics_contribution.yml b/ee/config/metrics/counts_all/20210216174836_g_analytics_contribution.yml
index e9ce30cc4c98e3bca1515e9c703f11125fa3e691..3e9b87d6c987c31edc98a1c7c9519f92ef53b680 100644
--- a/ee/config/metrics/counts_all/20210216174836_g_analytics_contribution.yml
+++ b/ee/config/metrics/counts_all/20210216174836_g_analytics_contribution.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: analytics_unique_visits.g_analytics_contribution
 description: Unique visitors to /groups/:group/-/contribution_analytics
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216174838_g_analytics_insights.yml b/ee/config/metrics/counts_all/20210216174838_g_analytics_insights.yml
index f95ed9af90ad376226544d7c0e1bc68690ba3785..a5ea67e65b81950ba474302518042566aef76f9f 100644
--- a/ee/config/metrics/counts_all/20210216174838_g_analytics_insights.yml
+++ b/ee/config/metrics/counts_all/20210216174838_g_analytics_insights.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: analytics_unique_visits.g_analytics_insights
 description: Unique visitors to /groups/:group/-/insights
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216174840_g_analytics_issues.yml b/ee/config/metrics/counts_all/20210216174840_g_analytics_issues.yml
index 36f2eb1fe114074d17503270c8f2ddd7fd254b03..85331a615c49869ec5d59b034d85518dd41aa6be 100644
--- a/ee/config/metrics/counts_all/20210216174840_g_analytics_issues.yml
+++ b/ee/config/metrics/counts_all/20210216174840_g_analytics_issues.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: analytics_unique_visits.g_analytics_issues
 description: Unique visitors to /groups/:group/-/issues_analytics
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216174842_g_analytics_productivity.yml b/ee/config/metrics/counts_all/20210216174842_g_analytics_productivity.yml
index ddc49c75ef890d2cea87b5af4a857f2515a708bb..7ea62e4dea39c20be7e595c23445ee676f5e6235 100644
--- a/ee/config/metrics/counts_all/20210216174842_g_analytics_productivity.yml
+++ b/ee/config/metrics/counts_all/20210216174842_g_analytics_productivity.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: analytics_unique_visits.g_analytics_productivity
 description: Unique visitors to /groups/:group/-/analytics/productivity_analytics
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216174844_g_analytics_valuestream.yml b/ee/config/metrics/counts_all/20210216174844_g_analytics_valuestream.yml
index fbd35c72bd04e0693d65af595335b4935c7ad855..2f55e10595db39541dbe9d16bf7f7eedb7e177b8 100644
--- a/ee/config/metrics/counts_all/20210216174844_g_analytics_valuestream.yml
+++ b/ee/config/metrics/counts_all/20210216174844_g_analytics_valuestream.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: analytics_unique_visits.g_analytics_valuestream
 description: Unique visitors to /groups/:group/-/analytics/value_stream_analytics
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml b/ee/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml
index 65be10b156f67685c372c48cf17ecffd05daca38..0996fd07bede4a30083682bc48699a33011e58b5 100644
--- a/ee/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml
+++ b/ee/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: analytics_unique_visits.p_analytics_code_reviews
 description: Unique visitors to /:group/:project/-/analytics/code_reviews
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216174852_p_analytics_insights.yml b/ee/config/metrics/counts_all/20210216174852_p_analytics_insights.yml
index f9c8b032fe0d68c8f9bf8190a9ce93a7b6143ef0..78627f43dd80e3733c98098970fb4b7c84e259e7 100644
--- a/ee/config/metrics/counts_all/20210216174852_p_analytics_insights.yml
+++ b/ee/config/metrics/counts_all/20210216174852_p_analytics_insights.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: analytics_unique_visits.p_analytics_insights
 description: Unique visitors to /:group/:project/insights
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216174854_p_analytics_issues.yml b/ee/config/metrics/counts_all/20210216174854_p_analytics_issues.yml
index 3dac85c1dc940b5a402278eff954f78c0f055476..7a8942ac0377bd7d4088d95816f41dd9eae31c7e 100644
--- a/ee/config/metrics/counts_all/20210216174854_p_analytics_issues.yml
+++ b/ee/config/metrics/counts_all/20210216174854_p_analytics_issues.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: analytics_unique_visits.p_analytics_issues
 description: Unique visitors to /:group/:project/-/analytics/issues_analytics
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml b/ee/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml
index 585a4d34e28678cf70e2f7a3f8323b68853df579..f0bd304cf0cda5eb840eb09e831f0dda5f6916d9 100644
--- a/ee/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml
+++ b/ee/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: analytics_unique_visits.p_analytics_merge_request
 description: Unique visitors to /:group/:project/-/analytics/merge_request_analytics
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216175028_requirements_created.yml b/ee/config/metrics/counts_all/20210216175028_requirements_created.yml
index 283ee2c575caba303f569d09672f476ce91049d4..53e254dc1cb23cc012abd3fd2673896cff68a3d0 100644
--- a/ee/config/metrics/counts_all/20210216175028_requirements_created.yml
+++ b/ee/config/metrics/counts_all/20210216175028_requirements_created.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.requirements_created
 description: Count of requirements created
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216175030_requirement_test_reports_manual.yml b/ee/config/metrics/counts_all/20210216175030_requirement_test_reports_manual.yml
index 74470ad49cee673b7ce3c1e6f7007a914b1b050b..f015c0abe58a0e12a15eabf87b055b4e9b4c53c6 100644
--- a/ee/config/metrics/counts_all/20210216175030_requirement_test_reports_manual.yml
+++ b/ee/config/metrics/counts_all/20210216175030_requirement_test_reports_manual.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.requirement_test_reports_manual
 description: Count of requirement test reports created manually
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216175032_requirement_test_reports_ci.yml b/ee/config/metrics/counts_all/20210216175032_requirement_test_reports_ci.yml
index f7813cffcbf55e8f483800c081a574e913036ce0..36292ae790550b17f769608e46cd506d75593ee6 100644
--- a/ee/config/metrics/counts_all/20210216175032_requirement_test_reports_ci.yml
+++ b/ee/config/metrics/counts_all/20210216175032_requirement_test_reports_ci.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.requirement_test_reports_ci
 description: Count of requirement test reports created from CI
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216175034_requirements_with_test_report.yml b/ee/config/metrics/counts_all/20210216175034_requirements_with_test_report.yml
index a80add8e79ab7a75ca9ba6df36451a09613be8bd..53d54be84f19528f294aa2126a16ad7efe0719dc 100644
--- a/ee/config/metrics/counts_all/20210216175034_requirements_with_test_report.yml
+++ b/ee/config/metrics/counts_all/20210216175034_requirements_with_test_report.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.requirements_with_test_report
 description: Count of requirements having a test report
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216175047_merge_requests_with_added_rules.yml b/ee/config/metrics/counts_all/20210216175047_merge_requests_with_added_rules.yml
index 5da78a3fbb6264521ed1b05bf6a2642a7e2e3c91..7021f137e90da76e290334336886c0e3a72d313a 100644
--- a/ee/config/metrics/counts_all/20210216175047_merge_requests_with_added_rules.yml
+++ b/ee/config/metrics/counts_all/20210216175047_merge_requests_with_added_rules.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.create.merge_requests_with_added_rules
 description: Merge requests with added rules
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216175049_merge_requests_with_optional_codeowners.yml b/ee/config/metrics/counts_all/20210216175049_merge_requests_with_optional_codeowners.yml
index be2758d9b21c2084cac96cf0ddb708ce7723dd99..f27a841b152fa375d86ada0dd94e95a4e19bd395 100644
--- a/ee/config/metrics/counts_all/20210216175049_merge_requests_with_optional_codeowners.yml
+++ b/ee/config/metrics/counts_all/20210216175049_merge_requests_with_optional_codeowners.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.create.merge_requests_with_optional_codeowners
 description: Count of merge requests with optional codeowner approval rules
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216175051_merge_requests_with_required_codeowners.yml b/ee/config/metrics/counts_all/20210216175051_merge_requests_with_required_codeowners.yml
index d4489bc060cf7f0da660076976421e16ee2f7fa1..bc2535df2261ad7dc5d37842270c69c1c4a0f534 100644
--- a/ee/config/metrics/counts_all/20210216175051_merge_requests_with_required_codeowners.yml
+++ b/ee/config/metrics/counts_all/20210216175051_merge_requests_with_required_codeowners.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.create.merge_requests_with_required_codeowners
 description: Count of merge requests with required codeowner approval rules
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216175211_dependency_list_usages_total.yml b/ee/config/metrics/counts_all/20210216175211_dependency_list_usages_total.yml
index 693d03a446febe4a2c7964aff0d11432e1afd5a8..e1d009971706c6dd2a44d82500991583b2d885de 100644
--- a/ee/config/metrics/counts_all/20210216175211_dependency_list_usages_total.yml
+++ b/ee/config/metrics/counts_all/20210216175211_dependency_list_usages_total.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.dependency_list_usages_total
 description: Count to Dependency List page views
 product_section: sec
diff --git a/ee/config/metrics/counts_all/20210216175213_dependency_scanning_jobs.yml b/ee/config/metrics/counts_all/20210216175213_dependency_scanning_jobs.yml
index be8a8640709db68ec05cf970c8ee49ec4b7238f5..297a0211eed8d52c15e7acf459d8750913178943 100644
--- a/ee/config/metrics/counts_all/20210216175213_dependency_scanning_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216175213_dependency_scanning_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.dependency_scanning_jobs
 description: Count of Dependency Scanning jobs run
 product_section: sec
diff --git a/ee/config/metrics/counts_all/20210216175216_user_dependency_scanning_jobs.yml b/ee/config/metrics/counts_all/20210216175216_user_dependency_scanning_jobs.yml
index 1d507cb426bc14b5bf4efa68c3f6f420e3e0a6b7..2dfafb2ae477f694551ad724b90043064b0cda2c 100644
--- a/ee/config/metrics/counts_all/20210216175216_user_dependency_scanning_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216175216_user_dependency_scanning_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.secure.user_dependency_scanning_jobs
 description: Total number of users running Dependency Scanning jobs
 product_section: sec
diff --git a/ee/config/metrics/counts_all/20210216175218_user_license_management_jobs.yml b/ee/config/metrics/counts_all/20210216175218_user_license_management_jobs.yml
index 28e75ad6ae572fc439487d2f28c961f231f336be..f8a61b946991711959c5f240c5ddf2e3a38ff148 100644
--- a/ee/config/metrics/counts_all/20210216175218_user_license_management_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216175218_user_license_management_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.secure.user_license_management_jobs
 description: Total number of users running License Scanning jobs
 product_section: sec
diff --git a/ee/config/metrics/counts_all/20210216175220_dependency_scanning_scans.yml b/ee/config/metrics/counts_all/20210216175220_dependency_scanning_scans.yml
index 42e51f676efaf057d5cd1be430a4e5213960b9fc..695828768fa5e35815a315424df7091802761176 100644
--- a/ee/config/metrics/counts_all/20210216175220_dependency_scanning_scans.yml
+++ b/ee/config/metrics/counts_all/20210216175220_dependency_scanning_scans.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.secure.dependency_scanning_scans
 description: Total number of users running Dependency Scanning Scans
 product_section: sec
diff --git a/ee/config/metrics/counts_all/20210216175316_kubernetes_agents.yml b/ee/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
index bc523f7144560259aab4a4e831fbf145c8ab3d59..819ff816eb44e80a540a7ef6eb04ba89f99cd5cf 100644
--- a/ee/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
+++ b/ee/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.kubernetes_agents
 description: Count of Kubernetes registered agents
 product_section: ops
diff --git a/ee/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml b/ee/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
index 702d80b228fa7e09835f8bf71a54c072360acb92..d5392adfc23861b220d8744eaca65f44df404b39 100644
--- a/ee/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
+++ b/ee/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.kubernetes_agents_with_token
 description: Count of Kubernetes agents with at least one token
 product_section: ops
diff --git a/ee/config/metrics/counts_all/20210216175328_kubernetes_agent_gitops_sync.yml b/ee/config/metrics/counts_all/20210216175328_kubernetes_agent_gitops_sync.yml
index 10ba1233e56510523f7fda988b6ab1ee9059db01..738b633f2a0bb7e1aca861c67344b1e8228d08ee 100644
--- a/ee/config/metrics/counts_all/20210216175328_kubernetes_agent_gitops_sync.yml
+++ b/ee/config/metrics/counts_all/20210216175328_kubernetes_agent_gitops_sync.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.kubernetes_agent_gitops_sync
 description: Count of events when an Agent is asked to synchronize the manifests or its configuration
 product_section: ops
diff --git a/ee/config/metrics/counts_all/20210216175400_projects_slack_notifications_active.yml b/ee/config/metrics/counts_all/20210216175400_projects_slack_notifications_active.yml
index 28d41f66fa5d20a8262953c87fa48a03eae5a607..b999d81100df635624fe7fd6f3929af128dcef4c 100644
--- a/ee/config/metrics/counts_all/20210216175400_projects_slack_notifications_active.yml
+++ b/ee/config/metrics/counts_all/20210216175400_projects_slack_notifications_active.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.configure.projects_slack_notifications_active
 description: Unique projects with Slack webhook enabled
 product_section: ops
diff --git a/ee/config/metrics/counts_all/20210216175402_projects_slack_slash_active.yml b/ee/config/metrics/counts_all/20210216175402_projects_slack_slash_active.yml
index 0d9befcc2e14298143708832e5f9e11899784076..e6e844b6da1bae8bd75a7d406fbb2a3f3d62a08e 100644
--- a/ee/config/metrics/counts_all/20210216175402_projects_slack_slash_active.yml
+++ b/ee/config/metrics/counts_all/20210216175402_projects_slack_slash_active.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.configure.projects_slack_slash_active
 description: Unique projects with Slack ‘/’ commands enabled
 product_section: ops
diff --git a/ee/config/metrics/counts_all/20210216175441_ingress_modsecurity_statistics_unavailable.yml b/ee/config/metrics/counts_all/20210216175441_ingress_modsecurity_statistics_unavailable.yml
index 0e580df0672694f3c93287107476ababcf399b3e..8a4c8fbca5afd7ba1679ac63f7522581a18595f9 100644
--- a/ee/config/metrics/counts_all/20210216175441_ingress_modsecurity_statistics_unavailable.yml
+++ b/ee/config/metrics/counts_all/20210216175441_ingress_modsecurity_statistics_unavailable.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.ingress_modsecurity_statistics_unavailable
 description: Whether or not ModSecurity statistics are unavailable
 product_section: sec
diff --git a/ee/config/metrics/counts_all/20210216175458_container_scanning_jobs.yml b/ee/config/metrics/counts_all/20210216175458_container_scanning_jobs.yml
index 2b036e3030044376eb80cd2b39e605f0fb39b6b0..373cd8c357b7084890d4b5b78c5106a017de3d0c 100644
--- a/ee/config/metrics/counts_all/20210216175458_container_scanning_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216175458_container_scanning_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.container_scanning_jobs
 description: Count of Container Scanning jobs run
 product_section: sec
diff --git a/ee/config/metrics/counts_all/20210216175501_user_container_scanning_jobs.yml b/ee/config/metrics/counts_all/20210216175501_user_container_scanning_jobs.yml
index 964b2a1c4e96d0cc03e926b2363a9ea9e61921db..ccc2ff2c6a6cec0278e2e21b6de9e53e5d90e16b 100644
--- a/ee/config/metrics/counts_all/20210216175501_user_container_scanning_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216175501_user_container_scanning_jobs.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.secure.user_container_scanning_jobs
 description: Distinct count per user of Container Scanning jobs run
 product_section: sec
diff --git a/ee/config/metrics/counts_all/20210216175503_container_scanning_scans.yml b/ee/config/metrics/counts_all/20210216175503_container_scanning_scans.yml
index 7b36f35b62b607a890d0592a56caa75b4b14b06b..dc9556589d5003f821b4d9a103e83c54eded45f2 100644
--- a/ee/config/metrics/counts_all/20210216175503_container_scanning_scans.yml
+++ b/ee/config/metrics/counts_all/20210216175503_container_scanning_scans.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.secure.container_scanning_scans
 description: 'Counts container scanning jobs'
 product_section: sec
diff --git a/ee/config/metrics/counts_all/20210216175540_projects_reporting_ci_cd_back_to_github.yml b/ee/config/metrics/counts_all/20210216175540_projects_reporting_ci_cd_back_to_github.yml
index 914e181d6be7b6b5ae7861cee888df6fe61266c6..9d5cd811f0d9157b7f4ff08db7dc77bc5bb4d6c7 100644
--- a/ee/config/metrics/counts_all/20210216175540_projects_reporting_ci_cd_back_to_github.yml
+++ b/ee/config/metrics/counts_all/20210216175540_projects_reporting_ci_cd_back_to_github.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.verify.projects_reporting_ci_cd_back_to_github
 description: Projects with a GitHub service pipeline enabled
 product_section: ops
diff --git a/ee/config/metrics/counts_all/20210216175848_projects_github_active.yml b/ee/config/metrics/counts_all/20210216175848_projects_github_active.yml
index d0d180a6f16126e64cb470d48c473680acb98375..6172d5e5571a6ccb34d39de7efd8afae15a22d99 100644
--- a/ee/config/metrics/counts_all/20210216175848_projects_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175848_projects_github_active.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.projects_github_active
 description: Count of projects with active integrations for GitHub
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216175850_groups_github_active.yml b/ee/config/metrics/counts_all/20210216175850_groups_github_active.yml
index 81ef56e1655523bd7f9d58f6625e3abdaa9d536a..5b3de36576872aad648267713074f06e517eb39f 100644
--- a/ee/config/metrics/counts_all/20210216175850_groups_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175850_groups_github_active.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.groups_github_active
 description: Count of groups with active integrations for GitHub
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216175851_templates_github_active.yml b/ee/config/metrics/counts_all/20210216175851_templates_github_active.yml
index d72ff446f1c1dc078eb6552cb0cfcb6c3e25f765..d5720d240816845859bb5dfb6e32b76b72aaffd4 100644
--- a/ee/config/metrics/counts_all/20210216175851_templates_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175851_templates_github_active.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.templates_github_active
 description: Count of active service templates for GitHub
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216175853_instances_github_active.yml b/ee/config/metrics/counts_all/20210216175853_instances_github_active.yml
index a8f8722a385d1b1a1973019fb6a6095a2a8a16e1..a3038ba72213d5f1a26ce19d9d3d4be7d7e727b9 100644
--- a/ee/config/metrics/counts_all/20210216175853_instances_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175853_instances_github_active.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.instances_github_active
 description: Count of active instance-level integrations for GitHub
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216175855_projects_inheriting_github_active.yml b/ee/config/metrics/counts_all/20210216175855_projects_inheriting_github_active.yml
index 6af620c9e75400598a47b0e726491d6270a26603..28c2e2a00a347ef39d765ccf2b6ae92979963449 100644
--- a/ee/config/metrics/counts_all/20210216175855_projects_inheriting_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175855_projects_inheriting_github_active.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.projects_inheriting_github_active
 description: Count of active projects inheriting integrations for GitHub
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216175857_groups_inheriting_github_active.yml b/ee/config/metrics/counts_all/20210216175857_groups_inheriting_github_active.yml
index 3712eb9296fcc7c0eab1521f2f994f7a8e6df6ec..1fb9cd26b017c3b6e5990497a09cf8407e7d275c 100644
--- a/ee/config/metrics/counts_all/20210216175857_groups_inheriting_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175857_groups_inheriting_github_active.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.groups_inheriting_github_active
 description: Count of active groups inheriting integrations for GitHub
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216180236_projects_jira_issuelist_active.yml b/ee/config/metrics/counts_all/20210216180236_projects_jira_issuelist_active.yml
index 041137a904b7f174a64191b5992e800195842ed6..0b74f80b491226dc853bc79b8ab0ecf77b3f2098 100644
--- a/ee/config/metrics/counts_all/20210216180236_projects_jira_issuelist_active.yml
+++ b/ee/config/metrics/counts_all/20210216180236_projects_jira_issuelist_active.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.projects_jira_issuelist_active
 description: Total Jira Issue feature enabled
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216180352_coverage_fuzzing_scans.yml b/ee/config/metrics/counts_all/20210216180352_coverage_fuzzing_scans.yml
index aa27ecd37e64fefcce59a5ed5409bc6865e9f239..fc360ea51dfd9c3f111cb38e7a0fd28a7bfdfe46 100644
--- a/ee/config/metrics/counts_all/20210216180352_coverage_fuzzing_scans.yml
+++ b/ee/config/metrics/counts_all/20210216180352_coverage_fuzzing_scans.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.secure.coverage_fuzzing_scans
 description: 'Counts fuzzing jobs'
 product_section: sec
diff --git a/ee/config/metrics/counts_all/20210216180353_api_fuzzing_scans.yml b/ee/config/metrics/counts_all/20210216180353_api_fuzzing_scans.yml
index d74f2b3d63c2e9ba2e972fec19bcf3d679bbb3d4..cb744695839ac177089138314175e44b39886579 100644
--- a/ee/config/metrics/counts_all/20210216180353_api_fuzzing_scans.yml
+++ b/ee/config/metrics/counts_all/20210216180353_api_fuzzing_scans.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.secure.api_fuzzing_scans
 description: 'Counts API fuzzing jobs'
 product_section: sec
diff --git a/ee/config/metrics/counts_all/20210216180405_geo_event_log_max_id.yml b/ee/config/metrics/counts_all/20210216180405_geo_event_log_max_id.yml
index a955fd19581a1b2756dfef996e4a3811259fb7da..8fda560d89f183dea790ca6ec25b80980595774b 100644
--- a/ee/config/metrics/counts_all/20210216180405_geo_event_log_max_id.yml
+++ b/ee/config/metrics/counts_all/20210216180405_geo_event_log_max_id.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.geo_event_log_max_id
 description: Number of replication events on a Geo primary
 product_section: enablement
diff --git a/ee/config/metrics/counts_all/20210216180418_i_search_advanced.yml b/ee/config/metrics/counts_all/20210216180418_i_search_advanced.yml
index dc167ab5c3a5cd895d30e6115369bf50e176f818..1552c86102174230f8a1550497a4db6b3b555c91 100644
--- a/ee/config/metrics/counts_all/20210216180418_i_search_advanced.yml
+++ b/ee/config/metrics/counts_all/20210216180418_i_search_advanced.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: search_unique_visits.i_search_advanced
 description: Calculated unique users to perform Advanced searches by week
 product_section: enablement
diff --git a/ee/config/metrics/counts_all/20210216180420_i_search_paid.yml b/ee/config/metrics/counts_all/20210216180420_i_search_paid.yml
index a25ead05e2fdd614e20e7edeffe4c0b3fe627a50..1ab69cd163962bcb6b2335ca550f2e30bd5f7712 100644
--- a/ee/config/metrics/counts_all/20210216180420_i_search_paid.yml
+++ b/ee/config/metrics/counts_all/20210216180420_i_search_paid.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: search_unique_visits.i_search_paid
 description: Calculated unique users to perform a search with a paid license enabled by week
 product_section: enablement
diff --git a/ee/config/metrics/counts_all/20210216180502_status_page_incident_publishes.yml b/ee/config/metrics/counts_all/20210216180502_status_page_incident_publishes.yml
index fcd0f5a9ba6d35e6d46dd1f4a6e41596f04877d8..005926e07ba1309b7ae31bc7d02a2156fb557ec1 100644
--- a/ee/config/metrics/counts_all/20210216180502_status_page_incident_publishes.yml
+++ b/ee/config/metrics/counts_all/20210216180502_status_page_incident_publishes.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.status_page_incident_publishes
 description: Cumulative count of usages of publish operation
 product_section: ops
diff --git a/ee/config/metrics/counts_all/20210216180504_status_page_incident_unpublishes.yml b/ee/config/metrics/counts_all/20210216180504_status_page_incident_unpublishes.yml
index b3c59fa60fcf7ad13dca3b9e8c51dacb0ee8fee3..ca4e4528bb26abc559f50a176a08ffa55917e136 100644
--- a/ee/config/metrics/counts_all/20210216180504_status_page_incident_unpublishes.yml
+++ b/ee/config/metrics/counts_all/20210216180504_status_page_incident_unpublishes.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.status_page_incident_unpublishes
 description: Cumulative count of usages of unpublish operation
 product_section: ops
diff --git a/ee/config/metrics/counts_all/20210216180506_status_page_projects.yml b/ee/config/metrics/counts_all/20210216180506_status_page_projects.yml
index 1e199682db4e7a5da27fe52d14cbfd8e9736469b..d3a65911944f1d549b5ff62044f160868dae934d 100644
--- a/ee/config/metrics/counts_all/20210216180506_status_page_projects.yml
+++ b/ee/config/metrics/counts_all/20210216180506_status_page_projects.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.status_page_projects
 description: Projects with status page enabled
 product_section: ops
diff --git a/ee/config/metrics/counts_all/20210216180507_status_page_issues.yml b/ee/config/metrics/counts_all/20210216180507_status_page_issues.yml
index da3243ec93defa35167ad7ba1dbf28730e7cbcc2..b074cc25b15821f2438db0dc941ff32f016ace3a 100644
--- a/ee/config/metrics/counts_all/20210216180507_status_page_issues.yml
+++ b/ee/config/metrics/counts_all/20210216180507_status_page_issues.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.status_page_issues
 description: Issues published to a Status Page
 product_section: ops
diff --git a/ee/config/metrics/counts_all/20210216180522_projects_incident_sla_enabled.yml b/ee/config/metrics/counts_all/20210216180522_projects_incident_sla_enabled.yml
index 8d43ba5b7c0a5173b881cfed831615ef247e6128..c5b62f175b8fd2991cf126e0ba345f0c6d29fb81 100644
--- a/ee/config/metrics/counts_all/20210216180522_projects_incident_sla_enabled.yml
+++ b/ee/config/metrics/counts_all/20210216180522_projects_incident_sla_enabled.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.monitor.projects_incident_sla_enabled
 description: Projects where Incident SLA is enabled
 product_section: ops
diff --git a/ee/config/metrics/counts_all/20210216180800_ldap_keys.yml b/ee/config/metrics/counts_all/20210216180800_ldap_keys.yml
index 3db620e7924904b64e4115b1322e42ca404a4d30..6d8a38661b54dfe0019c83c18e6201d87e74b767 100644
--- a/ee/config/metrics/counts_all/20210216180800_ldap_keys.yml
+++ b/ee/config/metrics/counts_all/20210216180800_ldap_keys.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.manage.ldap_keys
 description: Number of users creating keys synced as part of LDAP
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216180801_ldap_users.yml b/ee/config/metrics/counts_all/20210216180801_ldap_users.yml
index 0db0a220a010b6fdb75e406f4cf0a8f60d9e5089..2c017cd1ac6f59420fda6d128f441ca703a107d5 100644
--- a/ee/config/metrics/counts_all/20210216180801_ldap_users.yml
+++ b/ee/config/metrics/counts_all/20210216180801_ldap_users.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.manage.ldap_users
 description: Number of users that are linked to LDAP
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216180803_value_stream_management_customized_group_stages.yml b/ee/config/metrics/counts_all/20210216180803_value_stream_management_customized_group_stages.yml
index 0bcbc68d6d876594511fa117022c8a3e81a84637..2f50cbc389128f8dab95699c5f69c3c9e01f4844 100644
--- a/ee/config/metrics/counts_all/20210216180803_value_stream_management_customized_group_stages.yml
+++ b/ee/config/metrics/counts_all/20210216180803_value_stream_management_customized_group_stages.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.manage.value_stream_management_customized_group_stages
 description: Number of custom value stream analytics stages.
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216180805_projects_with_compliance_framework.yml b/ee/config/metrics/counts_all/20210216180805_projects_with_compliance_framework.yml
index 1a36a6a46c6ce94a75b93be915b6d1b825cd579f..bcd0af9d128c06188d8721373a018aeba346a451 100644
--- a/ee/config/metrics/counts_all/20210216180805_projects_with_compliance_framework.yml
+++ b/ee/config/metrics/counts_all/20210216180805_projects_with_compliance_framework.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.manage.projects_with_compliance_framework
 description: Number of projects labeled with a compliance framework label [see](https://gitlab.com/gitlab-org/gitlab/-/issues/118671)
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216180807_ldap_servers.yml b/ee/config/metrics/counts_all/20210216180807_ldap_servers.yml
index 7a3b7e021471faeeffd02ce4b6c6f72ad39ea3c9..1d1ba5f8f8a656396993d11842ce5cc23bd294dd 100644
--- a/ee/config/metrics/counts_all/20210216180807_ldap_servers.yml
+++ b/ee/config/metrics/counts_all/20210216180807_ldap_servers.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.manage.ldap_servers
 description: Number of [LDAP servers configured for the instance](https://docs.gitlab.com/ee/administration/auth/ldap/#multiple-ldap-servers)
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216181100_assignee_lists.yml b/ee/config/metrics/counts_all/20210216181100_assignee_lists.yml
index b4e2c499b2ce6a114276edcb1097c34a94445d6e..1885ef2861c9fa9b69b228f0ac4a0a5137d0c86d 100644
--- a/ee/config/metrics/counts_all/20210216181100_assignee_lists.yml
+++ b/ee/config/metrics/counts_all/20210216181100_assignee_lists.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.assignee_lists
 description: Count of assignee lists created on Boards
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216181106_milestone_lists.yml b/ee/config/metrics/counts_all/20210216181106_milestone_lists.yml
index bbf37a002b0bfdcbc4161f7acdcacda3af0e050e..4cf7c8096acec294663968567a78be0eba91cbc1 100644
--- a/ee/config/metrics/counts_all/20210216181106_milestone_lists.yml
+++ b/ee/config/metrics/counts_all/20210216181106_milestone_lists.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.milestone_lists
 description: Count of milestone lists created on Boards 
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216181132_assignee_lists.yml b/ee/config/metrics/counts_all/20210216181132_assignee_lists.yml
index 7e3b1a674cadc3258302cecbbc626906412de178..6cac92066f4dabd060f98f7bb0e5cd4ca027f29e 100644
--- a/ee/config/metrics/counts_all/20210216181132_assignee_lists.yml
+++ b/ee/config/metrics/counts_all/20210216181132_assignee_lists.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.plan.assignee_lists
 description: Count of users creating assignee lists on Boards
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216181137_milestone_lists.yml b/ee/config/metrics/counts_all/20210216181137_milestone_lists.yml
index 525ef4ba699e96dc8db77a08398d7ff682a49055..caade6e66d7992a02a9f52907a337d48f599030f 100644
--- a/ee/config/metrics/counts_all/20210216181137_milestone_lists.yml
+++ b/ee/config/metrics/counts_all/20210216181137_milestone_lists.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.plan.milestone_lists
 description: Count of users creating milestone lists on Boards
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216181205_confidential_epics.yml b/ee/config/metrics/counts_all/20210216181205_confidential_epics.yml
index d19d319c654e1fc68d01555b862669a1e272f979..c5ab5d5f30d31b4e4c7754dc68732665ac0930e0 100644
--- a/ee/config/metrics/counts_all/20210216181205_confidential_epics.yml
+++ b/ee/config/metrics/counts_all/20210216181205_confidential_epics.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.confidential_epics
 description: Count of confidential epics
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216181206_epics.yml b/ee/config/metrics/counts_all/20210216181206_epics.yml
index a6fda2a5bbfe59b19fb78abebfc071754b458d67..f7a333c7f7bc77a2af8df0d9b86c1b9556164c54 100644
--- a/ee/config/metrics/counts_all/20210216181206_epics.yml
+++ b/ee/config/metrics/counts_all/20210216181206_epics.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.epics
 description: Count of all epics
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216181208_epic_issues.yml b/ee/config/metrics/counts_all/20210216181208_epic_issues.yml
index 7d89b13f5676be474dcfa67813a3b4a1cebf2c1e..5f8a63cbb1a37a86eb3a0b4c1f64a267ffe947c5 100644
--- a/ee/config/metrics/counts_all/20210216181208_epic_issues.yml
+++ b/ee/config/metrics/counts_all/20210216181208_epic_issues.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.epic_issues
 description: Count of issues that are assigned to an epic
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216181210_issues_with_health_status.yml b/ee/config/metrics/counts_all/20210216181210_issues_with_health_status.yml
index 00d134b6c1c1a1bfc0d17cb9f41220c0caf217cc..c6e07c5c51e89198219a9de190e9881c5f51d25d 100644
--- a/ee/config/metrics/counts_all/20210216181210_issues_with_health_status.yml
+++ b/ee/config/metrics/counts_all/20210216181210_issues_with_health_status.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.issues_with_health_status
 description: Count of issues with health status
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216181212_epics_deepest_relationship_level.yml b/ee/config/metrics/counts_all/20210216181212_epics_deepest_relationship_level.yml
index 187bb55a9fd079e6ffd92a7ff5093acbeebcab98..8f246f89912eeb8d7b95f1d6c97d0cd930a5d9be 100644
--- a/ee/config/metrics/counts_all/20210216181212_epics_deepest_relationship_level.yml
+++ b/ee/config/metrics/counts_all/20210216181212_epics_deepest_relationship_level.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.epics_deepest_relationship_level
 description: Count of the deepest relationship level for epics
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216181920_projects_mirrored_with_pipelines_enabled.yml b/ee/config/metrics/counts_all/20210216181920_projects_mirrored_with_pipelines_enabled.yml
index cf8fa63f1ddb3ee8a239273eff8aee6aa7c4c350..0d40b5ba85b731d5df3e49c4c90707e3478274cd 100644
--- a/ee/config/metrics/counts_all/20210216181920_projects_mirrored_with_pipelines_enabled.yml
+++ b/ee/config/metrics/counts_all/20210216181920_projects_mirrored_with_pipelines_enabled.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.projects_mirrored_with_pipelines_enabled
 description: Projects with repository mirroring enabled
 product_section: ops
diff --git a/ee/config/metrics/counts_all/20210216181934_projects_mirrored_with_pipelines_enabled.yml b/ee/config/metrics/counts_all/20210216181934_projects_mirrored_with_pipelines_enabled.yml
index b497077ccbd8b50991a22c5fb6f731a2b3dfec9f..db696fdad12056b9662bb7125c881eefffcdb293 100644
--- a/ee/config/metrics/counts_all/20210216181934_projects_mirrored_with_pipelines_enabled.yml
+++ b/ee/config/metrics/counts_all/20210216181934_projects_mirrored_with_pipelines_enabled.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.release.projects_mirrored_with_pipelines_enabled
 description: Count creator_id from projects with repository mirroring enabled.
 product_section: ops
diff --git a/ee/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml b/ee/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml
index 317ef149a1199bee2f4467c8882da23eb908d06a..88b2add76b0966eddfa43253477c9c0617c6c70c 100644
--- a/ee/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml
+++ b/ee/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.projects_with_repositories_enabled
 description: Count of users creating projects that have a matching Git repository, result of a Git push action.
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216182001_protected_branches.yml b/ee/config/metrics/counts_all/20210216182001_protected_branches.yml
index 6398600ab7b901a10d5ecf083b0a6e5d561c66bc..fed2b9e35830d4c3cbaf043447be05a0a1a4f541 100644
--- a/ee/config/metrics/counts_all/20210216182001_protected_branches.yml
+++ b/ee/config/metrics/counts_all/20210216182001_protected_branches.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.protected_branches
 description: Count of total protected branches
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216182008_template_repositories.yml b/ee/config/metrics/counts_all/20210216182008_template_repositories.yml
index 87e7756235370c722219626db1a4f6f10eaa5119..a2bb8e4523248e1b9415b3b3fd8f604bf414289c 100644
--- a/ee/config/metrics/counts_all/20210216182008_template_repositories.yml
+++ b/ee/config/metrics/counts_all/20210216182008_template_repositories.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.template_repositories
 description: Count of total repo templates used to aggregate all file templates
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml b/ee/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml
index b0c26cad6d6a08c839ecb175cab30b282b9a9d8a..270f45b5f6ad8088dd267a006857df498decd4bb 100644
--- a/ee/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml
+++ b/ee/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.create.projects_enforcing_code_owner_approval
 description: Count of users creating projects that require approval by code owners for code changes.
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml b/ee/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml
index 64ab570731c0f6aa391d3e539adca6a3f01aa174..31eac3eff7f9106e892b68bf7051c6cf31e04a08 100644
--- a/ee/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml
+++ b/ee/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.create.projects_with_sectional_code_owner_rules
 description: Count of projects using code owners with code owners section feature
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml b/ee/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml
index 197ed9866841ba6e1dd55ad310d85d0c5ed6bc16..9ed7d53a30574e754be9c9d91c0a652967888f84 100644
--- a/ee/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml
+++ b/ee/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.create.projects_with_repositories_enabled
 description: Count of projects that have a matching Git repository, result of a Git push action
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216182025_protected_branches.yml b/ee/config/metrics/counts_all/20210216182025_protected_branches.yml
index 907d209c945bbc23faa1b42e949b6ed751d25e71..ca027d29dd7ce1ffad55208a03a8cc8955dc88fc 100644
--- a/ee/config/metrics/counts_all/20210216182025_protected_branches.yml
+++ b/ee/config/metrics/counts_all/20210216182025_protected_branches.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.create.protected_branches
 description: Count of users creating projects with repositories making use of at least one protected branch.
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml b/ee/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml
index e9787071da4cce38232144a161c1a03b7ad4f0a1..63012100779553c05cb1cfdd13082f2ce751f763 100644
--- a/ee/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml
+++ b/ee/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.create.total_number_of_path_locks
 description: Number of paths/directories manually locked through the UI
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml b/ee/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml
index b6279cf5028e11180369c7c7a288b6f2cfb9719e..a3225562cc2c822b2dbaf22aca688df4a095ce57 100644
--- a/ee/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml
+++ b/ee/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.create.total_number_of_locked_files
 description: The total number of files which have been locked via the GitLab UI
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216182030_approval_project_rules.yml b/ee/config/metrics/counts_all/20210216182030_approval_project_rules.yml
index f8e96d5b8faaa19c24f71e473bc0a292dedeaf48..b351145fe786197d8297374a9e0ed43d91c91411 100644
--- a/ee/config/metrics/counts_all/20210216182030_approval_project_rules.yml
+++ b/ee/config/metrics/counts_all/20210216182030_approval_project_rules.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.create.approval_project_rules
 description: Total number of project approval rules
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216182032_approval_project_rules_with_target_branch.yml b/ee/config/metrics/counts_all/20210216182032_approval_project_rules_with_target_branch.yml
index e293a7cea235564689f6ee8e36adbd0f5f4990ef..3f0d6594a5dea9a267b7bd6e42fdc3d9ba04f7c6 100644
--- a/ee/config/metrics/counts_all/20210216182032_approval_project_rules_with_target_branch.yml
+++ b/ee/config/metrics/counts_all/20210216182032_approval_project_rules_with_target_branch.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.create.approval_project_rules_with_target_branch
 description: Number of project approval rules scoped to a specific repo branch.
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216182120_sast_scans.yml b/ee/config/metrics/counts_all/20210216182120_sast_scans.yml
index 18ed3ae94279e799ff690c5c76e068981219c52e..5d1792c91644ce4f090c1207a64e7d5bc77ea34b 100644
--- a/ee/config/metrics/counts_all/20210216182120_sast_scans.yml
+++ b/ee/config/metrics/counts_all/20210216182120_sast_scans.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.secure.sast_scans
 description: 'Counts sast jobs'
 product_section: sec
diff --git a/ee/config/metrics/counts_all/20210216182122_dast_scans.yml b/ee/config/metrics/counts_all/20210216182122_dast_scans.yml
index 520ba192b2eb32d81e12d7da4d61a14d44f700df..7f19ed3953d793df52bf21500658fb7a03c63c18 100644
--- a/ee/config/metrics/counts_all/20210216182122_dast_scans.yml
+++ b/ee/config/metrics/counts_all/20210216182122_dast_scans.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.secure.dast_scans
 description: 'Counts dast jobs'
 product_section: sec
diff --git a/ee/config/metrics/counts_all/20210216182123_secret_detection_scans.yml b/ee/config/metrics/counts_all/20210216182123_secret_detection_scans.yml
index 4f860c7cc868d08f6576633b8f37e0554c83346d..db18ccf9398e4616cfc69f8d46e9bc3be5e99daa 100644
--- a/ee/config/metrics/counts_all/20210216182123_secret_detection_scans.yml
+++ b/ee/config/metrics/counts_all/20210216182123_secret_detection_scans.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.secure.secret_detection_scans
 description: 'Counts secret detection jobs'
 product_section: sec
diff --git a/ee/config/metrics/counts_all/20210216182203_user_preferences_group_overview_details.yml b/ee/config/metrics/counts_all/20210216182203_user_preferences_group_overview_details.yml
index 231b47711ea6e10e5e745e8de2b346dec27b99da..3dcab5493c1ded64d66099d9b5eccc0a6894f00f 100644
--- a/ee/config/metrics/counts_all/20210216182203_user_preferences_group_overview_details.yml
+++ b/ee/config/metrics/counts_all/20210216182203_user_preferences_group_overview_details.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.user_preferences_group_overview_details
 description: Count of users who set personal preference to see Details on Group information
   page
diff --git a/ee/config/metrics/counts_all/20210216182205_user_preferences_group_overview_security_dashboard.yml b/ee/config/metrics/counts_all/20210216182205_user_preferences_group_overview_security_dashboard.yml
index f2f9e63b15a26ce3bdadab3bb986905a0b7f90be..20e4dc30e5a9fd260746fd6f158d0fba0ff29005 100644
--- a/ee/config/metrics/counts_all/20210216182205_user_preferences_group_overview_security_dashboard.yml
+++ b/ee/config/metrics/counts_all/20210216182205_user_preferences_group_overview_security_dashboard.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.user_preferences_group_overview_security_dashboard
 description: Count of users who set personal preference to see Security Dashboard
   on Group information page
diff --git a/ee/config/metrics/counts_all/20210216182207_user_preferences_group_overview_security_dashboard.yml b/ee/config/metrics/counts_all/20210216182207_user_preferences_group_overview_security_dashboard.yml
index 8f0b59a3055e58eca2ff6217238ea9be8281cd30..52a5002b82a97627f9a1d63660cd4a30b7b8e4b1 100644
--- a/ee/config/metrics/counts_all/20210216182207_user_preferences_group_overview_security_dashboard.yml
+++ b/ee/config/metrics/counts_all/20210216182207_user_preferences_group_overview_security_dashboard.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.secure.user_preferences_group_overview_security_dashboard
 description: Users who set personal preference to see Details on Group information page
 product_section: sec
diff --git a/ee/config/metrics/counts_all/20210216182212_projects_reporting_ci_cd_back_to_github.yml b/ee/config/metrics/counts_all/20210216182212_projects_reporting_ci_cd_back_to_github.yml
index 9c2dab297d12c3eef98d81afeda9db5c18aa76cf..edc5e551be48810d37829d27719613b9e8fbdf74 100644
--- a/ee/config/metrics/counts_all/20210216182212_projects_reporting_ci_cd_back_to_github.yml
+++ b/ee/config/metrics/counts_all/20210216182212_projects_reporting_ci_cd_back_to_github.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.projects_reporting_ci_cd_back_to_github
 description: Projects with a GitHub service pipeline enabled
 product_section: ops
diff --git a/ee/config/metrics/counts_all/20210216183339_merge_requests_with_overridden_project_rules.yml b/ee/config/metrics/counts_all/20210216183339_merge_requests_with_overridden_project_rules.yml
index d87b6e39cc5d4e99d9431e1a3cb51900b92a88dc..d60ee013d65eb8eb3eaa2697ebe81a577e418c49 100644
--- a/ee/config/metrics/counts_all/20210216183339_merge_requests_with_overridden_project_rules.yml
+++ b/ee/config/metrics/counts_all/20210216183339_merge_requests_with_overridden_project_rules.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.create.merge_requests_with_overridden_project_rules
 description: Number of merge requests that have overridden rules created at the project level.
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216183344_users_using_path_locks.yml b/ee/config/metrics/counts_all/20210216183344_users_using_path_locks.yml
index 4b42d2a66dae3d2e3edfcd898674b35558402367..a6d4a608bc99c486d6554cd33bce7c52e1d1a0ad 100644
--- a/ee/config/metrics/counts_all/20210216183344_users_using_path_locks.yml
+++ b/ee/config/metrics/counts_all/20210216183344_users_using_path_locks.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.create.users_using_path_locks
 description: Number of users who have manually locked paths/directories through the UI
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml b/ee/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml
index 93cbeb48c018a7aec9da5373d2d7ffd997120610..0e5cd2b529c9c48d147ec797ffa680c5eafa9e09 100644
--- a/ee/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml
+++ b/ee/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.create.users_using_lfs_locks
 description: Number of unique users who have locked files or directories using LFS via the command line
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216183352_approval_project_rules_with_more_approvers_than_required.yml b/ee/config/metrics/counts_all/20210216183352_approval_project_rules_with_more_approvers_than_required.yml
index e7051b72b88e5de812e722827c9543968cfbb3d1..58575d51568b7b5034db805422c04e5bb7188d54 100644
--- a/ee/config/metrics/counts_all/20210216183352_approval_project_rules_with_more_approvers_than_required.yml
+++ b/ee/config/metrics/counts_all/20210216183352_approval_project_rules_with_more_approvers_than_required.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.create.approval_project_rules_with_more_approvers_than_required
 description: Number of approval rules with more approvers than required.
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216183354_approval_project_rules_with_less_approvers_than_required.yml b/ee/config/metrics/counts_all/20210216183354_approval_project_rules_with_less_approvers_than_required.yml
index afcf305a594249f26ab3259fdaca9901ea300846..13bf47fbfd2e8eaa164b97838caf746b56cddc1f 100644
--- a/ee/config/metrics/counts_all/20210216183354_approval_project_rules_with_less_approvers_than_required.yml
+++ b/ee/config/metrics/counts_all/20210216183354_approval_project_rules_with_less_approvers_than_required.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.create.approval_project_rules_with_less_approvers_than_required
 description: Number of approval rules with fewer approvers than required.
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216183355_approval_project_rules_with_exact_required_approvers.yml b/ee/config/metrics/counts_all/20210216183355_approval_project_rules_with_exact_required_approvers.yml
index 8e99b464bf0d52d8eca5d6fc5394a24c30bebeaf..a63eb49e8f007b1da0bff1fb06fe4c32c60a295b 100644
--- a/ee/config/metrics/counts_all/20210216183355_approval_project_rules_with_exact_required_approvers.yml
+++ b/ee/config/metrics/counts_all/20210216183355_approval_project_rules_with_exact_required_approvers.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.create.approval_project_rules_with_exact_required_approvers
 description: Number of approval rules with the exact number of required approvers.
 product_section: dev
diff --git a/ee/config/metrics/counts_all/20210216183753_projects_incident_sla_enabled.yml b/ee/config/metrics/counts_all/20210216183753_projects_incident_sla_enabled.yml
index 0b498546b01dd2310a26c0b0b201d2addcbff9aa..32c3643a6aafcdd45e57e151567b304ea98d8675 100644
--- a/ee/config/metrics/counts_all/20210216183753_projects_incident_sla_enabled.yml
+++ b/ee/config/metrics/counts_all/20210216183753_projects_incident_sla_enabled.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.monitor.projects_incident_sla_enabled
 description: Count of projects with Incident SLA enabled
 product_section: ops
diff --git a/ee/config/metrics/counts_all/20210216184035_i_search_paid_monthly.yml b/ee/config/metrics/counts_all/20210216184035_i_search_paid_monthly.yml
index d635fe9d7d242810d9a437d4f398b8429b42b88a..4dc9957b5d40e8c611a15da5be6fe4cc8c9d00c0 100644
--- a/ee/config/metrics/counts_all/20210216184035_i_search_paid_monthly.yml
+++ b/ee/config/metrics/counts_all/20210216184035_i_search_paid_monthly.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: redis_hll_counters.search.i_search_paid_monthly
 description: Calculated unique users to perform a search with a paid license enabled by month
 product_section: enablement
diff --git a/ee/config/metrics/counts_all/20210430081610_custom_compliance_frameworks.yml b/ee/config/metrics/counts_all/20210430081610_custom_compliance_frameworks.yml
index 01ebec55c83a325bf07eba4c416055e1e90b95ce..87a8d35329c0e32c7fddf3f2a212ae930e245b42 100644
--- a/ee/config/metrics/counts_all/20210430081610_custom_compliance_frameworks.yml
+++ b/ee/config/metrics/counts_all/20210430081610_custom_compliance_frameworks.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.manage.custom_compliance_frameworks
 name: "count_compliance_management_frameworks"
 description: Total count of all custom compliance framework labels
diff --git a/ee/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml b/ee/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
index b3eeaa7ba52c05272392f194e98208b8c5d2e399..12e90122585bb2091eb0da93f1de24567820c18e 100644
--- a/ee/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
+++ b/ee/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.kubernetes_agent_k8s_api_proxy_request
 description: Count of Kubernetes API proxy requests
 product_section: ops
diff --git a/ee/config/metrics/license/20210204124833_license_id.yml b/ee/config/metrics/license/20210204124833_license_id.yml
index 1ec9240ddb7e33e5833b9d35c41c1eb198427172..d1ea951e1bd1f479f9aa45649c8adaebc1af0e56 100644
--- a/ee/config/metrics/license/20210204124833_license_id.yml
+++ b/ee/config/metrics/license/20210204124833_license_id.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: license_id
 description: The ID of the license
 product_section: fulfillment
diff --git a/ee/config/metrics/license/20210204124835_historical_max_users.yml b/ee/config/metrics/license/20210204124835_historical_max_users.yml
index b26980685919c0adc06780f0700a0a34e3903a8d..30f199de1987bd2e9c58de2ec5a5c62614727cbf 100644
--- a/ee/config/metrics/license/20210204124835_historical_max_users.yml
+++ b/ee/config/metrics/license/20210204124835_historical_max_users.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: historical_max_users
 description: The peak active user count. Active is defined in UsersStatistics model.
 product_section: fulfillment
diff --git a/ee/config/metrics/license/20210204124837_name.yml b/ee/config/metrics/license/20210204124837_name.yml
index f36dd35c91f7fc6fec9990d17ca6721e06d7af0c..4ff6b2dd411c0371cb7e73cb67a5c169d9cde503 100644
--- a/ee/config/metrics/license/20210204124837_name.yml
+++ b/ee/config/metrics/license/20210204124837_name.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: licensee.Name
 description: Name on the GitLab license
 product_section: fulfillment
diff --git a/ee/config/metrics/license/20210204124839_email.yml b/ee/config/metrics/license/20210204124839_email.yml
index 3536c074ccc267e3b15ad8dd35838ff2889649f0..a920705333b4727ab7a0fd5f8501bb45e99ba144 100644
--- a/ee/config/metrics/license/20210204124839_email.yml
+++ b/ee/config/metrics/license/20210204124839_email.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: licensee.Email
 description: Email on the GitLab license
 product_section: fulfillment
diff --git a/ee/config/metrics/license/20210204124841_company.yml b/ee/config/metrics/license/20210204124841_company.yml
index 65ffa36bdd8ebf4537bbfdfb1342dc6db0d90471..7c3046b169510c9c2765a050d417d6f2c0306fe6 100644
--- a/ee/config/metrics/license/20210204124841_company.yml
+++ b/ee/config/metrics/license/20210204124841_company.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: licensee.Company
 description: Company on the GitLab license
 product_section: fulfillment
diff --git a/ee/config/metrics/license/20210204124843_license_user_count.yml b/ee/config/metrics/license/20210204124843_license_user_count.yml
index 27f61c5f1c036bd9d21780f28c90d184b06b3454..bf90b7e12e6b9427778b8c726ab258267d22026c 100644
--- a/ee/config/metrics/license/20210204124843_license_user_count.yml
+++ b/ee/config/metrics/license/20210204124843_license_user_count.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: license_user_count
 description: The number of seats included in the license
 product_section: fulfillment
diff --git a/ee/config/metrics/license/20210204124845_license_starts_at.yml b/ee/config/metrics/license/20210204124845_license_starts_at.yml
index c43b09a44934d868b8840bb8e2f916a919538ed6..26f0ab10587b2769d013585b083248eca35e8cd4 100644
--- a/ee/config/metrics/license/20210204124845_license_starts_at.yml
+++ b/ee/config/metrics/license/20210204124845_license_starts_at.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: license_starts_at
 description: The date the license starts
 product_section: fulfillment
diff --git a/ee/config/metrics/license/20210204124847_license_expires_at.yml b/ee/config/metrics/license/20210204124847_license_expires_at.yml
index 6d30795476107350d1f2054df03b6fc81cb2476c..f2619a6d219022fb48360ca0d1c0469d0c6463cd 100644
--- a/ee/config/metrics/license/20210204124847_license_expires_at.yml
+++ b/ee/config/metrics/license/20210204124847_license_expires_at.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: license_expires_at
 description: The date the license ends
 product_section: fulfillment
diff --git a/ee/config/metrics/license/20210204124849_license_plan.yml b/ee/config/metrics/license/20210204124849_license_plan.yml
index ca5b66e1fc2abcf6b66546712a1ba33dc8916740..a896b88240516b38b73c22f359a074b4b3e1f819 100644
--- a/ee/config/metrics/license/20210204124849_license_plan.yml
+++ b/ee/config/metrics/license/20210204124849_license_plan.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: license_plan
 description: The plan of the GitLab license
 product_section: fulfillment
diff --git a/ee/config/metrics/license/20210204124851_license_trial.yml b/ee/config/metrics/license/20210204124851_license_trial.yml
index 5c1adefde32eac64a13d8ccdaf84ce1239067ccd..9258ce21b3e58e74ba53f2f049b82da1a0ef0093 100644
--- a/ee/config/metrics/license/20210204124851_license_trial.yml
+++ b/ee/config/metrics/license/20210204124851_license_trial.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: license_trial
 description: Whether this is a trial license or not
 product_section: fulfillment
diff --git a/ee/config/metrics/license/20210204124926_license_trial_ends_on.yml b/ee/config/metrics/license/20210204124926_license_trial_ends_on.yml
index 5f426f103e9a570eeb2f99ec8e1106ec1663bc49..d43db9eeb472cd15efd672dd0016dea9136ffb02 100644
--- a/ee/config/metrics/license/20210204124926_license_trial_ends_on.yml
+++ b/ee/config/metrics/license/20210204124926_license_trial_ends_on.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: license_trial_ends_on
 description: Date the trial license ends on
 product_section: fulfillment
diff --git a/ee/config/metrics/license/20210204124940_recording_ee_finished_at.yml b/ee/config/metrics/license/20210204124940_recording_ee_finished_at.yml
index 2016ed5239476812f12ff79136fa78e04d08ea64..e4cf326614405fbc49ad41f5e26af0e81da6d67d 100644
--- a/ee/config/metrics/license/20210204124940_recording_ee_finished_at.yml
+++ b/ee/config/metrics/license/20210204124940_recording_ee_finished_at.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: recording_ee_finished_at
 description: When the EE-specific features were computed
 product_section: growth
diff --git a/ee/config/metrics/license/20210216175210_licenses_list_views.yml b/ee/config/metrics/license/20210216175210_licenses_list_views.yml
index ec4cd43bd8fc2099692b7cb453bb9d7e8ae4ee5f..6f0e3a712c1cf2a01301fc8f3fe146fe339aef43 100644
--- a/ee/config/metrics/license/20210216175210_licenses_list_views.yml
+++ b/ee/config/metrics/license/20210216175210_licenses_list_views.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: counts.licenses_list_views
 description: Count to License List page views
 product_section: sec
diff --git a/ee/config/metrics/license/20210531204603_license_billable_users.yml b/ee/config/metrics/license/20210531204603_license_billable_users.yml
index 7ef42b6a39d2398d94aff2b290469a02a2c29d33..6f3534e0d444058df11ad798875252fdf60d9903 100644
--- a/ee/config/metrics/license/20210531204603_license_billable_users.yml
+++ b/ee/config/metrics/license/20210531204603_license_billable_users.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: license_billable_users
 name: billable_users
 description: Number of all billable users (active users excluding bots and guests).
diff --git a/ee/config/metrics/settings/20210204124924_elasticsearch_enabled.yml b/ee/config/metrics/settings/20210204124924_elasticsearch_enabled.yml
index a7d64f906cf8c48554902108daeb5d51423d7efe..94546fb78e540e78145017ef3696190cca2204b1 100644
--- a/ee/config/metrics/settings/20210204124924_elasticsearch_enabled.yml
+++ b/ee/config/metrics/settings/20210204124924_elasticsearch_enabled.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: elasticsearch_enabled
 description: Whether Elasticsearch is enabled
 product_section: enablement
diff --git a/ee/config/metrics/settings/20210216180406_geo_enabled.yml b/ee/config/metrics/settings/20210216180406_geo_enabled.yml
index b38433067ad6610abb5a275ab15cc4b143e748eb..6b9674469c455b3673c3d9b3597dce8c939459cc 100644
--- a/ee/config/metrics/settings/20210216180406_geo_enabled.yml
+++ b/ee/config/metrics/settings/20210216180406_geo_enabled.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: geo_enabled
 description: Is Geo enabled?
 product_section: enablement
diff --git a/ee/config/metrics/settings/20210216180809_ldap_group_sync_enabled.yml b/ee/config/metrics/settings/20210216180809_ldap_group_sync_enabled.yml
index c322b460343e072102c8d1e543e5c08157c913a3..9bef8e9605a60dfb4a904f1fedfd4224c84885cd 100644
--- a/ee/config/metrics/settings/20210216180809_ldap_group_sync_enabled.yml
+++ b/ee/config/metrics/settings/20210216180809_ldap_group_sync_enabled.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.manage.ldap_group_sync_enabled
 description: Has the instance configured [LDAP Group Sync](https://docs.gitlab.com/ee/administration/auth/ldap/#group-sync)
 product_section: dev
diff --git a/ee/config/metrics/settings/20210216180811_ldap_admin_sync_enabled.yml b/ee/config/metrics/settings/20210216180811_ldap_admin_sync_enabled.yml
index 61a02ae420512f922310d43b38efa145d8711c04..33fd7f2d3526f8a38fec0ff8329b8d947add44b9 100644
--- a/ee/config/metrics/settings/20210216180811_ldap_admin_sync_enabled.yml
+++ b/ee/config/metrics/settings/20210216180811_ldap_admin_sync_enabled.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.manage.ldap_admin_sync_enabled
 description: Has the instance configured [LDAP Admin Sync](https://docs.gitlab.com/ee/administration/auth/ldap/#administrator-sync)
 product_section: dev
diff --git a/ee/config/metrics/settings/20210216180813_group_saml_enabled.yml b/ee/config/metrics/settings/20210216180813_group_saml_enabled.yml
index 776fe5a617beac45d5f78326612c2812d7f5c526..bf3b4c29e9968a09604aa91886beb1a63539e70d 100644
--- a/ee/config/metrics/settings/20210216180813_group_saml_enabled.yml
+++ b/ee/config/metrics/settings/20210216180813_group_saml_enabled.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage.manage.group_saml_enabled
 description: Has the instance enabled Group SAML SSO `https://docs.gitlab.com/ee/user/group/saml_sso/` on at least 1 group?
 product_section: dev
diff --git a/ee/config/metrics/settings/20210216180829_ldap_group_sync_enabled.yml b/ee/config/metrics/settings/20210216180829_ldap_group_sync_enabled.yml
index a1977412b7177b0bf46293a75b8bb0456344d1a5..4c682e8780fa4f3d5c32383fee83d91d360e80f1 100644
--- a/ee/config/metrics/settings/20210216180829_ldap_group_sync_enabled.yml
+++ b/ee/config/metrics/settings/20210216180829_ldap_group_sync_enabled.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.ldap_group_sync_enabled
 description: Has the instance configured [LDAP Group Sync](https://docs.gitlab.com/ee/administration/auth/ldap/#group-sync)
 product_section: dev
diff --git a/ee/config/metrics/settings/20210216180831_ldap_admin_sync_enabled.yml b/ee/config/metrics/settings/20210216180831_ldap_admin_sync_enabled.yml
index 5014596e9e4bcd0497f1863efcf18c5e2521ccba..d99840ad016b9b16ed527ebb1c779b4c885077c9 100644
--- a/ee/config/metrics/settings/20210216180831_ldap_admin_sync_enabled.yml
+++ b/ee/config/metrics/settings/20210216180831_ldap_admin_sync_enabled.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.ldap_admin_sync_enabled
 description: Whether LDAP admin sync is enabled
 product_section: dev
diff --git a/ee/config/metrics/settings/20210216180833_group_saml_enabled.yml b/ee/config/metrics/settings/20210216180833_group_saml_enabled.yml
index 18c13452f23eb8ebb9cf7cb3b1e72eac2716f0a2..c64489340227f0be7f84581bf2bd4b39b69a1480 100644
--- a/ee/config/metrics/settings/20210216180833_group_saml_enabled.yml
+++ b/ee/config/metrics/settings/20210216180833_group_saml_enabled.yml
@@ -1,4 +1,5 @@
 ---
+data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.group_saml_enabled
 description: Whether group SAML is enabled
 product_section: dev