Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
ed201a21
Commit
ed201a21
authored
May 24, 2019
by
Marcel Amirault
Committed by
Achilleas Pipinellis
May 24, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Docs: Put back deleted HA images
parent
d6df4fb2
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
4 additions
and
4 deletions
+4
-4
doc/administration/high_availability/README.md
doc/administration/high_availability/README.md
+3
-3
doc/administration/high_availability/database.md
doc/administration/high_availability/database.md
+1
-1
doc/administration/high_availability/img/fully-distributed.png
...dministration/high_availability/img/fully-distributed.png
+0
-0
doc/administration/high_availability/img/horizontal.png
doc/administration/high_availability/img/horizontal.png
+0
-0
doc/administration/high_availability/img/hybrid.png
doc/administration/high_availability/img/hybrid.png
+0
-0
doc/administration/high_availability/img/pg_ha_architecture.png
...ministration/high_availability/img/pg_ha_architecture.png
+0
-0
No files found.
doc/administration/high_availability/README.md
View file @
ed201a21
...
@@ -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
](
https://docs.gitlab.com/ee/administration/img/high_availability
/horizontal.png
)
![
Horizontal architecture diagram
](
img
/horizontal.png
)
### Hybrid
### Hybrid
...
@@ -153,7 +153,7 @@ contention due to certain workloads.
...
@@ -153,7 +153,7 @@ contention due to certain workloads.
-
1 or more NFS/Gitaly servers
-
1 or more NFS/Gitaly servers
-
1 Monitoring node (Prometheus, Grafana)
-
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
#### Reference Architecture
...
@@ -194,7 +194,7 @@ with the added complexity of many more nodes to configure, manage and monitor.
...
@@ -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 Web nodes (All other web requests)
-
2 or more NFS/Gitaly servers
-
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
The following pages outline the steps necessary to configure each component
separately:
separately:
...
...
doc/administration/high_availability/database.md
View file @
ed201a21
...
@@ -134,7 +134,7 @@ otherwise the networks will become a single point of failure.
...
@@ -134,7 +134,7 @@ otherwise the networks will become a single point of failure.
#### Architecture
#### Architecture
![
PG HA Architecture
](
pg_ha_architecture.png
)
![
PG HA Architecture
](
img/
pg_ha_architecture.png
)
Database nodes run two services with PostgreSQL:
Database nodes run two services with PostgreSQL:
...
...
doc/administration/high_availability/img/fully-distributed.png
0 → 100644
View file @
ed201a21
45.8 KB
doc/administration/high_availability/img/horizontal.png
0 → 100644
View file @
ed201a21
18.2 KB
doc/administration/high_availability/img/hybrid.png
0 → 100644
View file @
ed201a21
20.2 KB
doc/administration/high_availability/pg_ha_architecture.png
→
doc/administration/high_availability/
img/
pg_ha_architecture.png
View file @
ed201a21
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment