Add latest changes from gitlab-org/gitlab@master

10 files changed, 38 insertions, 8 deletions

diff --git a/config/metrics/counts_all/20210216175520_ci_runners.yml b/config/metrics/counts_all/20210216175520_ci_runners.yml
index d0004bf8902..d13a77aecc0 100644
--- a/config/metrics/counts_all/20210216175520_ci_runners.yml
+++ b/config/metrics/counts_all/20210216175520_ci_runners.yml
@@ -1,7 +1,7 @@
 ---
 data_category: Optional
 key_path: counts.ci_runners
-description: Total configured Runners in project
+description: Total configured Runners of all types
 product_section: ops
 product_stage: verify
 product_group: group::pipeline execution
diff --git a/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml b/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
index 2435c75973a..e108406ef11 100644
--- a/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
+++ b/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
@@ -2,7 +2,7 @@
 data_category: Optional
 key_path: counts.ci_runners_instance_type_active
 name: "count_active_instance_ci_runners"
-description: Total active group Runners
+description: Total active Shared (Instance) Runners
 product_section: ops
 product_stage: verify
 product_group: group::pipeline execution
diff --git a/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml b/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
index afe7a4fe62a..6fe5d74a7e7 100644
--- a/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
+++ b/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
@@ -2,7 +2,7 @@
 data_category: Optional
 key_path: counts.ci_runners_group_type_active
 name: "count_active_group_ci_runners"
-description: Total active instance Runners
+description: Total active Group Runners
 product_section: ops
 product_stage: verify
 product_group: group::pipeline execution
diff --git a/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml b/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
index ce221f1f343..eaf9a3b5dd7 100644
--- a/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
+++ b/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
@@ -2,7 +2,7 @@
 data_category: Optional
 key_path: counts.ci_runners_project_type_active
 name: "count_active_project_ci_runners"
-description: Total active project Runners
+description: Total active Specific (Project) Runners
 product_section: ops
 product_stage: verify
 product_group: group::pipeline execution
diff --git a/config/metrics/counts_all/20210502050942_ci_runners_online.yml b/config/metrics/counts_all/20210502050942_ci_runners_online.yml
index 4d2dc2d9a75..7e63e095cd4 100644
--- a/config/metrics/counts_all/20210502050942_ci_runners_online.yml
+++ b/config/metrics/counts_all/20210502050942_ci_runners_online.yml
@@ -2,7 +2,7 @@
 data_category: Optional
 key_path: counts.ci_runners_online
 name: "counts_online_runners"
-description: Total online Runners
+description: Total online Runners of all types
 product_section: ops
 product_stage: verify
 product_group: group::pipeline execution
diff --git a/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml b/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
index 5c8a4a11d0b..2e451b5955e 100644
--- a/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
+++ b/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
@@ -2,7 +2,7 @@
 data_category: Optional
 key_path: counts.ci_runners_instance_type_active_online
 name: "count_instance_active_online_ci_runners"
-description: Total active and online instance Runners
+description: Total active and online Shared (Instance) Runners
 product_section: ops
 product_stage: verify
 product_group: group::pipeline execution
diff --git a/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml b/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
index 48c98352d74..30c6432d611 100644
--- a/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
+++ b/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
@@ -2,7 +2,7 @@
 data_category: Optional
 key_path: counts.ci_runners_group_type_active_online
 name: "count_group_active_online_ci_runners"
-description: Total active and online group Runners
+description: Total active and online Group Runners
 product_section: ops
 product_stage: verify
 product_group: group::pipeline execution
diff --git a/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml b/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
index 80d326dc91c..8f47542eac2 100644
--- a/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
+++ b/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
@@ -2,7 +2,7 @@
 data_category: Optional
 key_path: counts.ci_runners_project_type_active_online
 name: "count_project_active_online_ci_runners"
-description: Total active and online project Runners
+description: Total active and online Specific (Project) Runners
 product_section: ops
 product_stage: verify
 product_group: group::pipeline execution
diff --git a/config/metrics/objects_schemas/collected_data_categories_schema.json b/config/metrics/objects_schemas/collected_data_categories_schema.json
new file mode 100644
index 00000000000..c1ff96d3953
--- /dev/null
+++ b/config/metrics/objects_schemas/collected_data_categories_schema.json
@@ -0,0 +1,7 @@
+{
+  "type": "array",
+  "items": {
+    "type": ["string", "null"],
+    "enum": ["Standard", "Subscription", "Operational", "Optional"]
+  }
+}
diff --git a/config/metrics/settings/20210702140138_collected_data_categories.yml b/config/metrics/settings/20210702140138_collected_data_categories.yml
new file mode 100644
index 00000000000..dca7e1737db
--- /dev/null
+++ b/config/metrics/settings/20210702140138_collected_data_categories.yml
@@ -0,0 +1,23 @@
+---
+key_path: settings.collected_data_categories
+name: collected_data_categories
+description: List of collected data categories corresponding to instance settings
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: object
+status: implemented
+milestone: "14.1"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65336
+time_frame: none
+data_source: system
+data_category: Standard
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+value_json_schema: 'config/metrics/objects_schemas/collected_data_categories_schema.json'