From 24a3311848d9b7d21f1e0ad3d745689104915b8a Mon Sep 17 00:00:00 2001 From: Joshua Lambert Date: Mon, 20 Mar 2017 11:17:57 -0400 Subject: [PATCH 1/3] Update docs to indicate prometheus k8s monitoring is on by default --- doc/administration/monitoring/prometheus/index.md | 13 +++++-------- 1 file 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 From fa87ff0e309069611ce564eba838a91f42057512 Mon Sep 17 00:00:00 2001 From: Joshua Lambert Date: Mon, 20 Mar 2017 11:21:24 -0400 Subject: [PATCH 2/3] Minor tweak --- doc/administration/monitoring/prometheus/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/administration/monitoring/prometheus/index.md b/doc/administration/monitoring/prometheus/index.md index 558275ba244..95b2bc62c7b 100644 --- a/doc/administration/monitoring/prometheus/index.md +++ b/doc/administration/monitoring/prometheus/index.md @@ -96,7 +96,7 @@ Sample Prometheus queries: > Introduced in GitLab 9.0. -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. +If your GitLab server is running within Kubernetes, Prometheus will collect metrics from the Nodes 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. From 2413a4b5eb00035fb0a24ff535461c21d6f3e220 Mon Sep 17 00:00:00 2001 From: Joshua Lambert Date: Mon, 20 Mar 2017 11:24:40 -0400 Subject: [PATCH 3/3] Remove unnecessary paragraph --- doc/administration/monitoring/prometheus/index.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/administration/monitoring/prometheus/index.md b/doc/administration/monitoring/prometheus/index.md index 95b2bc62c7b..b2445d1c0e5 100644 --- a/doc/administration/monitoring/prometheus/index.md +++ b/doc/administration/monitoring/prometheus/index.md @@ -98,9 +98,6 @@ Sample Prometheus queries: If your GitLab server is running within Kubernetes, Prometheus will collect metrics from the Nodes 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 disable the monitoring of Kubernetes: 1. Edit `/etc/gitlab/gitlab.rb`