Add latest changes from gitlab-org/gitlab@master

58 files changed, 126 insertions, 124 deletions

diff --git a/app/controllers/concerns/notes_actions.rb b/app/controllers/concerns/notes_actions.rb
index 06b9c901e4a..eda9fbc9e3d 100644
--- a/app/controllers/concerns/notes_actions.rb
+++ b/app/controllers/concerns/notes_actions.rb
@@ -75,7 +75,7 @@ module NotesActions
   # rubocop:disable Gitlab/ModuleWithInstanceVariables
   def update
     @note = Notes::UpdateService.new(project, current_user, update_note_params).execute(note)
-    unless @note
+    if @note.destroyed?
       head :gone
       return
     end
diff --git a/app/graphql/mutations/notes/update/base.rb b/app/graphql/mutations/notes/update/base.rb
index 4c6df2776cc..09b814d903e 100644
--- a/app/graphql/mutations/notes/update/base.rb
+++ b/app/graphql/mutations/notes/update/base.rb
@@ -24,12 +24,9 @@ module Mutations
             note_params(note, args)
           ).execute(note)
 
-          # It's possible for updated_note to be `nil`, in the situation
-          # where the note is deleted within `Notes::UpdateService` due to
-          # the body of the note only containing Quick Actions.
           {
-            note: updated_note&.reset,
-            errors: updated_note ? errors_on_object(updated_note) : []
+            note: updated_note.destroyed? ? nil : updated_note.reset,
+            errors: updated_note.destroyed? ? [] : errors_on_object(updated_note)
           }
         end
 
diff --git a/app/services/notes/update_service.rb b/app/services/notes/update_service.rb
index e04891da7f8..92b41bb4cc7 100644
--- a/app/services/notes/update_service.rb
+++ b/app/services/notes/update_service.rb
@@ -45,7 +45,6 @@ module Notes
 
         if only_commands
           delete_note(note, message)
-          note = nil
         else
           note.save
         end
diff --git a/config/metrics/counts_28d/20210201124930_deployments.yml b/config/metrics/counts_28d/20210201124930_deployments.yml
index c2f9ecad3a5..afe8db8a265 100644
--- a/config/metrics/counts_28d/20210201124930_deployments.yml
+++ b/config/metrics/counts_28d/20210201124930_deployments.yml
@@ -3,8 +3,8 @@ data_category: operational
 key_path: counts_monthly.deployments
 description: Total deployments count for recent 28 days
 product_section: ops
-product_stage: release
-product_group: ops_release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 milestone: "13.2"
diff --git a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
index 06f94fe09b2..5760841db88 100644
--- a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
@@ -3,8 +3,8 @@ data_category: operational
 key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_config_auto_devops
 description: Distinct users that ran an auto DevOps pipeline without a .gitlab-ci.yml file.
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181923_successful_deployments.yml b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
index eb8b6df44e3..80ebafc31a0 100644
--- a/config/metrics/counts_28d/20210216181923_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
@@ -3,8 +3,8 @@ data_category: operational
 key_path: counts_monthly.successful_deployments
 description: Total successful deployments
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181924_failed_deployments.yml b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
index a6e27b6e8e0..3b172d25f84 100644
--- a/config/metrics/counts_28d/20210216181924_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
@@ -3,8 +3,8 @@ data_category: operational
 key_path: counts_monthly.failed_deployments
 description: Total failed deployments
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181935_deployments.yml b/config/metrics/counts_28d/20210216181935_deployments.yml
index a375dd5f7c9..cdde58c1366 100644
--- a/config/metrics/counts_28d/20210216181935_deployments.yml
+++ b/config/metrics/counts_28d/20210216181935_deployments.yml
@@ -3,8 +3,8 @@ data_category: operational
 key_path: usage_activity_by_stage_monthly.release.deployments
 description: Unique users triggering deployments
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: 28d
@@ -15,6 +15,5 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type:
-- smau
+performance_indicator_type: []
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181937_failed_deployments.yml b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
index 8099e8b4029..098e30ee827 100644
--- a/config/metrics/counts_28d/20210216181937_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
@@ -3,8 +3,8 @@ data_category: operational
 key_path: usage_activity_by_stage_monthly.release.failed_deployments
 description: Disinct users who initiated a failed deployment.
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181939_releases.yml b/config/metrics/counts_28d/20210216181939_releases.yml
index d1f7ba91094..6818cd31fe8 100644
--- a/config/metrics/counts_28d/20210216181939_releases.yml
+++ b/config/metrics/counts_28d/20210216181939_releases.yml
@@ -3,8 +3,8 @@ data_category: operational
 key_path: usage_activity_by_stage_monthly.release.releases
 description: Unique users creating release tags
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: 28d
@@ -16,8 +16,5 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type:
-- gmau
-- paid_gmau
-- smau
+performance_indicator_type: []
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181941_successful_deployments.yml b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
index 98b65907aa6..6ca92203a03 100644
--- a/config/metrics/counts_28d/20210216181941_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
@@ -3,8 +3,8 @@ data_category: operational
 key_path: usage_activity_by_stage_monthly.release.successful_deployments
 description: Disinct users who initiated a successful deployment.
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
index 7d222acb68f..b0c5b961263 100644
--- a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
+++ b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
@@ -3,8 +3,8 @@ data_category: operational
 key_path: redis_hll_counters.terraform.p_terraform_state_api_unique_users_monthly
 description: Monthly active users of GitLab Managed Terraform states
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: 28d
@@ -20,8 +20,5 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type:
-- smau
-- gmau
-- paid_gmau
+performance_indicator_type: []
 milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
