Add latest changes from gitlab-org/gitlab@master

68 files changed, 68 insertions, 30 deletions

diff --git a/config/feature_categories.yml b/config/feature_categories.yml
index 296fb69b83f..33044cfff8e 100644
--- a/config/feature_categories.yml
+++ b/config/feature_categories.yml
@@ -7,7 +7,6 @@
 # PLEASE DO NOT EDIT THIS FILE MANUALLY.
 #
 ---
-- advanced_deployments
 - advisory_database
 - api
 - api_security
@@ -22,6 +21,7 @@
 - build_artifacts
 - capacity_planning
 - cell
+- ci-cd_visibility
 - cloud_native_installation
 - code_quality
 - code_review_workflow
@@ -78,7 +78,6 @@
 - intel_code_security
 - interactive_application_security_testing
 - internationalization
-- kubernetes_management
 - logging
 - merge_trains
 - metrics
diff --git a/config/feature_flags/development/lazy_load_pipeline_dropdown_actions.yml b/config/feature_flags/development/lazy_load_pipeline_dropdown_actions.yml
deleted file mode 100644
index 136cb9a3615..00000000000
--- a/config/feature_flags/development/lazy_load_pipeline_dropdown_actions.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: lazy_load_pipeline_dropdown_actions
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114490
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/393846
-milestone: '15.10'
-type: development
-group: group::pipeline execution
-default_enabled: false
diff --git a/config/feature_flags/development/ci_simplify_dag_status_calculation_for_processing.yml b/config/feature_flags/development/record_issue_and_mr_assignee_events.yml
index bde5bce548f..4d63f1bf4d4 100644
--- a/config/feature_flags/development/ci_simplify_dag_status_calculation_for_processing.yml
+++ b/config/feature_flags/development/record_issue_and_mr_assignee_events.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_simplify_dag_status_calculation_for_processing
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115684
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/403005
+name: record_issue_and_mr_assignee_events
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117545
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/397050
 milestone: '15.11'
 type: development
-group: group::pipeline authoring
+group: group::optimize
 default_enabled: false
diff --git a/config/feature_flags/development/refactor_code_quality_inline_findings.yml b/config/feature_flags/development/refactor_code_quality_inline_findings.yml
deleted file mode 100644
index 98e2a307a50..00000000000
--- a/config/feature_flags/development/refactor_code_quality_inline_findings.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: refactor_code_quality_inline_findings
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88576
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364198
-milestone: '15.1'
-type: development
-group: group::static analysis
-default_enabled: true
diff --git a/config/feature_flags/experiment/security_actions_continuous_onboarding.yml b/config/feature_flags/experiment/security_actions_continuous_onboarding.yml
deleted file mode 100644
index ce7124cf0c8..00000000000
--- a/config/feature_flags/experiment/security_actions_continuous_onboarding.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: security_actions_continuous_onboarding
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82274
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345176
-milestone: '15.2'
-type: experiment
-group: group::acquisition
-default_enabled: false
diff --git a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
index 98a18d054a5..41383bbed2b 100644
--- a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
@@ -5,6 +5,7 @@ description: Count user ids from GitLab Managed clusters with Cert Manager enabl
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
index 1e33c81d2c2..24e70eddbe5 100644
--- a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
+++ b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
@@ -5,6 +5,7 @@ description: Count user ids from GitLab Managed clusters with Helm enabled
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
index a6e6e92d5bd..3a846b8016a 100644
--- a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
+++ b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
@@ -5,6 +5,7 @@ description: Count user ids from GitLab Managed clusters with Ingress enabled
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
index 77a4e5c2d07..75e14e36b4d 100644
--- a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
+++ b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
@@ -5,6 +5,7 @@ description: Count user ids from GitLab Managed clusters with Knative enabled
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
index 4902ca400bf..8ea669437ff 100644
--- a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
+++ b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
@@ -7,6 +7,7 @@ description: Number of Kubernetes clusters with clusters management project bein
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175415_clusters_disabled.yml b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
index ffc64495a14..39f8bf477c5 100644
--- a/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
@@ -5,6 +5,7 @@ description: Number of user ids from GitLab Managed disabled clusters
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
index 5c0d5dd9ae5..50e38523ade 100644
--- a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
@@ -5,6 +5,7 @@ description: Number of distict user ids from GitLab Managed clusters currently e
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
index f6ce65bd31f..f9f7e4137c9 100644
--- a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
+++ b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
@@ -5,6 +5,7 @@ description: Number of user ids from GitLab Managed clusters provisioned with Gi
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
index c3d6e83ae34..855b5f12fac 100644
--- a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
+++ b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
@@ -5,6 +5,7 @@ description: Number of user ids from GitLab Managed clusters provisioned with Gi
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
index 57d0fc54df4..7c0560448e7 100644
--- a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
+++ b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
@@ -5,6 +5,7 @@ description: Number of user ids from GitLab Managed clusters that are user provi
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
index d57a1e629e4..1946b6cc1a6 100644
--- a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
@@ -5,6 +5,7 @@ description: Number of users from GitLab Managed disabled clusters attached to t
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
index ae9ab5f3b19..139ca314e17 100644
--- a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
@@ -5,6 +5,7 @@ description: Number of user ids from GitLab Managed enabled clusters attached to
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
index 271359080eb..284d0ebd945 100644
--- a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
@@ -5,6 +5,7 @@ description: Number of user ids GitLab Managed disabled clusters attached to gro
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
index 958e91f3c8d..8898c54989e 100644
--- a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
@@ -5,6 +5,7 @@ description: Count disctinct user ids from GitLab Managed enabled clusters attac
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
index d5c9ae6c36b..b0b2c0e76a5 100644
--- a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
@@ -5,6 +5,7 @@ description: Number of user ids from GitLab Managed disabled clusters attached t
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
index 4c49cb7a9e8..9000f412607 100644
--- a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
@@ -5,6 +5,7 @@ description: Number of user ids from GitLab Managed enabled clusters attached to
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20220729001651_agent_users_using_ci_tunnel_monthly.yml b/config/metrics/counts_28d/20220729001651_agent_users_using_ci_tunnel_monthly.yml
index 1051dd92307..683fd308b0c 100644
--- a/config/metrics/counts_28d/20220729001651_agent_users_using_ci_tunnel_monthly.yml
+++ b/config/metrics/counts_28d/20220729001651_agent_users_using_ci_tunnel_monthly.yml
@@ -4,6 +4,7 @@ description: MAU of the Agent for Kubernetes CI/CD Tunnel
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 milestone: "15.3"
diff --git a/config/metrics/counts_all/20210216175232_clusters.yml b/config/metrics/counts_all/20210216175232_clusters.yml
index d829444f44b..ff1174d0c26 100644
--- a/config/metrics/counts_all/20210216175232_clusters.yml
+++ b/config/metrics/counts_all/20210216175232_clusters.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters both enabled and disabled
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175234_clusters_enabled.yml b/config/metrics/counts_all/20210216175234_clusters_enabled.yml
index 61b414ff244..2fc86649c4b 100644
--- a/config/metrics/counts_all/20210216175234_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175234_clusters_enabled.yml
@@ -5,6 +5,7 @@ description: Number of Kubernetes clusters attached to GitLab currently enabled
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml b/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
index 622a64538b9..d6d5228d0fe 100644
--- a/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters attached to projects
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml b/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
index 583773986a1..6c818d48782 100644
--- a/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters attached to groups
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml b/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
index 796957a7440..804e25da11c 100644
--- a/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters attached to the instance
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175242_clusters_disabled.yml b/config/metrics/counts_all/20210216175242_clusters_disabled.yml
index bb0380ae7e8..c4d4f14fc2c 100644
--- a/config/metrics/counts_all/20210216175242_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175242_clusters_disabled.yml
@@ -5,6 +5,7 @@ description: Number of Kubernetes clusters attached to GitLab currently disabled
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml b/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
index 058b23842d4..8ebcf09d7a2 100644
--- a/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed disabled clusters previously attached to proje
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml b/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
index e65c8abdd96..59b42f1cabe 100644
--- a/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed disabled clusters previously attached to group
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml b/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
index 1e57c37f13e..c9afefabf6c 100644
--- a/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed disabled clusters previously attached to the i
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml b/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
index 1e1438af907..6e9c86ea00f 100644
--- a/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
+++ b/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters provisioned with GitLab on AWS EKS
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml b/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
index 3b1f5b5ee7c..9d909701fe8 100644
--- a/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
+++ b/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters provisioned with GitLab on GCE GKE
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml b/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
index 0d9628454a5..4c073d61844 100644
--- a/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
+++ b/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters that are user provisioned
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
index 6a976e22817..075cddb387e 100644
--- a/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
+++ b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Helm enabled
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
index abf975a0ccc..cb308890bd4 100644
--- a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
+++ b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Ingress insta
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
index 69582bfbf19..cad1d25e732 100644
--- a/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Cert Manager
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
index d7e93b59ee9..e7ab1a3f950 100644
--- a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
+++ b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Crossplane in
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
index 201c31ee9cb..033d912d880 100644
--- a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Prometheus in
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
index 669b9b8f903..a460b40ed81 100644
--- a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Runner instal
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
index 6f6ef1e5dfa..bc142676e6a 100644
--- a/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
+++ b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Knative insta
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml b/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
index 46dfd58f5ff..54c96b5bea7 100644
--- a/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
+++ b/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Elastic Stack
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
index 63747b1fe74..b7d202d4c33 100644
--- a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
+++ b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Jupyter insta
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
index ece69b8f339..bd067804cbb 100644
--- a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
+++ b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Cilium instal
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175314_clusters_management_project.yml b/config/metrics/counts_all/20210216175314_clusters_management_project.yml
index 09f358a956f..3e4a4c6a7af 100644
--- a/config/metrics/counts_all/20210216175314_clusters_management_project.yml
+++ b/config/metrics/counts_all/20210216175314_clusters_management_project.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters with defined cluster management proje
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175316_kubernetes_agents.yml b/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
index def6e0ef296..537d29f11fa 100644
--- a/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
+++ b/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
@@ -5,6 +5,7 @@ description: Count of Kubernetes registered agents
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml b/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
index 65e3f88565b..143ebaa5b0d 100644
--- a/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
+++ b/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
@@ -5,6 +5,7 @@ description: Count of Kubernetes agents with at least one token
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml b/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
index 8937c8a82a9..82bfacffaf3 100644
--- a/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Cert Manager
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
index 18952db9b68..52c023961f9 100644
--- a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
+++ b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Helm enabled
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
index 593c86b6bf1..8d9897318a4 100644
--- a/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
+++ b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Ingress insta
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
index 78073455d01..1cab6eeee45 100644
--- a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
+++ b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Knative insta
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175337_clusters_management_project.yml b/config/metrics/counts_all/20210216175337_clusters_management_project.yml
index 4e127321fca..0a8899be1a3 100644
--- a/config/metrics/counts_all/20210216175337_clusters_management_project.yml
+++ b/config/metrics/counts_all/20210216175337_clusters_management_project.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters with defined cluster management proje
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175339_clusters_disabled.yml b/config/metrics/counts_all/20210216175339_clusters_disabled.yml
index 696e7a15888..510b66c02a2 100644
--- a/config/metrics/counts_all/20210216175339_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175339_clusters_disabled.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed disabled clusters
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175341_clusters_enabled.yml b/config/metrics/counts_all/20210216175341_clusters_enabled.yml
index 9271203b1a7..be4ca306eff 100644
--- a/config/metrics/counts_all/20210216175341_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175341_clusters_enabled.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters currently enabled
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml b/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
index 4e016aee66f..41a546f73ab 100644
--- a/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
+++ b/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters provisioned with GitLab on GCE GKE
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml b/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
index ed5981a9919..1711589636d 100644
--- a/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
+++ b/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters provisioned with GitLab on AWS EKS
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml b/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
index bbdb2ac0892..ed86490ef9c 100644
--- a/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
+++ b/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed clusters that are user provisioned
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml b/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
index 28e9355c88a..8007b2fc277 100644
--- a/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed disabled clusters attached to the instance
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml b/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
index d28bf04239a..bfe2a41c6ef 100644
--- a/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed enabled clusters attached to the instance
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml b/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
index cec667ac9c9..92e39a8aa36 100644
--- a/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed disabled clusters attached to groups
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml b/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
index 7fd97fd388d..263102b5a3b 100644
--- a/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed enabled clusters attached to groups
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml b/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
index 417ba5eb9a9..741036b7cd3 100644
--- a/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed disabled clusters attached to projects
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml b/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
index 4e9be0d170b..7afa52d0aa5 100644
--- a/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
@@ -5,6 +5,7 @@ description: Total GitLab Managed enabled clusters attached to projects
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml b/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
index 286733c87d7..4192eb5c3f8 100644
--- a/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
@@ -5,6 +5,7 @@ description: Projects with Prometheus alerting enabled
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: removed
 milestone_removed: '14.0'
diff --git a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
index 47290bf39ba..8e5acdf5ce3 100644
--- a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
@@ -5,6 +5,7 @@ description: Count of users creating managed clusters with Runner enabled
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all
diff --git a/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml b/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
index 67edbe13656..b1d5688c9a5 100644
--- a/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
+++ b/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
@@ -5,6 +5,7 @@ description: Count of Kubernetes API proxy requests
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 milestone: '13.12'
diff --git a/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml b/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml
index a535a7bca44..296e218d7b6 100644
--- a/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml
+++ b/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml
@@ -5,6 +5,7 @@ description: Total clusters with Clusters::Integrations::Prometheus enabled
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml b/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml
index 594138d4c17..0e8b04ad660 100644
--- a/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml
+++ b/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml
@@ -5,6 +5,7 @@ description: Total clusters with Clusters::Integrations::ElasticStack enabled
 product_section: ops
 product_stage: configure
 product_group: configure
+product_category: deployment_management
 value_type: number
 status: removed
 time_frame: all