Add latest changes from gitlab-org/gitlab@master

10 files changed, 20 insertions, 16 deletions

diff --git a/config/feature_flags/development/branches_pagination_without_count.yml b/config/feature_flags/development/branches_pagination_without_count.yml
index e342f302b2c..ed29caff812 100644
--- a/config/feature_flags/development/branches_pagination_without_count.yml
+++ b/config/feature_flags/development/branches_pagination_without_count.yml
@@ -5,4 +5,4 @@ rollout_issue_url:
 milestone: '13.9'
 type: development
 group: group::source code
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/ingress_modsecurity.yml b/config/feature_flags/development/load_balancing_for_build_queue_worker.yml
index 1dc7a1d6a52..1b80372ab82 100644
--- a/config/feature_flags/development/ingress_modsecurity.yml
+++ b/config/feature_flags/development/load_balancing_for_build_queue_worker.yml
@@ -1,8 +1,8 @@
 ---
-name: ingress_modsecurity
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20194
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/258554
-milestone: '12.5'
+name: load_balancing_for_build_queue_worker
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63212
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332586
+milestone: '14.0'
 type: development
-group: group::container security
+group: group::memory
 default_enabled: false
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index a9f5c569823..12461791b38 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -678,9 +678,6 @@ Gitlab.ee do
   Settings.cron_jobs['sync_seat_link_worker'] ||= Settingslogic.new({})
   Settings.cron_jobs['sync_seat_link_worker']['cron'] ||= "#{rand(60)} 3 * * * UTC"
   Settings.cron_jobs['sync_seat_link_worker']['job_class'] = 'SyncSeatLinkWorker'
-  Settings.cron_jobs['web_application_firewall_metrics_worker'] ||= Settingslogic.new({})
-  Settings.cron_jobs['web_application_firewall_metrics_worker']['cron'] ||= '0 1 * * 0'
-  Settings.cron_jobs['web_application_firewall_metrics_worker']['job_class'] = 'IngressModsecurityCounterMetricsWorker'
   Settings.cron_jobs['users_create_statistics_worker'] ||= Settingslogic.new({})
   Settings.cron_jobs['users_create_statistics_worker']['cron'] ||= '2 15 * * *'
   Settings.cron_jobs['users_create_statistics_worker']['job_class'] = 'Users::CreateStatisticsWorker'
diff --git a/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
index 2257a325aa6..a5607b54d05 100644
--- a/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
+++ b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
@@ -7,7 +7,8 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: deprecated
+status: removed
+milestone_removed: 14.0
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
index b716862c512..b8f5b8e8371 100644
--- a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
+++ b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
@@ -7,7 +7,8 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: deprecated
+status: removed
+milestone_removed: 14.0
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
index 74d2c99c5aa..0ab1020eadf 100644
--- a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
+++ b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
@@ -6,7 +6,8 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: deprecated
+status: removed
+milestone_removed: 14.0
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
index 7fce44b02cd..ecff0942267 100644
--- a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
+++ b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
@@ -6,7 +6,8 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: deprecated
+status: removed
+milestone_removed: 14.0
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
index 838837e223d..230a4b45f7e 100644
--- a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
+++ b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
@@ -6,7 +6,8 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: deprecated
+status: removed
+milestone_removed: 14.0
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
index 1e6ee0d40cb..19539659357 100644
--- a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
+++ b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
@@ -6,7 +6,8 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: deprecated
+status: removed
+milestone_removed: 14.0
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
index f76bd0593b6..a2552d1f465 100644
--- a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
+++ b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
@@ -6,7 +6,8 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: boolean
-status: deprecated
+status: removed
+milestone_removed: 14.0
 time_frame: none
 data_source: system
 distribution: