diff --git a/config/metrics/license/20210201124932_recorded_at.yml b/config/metrics/license/20210201124932_recorded_at.yml
index 4b9cfc900d6d575c9030c05444360a3f1d41d3a2..88f27fff377d9868028eb4697734e4a77d60d300 100644
--- a/config/metrics/license/20210201124932_recorded_at.yml
+++ b/config/metrics/license/20210201124932_recorded_at.yml
@@ -10,7 +10,7 @@ status: data_available
 milestone: "8.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
 time_frame: none
-data_source: ruby
+data_source: system
 distribution:
 - ee
 - ce
diff --git a/config/metrics/license/20210204124827_hostname.yml b/config/metrics/license/20210204124827_hostname.yml
index 6f878f04863d1f1dc2390e55702912f977669990..2d8942b1d488d30b98cd7df81ed80d60b70722dd 100644
--- a/config/metrics/license/20210204124827_hostname.yml
+++ b/config/metrics/license/20210204124827_hostname.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/license/20210204124926_license_trial_ends_on.yml b/config/metrics/license/20210204124926_license_trial_ends_on.yml
index e3c3303975f26c4826b2956381afcfa3c9075169..fb9ec099a461466c8589d07c4b178c7b2e23e8e9 100644
--- a/config/metrics/license/20210204124926_license_trial_ends_on.yml
+++ b/config/metrics/license/20210204124926_license_trial_ends_on.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/license/20210204124928_version.yml b/config/metrics/license/20210204124928_version.yml
index b39552b220e0e92df9ee8567d84fe3e298e59ee9..9aea9f8fde588458d1a8cf2cd071ed517ca60231 100644
--- a/config/metrics/license/20210204124928_version.yml
+++ b/config/metrics/license/20210204124928_version.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/license/20210204124936_version.yml b/config/metrics/license/20210204124936_version.yml
index 2d161e15fd0fe9aeee31dff800689eea39517427..ef87a6ed9e660833edfee670ae19f5836af65c62 100644
--- a/config/metrics/license/20210204124936_version.yml
+++ b/config/metrics/license/20210204124936_version.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/license/20210204124938_recording_ce_finished_at.yml b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
index b1fd0589e4a7c0367c38200e739a5501b5f98ede..d07580730c1cb54cfa37f3dfe07d5fc923b0503c 100644
--- a/config/metrics/license/20210204124938_recording_ce_finished_at.yml
+++ b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source: ruby
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/license/20210216175601_version.yml b/config/metrics/license/20210216175601_version.yml
index b3099eb76bdd4c10511d790daab242bfa6147146..5e5c1ad05ec52872003b14bc23ee927910762aa2 100644
--- a/config/metrics/license/20210216175601_version.yml
+++ b/config/metrics/license/20210216175601_version.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/license/20210216175602_installation_type.yml b/config/metrics/license/20210216175602_installation_type.yml
index ae5f26ff0a2d81cef66b711677e43e5fe68053cf..6e907b4a823b70f3ce7f1c2fa7e6634d7ba8a211 100644
--- a/config/metrics/license/20210216175602_installation_type.yml
+++ b/config/metrics/license/20210216175602_installation_type.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source: ruby
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/license/20210216181053_version.yml b/config/metrics/license/20210216181053_version.yml
index 3570a041b8f5a9d9c968ff43edbfa7b1fe9013cc..824167c8d9750b6cf3d3415828fedaa27b7bf79b 100644
--- a/config/metrics/license/20210216181053_version.yml
+++ b/config/metrics/license/20210216181053_version.yml
@@ -8,7 +8,7 @@ product_category:
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/license/20210216183237_version.yml b/config/metrics/license/20210216183237_version.yml
index 4f74963801a1364a634d82e4a3a84c3566c3af50..69d97e17f20d045ddbac45faf98e588679ca1d90 100644
--- a/config/metrics/license/20210216183237_version.yml
+++ b/config/metrics/license/20210216183237_version.yml
@@ -8,7 +8,7 @@ product_category: ''
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210201124935_database_adapter.yml b/config/metrics/settings/20210201124935_database_adapter.yml
index 020325995b12cdccfd797bf16f85725cb441b8ed..66a9e5fd52a7b3c965dcf40f6742ccf4f5968a9d 100644
--- a/config/metrics/settings/20210201124935_database_adapter.yml
+++ b/config/metrics/settings/20210201124935_database_adapter.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source: database
+data_source: system
 distribution:
 - ee
 - ce
diff --git a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
index bda8d4f856d49d97f6c3d94ef60f376382c1872c..dc6db53f8ab79a43f01140ee2799c6c51388c615 100644
--- a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
+++ b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
@@ -8,7 +8,7 @@ product_category: auto_devops
 value_type: boolean
 status: data_available
 time_frame: none
-data_source: database
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210204124858_container_registry_enabled.yml b/config/metrics/settings/20210204124858_container_registry_enabled.yml
index 6c50cb9144e2928378b9c57feba9c75e4daa5a80..d8a47a39912a286c5c8dee177f651bdf2e317597 100644
--- a/config/metrics/settings/20210204124858_container_registry_enabled.yml
+++ b/config/metrics/settings/20210204124858_container_registry_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
index 01feb7157d93cd998a6bdbb391e9024e628be94c..f7aa195f284626ce52795f8f0a3aed7a67c59f3a 100644
--- a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
+++ b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
index 5ec4b9fdc09edb512eccae9c89156f27993e0a83..2b6f1d41413ac458571a97d9a46261b56aa469db 100644
--- a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
+++ b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
@@ -8,7 +8,7 @@ product_category: runner
 value_type: boolean
 status: data_available
 time_frame: none
-data_source: database
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210204124904_gravatar_enabled.yml b/config/metrics/settings/20210204124904_gravatar_enabled.yml
index 21758753b35d38db3a8d64cfbc2897203edebbfc..b0280347b9f5decd1a0f9deba31e69d6e5266057 100644
--- a/config/metrics/settings/20210204124904_gravatar_enabled.yml
+++ b/config/metrics/settings/20210204124904_gravatar_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210204124906_ldap_enabled.yml b/config/metrics/settings/20210204124906_ldap_enabled.yml
index 6dc1a62d3374d19901f07a9a43f3cc9629e5d2f7..589897fb15b6ff920732fa0f77843b4465287417 100644
--- a/config/metrics/settings/20210204124906_ldap_enabled.yml
+++ b/config/metrics/settings/20210204124906_ldap_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210204124908_mattermost_enabled.yml b/config/metrics/settings/20210204124908_mattermost_enabled.yml
index 425f3c445116a919eb4e39baa7b1715adfaced48..a3c88cf976e1e78d25213a97268c5280b1805ab2 100644
--- a/config/metrics/settings/20210204124908_mattermost_enabled.yml
+++ b/config/metrics/settings/20210204124908_mattermost_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210204124910_omniauth_enabled.yml b/config/metrics/settings/20210204124910_omniauth_enabled.yml
index f9e691b0516db856e3ee94fecf92d664a887087f..67d1515abc5645f59d4b5f2d1ff30eaa1d5917a7 100644
--- a/config/metrics/settings/20210204124910_omniauth_enabled.yml
+++ b/config/metrics/settings/20210204124910_omniauth_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210204124912_prometheus_enabled.yml b/config/metrics/settings/20210204124912_prometheus_enabled.yml
index ca829933eda5659d67bcbae86cdaf21b92e6b8b5..092f273e23736a264e22cb3366d2fc76585e909f 100644
--- a/config/metrics/settings/20210204124912_prometheus_enabled.yml
+++ b/config/metrics/settings/20210204124912_prometheus_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
index f9566076c9e025ccf0d633db58ba7b5defb46ee1..43a13aff5e184e8f6218cde61004a9b37d9945d1 100644
--- a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
+++ b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
index f2fb58e33ec7454d485639279e8049cd2ade2db4..40b863cd225aa8ce7b8f48f7f4a035da74fe7601 100644
--- a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
+++ b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210204124918_signup_enabled.yml b/config/metrics/settings/20210204124918_signup_enabled.yml
index 36e228bf9277f7b1eab8d79c78464fcd85c70a84..b63a571c6b9e17c5592fd07cc45ec3a13b7624b8 100644
--- a/config/metrics/settings/20210204124918_signup_enabled.yml
+++ b/config/metrics/settings/20210204124918_signup_enabled.yml
@@ -8,7 +8,7 @@ product_category: authentication_and_authorization
 value_type: boolean
 status: data_available
 time_frame: none
-data_source: database
+data_source: system
 distribution:
 - ce
 - ee
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 4f21c0f2f18c6242db282036a661d586300649de..bfb143d2013d1d418a73e41898b6f4789ec32a21 100644
--- a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
+++ b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210204124922_grafana_link_enabled.yml b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
index 90f825dfc365aaf0a90f558e034e27e5add6aa37..c7e971f1a27875d342e5f4db713b1de025d0344a 100644
--- a/config/metrics/settings/20210204124922_grafana_link_enabled.yml
+++ b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source: database
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210204124934_enabled.yml b/config/metrics/settings/20210204124934_enabled.yml
index 2f2586ad8f45d92bc2443f04f23e756e9dd20a63..def857192eb9c478ce0668d465c06c994f5a9cef 100644
--- a/config/metrics/settings/20210204124934_enabled.yml
+++ b/config/metrics/settings/20210204124934_enabled.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210216174829_smtp_server.yml b/config/metrics/settings/20210216174829_smtp_server.yml
index afee13f5534eb9d37486178d9d5af7690a7159de..c3aa121a826a6a49f8608abe5a6fb137e4fb96f4 100644
--- a/config/metrics/settings/20210216174829_smtp_server.yml
+++ b/config/metrics/settings/20210216174829_smtp_server.yml
@@ -8,7 +8,7 @@ product_category: onboarding
 value_type: number
 status: data_available
 time_frame: all
-data_source: ruby
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
index ee3741581b4be14c1283b37d0cf4ef16a61f4637..f76bd0593b650560cc1d9234ae00968a319cae71 100644
--- a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
+++ b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
@@ -8,7 +8,7 @@ product_category: web_firewall
 value_type: boolean
 status: deprecated
 time_frame: none
-data_source: database
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216175604_edition.yml b/config/metrics/settings/20210216175604_edition.yml
index c06c494d68823c3771d15d8781581065d3d6db06..58d61ad5d881369b12794d407830d35e9a3b5b2b 100644
--- a/config/metrics/settings/20210216175604_edition.yml
+++ b/config/metrics/settings/20210216175604_edition.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source: ruby
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
index 37b12a982bb094adff763dd21fbd91ff70a1158d..dfc7222ebcf43faa5bf94a1b4b3dfd2526edd262 100644
--- a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
+++ b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
@@ -8,7 +8,7 @@ product_category: global_search
 value_type: boolean
 status: data_available
 time_frame: none
-data_source: ruby
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180314_gitpod_enabled.yml b/config/metrics/settings/20210216180314_gitpod_enabled.yml
index f716f3985f669f87f2429a737100f32fb9b91bbd..0bad75fe3db0326948ca4c2c8b380c0e3a67f7a1 100644
--- a/config/metrics/settings/20210216180314_gitpod_enabled.yml
+++ b/config/metrics/settings/20210216180314_gitpod_enabled.yml
@@ -8,7 +8,7 @@ product_category: integrations
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180836_enabled.yml b/config/metrics/settings/20210216180836_enabled.yml
index 1e7e5a226c279a471f722f30b7cb7abdc87700e0..df71de8d4c25fc7c2fc888eff8ed39c71c520846 100644
--- a/config/metrics/settings/20210216180836_enabled.yml
+++ b/config/metrics/settings/20210216180836_enabled.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180838_enabled.yml b/config/metrics/settings/20210216180838_enabled.yml
index 8524f52591734f1f6780c3d0f3bc8f8f3032fe6a..7bb1135ee08860a2395c9ecb1c3839a5c1556d62 100644
--- a/config/metrics/settings/20210216180838_enabled.yml
+++ b/config/metrics/settings/20210216180838_enabled.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180840_direct_upload.yml b/config/metrics/settings/20210216180840_direct_upload.yml
index 08ef5e1ece1313714d898edc26f4da6c1306f98e..788d101ba227532f6dc218127dbaa446f8ea970e 100644
--- a/config/metrics/settings/20210216180840_direct_upload.yml
+++ b/config/metrics/settings/20210216180840_direct_upload.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180841_background_upload.yml b/config/metrics/settings/20210216180841_background_upload.yml
index c7b943be3b80837b3df4031834bb55e7c6d180b1..77788a696d0b7afe3e657a6178fa88433fa69b35 100644
--- a/config/metrics/settings/20210216180841_background_upload.yml
+++ b/config/metrics/settings/20210216180841_background_upload.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180843_provider.yml b/config/metrics/settings/20210216180843_provider.yml
similarity index 90%
rename from config/metrics/counts_all/20210216180843_provider.yml
rename to config/metrics/settings/20210216180843_provider.yml
index 002fb0e7186aea9ae2c38c04312830fb5ff4cda1..c2d684605cbfd194438334bba5870cb0465b2a86 100644
--- a/config/metrics/counts_all/20210216180843_provider.yml
+++ b/config/metrics/settings/20210216180843_provider.yml
@@ -5,10 +5,10 @@ product_section: enablement
 product_stage: enablement
 product_group: group::memory
 product_category: operational_metrics
-value_type: number
+value_type: string
 status: data_available
 time_frame: all
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180845_enabled.yml b/config/metrics/settings/20210216180845_enabled.yml
index 45148c406dcfde885b5bbe86f3908df3434b6e91..9b5c02e3e166782bd2f7b0d198ad067d4a67ea05 100644
--- a/config/metrics/settings/20210216180845_enabled.yml
+++ b/config/metrics/settings/20210216180845_enabled.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180847_enabled.yml b/config/metrics/settings/20210216180847_enabled.yml
index 8323bd9f5ab9a70d1ac7c1edbb0566c182a3ec8a..5babfc27fbf028be98134d4ef377ba83c833b0bc 100644
--- a/config/metrics/settings/20210216180847_enabled.yml
+++ b/config/metrics/settings/20210216180847_enabled.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180849_direct_upload.yml b/config/metrics/settings/20210216180849_direct_upload.yml
index e67b87e0bce52b6f23f7e3dc57397a909e6013be..56b17b7b44e964a869d4316da21dc6c649a968eb 100644
--- a/config/metrics/settings/20210216180849_direct_upload.yml
+++ b/config/metrics/settings/20210216180849_direct_upload.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180851_background_upload.yml b/config/metrics/settings/20210216180851_background_upload.yml
index 058c80a536dd7ada00c59fb754862ba8fa8653f7..2108d35f4bffa534a7c318856a65a69549ebce62 100644
--- a/config/metrics/settings/20210216180851_background_upload.yml
+++ b/config/metrics/settings/20210216180851_background_upload.yml
@@ -9,7 +9,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180852_provider.yml b/config/metrics/settings/20210216180852_provider.yml
similarity index 90%
rename from config/metrics/counts_all/20210216180852_provider.yml
rename to config/metrics/settings/20210216180852_provider.yml
index 0b22e1ce412fe6822047fff4f5c26d548036dff8..2d6d48d4be81613436b829d4cbbae1e2db7131ca 100644
--- a/config/metrics/counts_all/20210216180852_provider.yml
+++ b/config/metrics/settings/20210216180852_provider.yml
@@ -5,10 +5,10 @@ product_section: enablement
 product_stage: enablement
 product_group: group::memory
 product_category: operational_metrics
-value_type: number
+value_type: string
 status: data_available
 time_frame: all
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180854_enabled.yml b/config/metrics/settings/20210216180854_enabled.yml
index 40be02cb34a0d02263596e8bda83af46c7dc11af..f61f15622d742fb5d099d665eb3a673a385e8510 100644
--- a/config/metrics/settings/20210216180854_enabled.yml
+++ b/config/metrics/settings/20210216180854_enabled.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180856_enabled.yml b/config/metrics/settings/20210216180856_enabled.yml
index 0646a211e313f986cef4f9b1d4b460265241973a..1c94354afc7002450ea0e7075a2d87343878ac8a 100644
--- a/config/metrics/settings/20210216180856_enabled.yml
+++ b/config/metrics/settings/20210216180856_enabled.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180858_direct_upload.yml b/config/metrics/settings/20210216180858_direct_upload.yml
index d4f14bc35fcc7fe35d59a89396327fb3c767307c..acceccafa5fa9947f84f91d71099244900a71918 100644
--- a/config/metrics/settings/20210216180858_direct_upload.yml
+++ b/config/metrics/settings/20210216180858_direct_upload.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180900_background_upload.yml b/config/metrics/settings/20210216180900_background_upload.yml
index 850c7ae04e2e5740a8028d327687447aaaab5d0e..e9545888d6e8084da1674409a46127d962d077d7 100644
--- a/config/metrics/settings/20210216180900_background_upload.yml
+++ b/config/metrics/settings/20210216180900_background_upload.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180902_provider.yml b/config/metrics/settings/20210216180902_provider.yml
similarity index 90%
rename from config/metrics/counts_all/20210216180902_provider.yml
rename to config/metrics/settings/20210216180902_provider.yml
index e5752e274b7f19c440bff690e2abe218a3ef60c5..d275a7ea5352b6ed2596d4b2bcfb6eafe8809b05 100644
--- a/config/metrics/counts_all/20210216180902_provider.yml
+++ b/config/metrics/settings/20210216180902_provider.yml
@@ -5,10 +5,10 @@ product_section: enablement
 product_stage: enablement
 product_group: group::memory
 product_category: operational_metrics
-value_type: number
+value_type: string
 status: data_available
 time_frame: all
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180903_enabled.yml b/config/metrics/settings/20210216180903_enabled.yml
similarity index 89%
rename from config/metrics/counts_all/20210216180903_enabled.yml
rename to config/metrics/settings/20210216180903_enabled.yml
index cc97f1fbaccb8bf8bf25f4e6aab0c81d3ec734f9..5955ed2aa831dd1c99290b510dc82f11cdd9fb11 100644
--- a/config/metrics/counts_all/20210216180903_enabled.yml
+++ b/config/metrics/settings/20210216180903_enabled.yml
@@ -5,10 +5,10 @@ product_section: enablement
 product_stage: enablement
 product_group: group::memory
 product_category: operational_metrics
