From 5c0368870d1acb06ffb1ebffa684bda738ef8245 Mon Sep 17 00:00:00 2001 From: Nailia Iskhakova Date: Wed, 21 Aug 2024 16:54:42 +0200 Subject: [PATCH 1/3] Update Prometheus configuration for Sidekiq in 2k docs Signed-off-by: Nailia Iskhakova --- doc/administration/reference_architectures/2k_users.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/administration/reference_architectures/2k_users.md b/doc/administration/reference_architectures/2k_users.md index c66964d5159759..cc992afc3e36c9 100644 --- a/doc/administration/reference_architectures/2k_users.md +++ b/doc/administration/reference_architectures/2k_users.md @@ -957,6 +957,7 @@ running [Prometheus](../monitoring/prometheus/index.md): 1.1.1.3: gitaly1 1.1.1.4: rails1 1.1.1.5: rails2 + 1.1.1.6: sidekiq ``` Add the following to `/etc/gitlab/gitlab.rb`: @@ -1003,13 +1004,13 @@ running [Prometheus](../monitoring/prometheus/index.md): { 'job_name': 'gitlab-sidekiq', 'static_configs' => [ - 'targets' => ['1.1.1.4:8082', '1.1.1.5:8082'], + 'targets' => ['1.1.1.6:8082'], ], }, { 'job_name': 'static-node', 'static_configs' => [ - 'targets' => ['1.1.1.1:9100', '1.1.1.2:9100', '1.1.1.3:9100', '1.1.1.4:9100', '1.1.1.5:9100'], + 'targets' => ['1.1.1.1:9100', '1.1.1.2:9100', '1.1.1.3:9100', '1.1.1.4:9100', '1.1.1.5:9100', '1.1.1.6:9100'], ], }, ] -- GitLab From c8fc525aada037e46a0e134333b18d16b256d4d3 Mon Sep 17 00:00:00 2001 From: Nailia Iskhakova Date: Wed, 21 Aug 2024 17:00:32 +0200 Subject: [PATCH 2/3] Update history in RA page Signed-off-by: Nailia Iskhakova --- doc/administration/reference_architectures/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/administration/reference_architectures/index.md b/doc/administration/reference_architectures/index.md index 0dc8ccef4cff81..0a66a4406292be 100644 --- a/doc/administration/reference_architectures/index.md +++ b/doc/administration/reference_architectures/index.md @@ -776,6 +776,7 @@ You can find a full history of changes [on the GitLab project](https://gitlab.co **2024:** +- [2024-08](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/163506): Updated Sidekiq configuration for Prometheus in Monitoring node on 2k. - [2024-08](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/162144): Added Next Steps breadcrumb section to the pages to help discoverability of additional features. - [2024-05](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153716): Updated the 60 RPS / 3k User and 100 RPS / 5k User pages to have latest Redis guidance on co-locating Redis Sentinel with Redis itself. - [2024-05](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153579): Renamed `Cost to run` section to `Cost calculator templates` to better reflect the calculators are only a starting point and need to be adjusted with specific usage to give more accurate cost estimates. -- GitLab From f3b1e11e8bd357d04da5a18b96e77f5dd86ca453 Mon Sep 17 00:00:00 2001 From: Nailia Iskhakova Date: Wed, 21 Aug 2024 17:05:37 +0200 Subject: [PATCH 3/3] Update diagram to be more congruent per review Signed-off-by: Nailia Iskhakova --- doc/administration/reference_architectures/2k_users.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/administration/reference_architectures/2k_users.md b/doc/administration/reference_architectures/2k_users.md index cc992afc3e36c9..b6937fa930db8d 100644 --- a/doc/administration/reference_architectures/2k_users.md +++ b/doc/administration/reference_architectures/2k_users.md @@ -71,16 +71,16 @@ card "**Redis**" as redis #FF6347 cloud "**Object Storage**" as object_storage #white elb -[#6a9be7]-> gitlab -elb -[#6a9be7]--> monitor +elb -[#6a9be7,norank]--> monitor gitlab -[#32CD32]--> gitaly gitlab -[#32CD32]--> postgres -gitlab -[#32CD32]-> object_storage +gitlab -[#32CD32]> object_storage gitlab -[#32CD32]--> redis -sidekiq -[#ff8dd1]r-> object_storage -sidekiq -[#ff8dd1]----> redis -sidekiq .[#ff8dd1]----> postgres +sidekiq -[#ff8dd1]> object_storage +sidekiq -[#ff8dd1]--> redis +sidekiq .[#ff8dd1]--> postgres sidekiq -[hidden]-> monitor monitor .[#7FFFD4]u-> gitlab -- GitLab