Update admin docs
This commit is contained in:
parent
00861676a0
commit
9f85578c0a
|
@ -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:
|
||||
|
||||
|
|
|
@ -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].
|
||||
|
|
Loading…
Reference in New Issue