-value_type: number
+value_type: string
 status: data_available
 time_frame: all
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180905_enabled.yml b/config/metrics/settings/20210216180905_enabled.yml
index ef22d960a95e7ce9f1aea4af6e2a91d9e6dcab53..475a38bc1902e92ae562eee58f1a80684c6352c1 100644
--- a/config/metrics/settings/20210216180905_enabled.yml
+++ b/config/metrics/settings/20210216180905_enabled.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180907_direct_upload.yml b/config/metrics/settings/20210216180907_direct_upload.yml
index b34ab887fc64703ccaa66ef6e3fdf2b3e87cd65f..d6d8d46706b353ab5f2f8bfdd7567813ec42c3bc 100644
--- a/config/metrics/settings/20210216180907_direct_upload.yml
+++ b/config/metrics/settings/20210216180907_direct_upload.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180909_background_upload.yml b/config/metrics/settings/20210216180909_background_upload.yml
index 497f7ef7926ec842ab22b2e85a30986b4415f0ba..3f7317974c0214176f79d044a99bc0f300cf407c 100644
--- a/config/metrics/settings/20210216180909_background_upload.yml
+++ b/config/metrics/settings/20210216180909_background_upload.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180911_provider.yml b/config/metrics/settings/20210216180911_provider.yml
similarity index 90%
rename from config/metrics/counts_all/20210216180911_provider.yml
rename to config/metrics/settings/20210216180911_provider.yml
index 53286df672408686b043617422b021db0f3b6330..17cbafdd04a860e6475094a95a77832204d7be63 100644
--- a/config/metrics/counts_all/20210216180911_provider.yml
+++ b/config/metrics/settings/20210216180911_provider.yml
@@ -5,10 +5,10 @@ product_section: enablement
 product_stage: enablement
 product_group: group::memory
 product_category: operational_metrics
-value_type: number
+value_type: string
 status: data_available
 time_frame: all
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180913_enabled.yml b/config/metrics/settings/20210216180913_enabled.yml
index 732a6364a3a1733f6371c83305e09a94fb506902..e5b38853325845741a53299d86a80aeb64e66236 100644
--- a/config/metrics/settings/20210216180913_enabled.yml
+++ b/config/metrics/settings/20210216180913_enabled.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180915_enabled.yml b/config/metrics/settings/20210216180915_enabled.yml
index eb78ef5f9e945e8ab19fed3f5af0cab5ad5ff2a3..d1b2c7a3e91df6905dce72c2cbdfa3c299385b63 100644
--- a/config/metrics/settings/20210216180915_enabled.yml
+++ b/config/metrics/settings/20210216180915_enabled.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180916_direct_upload.yml b/config/metrics/settings/20210216180916_direct_upload.yml
index 20785f2f8d71a1a83d84a13cbf7cccfe9835cdec..11c70c327b2890efe45071c51d666d0893fe7883 100644
--- a/config/metrics/settings/20210216180916_direct_upload.yml
+++ b/config/metrics/settings/20210216180916_direct_upload.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/settings/20210216180918_background_upload.yml b/config/metrics/settings/20210216180918_background_upload.yml
index 3ef8daaa68525c884cd9d50a6f0037a83f3e4752..066fc31a62d8dc8ca6eee7e7a26d401b50251f23 100644
--- a/config/metrics/settings/20210216180918_background_upload.yml
+++ b/config/metrics/settings/20210216180918_background_upload.yml
@@ -8,7 +8,7 @@ product_category: operational_metrics
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180920_provider.yml b/config/metrics/settings/20210216180920_provider.yml
similarity index 90%
rename from config/metrics/counts_all/20210216180920_provider.yml
rename to config/metrics/settings/20210216180920_provider.yml
index 133b65f6d517a6b9098adf4368e7f8042246e686..94f34244840296af7df6eb24913699fbda040498 100644
--- a/config/metrics/counts_all/20210216180920_provider.yml
+++ b/config/metrics/settings/20210216180920_provider.yml
@@ -5,10 +5,10 @@ product_section: enablement
 product_stage: enablement
 product_group: group::memory
 product_category: operational_metrics
-value_type: number
+value_type: string
 status: data_available
 time_frame: all
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216183241_filesystems.yml b/config/metrics/settings/20210216183241_filesystems.yml
similarity index 92%
rename from config/metrics/counts_all/20210216183241_filesystems.yml
rename to config/metrics/settings/20210216183241_filesystems.yml
index ffb3f0d5ccac23793c93f2072ae7855e63be338f..3585fda1771fc9f8bbcc6a7c0fe9bd9afc4bbb42 100644
--- a/config/metrics/counts_all/20210216183241_filesystems.yml
+++ b/config/metrics/settings/20210216183241_filesystems.yml
@@ -8,7 +8,7 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/counts_all/20210216183248_pg_system_id.yml b/config/metrics/settings/20210216183248_pg_system_id.yml
similarity index 93%
rename from config/metrics/counts_all/20210216183248_pg_system_id.yml
rename to config/metrics/settings/20210216183248_pg_system_id.yml
index 0fd54f5856791909aebd3451273baaf12085af0d..28905c62ce0cfb8b82ca8e9fd3c635668715d115 100644
--- a/config/metrics/counts_all/20210216183248_pg_system_id.yml
+++ b/config/metrics/settings/20210216183248_pg_system_id.yml
@@ -8,7 +8,7 @@ product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/settings/20210225045628_operating_system.yml b/config/metrics/settings/20210225045628_operating_system.yml
index 0d60bc309b4db93e7809d7ddb2a0e631908ecbf5..41b65a1bd6a0cc975e362d983d9effa39d041230 100644
--- a/config/metrics/settings/20210225045628_operating_system.yml
+++ b/config/metrics/settings/20210225045628_operating_system.yml
@@ -10,7 +10,7 @@ status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54778
 time_frame: none
-data_source: ruby
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/doc/development/usage_ping/dictionary.md b/doc/development/usage_ping/dictionary.md
index 234e3d7b5f126d54a92de99bee13acc954efe80c..d45203b1c0b49e6d90b0cc1c39a7c791083e4ba9 100644
--- a/doc/development/usage_ping/dictionary.md
+++ b/doc/development/usage_ping/dictionary.md
@@ -6480,7 +6480,7 @@ Tiers: `free`, `premium`, `ultimate`
 
 TBD
 
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216183248_pg_system_id.yml)
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/settings/20210216183248_pg_system_id.yml)
 
 Group: `group::distribution`
 
@@ -6576,7 +6576,7 @@ Tiers: `free`
 
 Missing description
 
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216183241_filesystems.yml)
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/settings/20210216183241_filesystems.yml)
 
 Group: ``
 
@@ -6972,7 +6972,7 @@ Tiers: `free`, `premium`, `ultimate`
 
 What Object Storage provider has been configured for Artifacts
 
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180843_provider.yml)
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/settings/20210216180843_provider.yml)
 
 Group: `group::memory`
 
@@ -7032,7 +7032,7 @@ Tiers: `free`, `premium`, `ultimate`
 
 What Object Storage provider has been configured for External Diffs
 
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180852_provider.yml)
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/settings/20210216180852_provider.yml)
 
 Group: `group::memory`
 
@@ -7092,7 +7092,7 @@ Tiers: `free`, `premium`, `ultimate`
 
 What Object Storage provider has been configured for LFS
 
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180902_provider.yml)
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/settings/20210216180902_provider.yml)
 
 Group: `group::memory`
 
@@ -7152,7 +7152,7 @@ Tiers: `free`, `premium`, `ultimate`
 
 What Object Storage provider has been configured for Packages
 
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180920_provider.yml)
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/settings/20210216180920_provider.yml)
 
 Group: `group::memory`
 
@@ -7164,7 +7164,7 @@ Tiers: `free`, `premium`, `ultimate`
 
 Whether Object Storage is enabled for Uploads
 
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180903_enabled.yml)
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/settings/20210216180903_enabled.yml)
 
 Group: `group::memory`
 
@@ -7212,7 +7212,7 @@ Tiers: `free`, `premium`, `ultimate`
 
 What Object Storage provider has been configured for Uploads
 
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180911_provider.yml)
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/settings/20210216180911_provider.yml)
 
 Group: `group::memory`
 
diff --git a/ee/config/metrics/license/20210204124831_license_md5.yml b/ee/config/metrics/license/20210204124831_license_md5.yml
index 78052e1838d8fe597b785def2d6847e068c02ff4..925ec1405dc74fe68c4afb6a8e4378f77345d895 100644
--- a/ee/config/metrics/license/20210204124831_license_md5.yml
+++ b/ee/config/metrics/license/20210204124831_license_md5.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ee
 tier:
diff --git a/ee/config/metrics/license/20210204124833_license_id.yml b/ee/config/metrics/license/20210204124833_license_id.yml
index 751e92f59e6bc6c6a0bbd1c32910de67da88d15d..54e28e6d4a5e1ed8a20eabd1e560eccc2b90cd35 100644
--- a/ee/config/metrics/license/20210204124833_license_id.yml
+++ b/ee/config/metrics/license/20210204124833_license_id.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ee
 tier:
