diff options
| author | Joshua Lambert <joshua@gitlab.com> | 2019-05-05 23:38:48 -0400 |
|---|---|---|
| committer | Joshua Lambert <joshua@gitlab.com> | 2019-05-05 23:38:48 -0400 |
| commit | 00305fe6f87653a77a7eae9948d5125669d1c028 (patch) | |
| tree | dfa7efa7c15cd7a67685e827d394e0a7cdc4cf93 | |
| parent | 7fca61832e313c8b866c3d1b1c780e1912313f2a (diff) | |
| download | gitlab-ce-00305fe6f87653a77a7eae9948d5125669d1c028.tar.gz | |
Add Geo and LDAP items to mermaid chart
| -rw-r--r-- | doc/development/architecture.md | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/doc/development/architecture.md b/doc/development/architecture.md index e256d9c5fcd..6fa9b98349e 100644 --- a/doc/development/architecture.md +++ b/doc/development/architecture.md @@ -216,6 +216,7 @@ graph TB HTTP[HTTP/HTTPS] -- TCP 80, 443 --> NGINX(NGINX) SSH --TCP 22 --> GitLabShell(GitLab Shell) SMTP(SMTP Gateway) + Geo(GitLab Geo Node) -- TCP 22, 80, 443 --> NGINX subgraph GitLab GitLabShell --TCP 8080 -->Unicorn["Unicorn (GitLab Rails)"] @@ -283,10 +284,13 @@ graph TB Alertmanager -- TCP 25 --> SMTP Sidekiq -- TCP 25 --> SMTP Unicorn -- TCP 25 --> SMTP + Unicorn -- TCP 369 --> LDAP + Sidekiq -- TCP 369 --> LDAP Unicorn -- TCP 443 --> ObjectStorage("Object Storage (Required for Chart)") Sidekiq -- TCP 443 --> ObjectStorage GitLabWorkhorse -- TCP 443 --> ObjectStorage Registry -- TCP 443 --> ObjectStorage + Geo -- TCP 5432 --> PostgreSQL classDef defaultoff stroke-dasharray: 5, 5 class ElasticSearch defaultoff @@ -305,11 +309,12 @@ class Jaeger defaultoff class Alertmanager defaultoff class SMTP defaultoff class ObjectStorage defaultoff +class Geo defaultoff ``` -| Component | Description | On by Default | Required | CE/EE | Omnibus / Chart | Omnibus Configuration | Chart Configuration | +| Component | Description | On by Default | Required | CE/EE | Included in Omnibus / Chart | Omnibus Configuration | Chart Configuration | | --------- | ----------- |:-------------:|:--------:|:-----:| --------------- | --------------------- | ------------------- | -| NGINX | Routes requests to appropriate components, terminates SSL | ✅ | | CE & EE | Omnibus & Chart | [NGINX Settings](https://docs.gitlab.com/omnibus/settings/nginx.html) | [NGINX Ingress settings](https://docs.gitlab.com/charts/charts/nginx/index.html) | +| NGINX | Routes requests to appropriate components, terminates SSL | ✅ | | CE & EE | Omnibus & Chart | [NGINX Settings](https://docs.gitlab.com/omnibus/settings/nginx.html) | [NGINX Ingress settings](https://docs.gitlab.com/charts/charts/nginx/index.html) | | Unicorn (GitLab Rails) | Handles requests for the web interface and API | ✅ | ✅ | CE & EE | Omnibus & Chart | [Unicorn specific settings](https://docs.gitlab.com/omnibus/settings/unicorn.html), for general GitLab Rails settings search for `gitlab_rails` in the Omnibus [`gitlab.rb` configuration file](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-config-template/gitlab.rb.template) | [Unicorn chart settings](https://docs.gitlab.com/charts/charts/gitlab/unicorn/index.html) | | Sidekiq | Background jobs processor | ✅ | ✅ | CE & EE | Omnibus & Chart | Search for `sidekiq` in Omnibus [`gitlab.rb` configuration file](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-config-template/gitlab.rb.template) | [Sidekiq chart settings](https://docs.gitlab.com/charts/charts/gitlab/sidekiq/index.html) | | Gitaly | Git RPC service for handling all git calls made by GitLab | ✅ | ✅ | CE & EE | Omnibus & Chart | [Gitaly Settings](https://docs.gitlab.com/ee/administration/gitaly/) | [Gitaly chart settings](https://docs.gitlab.com/charts/charts/gitlab/gitaly/index.html) | |