diff options
| author | Kamil Trzciński 🎆 Back on Jan 2! <ayufan@ayufan.eu> | 2018-01-03 20:37:58 +0000 |
|---|---|---|
| committer | Kamil Trzciński 🎆 Back on Jan 2! <ayufan@ayufan.eu> | 2018-01-03 20:37:58 +0000 |
| commit | 61ea4872c7a07fc672bdfe2eca23917d3e324c4f (patch) | |
| tree | cedcccdbc327422360985b2b61d065a2f40bf0d6 | |
| parent | 034a21ba4dc0acb12abbb70664a1a7215d9dd42c (diff) | |
| parent | c44d72a8cef70ad26ff5e5cc149f6a00331f184e (diff) | |
| download | gitlab-ce-61ea4872c7a07fc672bdfe2eca23917d3e324c4f.tar.gz | |
Merge branch 'docs-update-doc-for-prometheus-and-kubernetes-integrations' into 'master'
Updates documentation for Prometheus and Kubernetes integration
Closes #41432
See merge request gitlab-org/gitlab-ce!16156
| -rw-r--r-- | doc/user/project/clusters/index.md | 1 | ||||
| -rw-r--r-- | doc/user/project/integrations/kubernetes.md | 5 | ||||
| -rw-r--r-- | doc/user/project/integrations/project_services.md | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md index e2924c66e70..d5619c7b563 100644 --- a/doc/user/project/clusters/index.md +++ b/doc/user/project/clusters/index.md @@ -83,6 +83,7 @@ added directly to your configured cluster. Those applications are needed for | ----------- | :------------: | ----------- | | [Helm Tiller](https://docs.helm.sh/) | 10.2+ | Helm is a package manager for Kubernetes and is required to install all the other applications. It will be automatically installed as a dependency when you try to install a different app. It is installed in its own pod inside the cluster which can run the `helm` CLI in a safe environment. | | [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) | 10.2+ | Ingress can provide load balancing, SSL termination, and name-based virtual hosting. It acts as a web proxy for your applications and is useful if you want to use [Auto DevOps](../../../topics/autodevops/index.md) or deploy your own web apps. | +| [Prometheus](https://prometheus.io/docs/introduction/overview/) | 10.4+ | Prometheus is an open-source monitoring and alerting system useful to supervise your deployed applications | ## Enabling or disabling the Cluster integration diff --git a/doc/user/project/integrations/kubernetes.md b/doc/user/project/integrations/kubernetes.md index e9738b683f9..079a840a56a 100644 --- a/doc/user/project/integrations/kubernetes.md +++ b/doc/user/project/integrations/kubernetes.md @@ -1,7 +1,10 @@ --- -last_updated: 2017-09-25 +last_updated: 2017-12-28 --- +CAUTION: **Warning:** +Kubernetes service integration has been deprecated on GitLab 10.4. Fields on Kubernetes integration page are now uneditable, you can configure your clusters using the new [Clusters](../clusters/index.md) page. + # GitLab Kubernetes / OpenShift integration GitLab can be configured to interact with Kubernetes, or other systems using the diff --git a/doc/user/project/integrations/project_services.md b/doc/user/project/integrations/project_services.md index a0405161495..6bda07f103e 100644 --- a/doc/user/project/integrations/project_services.md +++ b/doc/user/project/integrations/project_services.md @@ -39,7 +39,7 @@ Click on the service links to see further configuration instructions and details | [Irker (IRC gateway)](irker.md) | Send IRC messages, on update, to a list of recipients through an Irker gateway | | [JIRA](jira.md) | JIRA issue tracker | | JetBrains TeamCity CI | A continuous integration and build server | -| [Kubernetes](kubernetes.md) | A containerized deployment service | +| [Kubernetes](kubernetes.md) _(Has been deprecated in GitLab 10.4)_ | A containerized deployment service | | [Mattermost slash commands](mattermost_slash_commands.md) | Mattermost chat and ChatOps slash commands | | [Mattermost Notifications](mattermost.md) | Receive event notifications in Mattermost | | [Microsoft teams](microsoft_teams.md) | Receive notifications for actions that happen on GitLab into a room on Microsoft Teams using Office 365 Connectors | |