Merge branch '322557-add-system-as-a-data_source-for-metrics-definition' into 'master'

Add system as a data_source and update metric definitions See merge request gitlab-org/gitlab!61011

Merge branch '322557-add-system-as-a-data_source-for-metrics-definition' into 'master'
Add system as a data_source and update metric definitions See merge request gitlab-org/gitlab!61011
41762757 · Etienne Baqué · 88409eef · 3bcc2628 · 41762757 · 41762757
Commit 41762757 authored May 11, 2021 by Etienne Baqué
83 changed files
--- 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

--- 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: ruby
+data_source: system
 instrumentation_class: 'Gitlab::Usage::Metrics::Instrumentations::HostnameMetric'
 distribution:
 - ce

--- 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:

--- 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:

--- 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:

--- 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

--- 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

--- 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

--- 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:

--- 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:

--- a/config/metrics/schema.json
+++ b/config/metrics/schema.json
@@ -52,7 +52,7 @@
    },
    "data_source": {
      "type": "string",
-      "enum": ["database", "redis", "redis_hll", "prometheus", "ruby"]
+      "enum": ["database", "redis", "redis_hll", "prometheus", "system"]
    },
    "instrumentation_class": {
      "type": "string",

--- 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

--- 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

--- 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:

--- 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:

--- 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

--- 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:

--- 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:

--- 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:

--- 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:

--- 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:

--- 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:

--- 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:

--- 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

--- 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:

--- 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:

--- 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:

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- a/config/metrics/counts_all/20210216180843_provider.yml
+++ b/config/metrics/counts_all/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

--- 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

--- 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

--- 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

--- 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

--- a/config/metrics/counts_all/20210216180852_provider.yml
+++ b/config/metrics/counts_all/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

--- 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

--- 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

--- 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

--- 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

--- a/config/metrics/counts_all/20210216180902_provider.yml
+++ b/config/metrics/counts_all/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

--- a/config/metrics/counts_all/20210216180903_enabled.yml
+++ b/config/metrics/counts_all/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

--- 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

--- 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

--- 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

--- a/config/metrics/counts_all/20210216180911_provider.yml
+++ b/config/metrics/counts_all/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

--- 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

--- 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

--- 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

--- 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

--- a/config/metrics/counts_all/20210216180920_provider.yml
+++ b/config/metrics/counts_all/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

--- a/config/metrics/counts_all/20210216183241_filesystems.yml
+++ b/config/metrics/counts_all/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:

--- a/config/metrics/counts_all/20210216183248_pg_system_id.yml
+++ b/config/metrics/counts_all/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:

--- 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

--- a/doc/development/usage_ping/dictionary.md
+++ b/doc/development/usage_ping/dictionary.md
@@ -6494,7 +6494,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`

@@ -6590,7 +6590,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: ``

@@ -6986,7 +6986,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`

@@ -7046,7 +7046,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`

@@ -7106,7 +7106,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`

@@ -7166,7 +7166,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`

@@ -7178,7 +7178,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`

@@ -7226,7 +7226,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`


--- a/doc/development/usage_ping/metrics_dictionary.md
+++ b/doc/development/usage_ping/metrics_dictionary.md
@@ -36,7 +36,7 @@ Each metric is defined in a separate YAML file consisting of a number of fields:
 | `value_type`        | yes      | `string`; one of [`string`, `number`, `boolean`, `object`](https://json-schema.org/understanding-json-schema/reference/type.html).                                                     |
 | `status`            | yes      | `string`; [status](#metric-statuses) of the metric, may be set to `data_available`, `implemented`, `not_used`, `deprecated`, `removed`. |
 | `time_frame`        | yes      | `string`; may be set to a value like `7d`, `28d`, `all`, `none`. |
-| `data_source`       | yes      | `string`; may be set to a value like `database`, `redis`, `redis_hll`, `prometheus`, `ruby`. |
+| `data_source`       | yes      | `string`; may be set to a value like `database`, `redis`, `redis_hll`, `prometheus`, `system`. |
 | `instrumentation_class` | no   | `string`; [the class that implements the metric](metrics_instrumentation.md).  |
 | `distribution`      | yes      | `array`; may be set to one of `ce, ee` or `ee`. The [distribution](https://about.gitlab.com/handbook/marketing/strategic-marketing/tiers/#definitions) where the tracked feature is available.  |
 | `tier`              | yes      | `array`; may be set to one of `free, premium, ultimate`, `premium, ultimate` or `ultimate`. The [tier]( https://about.gitlab.com/handbook/marketing/strategic-marketing/tiers/) where the tracked feature is available. |
@@ -121,10 +121,10 @@ only the single prompt to be replaced by the person working with metrics YAML.
  `{subject}_{verb}{ing|ed}_{object}`, such as `user_creating_epics`, `users_triggering_security_scans`,
  or `merge_requests_viewed_in_single_file_mode`

-#### Metric with `data_source: prometheus` or `ruby`
+#### Metric with `data_source: prometheus` or `system`

-For metrics instrumented with Prometheus or Ruby, the suggested name includes only
-the single prompt by person working with metrics YAML.
+For metrics instrumented with Prometheus or coming from the operating system,
+the suggested name includes only the single prompt by person working with metrics YAML.

 - **Prompt**: `<please fill metric name>`
 - **Final metric name**: Due to the variety of cases that can apply to this kind of metric,

--- 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:

--- 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:

--- 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:

--- 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:

--- 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:

--- 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:

--- 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:

--- 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:

--- 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:

--- 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:

--- 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:

--- 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: []

--- 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:

--- 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:

--- 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:

--- 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: []

--- 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: []

--- 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:

--- 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: []

--- 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: []

--- 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: []