diff --git a/doc/administration/reference_architectures/10k_users.md b/doc/administration/reference_architectures/10k_users.md index fb20397622dc3a72f2ce3bc1cada6a1efcfa9a03..19d34e2131d2a0f2c0acd01e2bf6fe1134ac5b90 100644 --- a/doc/administration/reference_architectures/10k_users.md +++ b/doc/administration/reference_architectures/10k_users.md @@ -1847,12 +1847,9 @@ To configure the Sidekiq nodes, on each one: sidekiq['enable'] = true sidekiq['listen_address'] = "0.0.0.0" - # Set number of Sidekiq queue processes to the same number as available CPUs + ## Set number of Sidekiq queue processes to the same number as available CPUs sidekiq['queue_groups'] = ['*'] * 4 - # Set number of Sidekiq threads per queue process to the recommended number of 20 - sidekiq['max_concurrency'] = 20 - # Monitoring consul['enable'] = true consul['monitoring_service_discovery'] = true diff --git a/doc/administration/reference_architectures/25k_users.md b/doc/administration/reference_architectures/25k_users.md index 26daf5ab73da73e83d0b8ecbd582a289f3fb5b84..f1efa707ba9f7bfe1bce46378dfa34057a6958ff 100644 --- a/doc/administration/reference_architectures/25k_users.md +++ b/doc/administration/reference_architectures/25k_users.md @@ -1855,12 +1855,9 @@ To configure the Sidekiq nodes, on each one: sidekiq['enable'] = true sidekiq['listen_address'] = "0.0.0.0" - # Set number of Sidekiq queue processes to the same number as available CPUs + ## Set number of Sidekiq queue processes to the same number as available CPUs sidekiq['queue_groups'] = ['*'] * 4 - # Set number of Sidekiq threads per queue process to the recommend number of 20 - sidekiq['max_concurrency'] = 20 - # Monitoring consul['enable'] = true consul['monitoring_service_discovery'] = true diff --git a/doc/administration/reference_architectures/2k_users.md b/doc/administration/reference_architectures/2k_users.md index 1c2b39336d475a1cb0504f269fd1e5cc725fbc21..723fd52a4db95d406aac2875d4a50acf1be86a76 100644 --- a/doc/administration/reference_architectures/2k_users.md +++ b/doc/administration/reference_architectures/2k_users.md @@ -679,9 +679,6 @@ To configure the Sidekiq server, on the server node you want to use for Sidekiq: ## Set number of Sidekiq queue processes to the same number as available CPUs sidekiq['queue_groups'] = ['*'] * 4 - ## Set number of Sidekiq threads per queue process to the recommend number of 20 - sidekiq['max_concurrency'] = 20 - ## Set the network addresses that the exporters will listen on node_exporter['listen_address'] = '0.0.0.0:9100' diff --git a/doc/administration/reference_architectures/3k_users.md b/doc/administration/reference_architectures/3k_users.md index af5461a81f03bcfa0e750800003a24a048591078..84e369a9fc0b6b08ca623940f16dce424b01a60d 100644 --- a/doc/administration/reference_architectures/3k_users.md +++ b/doc/administration/reference_architectures/3k_users.md @@ -1772,9 +1772,6 @@ To configure the Sidekiq nodes, on each one: ## Set number of Sidekiq queue processes to the same number as available CPUs sidekiq['queue_groups'] = ['*'] * 4 - ## Set number of Sidekiq threads per queue process to the recommend number of 20 - sidekiq['max_concurrency'] = 20 - # Monitoring consul['enable'] = true consul['monitoring_service_discovery'] = true diff --git a/doc/administration/reference_architectures/50k_users.md b/doc/administration/reference_architectures/50k_users.md index ab14d7dad9c226c849bfad854b38691d5eade2cf..dc7d7ac25636097b8ac726e2d168629d9beb390e 100644 --- a/doc/administration/reference_architectures/50k_users.md +++ b/doc/administration/reference_architectures/50k_users.md @@ -1865,9 +1865,6 @@ To configure the Sidekiq nodes, on each one: ## Set number of Sidekiq queue processes to the same number as available CPUs sidekiq['queue_groups'] = ['*'] * 4 - ## Set number of Sidekiq threads per queue process to the recommend number of 20 - sidekiq['max_concurrency'] = 20 - # Monitoring consul['enable'] = true consul['monitoring_service_discovery'] = true diff --git a/doc/administration/reference_architectures/5k_users.md b/doc/administration/reference_architectures/5k_users.md index d24eece65d1845140e9b31b359197d7261511072..7f016872da18e962f1ea9357b6c6e728efc4a936 100644 --- a/doc/administration/reference_architectures/5k_users.md +++ b/doc/administration/reference_architectures/5k_users.md @@ -1763,9 +1763,6 @@ To configure the Sidekiq nodes, on each one: ## Set number of Sidekiq queue processes to the same number as available CPUs sidekiq['queue_groups'] = ['*'] * 4 - ## Set number of Sidekiq threads per queue process to the recommend number of 20 - sidekiq['max_concurrency'] = 20 - # Monitoring consul['enable'] = true consul['monitoring_service_discovery'] = true diff --git a/doc/administration/reference_architectures/index.md b/doc/administration/reference_architectures/index.md index 7ddc52e5a3233e2e854f8a1a24c453239a9dd27f..9a861039d19465c5927f10b417b014358a74c358 100644 --- a/doc/administration/reference_architectures/index.md +++ b/doc/administration/reference_architectures/index.md @@ -729,7 +729,8 @@ You can find a full history of changes [on the GitLab project](https://gitlab.co **2024:** -- [2024-02](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143539): Adjusted the Sidekiq recommendations on 2k to disable Sidekiq on Rails nodes and updated architecture diagram +- [2024-02](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143539): Remove the Sidekiq Max Concurrency setting in examples as this is deprecated and no longer required to be set explicitly. +- [2024-02](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143539): Adjusted the Sidekiq recommendations on 2k to disable Sidekiq on Rails nodes and updated architecture diagram. - [2024-01](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140465): Updated recommendations for Azure for all Reference Architecture sizes and latest cloud services. **2023:**