Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42

53 files changed, 75 insertions, 0 deletions

diff --git a/config/metrics/settings/20210201124935_database_adapter.yml b/config/metrics/settings/20210201124935_database_adapter.yml
index 66a9e5fd52a..0a26d0afb68 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 dc6db53f8ab..f1426cd220d 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 5cccb84ec10..4f5d2fde9e7 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 f06b89477a4..a567dd3bf51 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 2b6f1d41413..d1737989b80 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 a5ae02910c6..aa7d697acfd 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 589897fb15b..d1dcdaec106 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 14303726d1f..ed72e557ad7 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 67d1515abc5..2943913bcbb 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 0e8ce856858..bf33f8e4454 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 61b99f55452..df4a4f1edaa 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 ba61de920de..35f834511b2 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 b63a571c6b9..40b16f33b0b 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 80f247d9146..869f7c89483 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 c7e971f1a27..9660614bd46 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 def857192eb..24ba7606e08 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 c3aa121a826..1b264834821 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 a2552d1f465..603064a301d 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: Operational
 key_path: ingress_modsecurity_enabled
 description: Whether or not ModSecurity is enabled within Ingress
 product_section: sec
diff --git a/config/metrics/settings/20210216175604_edition.yml b/config/metrics/settings/20210216175604_edition.yml
index 58d61ad5d88..6d5843b35f2 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 dfc7222ebcf..2cd0949c9f5 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 378ae0e2ee4..468a8998637 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 72e13f785d4..71ceb75ab84 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 c5f7e230767..9a52788d2e3 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 3e5fbdf1acd..1e8c0bf8d30 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 4356fe775d8..a0859d7d5a6 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 4570a701b53..9386a1a8301 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 fcaea534dab..2c9e074f9ef 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 dc29c7211fd..a9c33827861 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 c5be296e19f..ca404dc8b66 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 cdce6e0329c..37e77067336 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 67852d9f039..5c231d544bf 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 5c843969510..8675e023caf 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 40656fdfe2c..51aebd0f029 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 1892882d5bb..842a6042ae6 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 f2b11a4e4a7..c2d680102e6 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 9cb4e2ed10e..9d4b16ba441 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 2e9e11b9301..1ec1949ef11 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 7c7f4f7bf57..7ebcbd04837 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 fa5d70567e8..f967861ae0b 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 8d2523f2e8f..ca8cfa003c3 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 466c630717b..783baa1f30d 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 75e5cda1f2b..4066f83afdb 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 806be543ad2..e19001746d8 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 fb16bfe1e48..0cb84815e26 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 f743723e6c3..41adb02d6c6 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 ede74fba29e..9c5ded4f956 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 4f94e0d07bc..da5d1dc0c1b 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 3585fda1771..242f2818ac6 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 28905c62ce0..19b920ea7e3 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 41b65a1bd6a..6f1cd9be724 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 8fe1e1edc0b..f760abae6dc 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 5fa9b475472..c998b37d039 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/config/metrics/settings/20210702140138_collected_data_categories.yml b/config/metrics/settings/20210702140138_collected_data_categories.yml
new file mode 100644
index 00000000000..dca7e1737db
--- /dev/null
+++ b/config/metrics/settings/20210702140138_collected_data_categories.yml
@@ -0,0 +1,23 @@
+---
+key_path: settings.collected_data_categories
+name: collected_data_categories
+description: List of collected data categories corresponding to instance settings
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: object
+status: implemented
+milestone: "14.1"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65336
+time_frame: none
+data_source: system
+data_category: Standard
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+value_json_schema: 'config/metrics/objects_schemas/collected_data_categories_schema.json'