From ed201a21f95c2a44a2d1724c43c806bd1f999529 Mon Sep 17 00:00:00 2001 From: Marcel Amirault Date: Fri, 24 May 2019 18:08:02 +0000 Subject: Docs: Put back deleted HA images --- doc/administration/high_availability/README.md | 6 +++--- doc/administration/high_availability/database.md | 2 +- .../high_availability/img/fully-distributed.png | Bin 0 -> 46918 bytes doc/administration/high_availability/img/horizontal.png | Bin 0 -> 18660 bytes doc/administration/high_availability/img/hybrid.png | Bin 0 -> 20698 bytes .../high_availability/img/pg_ha_architecture.png | Bin 0 -> 18412 bytes .../high_availability/pg_ha_architecture.png | Bin 18412 -> 0 bytes 7 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 doc/administration/high_availability/img/fully-distributed.png create mode 100644 doc/administration/high_availability/img/horizontal.png create mode 100644 doc/administration/high_availability/img/hybrid.png create mode 100644 doc/administration/high_availability/img/pg_ha_architecture.png delete mode 100644 doc/administration/high_availability/pg_ha_architecture.png (limited to 'doc/administration/high_availability') diff --git a/doc/administration/high_availability/README.md b/doc/administration/high_availability/README.md index 24db1c28778..a23817228cb 100644 --- a/doc/administration/high_availability/README.md +++ b/doc/administration/high_availability/README.md @@ -135,7 +135,7 @@ the contention. - 2 or more GitLab application nodes (Unicorn, Workhorse, Sidekiq, PGBouncer) - 1 NFS/Gitaly server -![Horizontal architecture diagram](https://docs.gitlab.com/ee/administration/img/high_availability/horizontal.png) +![Horizontal architecture diagram](img/horizontal.png) ### Hybrid @@ -153,7 +153,7 @@ contention due to certain workloads. - 1 or more NFS/Gitaly servers - 1 Monitoring node (Prometheus, Grafana) -![Hybrid architecture diagram](https://docs.gitlab.com/ee/administration/img/high_availability/hybrid.png) +![Hybrid architecture diagram](img/hybrid.png) #### Reference Architecture @@ -194,7 +194,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 NFS/Gitaly servers -![Fully Distributed architecture diagram](https://docs.gitlab.com/ee/administration/img/high_availability/fully-distributed.png) +![Fully Distributed architecture diagram](img/fully-distributed.png) The following pages outline the steps necessary to configure each component separately: diff --git a/doc/administration/high_availability/database.md b/doc/administration/high_availability/database.md index 1648b6b848a..a446ed9637c 100644 --- a/doc/administration/high_availability/database.md +++ b/doc/administration/high_availability/database.md @@ -134,7 +134,7 @@ otherwise the networks will become a single point of failure. #### Architecture -![PG HA Architecture](pg_ha_architecture.png) +![PG HA Architecture](img/pg_ha_architecture.png) Database nodes run two services with PostgreSQL: diff --git a/doc/administration/high_availability/img/fully-distributed.png b/doc/administration/high_availability/img/fully-distributed.png new file mode 100644 index 00000000000..ad23207134e Binary files /dev/null and b/doc/administration/high_availability/img/fully-distributed.png differ diff --git a/doc/administration/high_availability/img/horizontal.png b/doc/administration/high_availability/img/horizontal.png new file mode 100644 index 00000000000..c3bd489d96f Binary files /dev/null and b/doc/administration/high_availability/img/horizontal.png differ diff --git a/doc/administration/high_availability/img/hybrid.png b/doc/administration/high_availability/img/hybrid.png new file mode 100644 index 00000000000..7d4a56bf0ea Binary files /dev/null and b/doc/administration/high_availability/img/hybrid.png differ diff --git a/doc/administration/high_availability/img/pg_ha_architecture.png b/doc/administration/high_availability/img/pg_ha_architecture.png new file mode 100644 index 00000000000..ef870f652ae Binary files /dev/null and b/doc/administration/high_availability/img/pg_ha_architecture.png differ diff --git a/doc/administration/high_availability/pg_ha_architecture.png b/doc/administration/high_availability/pg_ha_architecture.png deleted file mode 100644 index ef870f652ae..00000000000 Binary files a/doc/administration/high_availability/pg_ha_architecture.png and /dev/null differ -- cgit v1.2.1