diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 06:07:59 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 06:07:59 +0000 |
| commit | f321e51f46bcb628c3e96a44b5ebf3bb1c4033ab (patch) | |
| tree | 41a470ff35cd211b308b1b4900935a225f103f32 /doc/administration | |
| parent | 612a849a6cba1765bc41d30d4e931195dcdf64cf (diff) | |
| download | gitlab-ce-f321e51f46bcb628c3e96a44b5ebf3bb1c4033ab.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/high_availability/README.md | 2 | ||||
| -rw-r--r-- | doc/administration/high_availability/pgbouncer.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/administration/high_availability/README.md b/doc/administration/high_availability/README.md index ea7ffb7aa51..8f39c6b3c06 100644 --- a/doc/administration/high_availability/README.md +++ b/doc/administration/high_availability/README.md @@ -37,7 +37,7 @@ in which you would typically configure them. | [Load Balancer(s)](load_balancer.md)[^6] | Handles load balancing for the GitLab nodes where required. | [Load balancer HA configuration](load_balancer.md) | | [Consul](../../development/architecture.md#consul)[^3] | Service discovery and health checks/failover | [Consul HA configuration](consul.md) | | [PostgreSQL](../../development/architecture.md#postgresql) | Database | [Database HA configuration](database.md) | -| [PgBouncer](../../development/architecture.md#pgbouncer) | Database Pool Manager | [PgBouncer HA configuration](pgbouncer.md) | +| [PgBouncer](../../development/architecture.md#pgbouncer) | Database Pool Manager | [PgBouncer HA configuration](pgbouncer.md) **(PREMIUM ONLY)** | | [Redis](../../development/architecture.md#redis)[^3] with Redis Sentinel | Key/Value store for shared data with HA watcher service | [Redis HA configuration](redis.md) | | [Gitaly](../../development/architecture.md#gitaly)[^2] [^5] [^7] | Recommended high-level storage for Git repository data. | [Gitaly HA configuration](gitaly.md) | | [Sidekiq](../../development/architecture.md#sidekiq) | Asynchronous/Background jobs | | diff --git a/doc/administration/high_availability/pgbouncer.md b/doc/administration/high_availability/pgbouncer.md index cea55e6c9b4..c820a01da8a 100644 --- a/doc/administration/high_availability/pgbouncer.md +++ b/doc/administration/high_availability/pgbouncer.md @@ -2,7 +2,7 @@ type: reference --- -# Working with the bundle PgBouncer service +# Working with the bundled PgBouncer service **(PREMIUM ONLY)** As part of its High Availability stack, GitLab Premium includes a bundled version of [PgBouncer](https://pgbouncer.github.io/) that can be managed through `/etc/gitlab/gitlab.rb`. PgBouncer is used to seamlessly migrate database connections between servers in a failover scenario. Additionally, it can be used in a non-HA setup to pool connections, speeding up response time while reducing resource usage. |