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

2 files changed, 20 insertions, 15 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']