Skip to content

G
gitlab-ce
Commit 2f598515 authored by Joshua Lambert's avatar Joshua Lambert
Browse files
Options

One last item of feedback

parent ed8dce70
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
doc/user/project/integrations/prometheus.md
View file @ 2f598515
...@@ -13,12 +13,12 @@ There are two ways to setup Prometheus integration, depending on where your apps ...@@ -13,12 +13,12 @@ There are two ways to setup Prometheus integration, depending on where your apps
* For other deployment targets, simply [specify the Prometheus server](#manual-configuration-of-prometheus). * For other deployment targets, simply [specify the Prometheus server](#manual-configuration-of-prometheus).
## Managed Prometheus on Kubernetes ## Managed Prometheus on Kubernetes
> **Note**: [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/28916) in GitLab 10.5
GitLab can seamlessly deploy and manage Prometheus on a [connected Kubernetes cluster](../clusters/index.md), making monitoring of your apps easy. GitLab can seamlessly deploy and manage Prometheus on a [connected Kubernetes cluster](../clusters/index.md), making monitoring of your apps easy.
### Requirements ### Requirements
* GitLab [10.5 or above](https://gitlab.com/gitlab-org/gitlab-ce/issues/28916)
* A [connected Kubernetes cluster](../clusters/index.md) * A [connected Kubernetes cluster](../clusters/index.md)
* Helm Tiller [installed by GitLab](../clusters/index.md#installing-applications) * Helm Tiller [installed by GitLab](../clusters/index.md#installing-applications)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7