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

4 files changed, 47 insertions, 15 deletions

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']