index 19d4de90bdb..7929ef37d7b 100644
--- a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
+++ b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
@@ -3,8 +3,8 @@ data_category: operational
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_monthly
 description: Count of pipelines with implicit Auto DevOps runs
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml b/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
index 0f713615c12..b88fcc4d439 100644
--- a/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
+++ b/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_build_monthly
 description: Count of pipelines with implicit Auto Build runs
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 value_type: number
 status: removed
 milestone_removed: '14.6'
diff --git a/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml b/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
index db546cbb42f..33e3ef689d3 100644
--- a/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_deploy_monthly
 description: Count of pipelines with implicit Auto Deploy runs
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 value_type: number
 status: removed
 milestone_removed: '14.6'
diff --git a/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml b/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
index 12c46bcc065..e59a9924647 100644
--- a/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
+++ b/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
@@ -4,8 +4,8 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_cf_deploy_ec2_month
 description: Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.yml`
   template in last 28 days.
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: removed
 milestone_removed: '14.6'
diff --git a/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml b/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
index a787e944c81..af2c2d5cb15 100644
--- a/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
+++ b/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
@@ -4,8 +4,8 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_deploy_ecs_monthly
 description: Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in last
   28 days.
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml b/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
index 05b81b18592..b31fae55802 100644
--- a/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
+++ b/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_build_monthly
 description: Count of pipelines using the Auto Build template
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 value_type: number
 status: removed
 milestone_removed: '14.6'
diff --git a/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml b/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
index ccf0acd5af5..cc3747ae053 100644
--- a/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_monthly
 description: Count of pipelines using the stable Auto Deploy template
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 value_type: number
 status: removed
 milestone_removed: '14.6'
diff --git a/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
index 0e49b4668cc..c5f9d63772f 100644
--- a/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_latest_monthly
 description: Count of pipelines using the latest Auto Deploy template
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 value_type: number
 status: removed
 milestone_removed: '14.6'
diff --git a/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml b/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
index 1eb8b515254..653a73eea17 100644
--- a/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_base_latest_monthly
 description: Count of pipelines that include the terraform base template from GitLab
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
index aa50145225e..9358d756644 100755
--- a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
@@ -3,8 +3,8 @@ data_category: operational
 key_path: redis_hll_counters.ci_templates.ci_templates_total_unique_counts_monthly
 description: Total count of pipelines runs
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 value_type: number
 status: removed
 milestone_removed: '14.3'
diff --git a/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml b/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml
index 6d95f6b1be2..cee6762a197 100644
--- a/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml
+++ b/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml
@@ -3,8 +3,8 @@ key_path: usage_activity_by_stage_monthly.release.releases_with_milestones
 description: Unique users creating releases with milestones associated
 performance_indicator_type: []
 product_section: ops
-product_stage: release
-product_group: 'release'
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml b/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml
index b88adb8bc0b..89470d71eae 100644
--- a/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml
+++ b/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml
@@ -2,8 +2,8 @@
 key_path: redis_hll_counters.ci_users.ci_users_executing_deployment_job_monthly
 description: Monthly counts of times users have executed deployment jobs
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 milestone: "14.8"
diff --git a/config/metrics/counts_28d/20220706175117_ci_users_executing_verify_job_monthly.yml b/config/metrics/counts_28d/20220706175117_ci_users_executing_verify_job_monthly.yml
index 78427581b47..e736283e7fa 100644
--- a/config/metrics/counts_28d/20220706175117_ci_users_executing_verify_job_monthly.yml
+++ b/config/metrics/counts_28d/20220706175117_ci_users_executing_verify_job_monthly.yml
@@ -2,8 +2,8 @@
 key_path: redis_hll_counters.ci_users.ci_users_executing_verify_environment_job_monthly
 description: Monthly counts of times users have executed verify jobs
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 milestone: "15.2"
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 683fd308b0c..6952fdc5ba6 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
@@ -2,8 +2,8 @@
 key_path: redis_hll_counters.kubernetes_agent.agent_users_using_ci_tunnel_monthly
 description: MAU of the Agent for Kubernetes CI/CD Tunnel
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environment
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220905210112_users_visiting_environments_pages_monthly.yml b/config/metrics/counts_28d/20220905210112_users_visiting_environments_pages_monthly.yml
index 908f5137d7d..8d289aa62ff 100644
--- a/config/metrics/counts_28d/20220905210112_users_visiting_environments_pages_monthly.yml
+++ b/config/metrics/counts_28d/20220905210112_users_visiting_environments_pages_monthly.yml
@@ -2,8 +2,8 @@
 key_path: redis_hll_counters.environments.users_visiting_environments_pages_monthly
 description: Monthly count of unique users visiting environments pages
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_28d/20230130074932_p_ci_templates_terraform_module_monthly.yml b/config/metrics/counts_28d/20230130074932_p_ci_templates_terraform_module_monthly.yml
index 35d4706c1ef..394fd4e7407 100644
--- a/config/metrics/counts_28d/20230130074932_p_ci_templates_terraform_module_monthly.yml
+++ b/config/metrics/counts_28d/20230130074932_p_ci_templates_terraform_module_monthly.yml
@@ -2,8 +2,8 @@
 key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_module_monthly
 description: Count of pipelines using the Terraform Module template
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_28d/20230130075614_p_ci_templates_terraform_module_base_monthly.yml b/config/metrics/counts_28d/20230130075614_p_ci_templates_terraform_module_base_monthly.yml
index 9e3d705d454..cd48737140b 100644
--- a/config/metrics/counts_28d/20230130075614_p_ci_templates_terraform_module_base_monthly.yml
+++ b/config/metrics/counts_28d/20230130075614_p_ci_templates_terraform_module_base_monthly.yml
@@ -2,8 +2,8 @@
 key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_module_base_monthly
 description: Count of pipelines using the Terraform Module Base template
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 milestone: "15.9"
diff --git a/config/metrics/counts_all/20210201124934_deployments.yml b/config/metrics/counts_all/20210201124934_deployments.yml
index b779e3f5955..cb85048c13b 100644
--- a/config/metrics/counts_all/20210201124934_deployments.yml
+++ b/config/metrics/counts_all/20210201124934_deployments.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: counts.deployments
 description: Total deployments count
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 milestone: "8.12"
diff --git a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
index a03db93064d..9b192fa26a0 100644
--- a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
+++ b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
@@ -4,8 +4,8 @@ key_path: counts.auto_devops_enabled
 description: Projects with Auto DevOps template enabled (excluding implicit Auto DevOps
   enabled and Auto DevOps template includes)
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml b/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
index 1dbdd608c38..2f87c61e262 100644
--- a/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
+++ b/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: counts.auto_devops_disabled
 description: Projects with Auto DevOps template disabled
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175232_clusters.yml b/config/metrics/counts_all/20210216175232_clusters.yml
index ff1174d0c26..16e8bced3f8 100644
--- a/config/metrics/counts_all/20210216175232_clusters.yml
+++ b/config/metrics/counts_all/20210216175232_clusters.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: counts.clusters
 description: Total GitLab Managed clusters both enabled and disabled
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175316_kubernetes_agents.yml b/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
index 537d29f11fa..33e30168e1a 100644
--- a/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
+++ b/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: counts.kubernetes_agents
 description: Count of Kubernetes registered agents
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
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 143ebaa5b0d..48564ce63a1 100644
--- a/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
+++ b/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: counts.kubernetes_agents_with_token
 description: Count of Kubernetes agents with at least one token
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
@@ -17,5 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- smau
 milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml b/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
index 8a66dd6ffe5..20519c8a1cd 100644
--- a/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
@@ -3,8 +3,8 @@ data_category: operational
 key_path: counts.projects_with_terraform_reports
 description: Count of projects with Terraform MR reports
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml b/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
index b189d0c66a3..85a60855f61 100644
--- a/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
@@ -3,8 +3,8 @@ data_category: operational
 key_path: counts.projects_with_terraform_states
 description: Count of projects with GitLab Managed Terraform State
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175324_terraform_reports.yml b/config/metrics/counts_all/20210216175324_terraform_reports.yml
index 82eb2fb5998..9c288820ddf 100644
--- a/config/metrics/counts_all/20210216175324_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175324_terraform_reports.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: counts.terraform_reports
 description: Count of Terraform MR reports generated
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175326_terraform_states.yml b/config/metrics/counts_all/20210216175326_terraform_states.yml
index 746bb8bf3e4..839dc15110e 100644
--- a/config/metrics/counts_all/20210216175326_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175326_terraform_states.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: counts.terraform_states
 description: Count of GitLab Managed Terraform States
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
index 0fee8cceb9b..3b896103527 100644
--- a/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
@@ -3,8 +3,8 @@ data_category: operational
 key_path: counts.ci_pipeline_config_auto_devops
 description: Total pipelines from an Auto DevOps template
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
index 033b680f496..2c84af42d0e 100644
--- a/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: usage_activity_by_stage.verify.ci_pipeline_config_auto_devops
 description: Total pipelines from an Auto DevOps template
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181249_feature_flags.yml b/config/metrics/counts_all/20210216181249_feature_flags.yml
index c812959bcce..076264f15ac 100644
--- a/config/metrics/counts_all/20210216181249_feature_flags.yml
+++ b/config/metrics/counts_all/20210216181249_feature_flags.yml
@@ -3,8 +3,8 @@ data_category: operational
 key_path: counts.feature_flags
 description: Number of feature flag toggles
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181908_deploy_keys.yml b/config/metrics/counts_all/20210216181908_deploy_keys.yml
index 1f3a8722606..be753113ba0 100644
--- a/config/metrics/counts_all/20210216181908_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216181908_deploy_keys.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: counts.deploy_keys
 description: Count of deploy keys
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181911_successful_deployments.yml b/config/metrics/counts_all/20210216181911_successful_deployments.yml
index 1b03273b287..c83a7296f1b 100644
--- a/config/metrics/counts_all/20210216181911_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181911_successful_deployments.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: counts.successful_deployments
 description: Total successful deployments
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181912_failed_deployments.yml b/config/metrics/counts_all/20210216181912_failed_deployments.yml
index a250f9c52aa..74bddeb265e 100644
--- a/config/metrics/counts_all/20210216181912_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181912_failed_deployments.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: counts.failed_deployments
 description: Total failed deployments
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181914_environments.yml b/config/metrics/counts_all/20210216181914_environments.yml
index cf1b6723b36..4ad72578b0e 100644
--- a/config/metrics/counts_all/20210216181914_environments.yml
+++ b/config/metrics/counts_all/20210216181914_environments.yml
@@ -3,8 +3,8 @@ data_category: operational
 key_path: counts.environments
 description: Total available and stopped environments
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181916_in_review_folder.yml b/config/metrics/counts_all/20210216181916_in_review_folder.yml
index a8bfcf8d001..f85f92c373f 100644
--- a/config/metrics/counts_all/20210216181916_in_review_folder.yml
+++ b/config/metrics/counts_all/20210216181916_in_review_folder.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: counts.in_review_folder
 description: A number of environments with name review/*
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181918_releases.yml b/config/metrics/counts_all/20210216181918_releases.yml
index 4b8c047ea9c..8aa50d710ca 100644
--- a/config/metrics/counts_all/20210216181918_releases.yml
+++ b/config/metrics/counts_all/20210216181918_releases.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: counts.releases
 description: Count of releases
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181926_deployments.yml b/config/metrics/counts_all/20210216181926_deployments.yml
index ec186c3910f..c8f8525d161 100644
--- a/config/metrics/counts_all/20210216181926_deployments.yml
+++ b/config/metrics/counts_all/20210216181926_deployments.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: usage_activity_by_stage.release.deployments
 description: Unique users triggering deployments
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181928_failed_deployments.yml b/config/metrics/counts_all/20210216181928_failed_deployments.yml
index 6e69a80cb7e..b0aa8c88fe8 100644
--- a/config/metrics/counts_all/20210216181928_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181928_failed_deployments.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: usage_activity_by_stage.release.failed_deployments
 description: Total failed deployments
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181930_releases.yml b/config/metrics/counts_all/20210216181930_releases.yml
index 49a75057fe2..6ad09bbc754 100644
--- a/config/metrics/counts_all/20210216181930_releases.yml
+++ b/config/metrics/counts_all/20210216181930_releases.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: usage_activity_by_stage.release.releases
 description: Unique users creating release tags
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181932_successful_deployments.yml b/config/metrics/counts_all/20210216181932_successful_deployments.yml
index 31ab9308ac1..5e3177d0f48 100644
--- a/config/metrics/counts_all/20210216181932_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181932_successful_deployments.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: usage_activity_by_stage.release.successful_deployments
 description: Total successful deployments
 product_section: ops
-product_stage: release
-product_group: release
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 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 b1d5688c9a5..0903545623a 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
@@ -3,8 +3,8 @@ data_category: optional
 key_path: counts.kubernetes_agent_k8s_api_proxy_request
 description: Count of Kubernetes API proxy requests
 product_section: ops
-product_stage: configure
-product_group: configure
+product_stage: deploy
+product_group: environments
 product_category: deployment_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210715094459_releases_with_milestones.yml b/config/metrics/counts_all/20210715094459_releases_with_milestones.yml
index 48461dab515..29997637a79 100644
--- a/config/metrics/counts_all/20210715094459_releases_with_milestones.yml
+++ b/config/metrics/counts_all/20210715094459_releases_with_milestones.yml
@@ -3,8 +3,8 @@ key_path: usage_activity_by_stage.release.releases_with_milestones
 description: Unique users creating releases with milestones associated
 performance_indicator_type: []
 product_section: ops
-product_stage: release
-product_group: 'release'
+product_stage: deploy
+product_group: environments
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/lib/api/discussions.rb b/lib/api/discussions.rb
index 768ffac41ce..45466a1894c 100644
--- a/lib/api/discussions.rb
+++ b/lib/api/discussions.rb
@@ -122,7 +122,7 @@ module API
 
           note = create_note(noteable, opts)
 
-          if note.valid?
+          if note.persisted?
             present note.discussion, with: Entities::Discussion
           else
             bad_request!("Note #{note.errors.messages}")
@@ -175,7 +175,7 @@ module API
           }
           note = create_note(noteable, opts)
 
-          if note.valid?
+          if note.persisted?
             present note, with: Entities::Note
           else
             bad_request!("Note #{note.errors.messages}")
diff --git a/lib/api/helpers/notes_helpers.rb b/lib/api/helpers/notes_helpers.rb
index da499abe475..4b5335840f6 100644
--- a/lib/api/helpers/notes_helpers.rb
+++ b/lib/api/helpers/notes_helpers.rb
@@ -27,7 +27,7 @@ module API
 
         note = ::Notes::UpdateService.new(project, current_user, opts).execute(note)
 
-        if note.valid?
+        if note.errors.blank?
           present note, with: Entities::Note
         else
           bad_request!("Failed to save note #{note.errors.messages}")
diff --git a/lib/api/notes.rb b/lib/api/notes.rb
index 8ce875cdc03..70b4a3735e3 100644
--- a/lib/api/notes.rb
+++ b/lib/api/notes.rb
@@ -98,7 +98,7 @@ module API
           if note.errors.attribute_names == [:commands_only, :command_names]
             status 202
             present note, with: Entities::NoteCommands
-          elsif note.valid?
+          elsif note.persisted?
             present note, with: Entities.const_get(note.class.name, false)
           else
             note.errors.delete(:commands_only) if note.errors.has_key?(:commands)
diff --git a/spec/services/notes/update_service_spec.rb b/spec/services/notes/update_service_spec.rb
index 245cc046775..808ab46ef99 100644
--- a/spec/services/notes/update_service_spec.rb
+++ b/spec/services/notes/update_service_spec.rb
@@ -89,6 +89,18 @@ RSpec.describe Notes::UpdateService, feature_category: :team_planning do
           expect { edit_note_text }.to change { note.reload.updated_by }
         end
       end
+
+      context 'when quick action only update' do
+        it "delete note and return commands_only error" do
+          updated_note = described_class.new(project, user, { note: "/close\n" }).execute(note)
+
+          expect(updated_note.destroyed?).to eq(true)
+          expect(updated_note.errors).to match_array([
+            "Note can't be blank",
+            "Commands only Closed this issue."
+          ])
+        end
+      end
     end
 
     context 'when note text was not changed' do