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

Update Usage Ping Metrics Definitions for group::license

See merge request gitlab-org/gitlab!63409

config/metrics/license/20210204124829_active_user_count.yml

 ---
 key_path: active_user_count
-description: This is named the instance_user_count in the Versions application.
+description: The number of active users existing in the instance. This is named the instance_user_count in the Versions application.
 product_section: growth
 product_stage: growth
 product_group: group::product intelligence
@@ -16,4 +16,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557

config/metrics/schema.json

@@ -55,7 +55,7 @@
     },
     "data_source": {
       "type": "string",
-      "enum": ["database", "redis", "redis_hll", "prometheus", "system"]
+      "enum": ["database", "redis", "redis_hll", "prometheus", "system", "license"]
     },
     "instrumentation_class": {
       "type": "string",

doc/development/usage_ping/dictionary.md

@@ -36,7 +36,7 @@ was released.
 
 ### `active_user_count`
 
-This is named the instance_user_count in the Versions application.
+The number of active users existing in the instance. This is named the instance_user_count in the Versions application.
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/license/20210204124829_active_user_count.yml)
 
@@ -7104,11 +7104,11 @@ Tiers: `free`, `premium`, `ultimate`
 
 ### `historical_max_users`
 
-The maximum active user count. Active is defined in UsersStatistics model.
+The peak active user count. Active is defined in UsersStatistics model.
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124835_historical_max_users.yml)
 
-Group: `group::product intelligence`
+Group: `group::license`
 
 Status: `data_available`
 
@@ -7192,7 +7192,7 @@ The date the license ends
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124847_license_expires_at.yml)
 
-Group: `group::product intelligence`
+Group: `group::license`
 
 Status: `data_available`
 
@@ -7204,7 +7204,7 @@ The ID of the license
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124833_license_id.yml)
 
-Group: `group::product intelligence`
+Group: `group::license`
 
 Status: `data_available`
 
@@ -7212,15 +7212,15 @@ Tiers: `premium`, `ultimate`
 
 ### `license_md5`
 
-The license key of the GitLab instance
+The MD5 hash of license key of the GitLab instance
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124831_license_md5.yml)
 
-Group: `group::product intelligence`
+Group: `group::license`
 
 Status: `data_available`
 
-Tiers: `free`, `premium`, `ultimate`
+Tiers: `premium`, `ultimate`
 
 ### `license_plan`
 
@@ -7228,7 +7228,7 @@ The plan of the GitLab license
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124849_license_plan.yml)
 
-Group: `group::product intelligence`
+Group: `group::license`
 
 Status: `data_available`
 
@@ -7240,7 +7240,7 @@ The date the license starts
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124845_license_starts_at.yml)
 
-Group: `group::product intelligence`
+Group: `group::license`
 
 Status: `data_available`
 
@@ -7252,7 +7252,7 @@ Licese zuora_subscription_id
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124852_license_subscription_id.yml)
 
-Group: `group::product intelligence`
+Group: `group::license`
 
 Status: `data_available`
 
@@ -7272,23 +7272,23 @@ Tiers: `premium`, `ultimate`
 
 ### `license_trial_ends_on`
 
-Date the license ends on
+Date the trial license ends on
 
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/license/20210204124926_license_trial_ends_on.yml)
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124926_license_trial_ends_on.yml)
 
-Group: `group::product intelligence`
+Group: `group::license`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `license_user_count`
 
-The number of users included in the license
+The number of seats included in the license
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124843_license_user_count.yml)
 
-Group: `group::product intelligence`
+Group: `group::license`
 
 Status: `data_available`
 
@@ -7300,7 +7300,7 @@ Company on the GitLab license
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124841_company.yml)
 
-Group: `group::product intelligence`
+Group: `group::license`
 
 Status: `data_available`
 
@@ -7312,7 +7312,7 @@ Email on the GitLab license
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124839_email.yml)
 
-Group: `group::product intelligence`
+Group: `group::license`
 
 Status: `data_available`
 
@@ -7324,7 +7324,7 @@ Name on the GitLab license
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210204124837_name.yml)
 
