From df56cd9f6edd1de2991d26475403ab86f157bbd9 Mon Sep 17 00:00:00 2001
From: Piotr Skorupa <pskorupa@gitlab.com>
Date: Thu, 6 May 2021 14:33:54 +0200
Subject: [PATCH] Update metric definitions to include system data_source

This adds `data_source: system` for metrics whose data comes from the
underlying operating system. Also, moves a few setting metrics that were
in the wrong metric subfolder and fixes some `value_type` entries.
---
 .../license/20210201124932_recorded_at.yml       |  2 +-
 .../metrics/license/20210204124827_hostname.yml  |  2 +-
 .../20210204124926_license_trial_ends_on.yml     |  2 +-
 .../metrics/license/20210204124928_version.yml   |  2 +-
 .../metrics/license/20210204124936_version.yml   |  2 +-
 .../20210204124938_recording_ce_finished_at.yml  |  2 +-
 .../metrics/license/20210216175601_version.yml   |  2 +-
 .../license/20210216175602_installation_type.yml |  2 +-
 .../metrics/license/20210216181053_version.yml   |  2 +-
 .../metrics/license/20210216183237_version.yml   |  2 +-
 .../settings/20210201124935_database_adapter.yml |  2 +-
 ...210204124856_instance_auto_devops_enabled.yml |  2 +-
 ...20210204124858_container_registry_enabled.yml |  2 +-
 .../20210204124900_dependency_proxy_enabled.yml  |  2 +-
 ...10204124902_gitlab_shared_runners_enabled.yml |  2 +-
 .../settings/20210204124904_gravatar_enabled.yml |  2 +-
 .../settings/20210204124906_ldap_enabled.yml     |  2 +-
 .../20210204124908_mattermost_enabled.yml        |  2 +-
 .../settings/20210204124910_omniauth_enabled.yml |  2 +-
 .../20210204124912_prometheus_enabled.yml        |  2 +-
 ...20210204124914_prometheus_metrics_enabled.yml |  2 +-
 .../20210204124916_reply_by_email_enabled.yml    |  2 +-
 .../settings/20210204124918_signup_enabled.yml   |  2 +-
 ...124920_web_ide_clientside_preview_enabled.yml |  2 +-
 .../20210204124922_grafana_link_enabled.yml      |  2 +-
 .../metrics/settings/20210204124934_enabled.yml  |  2 +-
 .../settings/20210216174829_smtp_server.yml      |  2 +-
 ...0210216175459_ingress_modsecurity_enabled.yml |  2 +-
 .../metrics/settings/20210216175604_edition.yml  |  2 +-
 ...0216175606_ldap_encrypted_secrets_enabled.yml |  2 +-
 .../settings/20210216180314_gitpod_enabled.yml   |  2 +-
 .../metrics/settings/20210216180836_enabled.yml  |  2 +-
 .../metrics/settings/20210216180838_enabled.yml  |  2 +-
 .../settings/20210216180840_direct_upload.yml    |  2 +-
 .../20210216180841_background_upload.yml         |  2 +-
 .../20210216180843_provider.yml                  |  4 ++--
 .../metrics/settings/20210216180845_enabled.yml  |  2 +-
 .../metrics/settings/20210216180847_enabled.yml  |  2 +-
 .../settings/20210216180849_direct_upload.yml    |  2 +-
 .../20210216180851_background_upload.yml         |  2 +-
 .../20210216180852_provider.yml                  |  4 ++--
 .../metrics/settings/20210216180854_enabled.yml  |  2 +-
 .../metrics/settings/20210216180856_enabled.yml  |  2 +-
 .../settings/20210216180858_direct_upload.yml    |  2 +-
 .../20210216180900_background_upload.yml         |  2 +-
 .../20210216180902_provider.yml                  |  4 ++--
 .../20210216180903_enabled.yml                   |  4 ++--
 .../metrics/settings/20210216180905_enabled.yml  |  2 +-
 .../settings/20210216180907_direct_upload.yml    |  2 +-
 .../20210216180909_background_upload.yml         |  2 +-
 .../20210216180911_provider.yml                  |  4 ++--
 .../metrics/settings/20210216180913_enabled.yml  |  2 +-
 .../metrics/settings/20210216180915_enabled.yml  |  2 +-
 .../settings/20210216180916_direct_upload.yml    |  2 +-
 .../20210216180918_background_upload.yml         |  2 +-
 .../20210216180920_provider.yml                  |  4 ++--
 .../20210216183241_filesystems.yml               |  2 +-
 .../20210216183248_pg_system_id.yml              |  2 +-
 .../settings/20210225045628_operating_system.yml |  2 +-
 doc/development/usage_ping/dictionary.md         | 16 ++++++++--------
 .../license/20210204124831_license_md5.yml       |  2 +-
 .../license/20210204124833_license_id.yml        |  2 +-
 .../20210204124835_historical_max_users.yml      |  2 +-
 .../metrics/license/20210204124837_name.yml      |  2 +-
 .../metrics/license/20210204124839_email.yml     |  2 +-
 .../metrics/license/20210204124841_company.yml   |  2 +-
 .../20210204124843_license_user_count.yml        |  2 +-
 .../license/20210204124845_license_starts_at.yml |  2 +-
 .../20210204124847_license_expires_at.yml        |  2 +-
 .../license/20210204124849_license_plan.yml      |  2 +-
 .../20210204124852_license_subscription_id.yml   |  2 +-
 .../20210204124940_recording_ee_finished_at.yml  |  2 +-
 .../settings/20210204124851_license_trial.yml    |  2 +-
 .../20210204124924_elasticsearch_enabled.yml     |  2 +-
 .../settings/20210216180406_geo_enabled.yml      |  2 +-
 .../20210216180809_ldap_group_sync_enabled.yml   |  2 +-
 .../20210216180811_ldap_admin_sync_enabled.yml   |  2 +-
 .../20210216180813_group_saml_enabled.yml        |  2 +-
 .../20210216180829_ldap_group_sync_enabled.yml   |  2 +-
 .../20210216180831_ldap_admin_sync_enabled.yml   |  2 +-
 .../20210216180833_group_saml_enabled.yml        |  2 +-
 81 files changed, 94 insertions(+), 94 deletions(-)
 rename config/metrics/{counts_all => settings}/20210216180843_provider.yml (90%)
 rename config/metrics/{counts_all => settings}/20210216180852_provider.yml (90%)
 rename config/metrics/{counts_all => settings}/20210216180902_provider.yml (90%)
 rename config/metrics/{counts_all => settings}/20210216180903_enabled.yml (89%)
 rename config/metrics/{counts_all => settings}/20210216180911_provider.yml (90%)
 rename config/metrics/{counts_all => settings}/20210216180920_provider.yml (90%)
 rename config/metrics/{counts_all => settings}/20210216183241_filesystems.yml (92%)
 rename config/metrics/{counts_all => settings}/20210216183248_pg_system_id.yml (93%)

diff --git a/config/metrics/license/20210201124932_recorded_at.yml b/config/metrics/license/20210201124932_recorded_at.yml
index 4b9cfc900d6d5..88f27fff377d9 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 6f878f04863d1..2d8942b1d488d 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 e3c3303975f26..fb9ec099a4614 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 b39552b220e0e..9aea9f8fde588 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 2d161e15fd0fe..ef87a6ed9e660 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 b1fd0589e4a7c..d07580730c1cb 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 b3099eb76bdd4..5e5c1ad05ec52 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 ae5f26ff0a2d8..6e907b4a823b7 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 3570a041b8f5a..824167c8d9750 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 4f74963801a13..69d97e17f20d0 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 020325995b12c..66a9e5fd52a7b 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 bda8d4f856d49..dc6db53f8ab79 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 6c50cb9144e29..d8a47a39912a2 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 01feb7157d93c..f7aa195f28462 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 5ec4b9fdc09ed..2b6f1d41413ac 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 21758753b35d3..b0280347b9f5d 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 6dc1a62d3374d..589897fb15b6f 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 425f3c445116a..a3c88cf976e1e 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 f9e691b0516db..67d1515abc564 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 ca829933eda56..092f273e23736 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 f9566076c9e02..43a13aff5e184 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 f2fb58e33ec74..40b863cd225aa 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 36e228bf9277f..b63a571c6b9e1 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 4f21c0f2f18c6..bfb143d2013d1 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 90f825dfc365a..c7e971f1a2787 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 2f2586ad8f45d..def857192eb9c 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 afee13f5534eb..c3aa121a826a6 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 ee3741581b4be..f76bd0593b650 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 c06c494d68823..58d61ad5d8813 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 37b12a982bb09..dfc7222ebcf43 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 f716f3985f669..0bad75fe3db03 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 1e7e5a226c279..df71de8d4c25f 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 8524f52591734..7bb1135ee0886 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 08ef5e1ece131..788d101ba2275 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 c7b943be3b808..77788a696d0b7 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 002fb0e7186ae..c2d684605cbfd 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 45148c406dcfd..9b5c02e3e1667 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 8323bd9f5ab9a..5babfc27fbf02 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 e67b87e0bce52..56b17b7b44e96 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 058c80a536dd7..2108d35f4bffa 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 0b22e1ce412fe..2d6d48d4be816 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 40be02cb34a0d..f61f15622d742 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 0646a211e313f..1c94354afc700 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 d4f14bc35fcc7..acceccafa5fa9 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 850c7ae04e2e5..e9545888d6e80 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 e5752e274b7f1..d275a7ea5352b 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 cc97f1fbaccb8..5955ed2aa831d 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 ef22d960a95e7..475a38bc1902e 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 b34ab887fc647..d6d8d46706b35 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 497f7ef7926ec..3f7317974c021 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 53286df672408..17cbafdd04a86 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 732a6364a3a17..e5b3885332584 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 eb78ef5f9e945..d1b2c7a3e91df 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 20785f2f8d71a..11c70c327b289 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 3ef8daaa68525..066fc31a62d8d 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 133b65f6d517a..94f3424484029 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 ffb3f0d5ccac2..3585fda1771fc 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 0fd54f5856791..28905c62ce0cf 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 0d60bc309b4db..41b65a1bd6a0c 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 234e3d7b5f126..d45203b1c0b49 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 78052e1838d8f..925ec1405dc74 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 751e92f59e6bc..54e28e6d4a5e1 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 95e95ddd9f30c..0e52310fd52d9 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 36ccf2b5acbcc..a0826455139d1 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 9855c5cc3b3ca..a9a668dd356f5 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 8c2ec03592a73..561a9f338b0f4 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 55bdb51671e8f..c8146b49d141b 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 9c7c1bb482a3f..76da8b1d396a5 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 45d05dab406cb..2b0a845f591d9 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 e4cd8ecfb2bc3..0cd7e0e734233 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 0d7832fe72b97..464af871b2c85 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 d650323be228c..0ae47c05a516a 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 07ebd7d7c7f42..a27c806b65aec 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 e572f2c0f2686..a7d64f906cf8c 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 58cb159575586..b38433067ad66 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 06214b812cbef..526395298aa66 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 9232271338ebc..3e0ef1acb31e3 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 6889be627fd2a..776fe5a617bea 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 4720b868cb741..08ed08ad4f2ad 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 3e6a66bad4ab5..1bd15409c56ec 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 999b14fa80b89..81892bdbd46c0 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: []
-- 
GitLab