summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2017-07-18 17:24:54 +0000
committerMarcia Ramos <virtua.creative@gmail.com>2017-07-18 17:24:54 +0000
commit64aec37d02a143b7f564992a4f2ceaecf2c5870f (patch)
tree79d4e3767df74f59e25bd4726b8ce23aa0580d23
parentfe0c3b79d92348f54c61b81635be65f895d2f712 (diff)
parent811108dce92f8fe9abcb43f8d94c49327474b475 (diff)
downloadgitlab-ce-64aec37d02a143b7f564992a4f2ceaecf2c5870f.tar.gz
Merge branch '35175-update-prometheus-admin-documentation-for-9-4-docs' into 'master'
Update Prometheus admin documentation for 9.4 - docs Closes #35175 See merge request !12903
-rw-r--r--doc/administration/monitoring/prometheus/index.md3
-rw-r--r--doc/user/project/integrations/prometheus.md2
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..f43c89dad87 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].