10 files changed, 145 insertions, 26 deletions
diff --git a/config/metrics/license/recorded_at.yml b/config/metrics/license/20210201124932_recorded_at.yml
index 5b2b3b37290..af60dcb329e 100644
--- a/config/metrics/license/recorded_at.yml
+++ b/config/metrics/license/20210201124932_recorded_at.yml
@@ -1,16 +1,20 @@
-name: recorded_at
+---
+key_path: recorded_at
 description: When the Usage Ping computation was started
-value_type: string
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
 product_category: collection
-stage: growth
+value_type: string
 status: data_available
-default_generation: generation_1
-full_path:
-  generation_1: recorded_at
 milestone: 8.10
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
-group: group::product analytics
 time_frame: none
 data_source: ruby
-distribution: [ee, ce]
-tier: ['free', 'starter', 'premium', 'ultimate', 'bronze', 'silver', 'gold']
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/license/20210201124933_uuid.yml b/config/metrics/license/20210201124933_uuid.yml
new file mode 100644
index 00000000000..6cd4ca58ef8
--- /dev/null
+++ b/config/metrics/license/20210201124933_uuid.yml
@@ -0,0 +1,20 @@
+---
+key_path: uuid
+description: GitLab instance unique identifier
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: string
+status: data_available
+milestone: 9.1
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1521
+time_frame: none
+data_source: database
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/license/20210204124827_hostname.yml b/config/metrics/license/20210204124827_hostname.yml
new file mode 100644
index 00000000000..6f878f04863
--- /dev/null
+++ b/config/metrics/license/20210204124827_hostname.yml
@@ -0,0 +1,19 @@
+---
+key_path: hostname
+description: Host name of GitLab instance
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: string
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/license/20210204124829_active_user_count.yml b/config/metrics/license/20210204124829_active_user_count.yml
new file mode 100644
index 00000000000..21dacb43d92
--- /dev/null
+++ b/config/metrics/license/20210204124829_active_user_count.yml
@@ -0,0 +1,19 @@
+---
+key_path: active_user_count
+description: This is named the instance_user_count in the Versions application.
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: string
+status: data_available
+time_frame: none
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/license/20210204124854_license_management_jobs.yml b/config/metrics/license/20210204124854_license_management_jobs.yml
new file mode 100644
index 00000000000..f89df165662
--- /dev/null
+++ b/config/metrics/license/20210204124854_license_management_jobs.yml
@@ -0,0 +1,16 @@
+---
+key_path: counts.license_management_jobs
+description: Name on the GitLab license
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: number
+status: data_available
+time_frame: none
+data_source: database
+distribution: []
+tier:
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/license/20210204124926_license_trial_ends_on.yml b/config/metrics/license/20210204124926_license_trial_ends_on.yml
new file mode 100644
index 00000000000..6e78c6239e9
--- /dev/null
+++ b/config/metrics/license/20210204124926_license_trial_ends_on.yml
@@ -0,0 +1,14 @@
+---
+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
+value_type: string
+status: data_available
+time_frame: none
+data_source:
+distribution: []
+tier: []
+skip_validation: true
diff --git a/config/metrics/license/20210204124928_version.yml b/config/metrics/license/20210204124928_version.yml
new file mode 100644
index 00000000000..a5e8acb1eaa
--- /dev/null
+++ b/config/metrics/license/20210204124928_version.yml
@@ -0,0 +1,14 @@
+---
+key_path: gitaly.version
+description: Version of Gitaly
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: string
+status: data_available
+time_frame: none
+data_source:
+distribution: []
+tier: []
+skip_validation: true
diff --git a/config/metrics/license/20210204124936_version.yml b/config/metrics/license/20210204124936_version.yml
new file mode 100644
index 00000000000..f9c28d40d3d
--- /dev/null
+++ b/config/metrics/license/20210204124936_version.yml
@@ -0,0 +1,14 @@
+---
+key_path: gitlab_pages.version
+description: The version number of GitLab Pages
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: string
+status: data_available
+time_frame: none
+data_source:
+distribution: []
+tier: []
+skip_validation: true
diff --git a/config/metrics/license/20210204124938_recording_ce_finished_at.yml b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
new file mode 100644
index 00000000000..bc8a3e57b45
--- /dev/null
+++ b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
@@ -0,0 +1,16 @@
+---
+key_path: recording_ce_finished_at
+description: When the core features were computed
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: string
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier: []
+skip_validation: true
diff --git a/config/metrics/license/uuid.yml b/config/metrics/license/uuid.yml
deleted file mode 100644
index 38e0d74fc22..00000000000
--- a/config/metrics/license/uuid.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: uuid
-description: GitLab instance unique identifier
-value_type: string
-product_category: collection
-stage: growth
-status: data_available
-default_generation: generation_1
-full_path:
-  generation_1: uuid
-  generation_2: license.uuid
-milestone: 9.1
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1521
-group: group::product analytics
-time_frame: none
-data_source: database
-distribution: [ee, ce]
-tier: ['free', 'starter', 'premium', 'ultimate', 'bronze', 'silver', 'gold']