summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-05-25 21:36:25 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-05-25 21:36:25 +0000
commit09ad0020587b01b614d0a686f9b1a45d492dfbff (patch)
tree29ec6467b1429668b7e1027738b2f3bad9e0a959 /doc
parent22bd28590743268de012e7861b768a8e8d702c88 (diff)
parentb10b6f963dd0d0da26e1750263e6b970b839ba0f (diff)
downloadgitlab-ce-09ad0020587b01b614d0a686f9b1a45d492dfbff.tar.gz
Merge branch 'add_ha_diagrams' into 'master'
Add new HA diagrams [ci skip] ## What does this MR do? Adds new HA diagrams created by @lukebabb (Thanks @lukebabb!) See merge request !4289
Diffstat (limited to 'doc')
-rw-r--r--doc/administration/high_availability/README.md4
-rw-r--r--doc/administration/img/high_availability/active-active-diagram.pngbin0 -> 29607 bytes
-rw-r--r--doc/administration/img/high_availability/active-passive-diagram.pngbin0 -> 24246 bytes
3 files changed, 4 insertions, 0 deletions
diff --git a/doc/administration/high_availability/README.md b/doc/administration/high_availability/README.md
index 43d85ffb775..d74a786ac24 100644
--- a/doc/administration/high_availability/README.md
+++ b/doc/administration/high_availability/README.md
@@ -19,6 +19,8 @@ Components/Servers Required:
- 2 servers/virtual machines (one active/one passive)
+![Active/Passive HA Diagram](../img/high_availability/active-passive-diagram.png)
+
### Active/Active
This architecture scales easily because all application servers handle
@@ -26,6 +28,8 @@ user requests simultaneously. The database, Redis, and GitLab application are
all deployed on separate servers. The configuration is **only** highly-available
if the database, Redis and storage are also configured as such.
+![Active/Active HA Diagram](../img/high_availability/active-active-diagram.png)
+
**Steps to configure active/active:**
1. [Configure the database](database.md)
diff --git a/doc/administration/img/high_availability/active-active-diagram.png b/doc/administration/img/high_availability/active-active-diagram.png
new file mode 100644
index 00000000000..81259e0ae93
--- /dev/null
+++ b/doc/administration/img/high_availability/active-active-diagram.png
Binary files differ
diff --git a/doc/administration/img/high_availability/active-passive-diagram.png b/doc/administration/img/high_availability/active-passive-diagram.png
new file mode 100644
index 00000000000..f69ff1d0357
--- /dev/null
+++ b/doc/administration/img/high_availability/active-passive-diagram.png
Binary files differ