Add latest changes from gitlab-org/gitlab@master

13 files changed, 20 insertions, 12 deletions

diff --git a/config/feature_flags/development/delayed_repository_update_mirror_worker.yml b/config/feature_flags/development/delayed_repository_update_mirror_worker.yml
new file mode 100644
index 00000000000..0de84c81e1d
--- /dev/null
+++ b/config/feature_flags/development/delayed_repository_update_mirror_worker.yml
@@ -0,0 +1,8 @@
+---
+name: delayed_repository_update_mirror_worker
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87995
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362894
+milestone: '15.1'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
index a0dd87cd7dc..67cae705601 100644
--- a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
@@ -3,7 +3,7 @@ data_category: operational
 key_path: counts_monthly.aggregated_metrics.code_review_category_monthly_active_users
 description: Unique users performing actions on code review events
 product_section: dev
-product_stage: devops::create
+product_stage: create
 product_group: group::code review
 product_category:
 value_type: number
diff --git a/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
index faa452f73a6..b379aa78586 100644
--- a/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts_monthly.aggregated_metrics.code_review_extension_category_monthly_active_users
 description: Number of users performing i_code_review_user_vs_code_api_request event
 product_section: dev
-product_stage: devops::create
+product_stage: create
 product_group: group::code review
 product_category:
 value_type: number
diff --git a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
index 5cbdd9afa54..01c4724971d 100644
--- a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts_monthly.aggregated_metrics.code_review_group_monthly_active_users
 description: Number of users performing at least one of the code review events
 product_section: dev
-product_stage: devops::create
+product_stage: create
 product_group: group::code review
 product_category:
 value_type: number
diff --git a/config/metrics/counts_28d/20210930125418_github_import_project_start_monthly.yml b/config/metrics/counts_28d/20210930125418_github_import_project_start_monthly.yml
index 2812aa73cad..d79dede39f0 100644
--- a/config/metrics/counts_28d/20210930125418_github_import_project_start_monthly.yml
+++ b/config/metrics/counts_28d/20210930125418_github_import_project_start_monthly.yml
@@ -2,7 +2,7 @@
 key_path: redis_hll_counters.importer.github_import_project_start_monthly
 description: The number of github projects that were enqueued to start monthy
 product_section: dev
-product_stage: devops
+product_stage: manage
 product_group: group::import
 product_category:
 value_type: number
diff --git a/config/metrics/counts_28d/20210930130531_github_import_project_success_monthly.yml b/config/metrics/counts_28d/20210930130531_github_import_project_success_monthly.yml
index ab599c67376..eb4ce81997f 100644
--- a/config/metrics/counts_28d/20210930130531_github_import_project_success_monthly.yml
+++ b/config/metrics/counts_28d/20210930130531_github_import_project_success_monthly.yml
@@ -2,7 +2,7 @@
 key_path: redis_hll_counters.importer.github_import_project_success_monthly
 description: The number of github projects that were successful monthly
 product_section: dev
-product_stage: devops
+product_stage: manage
 product_group: group::import
 product_category:
 value_type: number
diff --git a/config/metrics/counts_28d/20210930163813_github_import_project_failure_monthly.yml b/config/metrics/counts_28d/20210930163813_github_import_project_failure_monthly.yml
index 6651a770920..0f16cf65ca5 100644
--- a/config/metrics/counts_28d/20210930163813_github_import_project_failure_monthly.yml
+++ b/config/metrics/counts_28d/20210930163813_github_import_project_failure_monthly.yml
@@ -2,7 +2,7 @@
 key_path: redis_hll_counters.importer.github_import_project_failure_monthly
 description: The number of github projects that failed monthly
 product_section: dev
-product_stage: devops
+product_stage: manage
 product_group: group::import
 product_category:
 value_type: number
diff --git a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
index fa58494cc05..1143a233e85 100644
--- a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts_weekly.aggregated_metrics.code_review_group_monthly_active_users
 description: Number of users performing at least one of the code review events
 product_section: dev
-product_stage: devops::create
+product_stage: create
 product_group: group::code review
 product_category:
 value_type: number
diff --git a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
index e1c61db272b..96490623d95 100644
--- a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts_weekly.aggregated_metrics.code_review_category_monthly_active_users
 description: Unique users performing actions on code review events
 product_section: dev
-product_stage: devops::create
+product_stage: create
 product_group: group::code review
 product_category:
 value_type: number
diff --git a/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
index 29e52e07a14..d452a7d2c28 100644
--- a/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts_weekly.aggregated_metrics.code_review_extension_category_monthly_active_users
 description: Number of users performing code review extension_category events
 product_section: dev
-product_stage: devops::create
+product_stage: create
 product_group: group::code review
 product_category:
 value_type: number
diff --git a/config/metrics/counts_7d/20210930125411_github_import_project_start_weekly.yml b/config/metrics/counts_7d/20210930125411_github_import_project_start_weekly.yml
index 2c5b7d46e1a..fb065ffe3b1 100644
--- a/config/metrics/counts_7d/20210930125411_github_import_project_start_weekly.yml
+++ b/config/metrics/counts_7d/20210930125411_github_import_project_start_weekly.yml
@@ -2,7 +2,7 @@
 key_path: redis_hll_counters.importer.github_import_project_start_weekly
 description: The number of github projects that were enqueued to start weekly
 product_section: dev
-product_stage: devops
+product_stage: manage
 product_group: group::import
 product_category:
 value_type: number
diff --git a/config/metrics/counts_7d/20210930130525_github_import_project_success_weekly.yml b/config/metrics/counts_7d/20210930130525_github_import_project_success_weekly.yml
index 10147658ddc..887dc2565dc 100644
--- a/config/metrics/counts_7d/20210930130525_github_import_project_success_weekly.yml
+++ b/config/metrics/counts_7d/20210930130525_github_import_project_success_weekly.yml
@@ -2,7 +2,7 @@
 key_path: redis_hll_counters.importer.github_import_project_success_weekly
 description: The number of github projects that were successful weekly
 product_section: dev
-product_stage: devops
+product_stage: manage
 product_group: group::import
 product_category:
 value_type: number
diff --git a/config/metrics/counts_7d/20210930163807_github_import_project_failure_weekly.yml b/config/metrics/counts_7d/20210930163807_github_import_project_failure_weekly.yml
index 33a1902504f..c4ffb079c38 100644
--- a/config/metrics/counts_7d/20210930163807_github_import_project_failure_weekly.yml
+++ b/config/metrics/counts_7d/20210930163807_github_import_project_failure_weekly.yml
@@ -2,7 +2,7 @@
 key_path: redis_hll_counters.importer.github_import_project_failure_weekly
 description: The number of github projects that failed weekly
 product_section: dev
-product_stage: devops
+product_stage: manage
 product_group: group::import
 product_category:
 value_type: number