diff --git a/ee/config/metrics/license/20210204124835_historical_max_users.yml b/ee/config/metrics/license/20210204124835_historical_max_users.yml
index 95e95ddd9f30ce52fdec2d2007261182848b31ba..0e52310fd52d9bcfca2ec0b2b4ba52f279eaec93 100644
--- a/ee/config/metrics/license/20210204124835_historical_max_users.yml
+++ b/ee/config/metrics/license/20210204124835_historical_max_users.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ee
 tier:
diff --git a/ee/config/metrics/license/20210204124837_name.yml b/ee/config/metrics/license/20210204124837_name.yml
index 36ccf2b5acbcc8de461a893cc7649de70f8a6dec..a0826455139d108a0da58bc715ce6aa6f370f90f 100644
--- a/ee/config/metrics/license/20210204124837_name.yml
+++ b/ee/config/metrics/license/20210204124837_name.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ee
 tier:
diff --git a/ee/config/metrics/license/20210204124839_email.yml b/ee/config/metrics/license/20210204124839_email.yml
index 9855c5cc3b3ca1cc6b08f3c2ca82373e5a0e2b83..a9a668dd356f5130cbf2663ee43450f9c7550818 100644
--- a/ee/config/metrics/license/20210204124839_email.yml
+++ b/ee/config/metrics/license/20210204124839_email.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ee
 tier:
diff --git a/ee/config/metrics/license/20210204124841_company.yml b/ee/config/metrics/license/20210204124841_company.yml
index 8c2ec03592a735023346386260488c1faf9188cf..561a9f338b0f4ba3b5dae29eb94dc4e1930af700 100644
--- a/ee/config/metrics/license/20210204124841_company.yml
+++ b/ee/config/metrics/license/20210204124841_company.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ee
 tier:
diff --git a/ee/config/metrics/license/20210204124843_license_user_count.yml b/ee/config/metrics/license/20210204124843_license_user_count.yml
index 55bdb51671e8f8f6d81a461f0d076fb4c889ffa2..c8146b49d141b153a458397e55cb0696a656385a 100644
--- a/ee/config/metrics/license/20210204124843_license_user_count.yml
+++ b/ee/config/metrics/license/20210204124843_license_user_count.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source: database
+data_source: system
 distribution:
 - ee
 tier:
diff --git a/ee/config/metrics/license/20210204124845_license_starts_at.yml b/ee/config/metrics/license/20210204124845_license_starts_at.yml
index 9c7c1bb482a3f1a6d451265229a5b9250b63a830..76da8b1d396a525f2d2fc9f98d9b63b59f10edbd 100644
--- a/ee/config/metrics/license/20210204124845_license_starts_at.yml
+++ b/ee/config/metrics/license/20210204124845_license_starts_at.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ee
 tier:
diff --git a/ee/config/metrics/license/20210204124847_license_expires_at.yml b/ee/config/metrics/license/20210204124847_license_expires_at.yml
index 45d05dab406cb2ba561e94ee97768472351d9873..2b0a845f591d9ae95071adf78114a25971b3ba2c 100644
--- a/ee/config/metrics/license/20210204124847_license_expires_at.yml
+++ b/ee/config/metrics/license/20210204124847_license_expires_at.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ee
 tier:
diff --git a/ee/config/metrics/license/20210204124849_license_plan.yml b/ee/config/metrics/license/20210204124849_license_plan.yml
index e4cd8ecfb2bc3279430946982a00936fcb559963..0cd7e0e73423387561e60a19946eb6299b2049f9 100644
--- a/ee/config/metrics/license/20210204124849_license_plan.yml
+++ b/ee/config/metrics/license/20210204124849_license_plan.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ee
 tier:
diff --git a/ee/config/metrics/license/20210204124852_license_subscription_id.yml b/ee/config/metrics/license/20210204124852_license_subscription_id.yml
index 0d7832fe72b970b76c0fb676f7120e45b525e07c..464af871b2c853e28c9be45659c6e5c462648fba 100644
--- a/ee/config/metrics/license/20210204124852_license_subscription_id.yml
+++ b/ee/config/metrics/license/20210204124852_license_subscription_id.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ee
 tier:
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 d650323be228c119b95e9760795ff017c523a1b1..0ae47c05a516a0d0b055ed3c4a770d2a4408c414 100644
--- a/ee/config/metrics/license/20210204124940_recording_ee_finished_at.yml
+++ b/ee/config/metrics/license/20210204124940_recording_ee_finished_at.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ee
 tier: []
diff --git a/ee/config/metrics/settings/20210204124851_license_trial.yml b/ee/config/metrics/settings/20210204124851_license_trial.yml
index 07ebd7d7c7f42946ceee94818502856d45fdd9d1..a27c806b65aeca5f6bfe5f9bc27b52457e21f691 100644
--- a/ee/config/metrics/settings/20210204124851_license_trial.yml
+++ b/ee/config/metrics/settings/20210204124851_license_trial.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ee
 tier:
diff --git a/ee/config/metrics/settings/20210204124924_elasticsearch_enabled.yml b/ee/config/metrics/settings/20210204124924_elasticsearch_enabled.yml
index e572f2c0f2686bd94883644e490976ff1e4df60e..a7d64f906cf8c48554902108daeb5d51423d7efe 100644
--- a/ee/config/metrics/settings/20210204124924_elasticsearch_enabled.yml
+++ b/ee/config/metrics/settings/20210204124924_elasticsearch_enabled.yml
@@ -8,7 +8,7 @@ product_category: global_search
 value_type: boolean
 status: data_available
 time_frame: none
-data_source: database
+data_source: system
 distribution:
 - ee
 tier:
diff --git a/ee/config/metrics/settings/20210216180406_geo_enabled.yml b/ee/config/metrics/settings/20210216180406_geo_enabled.yml
index 58cb1595755862d9b4c99d0386ca280b93bdc787..b38433067ad6610abb5a275ab15cc4b143e748eb 100644
--- a/ee/config/metrics/settings/20210216180406_geo_enabled.yml
+++ b/ee/config/metrics/settings/20210216180406_geo_enabled.yml
@@ -8,7 +8,7 @@ product_category: geo_replication
 value_type: boolean
 status: data_available
 time_frame: none
-data_source: database
+data_source: system
 distribution:
 - ee
 tier:
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 06214b812cbef5acaabc14b4f587db79888cf32c..526395298aa66dcd56c26ba8253addfcb433f9b8 100644
--- a/ee/config/metrics/settings/20210216180809_ldap_group_sync_enabled.yml
+++ b/ee/config/metrics/settings/20210216180809_ldap_group_sync_enabled.yml
@@ -8,7 +8,7 @@ product_category:
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ee
 tier: []
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 9232271338ebc683f538295f8887deae67526aac..3e0ef1acb31e31d949c53fad0b0fd6689cf1186e 100644
--- a/ee/config/metrics/settings/20210216180811_ldap_admin_sync_enabled.yml
+++ b/ee/config/metrics/settings/20210216180811_ldap_admin_sync_enabled.yml
@@ -8,7 +8,7 @@ product_category:
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ee
 tier: []
diff --git a/ee/config/metrics/settings/20210216180813_group_saml_enabled.yml b/ee/config/metrics/settings/20210216180813_group_saml_enabled.yml
index 6889be627fd2a05dbd65e4dc0d367bc470c45024..776fe5a617beac45d5f78326612c2812d7f5c526 100644
--- a/ee/config/metrics/settings/20210216180813_group_saml_enabled.yml
+++ b/ee/config/metrics/settings/20210216180813_group_saml_enabled.yml
@@ -8,7 +8,7 @@ product_category:
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ee
 tier:
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 4720b868cb741c67c28bb1fd26ae2eb524eb5c18..08ed08ad4f2addb908b45ab9f5b103ebd108805a 100644
--- a/ee/config/metrics/settings/20210216180829_ldap_group_sync_enabled.yml
+++ b/ee/config/metrics/settings/20210216180829_ldap_group_sync_enabled.yml
@@ -8,7 +8,7 @@ product_category:
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ee
 tier: []
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 3e6a66bad4ab5e5e74a5a974e4c3507298bd7b13..1bd15409c56ecfdb0adc6a1f3d29ebbb609bfcfe 100644
--- a/ee/config/metrics/settings/20210216180831_ldap_admin_sync_enabled.yml
+++ b/ee/config/metrics/settings/20210216180831_ldap_admin_sync_enabled.yml
@@ -8,7 +8,7 @@ product_category:
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ee
 tier: []
diff --git a/ee/config/metrics/settings/20210216180833_group_saml_enabled.yml b/ee/config/metrics/settings/20210216180833_group_saml_enabled.yml
index 999b14fa80b89142ca53bcf9997bc6aeda28d5b1..81892bdbd46c08e950d51986bc8b4f93ca24f275 100644
--- a/ee/config/metrics/settings/20210216180833_group_saml_enabled.yml
+++ b/ee/config/metrics/settings/20210216180833_group_saml_enabled.yml
@@ -8,7 +8,7 @@ product_category:
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ee
 tier: []