diff options
| author | Joshua Lambert <joshua@gitlab.com> | 2017-03-20 11:17:57 -0400 |
|---|---|---|
| committer | Joshua Lambert <joshua@gitlab.com> | 2017-03-20 11:17:57 -0400 |
| commit | 24a3311848d9b7d21f1e0ad3d745689104915b8a (patch) | |
| tree | 11413829c14de755521853a6d3f64255c57f9f08 /doc/administration/monitoring | |
| parent | cd3e410110a5c6f33c5e873f8fb54883a8e11754 (diff) | |
| download | gitlab-ce-24a3311848d9b7d21f1e0ad3d745689104915b8a.tar.gz | |
Update docs to indicate prometheus k8s monitoring is on by default
Diffstat (limited to 'doc/administration/monitoring')
| -rw-r--r-- | doc/administration/monitoring/prometheus/index.md | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/doc/administration/monitoring/prometheus/index.md b/doc/administration/monitoring/prometheus/index.md index 69b16b7c483..558275ba244 100644 --- a/doc/administration/monitoring/prometheus/index.md +++ b/doc/administration/monitoring/prometheus/index.md @@ -96,21 +96,18 @@ Sample Prometheus queries: > 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. +If your GitLab server is running within Kubernetes, Prometheus will collect metrics from each Node in the cluster including performance data on each container. This is particularly helpful if your CI/CD environments run in the same cluster, as you can use the [Prometheus project 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. -To enable the Kubernetes monitoring: +To disable the monitoring of Kubernetes: 1. Edit `/etc/gitlab/gitlab.rb` -1. Add or find and uncomment the following line: +1. Add or find and uncomment the following line and set it to `false`: ```ruby - prometheus['monitor_kubernetes'] = true + prometheus['monitor_kubernetes'] = false ``` 1. Save the file and [reconfigure GitLab][reconfigure] for the changes to @@ -165,4 +162,4 @@ The GitLab monitor exporter allows you to measure various GitLab metrics. [reconfigure]: ../../restart_gitlab.md#omnibus-gitlab-reconfigure [1261]: https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1261 [prometheus integration]: ../../../user/project/integrations/prometheus.md -[rometheus-cadvisor-metrics]: https://github.com/google/cadvisor/blob/master/docs/storage/prometheus.md +[prometheus-cadvisor-metrics]: https://github.com/google/cadvisor/blob/master/docs/storage/prometheus.md |