diff options
| author | Joshua Lambert <joshua@gitlab.com> | 2017-07-17 00:29:21 -0400 |
|---|---|---|
| committer | Joshua Lambert <joshua@gitlab.com> | 2017-07-17 00:29:21 -0400 |
| commit | 9f85578c0a40f16ed4f1842f53a360d7d3ac0751 (patch) | |
| tree | 59a665b2f43dd63527e391d42e3a46df546f1201 /doc | |
| parent | 00861676a0cac3154153ec1afd7582991628e16e (diff) | |
| download | gitlab-ce-9f85578c0a40f16ed4f1842f53a360d7d3ac0751.tar.gz | |
Update admin docs
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/administration/monitoring/prometheus/index.md | 3 | ||||
| -rw-r--r-- | doc/user/project/integrations/prometheus.md | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/administration/monitoring/prometheus/index.md b/doc/administration/monitoring/prometheus/index.md index 695fdf09a87..c61c4d56443 100644 --- a/doc/administration/monitoring/prometheus/index.md +++ b/doc/administration/monitoring/prometheus/index.md @@ -95,8 +95,9 @@ Sample Prometheus queries: ## Configuring Prometheus to monitor Kubernetes > Introduced in GitLab 9.0. +> Pod monitoring introduced in GitLAb 9.4. -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. +If your GitLab server is running within Kubernetes, Prometheus will collect metrics from the Nodes and [annotated Pods](https://prometheus.io/docs/operating/configuration/#<kubernetes_sd_config>) 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. To disable the monitoring of Kubernetes: diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md index 86ceb14b965..4ccc13b16ab 100644 --- a/doc/user/project/integrations/prometheus.md +++ b/doc/user/project/integrations/prometheus.md @@ -45,7 +45,7 @@ Prometheus server up and running. You have two options here: ### Configuring Omnibus GitLab Prometheus to monitor Kubernetes With Omnibus GitLab running inside of Kubernetes, you can leverage the bundled -version of Prometheus to collect the required metrics. +version of Prometheus to collect the supported metrics. Once enabled, Prometheus will automatically begin monitoring Kubernetes Nodes and any [annotated Pods](https://prometheus.io/docs/operating/configuration/#<kubernetes_sd_config>). 1. Read how to configure the bundled Prometheus server in the [Administration guide][gitlab-prometheus-k8s-monitor]. |