Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

36 files changed, 89 insertions, 97 deletions

diff --git a/config/metrics/settings/20210204124858_container_registry_enabled.yml b/config/metrics/settings/20210204124858_container_registry_enabled.yml
index d8a47a39912..5cccb84ec10 100644
--- a/config/metrics/settings/20210204124858_container_registry_enabled.yml
+++ b/config/metrics/settings/20210204124858_container_registry_enabled.yml
@@ -1,16 +1,18 @@
 ---
 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
+description: A count of projects where the container registry is enabled
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: container registry
 value_type: boolean
 status: data_available
 time_frame: none
 data_source: system
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
index f7aa195f284..f06b89477a4 100644
--- a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
+++ b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
@@ -1,16 +1,18 @@
 ---
 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
+description: A count of projects where the dependency proxy is enabled
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category: container registry
 value_type: boolean
 status: data_available
 time_frame: none
 data_source: system
 distribution:
+- ee
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/settings/20210204124904_gravatar_enabled.yml b/config/metrics/settings/20210204124904_gravatar_enabled.yml
index b0280347b9f..a5ae02910c6 100644
--- a/config/metrics/settings/20210204124904_gravatar_enabled.yml
+++ b/config/metrics/settings/20210204124904_gravatar_enabled.yml
@@ -1,16 +1,19 @@
 ---
 key_path: gravatar_enabled
 description: Whether gravatar 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: users
 value_type: boolean
 status: data_available
 time_frame: none
 data_source: system
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+
diff --git a/config/metrics/settings/20210204124908_mattermost_enabled.yml b/config/metrics/settings/20210204124908_mattermost_enabled.yml
index a3c88cf976e..14303726d1f 100644
--- a/config/metrics/settings/20210204124908_mattermost_enabled.yml
+++ b/config/metrics/settings/20210204124908_mattermost_enabled.yml
@@ -1,16 +1,18 @@
 ---
 key_path: mattermost_enabled
 description: Whether Mattermost is enabled
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
+product_section: dev
+product_stage: create
+product_group: group::ecosystem
+product_category: integrations
 value_type: boolean
 status: data_available
 time_frame: none
 data_source: system
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/settings/20210204124912_prometheus_enabled.yml b/config/metrics/settings/20210204124912_prometheus_enabled.yml
index 092f273e237..0e8ce856858 100644
--- a/config/metrics/settings/20210204124912_prometheus_enabled.yml
+++ b/config/metrics/settings/20210204124912_prometheus_enabled.yml
@@ -11,6 +11,8 @@ time_frame: none
 data_source: system
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
index 43a13aff5e1..61b99f55452 100644
--- a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
+++ b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
@@ -11,6 +11,8 @@ time_frame: none
 data_source: system
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
index 40b863cd225..ba61de920de 100644
--- a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
+++ b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
@@ -1,16 +1,18 @@
 ---
 key_path: reply_by_email_enabled
 description: Whether incoming email is setup
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
+product_section: dev
+product_stage: plan
+product_group: group::certify
 product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
 data_source: system
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate
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 bfb143d2013..80f247d9146 100644
--- a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
+++ b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
@@ -1,16 +1,18 @@
 ---
 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
+description: Whether Web IDE clientside preview is enabled
+product_section: dev
+product_stage: create
+product_group: group::editor
 product_category: collection
 value_type: boolean
 status: data_available
 time_frame: none
-data_source: system
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
index f76bd0593b6..a2552d1f465 100644
--- a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
+++ b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
@@ -6,7 +6,8 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: boolean
-status: deprecated
+status: removed
+milestone_removed: 14.0
 time_frame: none
 data_source: system
 distribution:
diff --git a/config/metrics/settings/20210216180314_gitpod_enabled.yml b/config/metrics/settings/20210216180314_gitpod_enabled.yml
index 0bad75fe3db..72e13f785d4 100644
--- a/config/metrics/settings/20210216180314_gitpod_enabled.yml
+++ b/config/metrics/settings/20210216180314_gitpod_enabled.yml
@@ -1,6 +1,6 @@
 ---
 key_path: gitpod_enabled
-description: Whether gitpod is enabled in the instance
+description: Whether Gitpod is enabled in the instance
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -8,7 +8,7 @@ product_category: integrations
 value_type: boolean
 status: data_available
 time_frame: none
-data_source: system
+data_source: database
 distribution:
 - ce
 - ee
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180836_enabled.yml b/config/metrics/settings/20210216180836_enabled.yml
index df71de8d4c2..c5f7e230767 100644
--- a/config/metrics/settings/20210216180836_enabled.yml
+++ b/config/metrics/settings/20210216180836_enabled.yml
@@ -4,7 +4,7 @@ description: Whether Object Storage is enabled for Artifacts
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180838_enabled.yml b/config/metrics/settings/20210216180838_enabled.yml
index 7bb1135ee08..3e5fbdf1acd 100644
--- a/config/metrics/settings/20210216180838_enabled.yml
+++ b/config/metrics/settings/20210216180838_enabled.yml
@@ -4,7 +4,7 @@ description: Whether Object Storage is enabled for Artifacts
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ 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
index 788d101ba22..4356fe775d8 100644
--- a/config/metrics/settings/20210216180840_direct_upload.yml
+++ b/config/metrics/settings/20210216180840_direct_upload.yml
@@ -4,7 +4,7 @@ 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
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ 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
index 77788a696d0..4570a701b53 100644
--- a/config/metrics/settings/20210216180841_background_upload.yml
+++ b/config/metrics/settings/20210216180841_background_upload.yml
@@ -4,7 +4,7 @@ description: Whether Background Upload for Object Storage is enabled for Artifac
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180843_provider.yml b/config/metrics/settings/20210216180843_provider.yml
index c2d684605cb..fcaea534dab 100644
--- a/config/metrics/settings/20210216180843_provider.yml
+++ b/config/metrics/settings/20210216180843_provider.yml
@@ -4,10 +4,10 @@ description: What Object Storage provider has been configured for Artifacts
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: string
 status: data_available
-time_frame: all
+time_frame: none
 data_source: system
 distribution:
 - ce
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180845_enabled.yml b/config/metrics/settings/20210216180845_enabled.yml
index 9b5c02e3e16..dc29c7211fd 100644
--- a/config/metrics/settings/20210216180845_enabled.yml
+++ b/config/metrics/settings/20210216180845_enabled.yml
@@ -4,7 +4,7 @@ description: Whether Object Storage is enabled for External Diffs
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180847_enabled.yml b/config/metrics/settings/20210216180847_enabled.yml
index 5babfc27fbf..c5be296e19f 100644
--- a/config/metrics/settings/20210216180847_enabled.yml
+++ b/config/metrics/settings/20210216180847_enabled.yml
@@ -4,7 +4,7 @@ description: Whether Object Storage is enabled for External Diffs
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ 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
index 56b17b7b44e..cdce6e0329c 100644
--- a/config/metrics/settings/20210216180849_direct_upload.yml
+++ b/config/metrics/settings/20210216180849_direct_upload.yml
@@ -4,7 +4,7 @@ description: Whether Direct Upload for Object Storage is enabled for External Di
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ 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
index 2108d35f4bf..67852d9f039 100644
--- a/config/metrics/settings/20210216180851_background_upload.yml
+++ b/config/metrics/settings/20210216180851_background_upload.yml
@@ -5,7 +5,7 @@ description: Whether Background Upload for Object Storage is enabled for Externa
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -17,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180852_provider.yml b/config/metrics/settings/20210216180852_provider.yml
index 2d6d48d4be8..5c843969510 100644
--- a/config/metrics/settings/20210216180852_provider.yml
+++ b/config/metrics/settings/20210216180852_provider.yml
@@ -4,10 +4,10 @@ description: What Object Storage provider has been configured for External Diffs
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: string
 status: data_available
-time_frame: all
+time_frame: none
 data_source: system
 distribution:
 - ce
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180854_enabled.yml b/config/metrics/settings/20210216180854_enabled.yml
index f61f15622d7..40656fdfe2c 100644
--- a/config/metrics/settings/20210216180854_enabled.yml
+++ b/config/metrics/settings/20210216180854_enabled.yml
@@ -4,7 +4,7 @@ description: Whether Object Storage is enabled for LFS
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180856_enabled.yml b/config/metrics/settings/20210216180856_enabled.yml
index 1c94354afc7..1892882d5bb 100644
--- a/config/metrics/settings/20210216180856_enabled.yml
+++ b/config/metrics/settings/20210216180856_enabled.yml
@@ -4,7 +4,7 @@ description: Whether Object Storage is enabled for LFS
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ 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
index acceccafa5f..f2b11a4e4a7 100644
--- a/config/metrics/settings/20210216180858_direct_upload.yml
+++ b/config/metrics/settings/20210216180858_direct_upload.yml
@@ -4,7 +4,7 @@ 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
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ 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
index e9545888d6e..9cb4e2ed10e 100644
--- a/config/metrics/settings/20210216180900_background_upload.yml
+++ b/config/metrics/settings/20210216180900_background_upload.yml
@@ -4,7 +4,7 @@ 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
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180902_provider.yml b/config/metrics/settings/20210216180902_provider.yml
index d275a7ea535..2e9e11b9301 100644
--- a/config/metrics/settings/20210216180902_provider.yml
+++ b/config/metrics/settings/20210216180902_provider.yml
@@ -4,10 +4,10 @@ description: What Object Storage provider has been configured for LFS
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: string
 status: data_available
-time_frame: all
+time_frame: none
 data_source: system
 distribution:
 - ce
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180903_enabled.yml b/config/metrics/settings/20210216180903_enabled.yml
index 5955ed2aa83..7c7f4f7bf57 100644
--- a/config/metrics/settings/20210216180903_enabled.yml
+++ b/config/metrics/settings/20210216180903_enabled.yml
@@ -4,10 +4,10 @@ description: Whether Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: string
 status: data_available
-time_frame: all
+time_frame: none
 data_source: system
 distribution:
 - ce
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180905_enabled.yml b/config/metrics/settings/20210216180905_enabled.yml
index 475a38bc190..fa5d70567e8 100644
--- a/config/metrics/settings/20210216180905_enabled.yml
+++ b/config/metrics/settings/20210216180905_enabled.yml
@@ -4,7 +4,7 @@ description: Whether Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ 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
index d6d8d46706b..8d2523f2e8f 100644
--- a/config/metrics/settings/20210216180907_direct_upload.yml
+++ b/config/metrics/settings/20210216180907_direct_upload.yml
@@ -4,7 +4,7 @@ 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
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ 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
index 3f7317974c0..466c630717b 100644
--- a/config/metrics/settings/20210216180909_background_upload.yml
+++ b/config/metrics/settings/20210216180909_background_upload.yml
@@ -4,7 +4,7 @@ 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
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180911_provider.yml b/config/metrics/settings/20210216180911_provider.yml
index 17cbafdd04a..75e5cda1f2b 100644
--- a/config/metrics/settings/20210216180911_provider.yml
+++ b/config/metrics/settings/20210216180911_provider.yml
@@ -4,10 +4,10 @@ description: What Object Storage provider has been configured for Uploads
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: string
 status: data_available
-time_frame: all
+time_frame: none
 data_source: system
 distribution:
 - ce
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180913_enabled.yml b/config/metrics/settings/20210216180913_enabled.yml
index e5b38853325..806be543ad2 100644
--- a/config/metrics/settings/20210216180913_enabled.yml
+++ b/config/metrics/settings/20210216180913_enabled.yml
@@ -4,7 +4,7 @@ description: Whether Object Storage is enabled for Uploads
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180915_enabled.yml b/config/metrics/settings/20210216180915_enabled.yml
index d1b2c7a3e91..fb16bfe1e48 100644
--- a/config/metrics/settings/20210216180915_enabled.yml
+++ b/config/metrics/settings/20210216180915_enabled.yml
@@ -4,7 +4,7 @@ description: Whether Object Storage is enabled for Packages
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ 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
index 11c70c327b2..f743723e6c3 100644
--- a/config/metrics/settings/20210216180916_direct_upload.yml
+++ b/config/metrics/settings/20210216180916_direct_upload.yml
@@ -4,7 +4,7 @@ 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
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ 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
index 066fc31a62d..ede74fba29e 100644
--- a/config/metrics/settings/20210216180918_background_upload.yml
+++ b/config/metrics/settings/20210216180918_background_upload.yml
@@ -4,7 +4,7 @@ description: Whether Background Upload for Object Storage is enabled for Package
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216180920_provider.yml b/config/metrics/settings/20210216180920_provider.yml
index 94f34244840..4f94e0d07bc 100644
--- a/config/metrics/settings/20210216180920_provider.yml
+++ b/config/metrics/settings/20210216180920_provider.yml
@@ -4,10 +4,10 @@ description: What Object Storage provider has been configured for Packages
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category: operational_metrics
+product_category: memory
 value_type: string
 status: data_available
-time_frame: all
+time_frame: none
 data_source: system
 distribution:
 - ce
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210321224827_gitaly_apdex.yml b/config/metrics/settings/20210321224827_gitaly_apdex.yml
index 15db70b6008..8fe1e1edc0b 100644
--- a/config/metrics/settings/20210321224827_gitaly_apdex.yml
+++ b/config/metrics/settings/20210321224827_gitaly_apdex.yml
@@ -6,7 +6,7 @@ product_stage: create
 product_group: group::gitaly
 product_category: gitaly
 value_type: number
-status: implemented
+status: data_available
 milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47040
 time_frame: none