Add latest changes from gitlab-org/gitlab@master

12 files changed, 87 insertions, 21 deletions

diff --git a/config/feature_flags/development/ci_include_components.yml b/config/feature_flags/development/ci_include_components.yml
index b61863e9675..262493bc0cc 100644
--- a/config/feature_flags/development/ci_include_components.yml
+++ b/config/feature_flags/development/ci_include_components.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/39064
 milestone: '15.9'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/deployments_raise_updated_at_inefficient_error.yml b/config/feature_flags/development/deployments_raise_updated_at_inefficient_error.yml
index f1c388f6113..25db63e93cf 100644
--- a/config/feature_flags/development/deployments_raise_updated_at_inefficient_error.yml
+++ b/config/feature_flags/development/deployments_raise_updated_at_inefficient_error.yml
@@ -1,8 +1,8 @@
 ---
 name: deployments_raise_updated_at_inefficient_error
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116656
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/328500
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409584
 milestone: '15.11'
 type: development
 group: group::environments
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/deployments_raise_updated_at_inefficient_error_override.yml b/config/feature_flags/development/deployments_raise_updated_at_inefficient_error_override.yml
new file mode 100644
index 00000000000..80b06d9a720
--- /dev/null
+++ b/config/feature_flags/development/deployments_raise_updated_at_inefficient_error_override.yml
@@ -0,0 +1,8 @@
+---
+name: deployments_raise_updated_at_inefficient_error_override
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120066
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409584
+milestone: '16.0'
+type: development
+group: group::environments
+default_enabled: false
diff --git a/config/feature_flags/development/notify_kas_on_git_push.yml b/config/feature_flags/development/notify_kas_on_git_push.yml
new file mode 100644
index 00000000000..df90a4d1942
--- /dev/null
+++ b/config/feature_flags/development/notify_kas_on_git_push.yml
@@ -0,0 +1,8 @@
+---
+name: notify_kas_on_git_push
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119168
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/410429
+milestone: '16.0'
+type: development
+group: group::environments
+default_enabled: false
diff --git a/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml b/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
index 85372300fdb..f45f7be3022 100644
--- a/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
@@ -2,9 +2,9 @@
 data_category: optional
 key_path: usage_activity_by_stage_monthly.plan.service_desk_enabled_projects
 description: Count creator ids from projects with service desk enabled
-product_section: dev
-product_stage: plan
-product_group: product_planning
+product_section: ops
+product_stage: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
index ae780f35bb2..302dc04e16a 100644
--- a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
+++ b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
@@ -2,9 +2,9 @@
 data_category: operational
 key_path: usage_activity_by_stage_monthly.plan.service_desk_issues
 description: Count of service desk issues
-product_section: dev
-product_stage: plan
-product_group: plan
+product_section: ops
+product_stage: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20230420160442_i_quickactions_type_monthly.yml b/config/metrics/counts_28d/20230420160442_i_quickactions_type_monthly.yml
new file mode 100644
index 00000000000..f18f890904e
--- /dev/null
+++ b/config/metrics/counts_28d/20230420160442_i_quickactions_type_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_type_monthly
+description: Count of MAU using the `/type` quick action
+product_section: dev
+product_stage: plan
+product_group: product_planning
+value_type: number
+status: active
+milestone: "16.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118790
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_type
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20230420160441_i_quickactions_type_weekly.yml b/config/metrics/counts_7d/20230420160441_i_quickactions_type_weekly.yml
new file mode 100644
index 00000000000..0e7e540885c
--- /dev/null
+++ b/config/metrics/counts_7d/20230420160441_i_quickactions_type_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_type_weekly
+description: Count of MAU using the `/type` quick action
+product_section: dev
+product_stage: plan
+product_group: product_planning
+value_type: number
+status: active
+milestone: "16.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118790
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_type
+performance_indicator_type: []
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml b/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
index 815d440b63c..f81fb42db96 100644
--- a/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
@@ -2,9 +2,9 @@
 data_category: optional
 key_path: counts.service_desk_enabled_projects
 description: Count of service desk enabled projects
-product_section: dev
-product_stage: plan
-product_group: certify
+product_section: ops
+product_stage: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175026_service_desk_issues.yml b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
index 03761796cd4..3106b6bf7bb 100644
--- a/config/metrics/counts_all/20210216175026_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
@@ -2,9 +2,9 @@
 data_category: operational
 key_path: counts.service_desk_issues
 description: Count of service desk issues
-product_section: dev
-product_stage: plan
-product_group: certify
+product_section: ops
+product_stage: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml b/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
index 9b5ad936dac..30318cd2d3c 100644
--- a/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
@@ -2,9 +2,9 @@
 data_category: optional
 key_path: usage_activity_by_stage.plan.service_desk_enabled_projects
 description: Count creator ids from projects with service desk enabled
-product_section: dev
-product_stage: plan
-product_group: product_planning
+product_section: ops
+product_stage: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216181124_service_desk_issues.yml b/config/metrics/counts_all/20210216181124_service_desk_issues.yml
index 43b24581052..c2b27567ff1 100644
--- a/config/metrics/counts_all/20210216181124_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216181124_service_desk_issues.yml
@@ -2,9 +2,9 @@
 data_category: optional
 key_path: usage_activity_by_stage.plan.service_desk_issues
 description: Count of service desk issues
-product_section: dev
-product_stage: plan
-product_group: product_planning
+product_section: ops
+product_stage: monitor
+product_group: respond
 value_type: number
 status: active
 time_frame: all