Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

12 files changed, 12 insertions, 29 deletions

diff --git a/config/metrics/license/20210201124932_recorded_at.yml b/config/metrics/license/20210201124932_recorded_at.yml
index 4b9cfc900d6..88f27fff377 100644
--- a/config/metrics/license/20210201124932_recorded_at.yml
+++ b/config/metrics/license/20210201124932_recorded_at.yml
@@ -10,7 +10,7 @@ status: data_available
 milestone: "8.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
 time_frame: none
-data_source: ruby
+data_source: system
 distribution:
 - ee
 - ce
diff --git a/config/metrics/license/20210201124933_uuid.yml b/config/metrics/license/20210201124933_uuid.yml
index 9146bf1e070..afad2cf540a 100644
--- a/config/metrics/license/20210201124933_uuid.yml
+++ b/config/metrics/license/20210201124933_uuid.yml
@@ -11,6 +11,7 @@ milestone: "9.1"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1521
 time_frame: none
 data_source: database
+instrumentation_class: UuidMetric
 distribution:
 - ee
 - ce
diff --git a/config/metrics/license/20210204124827_hostname.yml b/config/metrics/license/20210204124827_hostname.yml
index 6f878f04863..953239eff7a 100644
--- a/config/metrics/license/20210204124827_hostname.yml
+++ b/config/metrics/license/20210204124827_hostname.yml
@@ -8,7 +8,8 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
+instrumentation_class: HostnameMetric
 distribution:
 - ce
 - ee
diff --git a/config/metrics/license/20210204124926_license_trial_ends_on.yml b/config/metrics/license/20210204124926_license_trial_ends_on.yml
index e3c3303975f..fb9ec099a46 100644
--- a/config/metrics/license/20210204124926_license_trial_ends_on.yml
+++ b/config/metrics/license/20210204124926_license_trial_ends_on.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/license/20210204124928_version.yml b/config/metrics/license/20210204124928_version.yml
index b39552b220e..9aea9f8fde5 100644
--- a/config/metrics/license/20210204124928_version.yml
+++ b/config/metrics/license/20210204124928_version.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/license/20210204124936_version.yml b/config/metrics/license/20210204124936_version.yml
index 2d161e15fd0..ef87a6ed9e6 100644
--- a/config/metrics/license/20210204124936_version.yml
+++ b/config/metrics/license/20210204124936_version.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/license/20210204124938_recording_ce_finished_at.yml b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
index b1fd0589e4a..d07580730c1 100644
--- a/config/metrics/license/20210204124938_recording_ce_finished_at.yml
+++ b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source: ruby
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/license/20210216175601_version.yml b/config/metrics/license/20210216175601_version.yml
index b3099eb76bd..5e5c1ad05ec 100644
--- a/config/metrics/license/20210216175601_version.yml
+++ b/config/metrics/license/20210216175601_version.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/license/20210216175602_installation_type.yml b/config/metrics/license/20210216175602_installation_type.yml
index ae5f26ff0a2..6e907b4a823 100644
--- a/config/metrics/license/20210216175602_installation_type.yml
+++ b/config/metrics/license/20210216175602_installation_type.yml
@@ -8,7 +8,7 @@ product_category: collection
 value_type: string
 status: data_available
 time_frame: none
-data_source: ruby
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/license/20210216175604_edition.yml b/config/metrics/license/20210216175604_edition.yml
deleted file mode 100644
index 6257c7e76c0..00000000000
--- a/config/metrics/license/20210216175604_edition.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-key_path: edition
-description: Edition of GitLab such as EE, CE, Bronze, Silver, Gold
-product_section: enablement
-product_stage: enablement
-product_group: group::distribution
-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/20210216181053_version.yml b/config/metrics/license/20210216181053_version.yml
index 3570a041b8f..824167c8d97 100644
--- a/config/metrics/license/20210216181053_version.yml
+++ b/config/metrics/license/20210216181053_version.yml
@@ -8,7 +8,7 @@ product_category:
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier:
diff --git a/config/metrics/license/20210216183237_version.yml b/config/metrics/license/20210216183237_version.yml
index 4f74963801a..69d97e17f20 100644
--- a/config/metrics/license/20210216183237_version.yml
+++ b/config/metrics/license/20210216183237_version.yml
@@ -8,7 +8,7 @@ product_category: ''
 value_type: string
 status: data_available
 time_frame: none
-data_source:
+data_source: system
 distribution:
 - ce
 tier: