From d809187fe5726aeb13e9b82e03ad13d7759cc191 Mon Sep 17 00:00:00 2001 From: Grant Young Date: Wed, 18 Oct 2023 11:58:53 +0100 Subject: [PATCH 1/3] Update Sidekiq config example to use role Role has been available since 14.1 --- doc/administration/sidekiq/index.md | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/doc/administration/sidekiq/index.md b/doc/administration/sidekiq/index.md index 10fadc40a8203c..69d4c69bd7f221 100644 --- a/doc/administration/sidekiq/index.md +++ b/doc/administration/sidekiq/index.md @@ -95,27 +95,7 @@ Updates to example must be made at: --> ```ruby - ######################################## - ##### Services Disabled ### - ######################################## - # - # When running GitLab on just one server, you have a single `gitlab.rb` - # to enable all services you want to run. - # When running GitLab on N servers, you have N `gitlab.rb` files. - # Enable only the services you want to run on each - # specific server, while disabling all others. - # - gitaly['enable'] = false - postgresql['enable'] = false - redis['enable'] = false - nginx['enable'] = false - puma['enable'] = false - gitlab_workhorse['enable'] = false - prometheus['enable'] = false - alertmanager['enable'] = false - grafana['enable'] = false - gitlab_exporter['enable'] = false - gitlab_kas['enable'] = false + roles ["sidekiq_role"] ## ## To maintain uniformity of links across nodes, the -- GitLab From cb9768ac690a9468959098d371d3e92f18493d4c Mon Sep 17 00:00:00 2001 From: Grant Young Date: Wed, 18 Oct 2023 12:01:34 +0100 Subject: [PATCH 2/3] Add docs link --- doc/administration/sidekiq/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/administration/sidekiq/index.md b/doc/administration/sidekiq/index.md index 69d4c69bd7f221..e45eb179fcc097 100644 --- a/doc/administration/sidekiq/index.md +++ b/doc/administration/sidekiq/index.md @@ -95,6 +95,7 @@ Updates to example must be made at: --> ```ruby + # https://docs.gitlab.com/omnibus/roles/#sidekiq-roles roles ["sidekiq_role"] ## -- GitLab From d45da40a95e07553f52137f46f71a4b9b4e727ff Mon Sep 17 00:00:00 2001 From: Grant Young Date: Wed, 18 Oct 2023 12:04:32 +0100 Subject: [PATCH 3/3] Use correct role config format Also add link to related docs throughout --- doc/administration/reference_architectures/10k_users.md | 3 ++- doc/administration/reference_architectures/25k_users.md | 3 ++- doc/administration/reference_architectures/2k_users.md | 3 ++- doc/administration/reference_architectures/3k_users.md | 3 ++- doc/administration/reference_architectures/50k_users.md | 3 ++- doc/administration/reference_architectures/5k_users.md | 3 ++- doc/administration/sidekiq/index.md | 2 +- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/doc/administration/reference_architectures/10k_users.md b/doc/administration/reference_architectures/10k_users.md index 2e208c4eca1fd6..16f1f11a6b13e0 100644 --- a/doc/administration/reference_architectures/10k_users.md +++ b/doc/administration/reference_architectures/10k_users.md @@ -1763,7 +1763,8 @@ Updates to example must be made at: --> ```ruby - roles ["sidekiq_role"] + # https://docs.gitlab.com/omnibus/roles/#sidekiq-roles + roles(["sidekiq_role"]) # External URL ## This should match the URL of the external load balancer diff --git a/doc/administration/reference_architectures/25k_users.md b/doc/administration/reference_architectures/25k_users.md index 355fe45cc2f08b..1745fb55b22cd0 100644 --- a/doc/administration/reference_architectures/25k_users.md +++ b/doc/administration/reference_architectures/25k_users.md @@ -1780,7 +1780,8 @@ Updates to example must be made at: --> ```ruby - roles ["sidekiq_role"] + # https://docs.gitlab.com/omnibus/roles/#sidekiq-roles + roles(["sidekiq_role"]) # External URL ## This should match the URL of the external load balancer diff --git a/doc/administration/reference_architectures/2k_users.md b/doc/administration/reference_architectures/2k_users.md index 5814d6c1e2de7d..6528301ae149cb 100644 --- a/doc/administration/reference_architectures/2k_users.md +++ b/doc/administration/reference_architectures/2k_users.md @@ -609,7 +609,8 @@ Updates to example must be made at: --> ```ruby - roles ["sidekiq_role"] + # https://docs.gitlab.com/omnibus/roles/#sidekiq-roles + roles(["sidekiq_role"]) # External URL external_url 'https://gitlab.example.com' diff --git a/doc/administration/reference_architectures/3k_users.md b/doc/administration/reference_architectures/3k_users.md index 1fd8239c93fe6c..80e2ed76839135 100644 --- a/doc/administration/reference_architectures/3k_users.md +++ b/doc/administration/reference_architectures/3k_users.md @@ -1708,7 +1708,8 @@ Updates to example must be made at: --> ```ruby - roles ["sidekiq_role"] + # https://docs.gitlab.com/omnibus/roles/#sidekiq-roles + roles(["sidekiq_role"]) # External URL ## This should match the URL of the external load balancer diff --git a/doc/administration/reference_architectures/50k_users.md b/doc/administration/reference_architectures/50k_users.md index 72ddd347856903..b0ca172893e61b 100644 --- a/doc/administration/reference_architectures/50k_users.md +++ b/doc/administration/reference_architectures/50k_users.md @@ -1776,7 +1776,8 @@ Updates to example must be made at: --> ```ruby - roles ["sidekiq_role"] + # https://docs.gitlab.com/omnibus/roles/#sidekiq-roles + roles(["sidekiq_role"]) # External URL ## This should match the URL of the external load balancer diff --git a/doc/administration/reference_architectures/5k_users.md b/doc/administration/reference_architectures/5k_users.md index e2bf0aa59f47e6..5e6387359d8085 100644 --- a/doc/administration/reference_architectures/5k_users.md +++ b/doc/administration/reference_architectures/5k_users.md @@ -1696,7 +1696,8 @@ Updates to example must be made at: --> ```ruby - roles ["sidekiq_role"] + # https://docs.gitlab.com/omnibus/roles/#sidekiq-roles + roles(["sidekiq_role"]) # External URL ## This should match the URL of the external load balancer diff --git a/doc/administration/sidekiq/index.md b/doc/administration/sidekiq/index.md index e45eb179fcc097..a27723faa4a341 100644 --- a/doc/administration/sidekiq/index.md +++ b/doc/administration/sidekiq/index.md @@ -96,7 +96,7 @@ Updates to example must be made at: ```ruby # https://docs.gitlab.com/omnibus/roles/#sidekiq-roles - roles ["sidekiq_role"] + roles(["sidekiq_role"]) ## ## To maintain uniformity of links across nodes, the -- GitLab