diff options
author | Joshua Lambert <joshua@gitlab.com> | 2017-03-16 21:02:07 +0300 |
---|---|---|
committer | Joshua Lambert <joshua@gitlab.com> | 2017-03-16 21:02:07 +0300 |
commit | 7726cb390e76d22a4dae562bfa32f2a741e50123 (patch) | |
tree | afb0e76ca51a13aa4b6c980d61b62ef86ecf75f0 /doc/administration | |
parent | a5134f10fbed615b1efbcf5e207680f8966ac0b5 (diff) |
Add prometheus memory requirements, include additional detail on disabling prometheus in docs.
Diffstat (limited to 'doc/administration')
-rw-r--r-- | doc/administration/monitoring/prometheus/index.md | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/doc/administration/monitoring/prometheus/index.md b/doc/administration/monitoring/prometheus/index.md index 925c25cd4aa..e4a09f18f47 100644 --- a/doc/administration/monitoring/prometheus/index.md +++ b/doc/administration/monitoring/prometheus/index.md @@ -22,26 +22,22 @@ dashboard tool like [Grafana]. ## Configuring Prometheus >**Note:** -Available since Omnibus GitLab 8.16. For installations from source you'll -have to install and configure it yourself. +- For installations from source you'll have to install and configure it yourself. -To enable Prometheus: +Prometheus and it's exporters are on by default, starting with GitLab 9.0. Prometheus will run as the `gitlab-prometheus` user and listen on `http://localhost:9090`. Each exporter will be automatically be set up as a monitoring target for Prometheus, unless individually disabled. + +To disable Prometheus and all of its exporters, as well as any added in the future: 1. Edit `/etc/gitlab/gitlab.rb` 1. Add or find and uncomment the following line, making sure it's set to `true`: ```ruby - prometheus['enable'] = true + prometheus['disable_all'] = true ``` 1. Save the file and [reconfigure GitLab][reconfigure] for the changes to take effect -By default, Prometheus will run as the `gitlab-prometheus` user and listen on -`http://localhost:9090`. If the [node exporter](#node-exporter) service -has been enabled, it will automatically be set up as a monitoring target for -Prometheus. - ## Changing the port Prometheus listens on >**Note:** @@ -67,8 +63,7 @@ To change the address/port that Prometheus listens on: ## Viewing performance metrics -After you have [enabled Prometheus](#configuring-prometheus), you can visit -`http://localhost:9090` for the dashboard that Prometheus offers by default. +You can visit `http://localhost:9090` for the dashboard that Prometheus offers by default. >**Note:** If SSL has been enabled on your GitLab instance, you may not be able to access @@ -98,7 +93,7 @@ This feature was introduced in GitLab 9.0. If your GitLab server is running within Kubernetes, an option is now available to monitor the health of each node in the cluster. This is particularly helpful if your CI/CD environments run in the same cluster, and you would like enable [Prometheus integration][] to monitor them. -When enabled, the bundled Prometheus server monitors Kubernetes and automatically [collects metrics](prometheus-cadvisor-metrics) from each Node in the cluster. +When enabled, the bundled Prometheus server monitors Kubernetes and automatically [collects metrics](prometheus-cadvisor-metrics) from each Node in the cluster. To enable the Kubernetes monitoring: |