-Group: `group::product intelligence`
+Group: `group::license`
 
 Status: `data_available`
 

ee/config/metrics/license/20210204124831_license_md5.yml

 ---
 key_path: license_md5
-description: The license key of the GitLab instance
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
+description: The MD5 hash of license key of the GitLab instance
+product_section: fulfillment
+product_stage: fulfillment
+product_group: group::license
+product_category: license
 value_type: string
 status: data_available
 time_frame: none
-data_source: system
+data_source: license
 distribution:
 - ee
 tier:
-- free
 - premium
 - ultimate
-skip_validation: true
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557

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

 ---
 key_path: license_id
 description: The ID of the license
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
-value_type: string
+product_section: fulfillment
+product_stage: fulfillment
+product_group: group::license
+product_category: license
+value_type: number
 status: data_available
 time_frame: none
-data_source: system
+data_source: license
 distribution:
 - ee
 tier:
 - premium
 - ultimate
-skip_validation: true

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

 ---
 key_path: historical_max_users
-description: The maximum active user count. Active is defined in UsersStatistics model.
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
-value_type: string
+description: The peak active user count. Active is defined in UsersStatistics model.
+product_section: fulfillment
+product_stage: fulfillment
+product_group: group::license
+product_category: license
+value_type: number
 status: data_available
 time_frame: none
-data_source: system
+data_source: database
 distribution:
 - ee
 tier:
 - premium
 - ultimate
-skip_validation: true
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557

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

 ---
 key_path: licensee.Name
 description: Name on the GitLab license
-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: string
 status: data_available
 time_frame: none
-data_source: system
+data_source: license
 distribution:
 - ee
 tier:
 - premium
 - ultimate
-skip_validation: true
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557

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

 ---
 key_path: licensee.Email
 description: Email on the GitLab license
-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: string
 status: data_available
 time_frame: none
-data_source: system
+data_source: license
 distribution:
 - ee
 tier:
 - premium
 - ultimate
-skip_validation: true
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557

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

 ---
 key_path: licensee.Company
 description: Company on the GitLab license
-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: string
 status: data_available
 time_frame: none
-data_source: system
+data_source: license
 distribution:
 - ee
 tier:
 - premium
 - ultimate
-skip_validation: true
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557

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

 ---
 key_path: license_user_count
-description: The number of users included in the license
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
-value_type: string
+description: The number of seats included in the license
+product_section: fulfillment
+product_stage: fulfillment
+product_group: group::license
+product_category: license
+value_type: number
 status: data_available
 time_frame: none
-data_source: system
+data_source: license
 distribution:
 - ee
 tier:
 - premium
 - ultimate
-skip_validation: true
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557

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

 ---
 key_path: license_starts_at
 description: The date the license starts
-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: string
 status: data_available
 time_frame: none
-data_source: system
+data_source: license
 distribution:
 - ee
 tier:
 - premium
 - ultimate
-skip_validation: true
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557

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

 ---
 key_path: license_expires_at
 description: The date the license ends
-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: string
 status: data_available
 time_frame: none
-data_source: system
+data_source: license
 distribution:
 - ee
 tier:
 - premium
 - ultimate
-skip_validation: true
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557

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

 ---
 key_path: license_plan
 description: The plan of the GitLab license
-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: string
 status: data_available
 time_frame: none
-data_source: system
+data_source: license
 distribution:
 - ee
 tier:

ee/config/metrics/license/20210204124852_license_subscription_id.yml

 ---
 key_path: license_subscription_id
 description: Licese zuora_subscription_id
-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: string
 status: data_available
 time_frame: none
-data_source: system
+data_source: license
 distribution:
 - ee
 tier:
 - premium
 - ultimate
-skip_validation: true

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

 ---
 key_path: license_trial_ends_on
-description: Date the license ends on
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
+description: Date the trial license ends on
+product_section: fulfillment
+product_stage: fulfillment
+product_group: group::license
+product_category: license
 value_type: string
 status: data_available
 time_frame: none
-data_source: system
+data_source: database
 distribution:
-- ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/22279