Merge branch '322708-update-usage-ping-2' into 'master'

Update license_trial usage ping

See merge request gitlab-org/gitlab!63602

doc/development/usage_ping/dictionary.md

@@ -7262,9 +7262,9 @@ Tiers: `premium`, `ultimate`
 
 Whether this is a trial license or not
 
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/settings/20210204124851_license_trial.yml)
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124851_license_trial.yml)
 
-Group: `group::product intelligence`
+Group: `group::license`
 
 Status: `data_available`
 

ee/config/metrics/license/20210204124849_license_plan.yml

@@ -14,4 +14,3 @@ distribution:
 tier:
 - premium
 - ultimate
-skip_validation: true

ee/config/metrics/settings/20210204124851_license_trial.yml → ee/config/metrics/license/20210204124851_license_trial.yml

 ---
 key_path: license_trial
 description: Whether this is a trial license or not
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
+product_section: fulfillment
+product_stage: fulfillment
+product_group: group::license
+product_category: license
 value_type: boolean
 status: data_available
 time_frame: none
-data_source: system
+data_source: license
 distribution:
 - ee
 tier:
 - premium
 - ultimate
-skip_validation: true