Merge branch '332863-update-subscription-metrics-data-category' into 'master'

Update Subscription data_category metrics

See merge request gitlab-org/gitlab!65215

config/metrics/license/20210204124829_active_user_count.yml

 ---
-data_category: Optional
 key_path: active_user_count
 description: The number of active users existing in the instance. This is named the instance_user_count in the Versions application.
 product_section: growth
@@ -8,6 +7,7 @@ product_group: group::product intelligence
 product_category: collection
 value_type: string
 status: data_available
+data_category: Subscription
 time_frame: none
 data_source: database
 distribution:

doc/development/usage_ping/dictionary.md

@@ -42,7 +42,7 @@ The number of active users existing in the instance. This is named the instance_
 
 Group: `group::product intelligence`
 
-Data Category: `Optional`
+Data Category: `Subscription`
 
 Status: `data_available`
 
@@ -3836,7 +3836,7 @@ Count of License Scanning jobs run
 
 Group: `group::composition analysis`
 
-Data Category: `Optional`
+Data Category: `Subscription`
 
 Status: `data_available`
 
@@ -8288,7 +8288,7 @@ The peak active user count. Active is defined in UsersStatistics model.
 
 Group: `group::license`
 
-Data Category: `Optional`
+Data Category: `Subscription`
 
 Status: `data_available`
 
@@ -8386,7 +8386,7 @@ The date the license ends
 
 Group: `group::license`
 
-Data Category: `Optional`
+Data Category: `Subscription`
 
 Status: `data_available`
 
@@ -8400,7 +8400,7 @@ The ID of the license
 
 Group: `group::license`
 
-Data Category: `Optional`
+Data Category: `Subscription`
 
 Status: `data_available`
 
@@ -8428,7 +8428,7 @@ The plan of the GitLab license
 
 Group: `group::license`
 
-Data Category: `Optional`
+Data Category: `Subscription`
 
 Status: `data_available`
 
@@ -8442,7 +8442,7 @@ The date the license starts
 
 Group: `group::license`
 
-Data Category: `Optional`
+Data Category: `Subscription`
 
 Status: `data_available`
 
@@ -8470,7 +8470,7 @@ Whether this is a trial license or not
 
 Group: `group::license`
 
-Data Category: `Optional`
+Data Category: `Subscription`
 
 Status: `data_available`
 
@@ -8484,7 +8484,7 @@ Date the trial license ends on
 
 Group: `group::license`
 
-Data Category: `Optional`
+Data Category: `Subscription`
 
 Status: `data_available`
 
@@ -8498,7 +8498,7 @@ The number of seats included in the license
 
 Group: `group::license`
 
-Data Category: `Optional`
+Data Category: `Subscription`
 
 Status: `data_available`
 
@@ -8512,7 +8512,7 @@ Company on the GitLab license
 
 Group: `group::license`
 
-Data Category: `Optional`
+Data Category: `Subscription`
 
 Status: `data_available`
 
@@ -8526,7 +8526,7 @@ Email on the GitLab license
 
 Group: `group::license`
 
-Data Category: `Optional`
+Data Category: `Subscription`
 
 Status: `data_available`
 
@@ -8540,7 +8540,7 @@ Name on the GitLab license
 
 Group: `group::license`
 
-Data Category: `Optional`
+Data Category: `Subscription`
 
 Status: `data_available`
 
@@ -9002,7 +9002,7 @@ When the EE-specific features were computed
 
 Group: `group::product intelligence`
 
-Data Category: `Optional`
+Data Category: `Subscription`
 
 Status: `data_available`
 

ee/config/metrics/counts_all/20210204124854_license_management_jobs.yml

 ---
-data_category: Optional
 key_path: counts.license_management_jobs
 description: Count of License Scanning jobs run
 product_section: sec
@@ -10,6 +9,7 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
+data_category: Subscription
 distribution:
 - ee
 tier:

ee/config/metrics/license/20210204124833_license_id.yml

 ---
-data_category: Optional
 key_path: license_id
 description: The ID of the license
 product_section: fulfillment
@@ -10,6 +9,7 @@ value_type: number
 status: data_available
 time_frame: none
 data_source: license
+data_category: Subscription
 distribution:
 - ee
 tier:

ee/config/metrics/license/20210204124835_historical_max_users.yml

 ---
-data_category: Optional
 key_path: historical_max_users
 description: The peak active user count. Active is defined in UsersStatistics model.
 product_section: fulfillment
@@ -10,6 +9,7 @@ value_type: number
 status: data_available
 time_frame: none
 data_source: database
+data_category: Subscription
 distribution:
 - ee
 tier:

ee/config/metrics/license/20210204124837_name.yml

 ---
-data_category: Optional
 key_path: licensee.Name
 description: Name on the GitLab license
 product_section: fulfillment
@@ -10,6 +9,7 @@ value_type: string
 status: data_available
 time_frame: none
 data_source: license
+data_category: Subscription
 distribution:
 - ee
 tier:

ee/config/metrics/license/20210204124839_email.yml

 ---
-data_category: Optional
 key_path: licensee.Email
 description: Email on the GitLab license
 product_section: fulfillment
@@ -10,6 +9,7 @@ value_type: string
 status: data_available
 time_frame: none
 data_source: license
+data_category: Subscription
 distribution:
 - ee
 tier:

ee/config/metrics/license/20210204124841_company.yml

 ---
-data_category: Optional
 key_path: licensee.Company
 description: Company on the GitLab license
 product_section: fulfillment
@@ -10,6 +9,7 @@ value_type: string
 status: data_available
 time_frame: none
 data_source: license
+data_category: Subscription
 distribution:
 - ee
 tier:

ee/config/metrics/license/20210204124843_license_user_count.yml

 ---
-data_category: Optional
 key_path: license_user_count
 description: The number of seats included in the license
 product_section: fulfillment
@@ -10,6 +9,7 @@ value_type: number
 status: data_available
 time_frame: none
 data_source: license
+data_category: Subscription
 distribution:
 - ee
 tier:

ee/config/metrics/license/20210204124845_license_starts_at.yml

 ---
-data_category: Optional
 key_path: license_starts_at
 description: The date the license starts
 product_section: fulfillment
@@ -10,6 +9,7 @@ value_type: string
 status: data_available
 time_frame: none
 data_source: license
+data_category: Subscription
 distribution:
 - ee
 tier:

ee/config/metrics/license/20210204124847_license_expires_at.yml

 ---
-data_category: Optional
 key_path: license_expires_at
 description: The date the license ends
 product_section: fulfillment
@@ -8,6 +7,7 @@ product_group: group::license
 product_category: license
 value_type: string
 status: data_available
+data_category: Subscription
 time_frame: none
 data_source: license
 distribution:

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

 ---
-data_category: Optional
 key_path: license_plan
 description: The plan of the GitLab license
 product_section: fulfillment
@@ -10,6 +9,7 @@ value_type: string
 status: data_available
 time_frame: none
 data_source: license
+data_category: Subscription
 distribution:
 - ee
 tier:

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

 ---
-data_category: Optional
 key_path: license_trial
 description: Whether this is a trial license or not
 product_section: fulfillment
@@ -10,6 +9,7 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source: license
+data_category: Subscription
 distribution:
 - ee
 tier:

ee/config/metrics/license/20210204124926_license_trial_ends_on.yml

 ---
-data_category: Optional
 key_path: license_trial_ends_on
 description: Date the trial license ends on
 product_section: fulfillment
@@ -10,6 +9,7 @@ value_type: string
 status: data_available
 time_frame: none
 data_source: database
+data_category: Subscription
 distribution:
 - ee
 tier:

ee/config/metrics/license/20210204124940_recording_ee_finished_at.yml

 ---
-data_category: Optional
 key_path: recording_ee_finished_at
 description: When the EE-specific features were computed
 product_section: growth
@@ -10,6 +9,7 @@ value_type: string
 status: data_available
 time_frame: none
 data_source: system
+data_category: Subscription
 distribution:
 - ee
 tier: