diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 09:07:59 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 09:07:59 +0000 |
commit | a325f3a104748ecc68df7c3d793940aa709a111f (patch) | |
tree | b3bce12be64ab2d9e31627dacd059165819797a3 /doc/development/architecture.md | |
parent | 8fb943c7df5f2b399caaeaebd6c00d0630bc763c (diff) | |
download | gitlab-ce-a325f3a104748ecc68df7c3d793940aa709a111f.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/architecture.md')
-rw-r--r-- | doc/development/architecture.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/architecture.md b/doc/development/architecture.md index c5ac8c040f8..5a1b53bc2fb 100644 --- a/doc/development/architecture.md +++ b/doc/development/architecture.md @@ -288,7 +288,7 @@ GitLab CI is the open-source continuous integration service included with GitLab - Configuration: [Omnibus][grafana-omnibus], [Charts][grafana-charts] - Layer: Monitoring -Grafana is an open source, feature rich metrics dashboard and graph editor for Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB. +Grafana is an open source, feature rich metrics dashboard and graph editor for Graphite, Elasticsearch, OpenTSDB, Prometheus, and InfluxDB. #### Jaeger @@ -321,7 +321,7 @@ Mattermost is an open source, private cloud, Slack-alternative from <https://mat - Configuration: [Omnibus][minio-omnibus], [Charts][minio-charts], [GDK][minio-gdk] - Layer: Core Service (Data) -MinIO is an object storage server released under Apache License v2.0. It is compatible with Amazon S3 cloud storage service. It is best suited for storing unstructured data such as photos, videos, log files, backups and container / VM images. Size of an object can range from a few KBs to a maximum of 5TB. +MinIO is an object storage server released under Apache License v2.0. It is compatible with Amazon S3 cloud storage service. It is best suited for storing unstructured data such as photos, videos, log files, backups, and container / VM images. Size of an object can range from a few KBs to a maximum of 5TB. #### NGINX |