summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-05-17 17:56:24 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-05-17 17:56:24 +0000
commitcbef8f2d6af6eb792b47f34c179f14e134dfd627 (patch)
tree4cc2c956bbd6f7239ac568b7829dcb2a81b4dfa0
parent8508195c26a8236e1cbadd5a514f2ebf97b1df61 (diff)
parent644a639295d0e33ad6db591ee2399bb2c8e9d26e (diff)
downloadgitlab-ce-cbef8f2d6af6eb792b47f34c179f14e134dfd627.tar.gz
Merge branch 'jl-add-pod-logs-to-k8s-docs' into 'master'
Add Pod logs docs to Kubernetes cluster docs See merge request gitlab-org/gitlab-ce!28161
-rw-r--r--doc/user/project/clusters/index.md11
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md
index 157afb3a78c..afad8f0fa9d 100644
--- a/doc/user/project/clusters/index.md
+++ b/doc/user/project/clusters/index.md
@@ -674,11 +674,6 @@ To remove the Kubernetes cluster integration from your project, simply click the
**Remove integration** button. You will then be able to follow the procedure
and add a Kubernetes cluster again.
-## View Kubernetes pod logs from GitLab **[ULTIMATE]**
-
-Learn how to easily
-[view the logs of running pods in connected Kubernetes clusters](kubernetes_pod_logs.md).
-
## What you can get with the Kubernetes integration
Here's what you can do with GitLab if you enable the Kubernetes integration.
@@ -701,6 +696,12 @@ the need to leave GitLab.
[Read more about Canary Deployments](https://docs.gitlab.com/ee/user/project/canary_deployments.html)
+### Pod logs **[ULTIMATE]**
+
+GitLab makes it easy to view the logs of running pods in connected Kubernetes clusters. By displaying the logs directly in GitLab, developers can avoid having to manage console tools or jump to a different interface.
+
+[Read more about Kubernetes pod logs](kubernetes_pod_logs.md)
+
### Kubernetes monitoring
Automatically detect and monitor Kubernetes metrics. Automatic monitoring of