Skip to content
代码片段 群组 项目
未验证 提交 4ca5f0ca 编辑于 作者: Achilleas Pipinellis's avatar Achilleas Pipinellis 提交者: GitLab
浏览文件

Merge branch 'docs-ref-arch-2k-sidekiq-updates' into 'master'

Update 2k reference architecture guidance for Sidekiq

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143539



Merged-by: default avatarAchilleas Pipinellis <axil@gitlab.com>
Approved-by: default avatarGrant Young <gyoung@gitlab.com>
Approved-by: default avatarAchilleas Pipinellis <axil@gitlab.com>
Reviewed-by: default avatarGrant Young <gyoung@gitlab.com>
Reviewed-by: default avatarNailia Iskhakova <niskhakova@gitlab.com>
Co-authored-by: default avatarGrant Young <gyoung@gitlab.com>
Co-authored-by: default avatarNailia Iskhakova <niskhakova@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -55,7 +55,11 @@ skinparam linetype ortho ...@@ -55,7 +55,11 @@ skinparam linetype ortho
card "**External Load Balancer**" as elb #6a9be7 card "**External Load Balancer**" as elb #6a9be7
collections "**GitLab Rails** x2" as gitlab #32CD32 together {
collections "**GitLab Rails** x2" as gitlab #32CD32
card "**Sidekiq**" as sidekiq #ff8dd1
}
card "**Prometheus**" as monitor #7FFFD4 card "**Prometheus**" as monitor #7FFFD4
card "**Gitaly**" as gitaly #FF8C00 card "**Gitaly**" as gitaly #FF8C00
card "**PostgreSQL**" as postgres #4EA7FF card "**PostgreSQL**" as postgres #4EA7FF
...@@ -70,11 +74,17 @@ gitlab -[#32CD32]--> postgres ...@@ -70,11 +74,17 @@ gitlab -[#32CD32]--> postgres
gitlab -[#32CD32]-> object_storage gitlab -[#32CD32]-> object_storage
gitlab -[#32CD32]--> redis gitlab -[#32CD32]--> redis
sidekiq -[#ff8dd1]r-> object_storage
sidekiq -[#ff8dd1]----> redis
sidekiq .[#ff8dd1]----> postgres
sidekiq -[hidden]-> monitor
monitor .[#7FFFD4]u-> gitlab monitor .[#7FFFD4]u-> gitlab
monitor .[#7FFFD4]-> gitaly monitor .[#7FFFD4]-> gitaly
monitor .[#7FFFD4]-> postgres monitor .[#7FFFD4]-> postgres
monitor .[#7FFFD4,norank]--> redis monitor .[#7FFFD4,norank]--> redis
monitor .[#7FFFD4,norank]u--> elb monitor .[#7FFFD4,norank]u--> elb
monitor .[#7FFFD4]u-> sidekiq
@enduml @enduml
``` ```
...@@ -294,7 +304,7 @@ If you use a third party external service: ...@@ -294,7 +304,7 @@ If you use a third party external service:
- `POSTGRESQL_PASSWORD_HASH` - The value output from the previous step - `POSTGRESQL_PASSWORD_HASH` - The value output from the previous step
- `APPLICATION_SERVER_IP_BLOCKS` - A space delimited list of IP subnets or IP - `APPLICATION_SERVER_IP_BLOCKS` - A space delimited list of IP subnets or IP
addresses of the GitLab application servers that will connect to the addresses of the GitLab Rails and Sidekiq servers that will connect to the
database. Example: `%w(123.123.123.123/32 123.123.123.234/32)` database. Example: `%w(123.123.123.123/32 123.123.123.234/32)`
```ruby ```ruby
...@@ -783,6 +793,7 @@ On each node perform the following: ...@@ -783,6 +793,7 @@ On each node perform the following:
roles(['application_role']) roles(['application_role'])
gitaly['enable'] = false gitaly['enable'] = false
nginx['enable'] = true nginx['enable'] = true
sidekiq['enable'] = false
## PostgreSQL connection details ## PostgreSQL connection details
gitlab_rails['db_adapter'] = 'postgresql' gitlab_rails['db_adapter'] = 'postgresql'
...@@ -800,10 +811,6 @@ On each node perform the following: ...@@ -800,10 +811,6 @@ On each node perform the following:
gitlab_workhorse['prometheus_listen_addr'] = '0.0.0.0:9229' gitlab_workhorse['prometheus_listen_addr'] = '0.0.0.0:9229'
puma['listen'] = '0.0.0.0' puma['listen'] = '0.0.0.0'
# Configure Sidekiq with 2 workers and 20 max concurrency
sidekiq['max_concurrency'] = 20
sidekiq['queue_groups'] = ['*'] * 2
# Add the monitoring node's IP address to the monitoring whitelist and allow it to # Add the monitoring node's IP address to the monitoring whitelist and allow it to
# scrape the NGINX metrics. Replace placeholder `monitoring.gitlab.example.com` with # scrape the NGINX metrics. Replace placeholder `monitoring.gitlab.example.com` with
# the address and/or subnets gathered from the monitoring node # the address and/or subnets gathered from the monitoring node
......
...@@ -729,6 +729,7 @@ You can find a full history of changes [on the GitLab project](https://gitlab.co ...@@ -729,6 +729,7 @@ You can find a full history of changes [on the GitLab project](https://gitlab.co
**2024:** **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-01](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140465): Updated recommendations for Azure for all Reference Architecture sizes and latest cloud services. - [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:** **2023:**
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册