summaryrefslogtreecommitdiff
path: root/doc/install
diff options
context:
space:
mode:
authorJoshua Lambert <joshua@gitlab.com>2017-03-16 14:02:07 -0400
committerJoshua Lambert <joshua@gitlab.com>2017-03-16 14:02:07 -0400
commit7726cb390e76d22a4dae562bfa32f2a741e50123 (patch)
treeafb0e76ca51a13aa4b6c980d61b62ef86ecf75f0 /doc/install
parenta5134f10fbed615b1efbcf5e207680f8966ac0b5 (diff)
downloadgitlab-ce-7726cb390e76d22a4dae562bfa32f2a741e50123.tar.gz
Add prometheus memory requirements, include additional detail on disabling prometheus in docs.
Diffstat (limited to 'doc/install')
-rw-r--r--doc/install/requirements.md8
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index 3f90597ec80..27d12fbc753 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -108,7 +108,7 @@ use the CI features.
## Unicorn Workers
-It's possible to increase the amount of unicorn workers and this will usually help for to reduce the response time of the applications and increase the ability to handle parallel requests.
+It's possible to increase the amount of unicorn workers and this will usually help to reduce the response time of the applications and increase the ability to handle parallel requests.
For most instances we recommend using: CPU cores + 1 = unicorn workers.
So for a machine with 2 cores, 3 unicorn workers is ideal.
@@ -148,6 +148,12 @@ Sidekiq processes the background jobs with a multithreaded process.
This process starts with the entire Rails stack (200MB+) but it can grow over time due to memory leaks.
On a very active server (10,000 active users) the Sidekiq process can use 1GB+ of memory.
+## Prometheus and its exporters
+
+As of GitLab 9.0, [Prometheus](https://prometheus.io) and its related exporters are enabled by default, to enable easy and in depth monitoring of GitLab. Approximately 200MB of memory will be consumed by these processes, with default settings.
+
+If you would like to disable Prometheus and it's exporters, simply set `prometheus['disable_all']=true` in `gitlab.rb`. More information is available in [the documentation](https://docs.gitlab.com/ce/doc/administration/monitoring/prometheus/index.html).
+
## Supported web browsers
We support the current and the previous major release of Firefox, Chrome/Chromium, Safari and Microsoft browsers (Microsoft Edge and Internet Explorer 11).