Merge branch 'dorrino-master-patch-64254' into 'master'

Update metrics definition - edition

See merge request gitlab-org/gitlab!59507

config/metrics/license/20210216175604_edition.yml → config/metrics/settings/20210216175604_edition.yml

 ---
 key_path: edition
-description: Edition of GitLab such as EE, CE, Bronze, Silver, Gold
+description: Edition of GitLab such as EE or CE
 product_section: enablement
 product_stage: enablement
 product_group: group::distribution
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: ruby
 distribution:
 - ce
 - ee
@@ -16,4 +16,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
+

doc/development/usage_ping/dictionary.md

@@ -6382,7 +6382,7 @@ Tiers: `free`
 
 ### `edition`
 
-Edition of GitLab such as EE, CE, Bronze, Silver, Gold
+Edition of GitLab such as EE or CE
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/license/20210216175604_edition.yml)