Skip to content

G
gitlab-ce
Commit 2084301b authored by Joshua Lambert's avatar Joshua Lambert
Browse files
Options

Resolve conflicts from master

parent 4f447e0f
Show whitespace changes
Inline Side-by-side
Showing with 65 additions and 99 deletions
doc/development/architecture.md
View file @ 2084301b
...@@ -213,50 +213,49 @@ To serve repositories over SSH there's an add-on application called gitlab-shell ...@@ -213,50 +213,49 @@ To serve repositories over SSH there's an add-on application called gitlab-shell
```mermaid ```mermaid
graph TB graph TB
HTTP[HTTP/HTTPS] -- TCP 80, 443 --> NGINX(NGINX) HTTP[HTTP/HTTPS] -- TCP 80, 443 --> NGINX[NGINX]
SSH --TCP 22 --> GitLabShell(GitLab Shell) SSH -- TCP 22 --> GitLabShell[GitLab Shell]
SMTP(SMTP Gateway) SMTP[SMTP Gateway]
Geo(GitLab Geo Node) -- TCP 22, 80, 443 --> NGINX Geo[GitLab Geo Node] -- TCP 22, 80, 443 --> NGINX
subgraph GitLab
GitLabShell --TCP 8080 -->Unicorn["Unicorn (GitLab Rails)"] GitLabShell --TCP 8080 -->Unicorn["Unicorn (GitLab Rails)"]
GitLabShell --> Gitaly GitLabShell --> Gitaly
GitLabShell --> Redis GitLabShell --> Redis
Unicorn --> PgBouncer(PgBouncer) Unicorn --> PgBouncer[PgBouncer]
Unicorn --> Redis Unicorn --> Redis
Unicorn --> Gitaly Unicorn --> Gitaly
Redis --> Sidekiq Redis --> Sidekiq
Sidekiq("Sidekiq (GitLab Rails, ES Indexer)") --> PgBouncer Sidekiq["Sidekiq (GitLab Rails, ES Indexer)"] --> PgBouncer
GitLabWorkhorse(GitLab Workhorse) --> Unicorn GitLabWorkhorse[GitLab Workhorse] --> Unicorn
GitLabWorkhorse --> Redis GitLabWorkhorse --> Redis
GitLabWorkhorse --> Gitaly GitLabWorkhorse --> Gitaly
Gitaly --> Redis Gitaly --> Redis
NGINX --> GitLabWorkhorse NGINX --> GitLabWorkhorse
NGINX -- TCP 8090 --> GitLabPages(GitLab Pages) NGINX -- TCP 8090 --> GitLabPages[GitLab Pages]
NGINX --> Grafana(Grafana) NGINX --> Grafana[Grafana]
Grafana -- TCP 9090 --> Prometheus(Prometheus) Grafana -- TCP 9090 --> Prometheus[Prometheus]
Prometheus -- TCP 80, 443 --> Unicorn Prometheus -- TCP 80, 443 --> Unicorn
RedisExporter(Redis Exporter) --> Redis RedisExporter[Redis Exporter] --> Redis
Prometheus -- TCP 9121 --> RedisExporter Prometheus -- TCP 9121 --> RedisExporter
PostgreSQLExporter(PostgreSQL Exporter) --> PostgreSQL PostgreSQLExporter[PostgreSQL Exporter] --> PostgreSQL
PgBouncerExporter(PgBouncer Exporter) --> PgBouncer PgBouncerExporter[PgBouncer Exporter] --> PgBouncer
Prometheus -- TCP 9187 --> PostgreSQLExporter Prometheus -- TCP 9187 --> PostgreSQLExporter
Prometheus -- TCP 9100 --> NodeExporter(Node Exporter) Prometheus -- TCP 9100 --> NodeExporter[Node Exporter]
Prometheus -- TCP 9168 --> GitLabMonitor(GitLab Monitor) Prometheus -- TCP 9168 --> GitLabMonito[GitLab Monitor]
Prometheus -- TCP 9127 --> PgBouncerExporter Prometheus -- TCP 9127 --> PgBouncerExporter
GitLabMonitor --> PostgreSQL GitLabMonitor --> PostgreSQL
GitLabMonitor --> GitLabShell GitLabMonitor --> GitLabShell
GitLabMonitor --> Sidekiq GitLabMonitor --> Sidekiq
PgBouncer --> Consul(Consul) PgBouncer --> Consul
PostgreSQL --> Consul PostgreSQL --> Consul
PgBouncer --> PostgreSQL PgBouncer --> PostgreSQL
NGINX --> Registry(Registry) NGINX --> Registry
Unicorn --> Registry Unicorn --> Registry
NGINX --> Mattermost(Mattermost) NGINX --> Mattermost
Mattermost --- Unicorn Mattermost --- Unicorn
Prometheus --> Alertmanager Prometheus --> Alertmanager
Migrations --> PostgreSQL Migrations --> PostgreSQL
Runner(Runner) --> NGINX Runner -- TCP 443 --> NGINX
Unicorn -- TCP 9200 --> ElasticSearch Unicorn -- TCP 9200 --> ElasticSearch
Sidekiq -- TCP 9200 --> ElasticSearch Sidekiq -- TCP 9200 --> ElasticSearch
Sidekiq -- TCP 80, 443 --> Sentry Sidekiq -- TCP 80, 443 --> Sentry
...@@ -271,45 +270,12 @@ graph TB ...@@ -271,45 +270,12 @@ graph TB
Unicorn -- TCP 25 --> SMTP Unicorn -- TCP 25 --> SMTP
Unicorn -- TCP 369 --> LDAP Unicorn -- TCP 369 --> LDAP
Sidekiq -- TCP 369 --> LDAP Sidekiq -- TCP 369 --> LDAP
Unicorn -- TCP 443 --> ObjectStorage("Object Storage") Unicorn -- TCP 443 --> ObjectStorage["Object Storage"]
Sidekiq -- TCP 443 --> ObjectStorage Sidekiq -- TCP 443 --> ObjectStorage
GitLabWorkhorse -- TCP 443 --> ObjectStorage GitLabWorkhorse -- TCP 443 --> ObjectStorage
Registry -- TCP 443 --> ObjectStorage Registry -- TCP 443 --> ObjectStorage
Geo -- TCP 5432 --> PostgreSQL Geo -- TCP 5432 --> PostgreSQL
end
HTTPK8s(HTTP/HTTPS) -- TCP 80, 443 --> LoadBalancerK8s(Load Balancer)
LoadBalancerK8s -- TCP 80, 443 --> nginx-ingressK8s
subgraph Kubernetes
PrometheusK8s(Prometheus)
TillerK8s(Tiller)
nginx-ingressK8s(NGINX Ingress)
Cert-ManagerK8s(Cert-Manager)
GitLabRunnerK8s(GitLab Runner)
GitLabRunnerK8s --> NGINX
JupyterHubK8s(JupyterHub)
nginx-ingressK8s --> JupyterHubK8s
KnativeK8s(Knative)
end
classDef defaultoff stroke-dasharray: 5, 5
class ElasticSearch defaultoff
class Grafana defaultoff
class PrometheusK8s defaultoff
class TillerK8s defaultoff
class nginx-ingressK8s defaultoff
class Cert-ManagerK8s defaultoff
class GitLabRunnerK8s defaultoff
class JupyterHubK8s defaultoff
class KnativeK8s defaultoff
class HTTPK8s defaultoff
class LoadBalancerK8s defaultoff
class Sentry defaultoff
class Jaeger defaultoff
class Alertmanager defaultoff
class SMTP defaultoff
class ObjectStorage defaultoff
class Geo defaultoff
``` ```
**Legend**: **Legend**:
...@@ -321,7 +287,7 @@ class Geo defaultoff ...@@ -321,7 +287,7 @@ class Geo defaultoff
| Component | Description | [Omnibus GitLab](https://docs.gitlab.com/omnibus/README.html) | [GitLab chart](https://docs.gitlab.com/charts/) | [Minikube Minimal](https://docs.gitlab.com/charts/development/minikube/#deploying-gitlab-with-minimal-settings) | [GitLab.com](https://gitlab.com) | CE/EE | | Component | Description | [Omnibus GitLab](https://docs.gitlab.com/omnibus/README.html) | [GitLab chart](https://docs.gitlab.com/charts/) | [Minikube Minimal](https://docs.gitlab.com/charts/development/minikube/#deploying-gitlab-with-minimal-settings) | [GitLab.com](https://gitlab.com) | CE/EE |
| --------- | ----------- |:--------------------:|:------------------:|:-----:|:--------:|:--------:| | --------- | ----------- |:--------------------:|:------------------:|:-----:|:--------:|:--------:|
| NGINX | Routes requests to appropriate components, terminates SSL | [✅](https://docs.gitlab.com/omnibus/settings/nginx.html) | [✅](https://docs.gitlab.com/charts/charts/nginx/index.html) | [⚙](https://docs.gitlab.com/charts/charts/nginx/index.html) | [✅](https://about.gitlab.com/handbook/engineering/infrastructure/production-architecture/#service-architecture) |CE & EE | | NGINX | Routes requests to appropriate components, terminates SSL | [✅](https://docs.gitlab.com/omnibus/settings/nginx.html) | [✅](https://docs.gitlab.com/charts/charts/nginx/index.html) | [⚙](https://docs.gitlab.com/charts/charts/nginx/index.html) | [✅](https://about.gitlab.com/handbook/engineering/infrastructure/production-architecture/#service-architecture) | CE & EE |
| Unicorn (GitLab Rails) | Handles requests for the web interface and API | [✅](https://docs.gitlab.com/omnibus/settings/unicorn.html) | [✅](https://docs.gitlab.com/charts/charts/gitlab/unicorn/index.html) | [✅](https://docs.gitlab.com/charts/charts/gitlab/unicorn/index.html) | [✅](https://docs.gitlab.com/ee/user/gitlab_com/#unicorn) | CE & EE | | Unicorn (GitLab Rails) | Handles requests for the web interface and API | [✅](https://docs.gitlab.com/omnibus/settings/unicorn.html) | [✅](https://docs.gitlab.com/charts/charts/gitlab/unicorn/index.html) | [✅](https://docs.gitlab.com/charts/charts/gitlab/unicorn/index.html) | [✅](https://docs.gitlab.com/ee/user/gitlab_com/#unicorn) | CE & EE |
| Sidekiq | Background jobs processor | [✅](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-config-template/gitlab.rb.template) | [✅](https://docs.gitlab.com/charts/charts/gitlab/sidekiq/index.html) | [✅](https://docs.gitlab.com/charts/charts/gitlab/sidekiq/index.html) | [✅](https://docs.gitlab.com/ee/user/gitlab_com/#sidekiq) | CE & EE | | Sidekiq | Background jobs processor | [✅](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-config-template/gitlab.rb.template) | [✅](https://docs.gitlab.com/charts/charts/gitlab/sidekiq/index.html) | [✅](https://docs.gitlab.com/charts/charts/gitlab/sidekiq/index.html) | [✅](https://docs.gitlab.com/ee/user/gitlab_com/#sidekiq) | CE & EE |
| Gitaly | Git RPC service for handling all git calls made by GitLab | [✅](https://docs.gitlab.com/ee/administration/gitaly/) | [✅](https://docs.gitlab.com/charts/charts/gitlab/gitaly/index.html) | [✅](https://docs.gitlab.com/charts/charts/gitlab/gitaly/index.html) | [✅](https://about.gitlab.com/handbook/engineering/infrastructure/production-architecture/#service-architecture) | CE & EE | | Gitaly | Git RPC service for handling all git calls made by GitLab | [✅](https://docs.gitlab.com/ee/administration/gitaly/) | [✅](https://docs.gitlab.com/charts/charts/gitlab/gitaly/index.html) | [✅](https://docs.gitlab.com/charts/charts/gitlab/gitaly/index.html) | [✅](https://about.gitlab.com/handbook/engineering/infrastructure/production-architecture/#service-architecture) | CE & EE |
...@@ -341,7 +307,7 @@ class Geo defaultoff ...@@ -341,7 +307,7 @@ class Geo defaultoff
| PgBouncer Exporter | Prometheus endpoint with PgBouncer metrics | [⚙](https://docs.gitlab.com/ee/administration/monitoring/prometheus/pgbouncer_exporter.html) | [❌](https://docs.gitlab.com/charts/installation/deployment.html#postgresql) | [❌](https://docs.gitlab.com/charts/installation/deployment.html#postgresql) | [✅](https://about.gitlab.com/handbook/engineering/monitoring/) | CE & EE | | PgBouncer Exporter | Prometheus endpoint with PgBouncer metrics | [⚙](https://docs.gitlab.com/ee/administration/monitoring/prometheus/pgbouncer_exporter.html) | [❌](https://docs.gitlab.com/charts/installation/deployment.html#postgresql) | [❌](https://docs.gitlab.com/charts/installation/deployment.html#postgresql) | [✅](https://about.gitlab.com/handbook/engineering/monitoring/) | CE & EE |
| GitLab Monitor | Tracks a variety of GitLab metrics | [✅](https://docs.gitlab.com/ee/administration/monitoring/prometheus/gitlab_monitor_exporter.html) | [❌](https://gitlab.com/charts/gitlab/issues/319) | [❌](https://gitlab.com/charts/gitlab/issues/319) | [✅](https://about.gitlab.com/handbook/engineering/monitoring/) | CE & EE | | GitLab Monitor | Tracks a variety of GitLab metrics | [✅](https://docs.gitlab.com/ee/administration/monitoring/prometheus/gitlab_monitor_exporter.html) | [❌](https://gitlab.com/charts/gitlab/issues/319) | [❌](https://gitlab.com/charts/gitlab/issues/319) | [✅](https://about.gitlab.com/handbook/engineering/monitoring/) | CE & EE |
| Mattermost | Open-source Slack alternative | [⚙](https://docs.gitlab.com/omnibus/gitlab-mattermost/) | [⤓](https://docs.mattermost.com/install/install-mmte-helm-gitlab-helm.html) | [⤓](https://docs.mattermost.com/install/install-mmte-helm-gitlab-helm.html) | [⤓](https://docs.gitlab.com/ee/user/project/integrations/mattermost_slash_commands.html#manual-configuration), [⤓](https://docs.gitlab.com/ee/user/project/integrations/mattermost.html) | CE & EE | | Mattermost | Open-source Slack alternative | [⚙](https://docs.gitlab.com/omnibus/gitlab-mattermost/) | [⤓](https://docs.mattermost.com/install/install-mmte-helm-gitlab-helm.html) | [⤓](https://docs.mattermost.com/install/install-mmte-helm-gitlab-helm.html) | [⤓](https://docs.gitlab.com/ee/user/project/integrations/mattermost_slash_commands.html#manual-configuration), [⤓](https://docs.gitlab.com/ee/user/project/integrations/mattermost.html) | CE & EE |
| Minio | Object storage service | [⤓](https://min.io/download) | [✅](https://docs.gitlab.com/charts/charts/minio/index.html) | [✅](https://docs.gitlab.com/charts/charts/minio/index.html) | [❌](https://about.gitlab.com/handbook/engineering/infrastructure/production-architecture/#storage-architecture) | CE & EE | | Minio | Object storage service | [⤓](https://min.io/download) | [✅](https://docs.gitlab.com/charts/charts/minio/index.html) | [✅](https://docs.gitlab.com/charts/charts/minio/index.html) | [✅](https://about.gitlab.com/handbook/engineering/infrastructure/production-architecture/#storage-architecture) | CE & EE |
| Runner | Executes GitLab CI jobs | [⤓](https://docs.gitlab.com/runner/) | [✅](https://docs.gitlab.com/runner/) | [⚙](https://docs.gitlab.com/runner/) | [✅](https://docs.gitlab.com/ee/user/gitlab_com/#shared-runners) | CE & EE | | Runner | Executes GitLab CI jobs | [⤓](https://docs.gitlab.com/runner/) | [✅](https://docs.gitlab.com/runner/) | [⚙](https://docs.gitlab.com/runner/) | [✅](https://docs.gitlab.com/ee/user/gitlab_com/#shared-runners) | CE & EE |
| Migrations | Database migrations | [✅](https://docs.gitlab.com/omnibus/settings/database.html#disabling-automatic-database-migration) | [✅](https://docs.gitlab.com/charts/charts/gitlab/migrations/index.html) | [✅](https://docs.gitlab.com/charts/charts/gitlab/migrations/index.html) | [✅](https://about.gitlab.com/handbook/engineering/infrastructure/production-architecture/#database-architecture) | CE & EE | | Migrations | Database migrations | [✅](https://docs.gitlab.com/omnibus/settings/database.html#disabling-automatic-database-migration) | [✅](https://docs.gitlab.com/charts/charts/gitlab/migrations/index.html) | [✅](https://docs.gitlab.com/charts/charts/gitlab/migrations/index.html) | [✅](https://about.gitlab.com/handbook/engineering/infrastructure/production-architecture/#database-architecture) | CE & EE |
| Certificate Management | TLS Settings, Let's Encrypt | [✅](https://docs.gitlab.com/omnibus/settings/ssl.html) | [✅](https://docs.gitlab.com/charts/installation/tls.html) | [⚙](https://docs.gitlab.com/charts/installation/tls.html) | [✅](https://about.gitlab.com/handbook/engineering/infrastructure/production-architecture/#secrets-management) | CE & EE | | Certificate Management | TLS Settings, Let's Encrypt | [✅](https://docs.gitlab.com/omnibus/settings/ssl.html) | [✅](https://docs.gitlab.com/charts/installation/tls.html) | [⚙](https://docs.gitlab.com/charts/installation/tls.html) | [✅](https://about.gitlab.com/handbook/engineering/infrastructure/production-architecture/#secrets-management) | CE & EE |
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7