Commit 871ea5e0 authored by Marcel Amirault's avatar Marcel Amirault Committed by Achilleas Pipinellis

Docs: (EE Port) Merge EE doc/administration/high_availability to CE

parent 151ed9bb
...@@ -69,8 +69,8 @@ larger one. ...@@ -69,8 +69,8 @@ larger one.
#### Installation Instructions #### Installation Instructions
Complete the following installation steps in order. A link at the end of each Complete the following installation steps in order. A link at the end of each
section will bring you back to the Scalable Architecture Examples section so section will bring you back to the Scalable Architecture Examples section so
you can continue with the next step. you can continue with the next step.
1. [PostgreSQL](./database.md#postgresql-in-a-scaled-environment) 1. [PostgreSQL](./database.md#postgresql-in-a-scaled-environment)
...@@ -135,7 +135,7 @@ the contention. ...@@ -135,7 +135,7 @@ the contention.
- 2 or more GitLab application nodes (Unicorn, Workhorse, Sidekiq, PGBouncer) - 2 or more GitLab application nodes (Unicorn, Workhorse, Sidekiq, PGBouncer)
- 1 NFS/Gitaly server - 1 NFS/Gitaly server
![Horizontal architecture diagram](../img/high_availability/horizontal.png) ![Horizontal architecture diagram](https://docs.gitlab.com/ee/administration/img/high_availability/horizontal.png)
### Hybrid ### Hybrid
...@@ -151,7 +151,7 @@ contention due to certain workloads. ...@@ -151,7 +151,7 @@ contention due to certain workloads.
- 2 or more Web nodes (Unicorn, Workhorse, PGBouncer) - 2 or more Web nodes (Unicorn, Workhorse, PGBouncer)
- 1 or more NFS/Gitaly servers - 1 or more NFS/Gitaly servers
![Hybrid architecture diagram](../img/high_availability/hybrid.png) ![Hybrid architecture diagram](https://docs.gitlab.com/ee/administration/img/high_availability/hybrid.png)
### Fully Distributed ### Fully Distributed
...@@ -170,7 +170,7 @@ with the added complexity of many more nodes to configure, manage and monitor. ...@@ -170,7 +170,7 @@ with the added complexity of many more nodes to configure, manage and monitor.
- 2 or more Web nodes (All other web requests) - 2 or more Web nodes (All other web requests)
- 2 or more NFS/Gitaly servers - 2 or more NFS/Gitaly servers
![Fully Distributed architecture diagram](../img/high_availability/fully-distributed.png) ![Fully Distributed architecture diagram](https://docs.gitlab.com/ee/administration/img/high_availability/fully-distributed.png)
The following pages outline the steps necessary to configure each component The following pages outline the steps necessary to configure each component
separately: separately:
......
...@@ -98,9 +98,9 @@ environments including [Horizontal](./README.md#horizontal), ...@@ -98,9 +98,9 @@ environments including [Horizontal](./README.md#horizontal),
### Provide your own PostgreSQL instance **[CORE ONLY]** ### Provide your own PostgreSQL instance **[CORE ONLY]**
If you want to use your own deployed PostgreSQL instance(s), If you want to use your own deployed PostgreSQL instance(s),
see [Provide your own PostgreSQL instance](#provide-your-own-postgresql-instance-core-only) see [Provide your own PostgreSQL instance](#provide-your-own-postgresql-instance-core-only)
for more details. However, you can use the GitLab Omnibus package to easily for more details. However, you can use the GitLab Omnibus package to easily
deploy the bundled PostgreSQL. deploy the bundled PostgreSQL.
### High Availability with GitLab Omnibus **[PREMIUM ONLY]** ### High Availability with GitLab Omnibus **[PREMIUM ONLY]**
......
...@@ -13,6 +13,7 @@ It is recommended to run pgbouncer alongside the `gitlab-rails` service, or on i ...@@ -13,6 +13,7 @@ It is recommended to run pgbouncer alongside the `gitlab-rails` service, or on i
## Operations ## Operations
### Running Pgbouncer as part of an HA GitLab installation ### Running Pgbouncer as part of an HA GitLab installation
See our [HA documentation for PostgreSQL](database.md) for information on running pgbouncer as part of a HA setup See our [HA documentation for PostgreSQL](database.md) for information on running pgbouncer as part of a HA setup
### Running Pgbouncer as part of a non-HA GitLab installation ### Running Pgbouncer as part of a non-HA GitLab installation
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment