Add latest changes from gitlab-org/gitlab@master

5 files changed, 24 insertions, 16 deletions

diff --git a/config/feature_flags/development/new_graphql_keyset_pagination.yml b/config/feature_flags/development/new_graphql_keyset_pagination.yml
new file mode 100644
index 00000000000..f4afcba68cf
--- /dev/null
+++ b/config/feature_flags/development/new_graphql_keyset_pagination.yml
@@ -0,0 +1,8 @@
+---
+name: new_graphql_keyset_pagination
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56751
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323730
+milestone: '13.10'
+type: development
+group: group::optimize
+default_enabled: false
diff --git a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
index 3bab0578a71..a8ba5b65187 100644
--- a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
@@ -2,7 +2,7 @@
 key_path: counts.clusters_applications_runner
 description: Total GitLab Managed clusters with GitLab Managed App:Runner installed
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml b/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
index 7f7c3b4d91a..d1ae17cdc47 100644
--- a/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
+++ b/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
@@ -6,7 +6,7 @@ product_stage: monitor
 product_group: group::health
 product_category: incident_management
 value_type: number
-status: data_available
+status: deprecated
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
index 3b36b410b3a..3e84a694e96 100644
--- a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
@@ -1,19 +1,18 @@
 ---
 key_path: usage_activity_by_stage.verify.clusters_applications_runner
-description: Total GitLab Managed clusters with Runner enabled
+description: Count of users creating managed clusters with Runner enabled
 product_section: ops
-product_stage: verify
-product_group: group::runner
-product_category: runner
+product_stage: configure
+product_group: group::configure
+product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
 tier:
 - free
 - premium
-- ultimate
-skip_validation: true
+- ultimate
\ No newline at end of file
diff --git a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
index ed9491959ae..5ec4b9fdc09 100644
--- a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
+++ b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
@@ -1,16 +1,18 @@
 ---
 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
+product_section: ops
+product_stage: verify
+product_group: group::runner
+product_category: runner
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate