Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

39 files changed, 507 insertions, 49 deletions

diff --git a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
index 41f6d432b78..6f05eacbe5a 100644
--- a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
+++ b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124858_container_registry_enabled.yml b/config/metrics/settings/20210204124858_container_registry_enabled.yml
index 53567998a76..6c50cb9144e 100644
--- a/config/metrics/settings/20210204124858_container_registry_enabled.yml
+++ b/config/metrics/settings/20210204124858_container_registry_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
index cecb9035dc6..01feb7157d9 100644
--- a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
+++ b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 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
index 5cdb62237e4..ed9491959ae 100644
--- a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
+++ b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124904_gravatar_enabled.yml b/config/metrics/settings/20210204124904_gravatar_enabled.yml
index 7102c96332a..21758753b35 100644
--- a/config/metrics/settings/20210204124904_gravatar_enabled.yml
+++ b/config/metrics/settings/20210204124904_gravatar_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124906_ldap_enabled.yml b/config/metrics/settings/20210204124906_ldap_enabled.yml
index b0bdeded7d9..6dc1a62d337 100644
--- a/config/metrics/settings/20210204124906_ldap_enabled.yml
+++ b/config/metrics/settings/20210204124906_ldap_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124908_mattermost_enabled.yml b/config/metrics/settings/20210204124908_mattermost_enabled.yml
index 7082b6c4ec5..425f3c44511 100644
--- a/config/metrics/settings/20210204124908_mattermost_enabled.yml
+++ b/config/metrics/settings/20210204124908_mattermost_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124910_omniauth_enabled.yml b/config/metrics/settings/20210204124910_omniauth_enabled.yml
index 10483bd977b..f9e691b0516 100644
--- a/config/metrics/settings/20210204124910_omniauth_enabled.yml
+++ b/config/metrics/settings/20210204124910_omniauth_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124912_prometheus_enabled.yml b/config/metrics/settings/20210204124912_prometheus_enabled.yml
index 0e6199e9976..ca829933eda 100644
--- a/config/metrics/settings/20210204124912_prometheus_enabled.yml
+++ b/config/metrics/settings/20210204124912_prometheus_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
index 50b08c15919..f9566076c9e 100644
--- a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
+++ b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 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
index 82defcf4014..f2fb58e33ec 100644
--- a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
+++ b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124918_signup_enabled.yml b/config/metrics/settings/20210204124918_signup_enabled.yml
index 49d997bd2a8..36e228bf927 100644
--- a/config/metrics/settings/20210204124918_signup_enabled.yml
+++ b/config/metrics/settings/20210204124918_signup_enabled.yml
@@ -1,14 +1,19 @@
 ---
 key_path: signup_enabled
 description: Whether public signup is enabled
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
+product_section: dev
+product_stage: manage
+product_group: group::access
+product_category: authentication_and_authorization
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
-distribution: []
-tier: []
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
 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
index d3eb20e93fd..4f21c0f2f18 100644
--- a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
+++ b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124922_grafana_link_enabled.yml b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
index a78936d3324..596ae1384ca 100644
--- a/config/metrics/settings/20210204124922_grafana_link_enabled.yml
+++ b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124924_elasticsearch_enabled.yml b/config/metrics/settings/20210204124924_elasticsearch_enabled.yml
deleted file mode 100644
index 4b7d560b4ef..00000000000
--- a/config/metrics/settings/20210204124924_elasticsearch_enabled.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-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
index 3f4c8653dd1..2f2586ad8f4 100644
--- a/config/metrics/settings/20210204124934_enabled.yml
+++ b/config/metrics/settings/20210204124934_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
new file mode 100644
index 00000000000..6bb5795c971
--- /dev/null
+++ b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
@@ -0,0 +1,19 @@
+---
+key_path: ingress_modsecurity_enabled
+description: Whether or not ModSecurity is enabled within Ingress
+product_section: sec
+product_stage: protect
+product_group: group::container security
+product_category: web_firewall
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
new file mode 100644
index 00000000000..1828d18b794
--- /dev/null
+++ b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
@@ -0,0 +1,19 @@
+---
+key_path: settings.ldap_encrypted_secrets_enabled
+description: Is encrypted LDAP secrets configured?
+product_section: enablement
+product_stage: enablement
+product_group: group::distribution
+product_category: global_search
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210216180314_gitpod_enabled.yml b/config/metrics/settings/20210216180314_gitpod_enabled.yml
new file mode 100644
index 00000000000..f716f3985f6
--- /dev/null
+++ b/config/metrics/settings/20210216180314_gitpod_enabled.yml
@@ -0,0 +1,19 @@
+---
+key_path: gitpod_enabled
+description: Whether gitpod is enabled in the instance
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category: integrations
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210216180836_enabled.yml b/config/metrics/settings/20210216180836_enabled.yml
new file mode 100644
index 00000000000..1e7e5a226c2
--- /dev/null
+++ b/config/metrics/settings/20210216180836_enabled.yml
@@ -0,0 +1,19 @@
+---
+key_path: object_store.artifacts.enabled
+description: Whether Object Storage is enabled for Artifacts
+product_section: enablement
+product_stage: enablement
+product_group: group::memory
+product_category: operational_metrics
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210216180838_enabled.yml b/config/metrics/settings/20210216180838_enabled.yml
new file mode 100644
index 00000000000..8524f525917
--- /dev/null
+++ b/config/metrics/settings/20210216180838_enabled.yml
@@ -0,0 +1,19 @@
+---
+key_path: object_store.artifacts.object_store.enabled
+description: Whether Object Storage is enabled for Artifacts
+product_section: enablement
+product_stage: enablement
+product_group: group::memory
+product_category: operational_metrics
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210216180840_direct_upload.yml b/config/metrics/settings/20210216180840_direct_upload.yml
new file mode 100644
index 00000000000..08ef5e1ece1
--- /dev/null
+++ b/config/metrics/settings/20210216180840_direct_upload.yml
@@ -0,0 +1,19 @@
+---
+key_path: object_store.artifacts.object_store.direct_upload
+description: Whether Direct Upload for Object Storage is enabled for Artifacts
+product_section: enablement
+product_stage: enablement
+product_group: group::memory
+product_category: operational_metrics
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210216180841_background_upload.yml b/config/metrics/settings/20210216180841_background_upload.yml
new file mode 100644
index 00000000000..c7b943be3b8
--- /dev/null
+++ b/config/metrics/settings/20210216180841_background_upload.yml
@@ -0,0 +1,19 @@
+---
+key_path: object_store.artifacts.object_store.background_upload
+description: Whether Background Upload for Object Storage is enabled for Artifacts
+product_section: enablement
+product_stage: enablement
+product_group: group::memory
+product_category: operational_metrics
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210216180845_enabled.yml b/config/metrics/settings/20210216180845_enabled.yml
new file mode 100644
index 00000000000..45148c406dc
--- /dev/null
+++ b/config/metrics/settings/20210216180845_enabled.yml
@@ -0,0 +1,19 @@
+---
+key_path: object_store.external_diffs.enabled
+description: Whether Object Storage is enabled for External Diffs
+product_section: enablement
+product_stage: enablement
+product_group: group::memory
+product_category: operational_metrics
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210216180847_enabled.yml b/config/metrics/settings/20210216180847_enabled.yml
new file mode 100644
index 00000000000..8323bd9f5ab
--- /dev/null
+++ b/config/metrics/settings/20210216180847_enabled.yml
@@ -0,0 +1,19 @@
+---
+key_path: object_store.external_diffs.object_store.enabled
+description: Whether Object Storage is enabled for External Diffs
+product_section: enablement
+product_stage: enablement
+product_group: group::memory
+product_category: operational_metrics
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210216180849_direct_upload.yml b/config/metrics/settings/20210216180849_direct_upload.yml
new file mode 100644
index 00000000000..e67b87e0bce
--- /dev/null
+++ b/config/metrics/settings/20210216180849_direct_upload.yml
@@ -0,0 +1,19 @@
+---
+key_path: object_store.external_diffs.object_store.direct_upload
+description: Whether Direct Upload for Object Storage is enabled for External Diffs
+product_section: enablement
+product_stage: enablement
+product_group: group::memory
+product_category: operational_metrics
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210216180851_background_upload.yml b/config/metrics/settings/20210216180851_background_upload.yml
new file mode 100644
index 00000000000..058c80a536d
--- /dev/null
+++ b/config/metrics/settings/20210216180851_background_upload.yml
@@ -0,0 +1,20 @@
+---
+key_path: object_store.external_diffs.object_store.background_upload
+description: Whether Background Upload for Object Storage is enabled for External
+  Diffs
+product_section: enablement
+product_stage: enablement
+product_group: group::memory
+product_category: operational_metrics
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210216180854_enabled.yml b/config/metrics/settings/20210216180854_enabled.yml
new file mode 100644
index 00000000000..40be02cb34a
--- /dev/null
+++ b/config/metrics/settings/20210216180854_enabled.yml
@@ -0,0 +1,19 @@
+---
+key_path: object_store.lfs.enabled
+description: Whether Object Storage is enabled for LFS
+product_section: enablement
+product_stage: enablement
+product_group: group::memory
+product_category: operational_metrics
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210216180856_enabled.yml b/config/metrics/settings/20210216180856_enabled.yml
new file mode 100644
index 00000000000..0646a211e31
--- /dev/null
+++ b/config/metrics/settings/20210216180856_enabled.yml
@@ -0,0 +1,19 @@
+---
+key_path: object_store.lfs.object_store.enabled
+description: Whether Object Storage is enabled for LFS
+product_section: enablement
+product_stage: enablement
+product_group: group::memory
+product_category: operational_metrics
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210216180858_direct_upload.yml b/config/metrics/settings/20210216180858_direct_upload.yml
new file mode 100644
index 00000000000..d4f14bc35fc
--- /dev/null
+++ b/config/metrics/settings/20210216180858_direct_upload.yml
@@ -0,0 +1,19 @@
+---
+key_path: object_store.lfs.object_store.direct_upload
+description: Whether Direct Upload for Object Storage is enabled for LFS
+product_section: enablement
+product_stage: enablement
+product_group: group::memory
+product_category: operational_metrics
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210216180900_background_upload.yml b/config/metrics/settings/20210216180900_background_upload.yml
new file mode 100644
index 00000000000..850c7ae04e2
--- /dev/null
+++ b/config/metrics/settings/20210216180900_background_upload.yml
@@ -0,0 +1,19 @@
+---
+key_path: object_store.lfs.object_store.background_upload
+description: Whether Background Upload for Object Storage is enabled for LFS
+product_section: enablement
+product_stage: enablement
+product_group: group::memory
+product_category: operational_metrics
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210216180905_enabled.yml b/config/metrics/settings/20210216180905_enabled.yml
new file mode 100644
index 00000000000..ef22d960a95
--- /dev/null
+++ b/config/metrics/settings/20210216180905_enabled.yml
@@ -0,0 +1,19 @@
+---
+key_path: object_store.uploads.object_store.enabled
+description: Whether Object Storage is enabled for Uploads
+product_section: enablement
+product_stage: enablement
+product_group: group::memory
+product_category: operational_metrics
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210216180907_direct_upload.yml b/config/metrics/settings/20210216180907_direct_upload.yml
new file mode 100644
index 00000000000..b34ab887fc6
--- /dev/null
+++ b/config/metrics/settings/20210216180907_direct_upload.yml
@@ -0,0 +1,19 @@
+---
+key_path: object_store.uploads.object_store.direct_upload
+description: Whether Direct Upload for Object Storage is enabled for Uploads
+product_section: enablement
+product_stage: enablement
+product_group: group::memory
+product_category: operational_metrics
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210216180909_background_upload.yml b/config/metrics/settings/20210216180909_background_upload.yml
new file mode 100644
index 00000000000..497f7ef7926
--- /dev/null
+++ b/config/metrics/settings/20210216180909_background_upload.yml
@@ -0,0 +1,19 @@
+---
+key_path: object_store.uploads.object_store.background_upload
+description: Whether Background Upload for Object Storage is enabled for Uploads
+product_section: enablement
+product_stage: enablement
+product_group: group::memory
+product_category: operational_metrics
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210216180913_enabled.yml b/config/metrics/settings/20210216180913_enabled.yml
new file mode 100644
index 00000000000..732a6364a3a
--- /dev/null
+++ b/config/metrics/settings/20210216180913_enabled.yml
@@ -0,0 +1,19 @@
+---
+key_path: object_store.packages.enabled
+description: Whether Object Storage is enabled for Uploads
+product_section: enablement
+product_stage: enablement
+product_group: group::memory
+product_category: operational_metrics
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210216180915_enabled.yml b/config/metrics/settings/20210216180915_enabled.yml
new file mode 100644
index 00000000000..eb78ef5f9e9
--- /dev/null
+++ b/config/metrics/settings/20210216180915_enabled.yml
@@ -0,0 +1,19 @@
+---
+key_path: object_store.packages.object_store.enabled
+description: Whether Object Storage is enabled for Packages
+product_section: enablement
+product_stage: enablement
+product_group: group::memory
+product_category: operational_metrics
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210216180916_direct_upload.yml b/config/metrics/settings/20210216180916_direct_upload.yml
new file mode 100644
index 00000000000..20785f2f8d7
--- /dev/null
+++ b/config/metrics/settings/20210216180916_direct_upload.yml
@@ -0,0 +1,19 @@
+---
+key_path: object_store.packages.object_store.direct_upload
+description: Whether Direct Upload for Object Storage is enabled for Packages
+product_section: enablement
+product_stage: enablement
+product_group: group::memory
+product_category: operational_metrics
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210216180918_background_upload.yml b/config/metrics/settings/20210216180918_background_upload.yml
new file mode 100644
index 00000000000..3ef8daaa685
--- /dev/null
+++ b/config/metrics/settings/20210216180918_background_upload.yml
@@ -0,0 +1,19 @@
+---
+key_path: object_store.packages.object_store.background_upload
+description: Whether Background Upload for Object Storage is enabled for Packages
+product_section: enablement
+product_stage: enablement
+product_group: group::memory
+product_category: operational_metrics
+value_type: boolean
+status: data_available
+time_frame: none
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
diff --git a/config/metrics/settings/20210225045628_operating_system.yml b/config/metrics/settings/20210225045628_operating_system.yml
new file mode 100644
index 00000000000..e88b8f8c827
--- /dev/null
+++ b/config/metrics/settings/20210225045628_operating_system.yml
@@ -0,0 +1,20 @@
+---
+key_path: settings.operating_system
+description: Information about the operating system running GitLab
+product_section: enablement
+product_stage: enablement
+product_group: group::distribution
+product_category: collection
+value_type: string
+status: implemented
+milestone: "13.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54778
+time_frame: none
+data_source: ruby
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate