Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

36 files changed, 486 insertions, 98 deletions

diff --git a/config/metrics/counts_28d/20210201124930_deployments.yml b/config/metrics/counts_28d/20210201124930_deployments.yml
new file mode 100644
index 00000000000..e03785d62ba
--- /dev/null
+++ b/config/metrics/counts_28d/20210201124930_deployments.yml
@@ -0,0 +1,20 @@
+---
+key_path: counts_monthly.deployments
+description: Total deployments count for recent 28 days
+product_section: ops
+product_stage: release
+product_group: group::ops release
+product_category:
+value_type: number
+status: data_available
+milestone: 13.2
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35493
+time_frame: 28d
+data_source: database
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/deployments.yml b/config/metrics/counts_28d/deployments.yml
deleted file mode 100644
index dabd50ef5be..00000000000
--- a/config/metrics/counts_28d/deployments.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: deployments
-description: Total deployments count for recent 28 days
-value_type: integer
-stage: release
-status: data_available
-default_generation: generation_1
-full_path:
-  generation_1: counts_monthy.deployments
-milestone: 13.2
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35493
-group: 'group::ops release'
-time_frame: 28d
-data_source: database
-distribution: [ee, ce]
-tier: ['free', 'starter', 'premium', 'ultimate', 'bronze', 'silver', 'gold']
diff --git a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
new file mode 100644
index 00000000000..07b20fd2938
--- /dev/null
+++ b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_title_changed_weekly
+description: Distinct users count that changed issue title in a group for last recent week
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+value_type: number
+status: data_available
+milestone: 13.6
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
+
diff --git a/config/metrics/counts_7d/g_project_management_issue_title_changed_weekly.yml b/config/metrics/counts_7d/g_project_management_issue_title_changed_weekly.yml
deleted file mode 100644
index 997263f9e30..00000000000
--- a/config/metrics/counts_7d/g_project_management_issue_title_changed_weekly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: g_project_management_issue_title_changed_weekly
-description: Distinct users count that changed issue title in a group for last recent week
-value_type: integer
-product_category: issue_tracking
-stage: plan
-status: data_available
-default_generation: generation_1
-full_path:
-  generation_1: redis_hll_counters.issues_edit.g_project_management_issue_title_changed_weekly
-milestone: 13.6
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-group: 'group::project management'
-time_frame: 7d
-data_source: redis_hll
-distribution: [ee, ce]
-tier: ['free', 'starter', 'premium', 'ultimate', 'bronze', 'silver', 'gold']
diff --git a/config/metrics/counts_all/20210201124934_deployments.yml b/config/metrics/counts_all/20210201124934_deployments.yml
new file mode 100644
index 00000000000..8b93eaf989d
--- /dev/null
+++ b/config/metrics/counts_all/20210201124934_deployments.yml
@@ -0,0 +1,19 @@
+---
+key_path: counts.deployments
+description: Total deployments count
+product_section: ops
+product_stage: release
+product_group: group::ops release
+value_type: number
+status: data_available
+milestone: 8.12
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/735
+time_frame: all
+data_source: database
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210204124930_servers.yml b/config/metrics/counts_all/20210204124930_servers.yml
new file mode 100644
index 00000000000..3103797ccce
--- /dev/null
+++ b/config/metrics/counts_all/20210204124930_servers.yml
@@ -0,0 +1,14 @@
+---
+key_path: gitaly.servers
+description: Total Gitalty Servers
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: number
+status: data_available
+time_frame: all
+data_source:
+distribution: []
+tier: []
+skip_validation: true
diff --git a/config/metrics/counts_all/20210204124932_clusters.yml b/config/metrics/counts_all/20210204124932_clusters.yml
new file mode 100644
index 00000000000..1bb86905502
--- /dev/null
+++ b/config/metrics/counts_all/20210204124932_clusters.yml
@@ -0,0 +1,14 @@
+---
+key_path: gitaly.clusters
+description: Total GitLab Managed clusters both enabled and disabled
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: number
+status: data_available
+time_frame: all
+data_source:
+distribution: []
+tier: []
+skip_validation: true
diff --git a/config/metrics/counts_all/deployments.yml b/config/metrics/counts_all/deployments.yml
deleted file mode 100644
index bb78e8d6144..00000000000
--- a/config/metrics/counts_all/deployments.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: deployments
-description: Total deployments count
-value_type: integer
-stage: release
-status: data_available
-default_generation: generation_1
-full_path:
-  generation_1: counts.deployments
-milestone: 8.12
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/735
-group: 'group::ops release'
-time_frame: all
-data_source: database
-distribution: [ee, ce]
-tier: ['free', 'starter', 'premium', 'ultimate', 'bronze', 'silver', 'gold']
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']
diff --git a/config/metrics/schema.json b/config/metrics/schema.json
index 4d1120a7d8d..d71eddab469 100644
--- a/config/metrics/schema.json
+++ b/config/metrics/schema.json
@@ -1,32 +1,32 @@
 {
   "type": "object",
-  "required": ["name", "description", "value_type", "status", "default_generation", "full_path", "group", "time_frame", "data_source", "distribution", "tier"],
+  "required": ["key_path", "description", "value_type", "status", "product_group", "time_frame", "data_source", "distribution", "tier"],
   "properties": {
-    "name": {
+    "key_path": {
       "type": "string"
     },
     "description": {
       "type": "string"
     },
-    "value_type": {
-      "type": "string",
-      "enum": ["integer", "string", "number", "boolean"]
+    "product_section": {
+      "type": ["string", "null"]
     },
-    "product_category": {
+    "product_stage": {
       "type": ["string", "null"]
     },
-    "stage": {
+    "product_group": {
+      "type": "string"
+    },
+    "product_category": {
       "type": ["string", "null"]
     },
+    "value_type": {
+      "type": "string",
+      "enum": ["integer", "string", "number", "boolean"]
+    },
     "status": {
       "type": ["string"],
-      "enum": ["data_available", "planned", "in_progress", "implmented"]
-    },
-    "default_generation": {
-      "type": "string"
-    },
-    "full_path": {
-      "type": "object"
+      "enum": ["data_available", "planned", "in_progress", "implemented"]
     },
     "milestone": {
       "type": ["number", "null"]
@@ -37,9 +37,6 @@
     "introduced_by_url": {
       "type": ["string", "null"]
     },
-    "group": {
-      "type": "string"
-    },
     "time_frame": {
       "type": "string",
       "enum": ["7d", "28d", "all", "none"]
@@ -61,6 +58,9 @@
         "type": "string",
         "enum": ["free", "starter", "premium", "ultimate", "bronze", "silver", "gold"]
       }
+    },
+    "skip_validation": {
+      "type": "boolean"
     }
   }
 }
diff --git a/config/metrics/settings/database_adapter.yml b/config/metrics/settings/20210201124935_database_adapter.yml
index b24fc933a08..020325995b1 100644
--- a/config/metrics/settings/database_adapter.yml
+++ b/config/metrics/settings/20210201124935_database_adapter.yml
@@ -1,14 +1,18 @@
-name: adapter
+---
+key_path: database.adapter
 description: This metric only returns a value of PostgreSQL in supported versions of GitLab. It could be removed from the usage ping. Historically MySQL was also supported.
-value_type: string
+product_section: enablement
+product_stage: enablement
+product_group: group::enablement distribution
 product_category: collection
-stage: growth
+value_type: string
 status: data_available
-default_generation: generation_1
-full_path:
-  generation_1: database.adapter
-group: group::enablement distribution
 time_frame: none
 data_source: database
-distribution: [ee, ce]
-tier: ['free', 'starter', 'premium', 'ultimate', 'bronze', 'silver', 'gold']
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
new file mode 100644
index 00000000000..41f6d432b78
--- /dev/null
+++ b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
@@ -0,0 +1,14 @@
+---
+key_path: instance_auto_devops_enabled
+description: Whether auto DevOps is enabled
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution: []
+tier: []
+skip_validation: true
diff --git a/config/metrics/settings/20210204124858_container_registry_enabled.yml b/config/metrics/settings/20210204124858_container_registry_enabled.yml
new file mode 100644
index 00000000000..53567998a76
--- /dev/null
+++ b/config/metrics/settings/20210204124858_container_registry_enabled.yml
@@ -0,0 +1,14 @@
+---
+key_path: container_registry_enabled
+description: Whether container registry is enabled
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution: []
+tier: []
+skip_validation: true
diff --git a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
new file mode 100644
index 00000000000..cecb9035dc6
--- /dev/null
+++ b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
@@ -0,0 +1,14 @@
+---
+key_path: dependency_proxy_enabled
+description: Whether dependency proxy is enabled
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution: []
+tier: []
+skip_validation: true
diff --git a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
new file mode 100644
index 00000000000..5cdb62237e4
--- /dev/null
+++ b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
@@ -0,0 +1,14 @@
+---
+key_path: gitlab_shared_runners_enabled
+description: Whether shared runners is enabled
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution: []
+tier: []
+skip_validation: true
diff --git a/config/metrics/settings/20210204124904_gravatar_enabled.yml b/config/metrics/settings/20210204124904_gravatar_enabled.yml
new file mode 100644
index 00000000000..7102c96332a
--- /dev/null
+++ b/config/metrics/settings/20210204124904_gravatar_enabled.yml
@@ -0,0 +1,14 @@
+---
+key_path: gravatar_enabled
+description: Whether gravatar is enabled
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution: []
+tier: []
+skip_validation: true
diff --git a/config/metrics/settings/20210204124906_ldap_enabled.yml b/config/metrics/settings/20210204124906_ldap_enabled.yml
new file mode 100644
index 00000000000..b0bdeded7d9
--- /dev/null
+++ b/config/metrics/settings/20210204124906_ldap_enabled.yml
@@ -0,0 +1,14 @@
+---
+key_path: ldap_enabled
+description: Whether LDAP is enabled
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution: []
+tier: []
+skip_validation: true
diff --git a/config/metrics/settings/20210204124908_mattermost_enabled.yml b/config/metrics/settings/20210204124908_mattermost_enabled.yml
new file mode 100644
index 00000000000..7082b6c4ec5
--- /dev/null
+++ b/config/metrics/settings/20210204124908_mattermost_enabled.yml
@@ -0,0 +1,14 @@
+---
+key_path: mattermost_enabled
+description: Whether Mattermost is enabled
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution: []
+tier: []
+skip_validation: true
diff --git a/config/metrics/settings/20210204124910_omniauth_enabled.yml b/config/metrics/settings/20210204124910_omniauth_enabled.yml
new file mode 100644
index 00000000000..10483bd977b
--- /dev/null
+++ b/config/metrics/settings/20210204124910_omniauth_enabled.yml
@@ -0,0 +1,14 @@
+---
+key_path: omniauth_enabled
+description: Whether OmniAuth is enabled
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution: []
+tier: []
+skip_validation: true
diff --git a/config/metrics/settings/20210204124912_prometheus_enabled.yml b/config/metrics/settings/20210204124912_prometheus_enabled.yml
new file mode 100644
index 00000000000..0e6199e9976
--- /dev/null
+++ b/config/metrics/settings/20210204124912_prometheus_enabled.yml
@@ -0,0 +1,14 @@
+---
+key_path: prometheus_enabled
+description: Whether the bundled Prometheus is enabled
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution: []
+tier: []
+skip_validation: true
diff --git a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
new file mode 100644
index 00000000000..50b08c15919
--- /dev/null
+++ b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
@@ -0,0 +1,14 @@
+---
+key_path: prometheus_metrics_enabled
+description: Whether Prometheus Metrics endpoint is enabled
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution: []
+tier: []
+skip_validation: true
diff --git a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
new file mode 100644
index 00000000000..82defcf4014
--- /dev/null
+++ b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
@@ -0,0 +1,14 @@
+---
+key_path: reply_by_email_enabled
+description: Whether incoming email is setup
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution: []
+tier: []
+skip_validation: true
diff --git a/config/metrics/settings/20210204124918_signup_enabled.yml b/config/metrics/settings/20210204124918_signup_enabled.yml
new file mode 100644
index 00000000000..49d997bd2a8
--- /dev/null
+++ b/config/metrics/settings/20210204124918_signup_enabled.yml
@@ -0,0 +1,14 @@
+---
+key_path: signup_enabled
+description: Whether public signup is enabled
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution: []
+tier: []
+skip_validation: true
diff --git a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
new file mode 100644
index 00000000000..d3eb20e93fd
--- /dev/null
+++ b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
@@ -0,0 +1,14 @@
+---
+key_path: web_ide_clientside_preview_enabled
+description: Whether web ide clientside preview is enabled
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution: []
+tier: []
+skip_validation: true
diff --git a/config/metrics/settings/20210204124922_grafana_link_enabled.yml b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
new file mode 100644
index 00000000000..a78936d3324
--- /dev/null
+++ b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
@@ -0,0 +1,14 @@
+---
+key_path: grafana_link_enabled
+description: Whether Grafana is enabled
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution: []
+tier: []
+skip_validation: true
diff --git a/config/metrics/settings/20210204124924_elasticsearch_enabled.yml b/config/metrics/settings/20210204124924_elasticsearch_enabled.yml
new file mode 100644
index 00000000000..4b7d560b4ef
--- /dev/null
+++ b/config/metrics/settings/20210204124924_elasticsearch_enabled.yml
@@ -0,0 +1,14 @@
+---
+key_path: elasticsearch_enabled
+description: Whether Elasticsearch is enabled
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution: []
+tier: []
+skip_validation: true
diff --git a/config/metrics/settings/20210204124934_enabled.yml b/config/metrics/settings/20210204124934_enabled.yml
new file mode 100644
index 00000000000..3f4c8653dd1
--- /dev/null
+++ b/config/metrics/settings/20210204124934_enabled.yml
@@ -0,0 +1,14 @@
+---
+key_path: gitlab_pages.enabled
+description: Whether GitLab Pages is enabled
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution: []
+tier: []
+skip_validation: true