summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Lambert <joshua@gitlab.com>2017-07-18 10:58:19 -0400
committerJoshua Lambert <joshua@gitlab.com>2017-07-18 10:58:19 -0400
commit811108dce92f8fe9abcb43f8d94c49327474b475 (patch)
treefde8b936c39b7bb248c4f2f63af4451e02835ad1
parent9f85578c0a40f16ed4f1842f53a360d7d3ac0751 (diff)
downloadgitlab-ce-811108dce92f8fe9abcb43f8d94c49327474b475.tar.gz
-rw-r--r--doc/administration/monitoring/prometheus/index.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/administration/monitoring/prometheus/index.md b/doc/administration/monitoring/prometheus/index.md
index c61c4d56443..f43c89dad87 100644
--- a/doc/administration/monitoring/prometheus/index.md
+++ b/doc/administration/monitoring/prometheus/index.md
@@ -95,9 +95,9 @@ Sample Prometheus queries:
## Configuring Prometheus to monitor Kubernetes
> Introduced in GitLab 9.0.
-> Pod monitoring introduced in GitLAb 9.4.
+> Pod monitoring introduced in GitLab 9.4.
-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.
+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: