diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-09-15 11:05:58 +0200 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2017-09-25 15:48:52 +0200 |
| commit | 3269588858f8248f528da4ccebfd4bec834518d6 (patch) | |
| tree | 8a54450ef940ab7ebf080c813d04497fee0a6608 /doc/user/project/integrations/kubernetes.md | |
| parent | 5c251458b83d67da257047237157278f5c63e7a6 (diff) | |
| download | gitlab-ce-3269588858f8248f528da4ccebfd4bec834518d6.tar.gz | |
Clean up Kubernetes integration docs page
Diffstat (limited to 'doc/user/project/integrations/kubernetes.md')
| -rw-r--r-- | doc/user/project/integrations/kubernetes.md | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/doc/user/project/integrations/kubernetes.md b/doc/user/project/integrations/kubernetes.md index ff39549fac2..a92426fa0fc 100644 --- a/doc/user/project/integrations/kubernetes.md +++ b/doc/user/project/integrations/kubernetes.md @@ -96,10 +96,8 @@ the need to leave GitLab. ### Kubernetes monitoring -GitLab has support for automatically detecting and monitoring Kubernetes metrics. -Kubernetes exposes Node level metrics out of the box via the built-in -[Prometheus metrics support in cAdvisor](https://github.com/google/cadvisor). -No additional services or exporters are needed. +Automatically detect and monitor Kubernetes metrics. Automatic monitoring of +NGINX ingress is also supported. [> Read more about Kubernetes monitoring](./prometheus_library/kubernetes.md) @@ -118,7 +116,7 @@ with no configuration, including: **Auto Build**, **Auto Test**, **Auto Code Qua NOTE: **Note:** Introduced in GitLab 8.15. You must be the project owner or have `master` permissions -to use terminals. Support is currently limited to the first container in the +to use terminals. Support is limited to the first container in the first pod of your environment. When enabled, the Kubernetes service adds [web terminal](../../../ci/environments.md#web-terminals) |