diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2018-02-21 20:34:46 +0000 |
|---|---|---|
| committer | Ian Baum <ibaum@gitlab.com> | 2018-02-23 14:00:39 -0600 |
| commit | 94fdf6a4e033e54d35996a6e546003392d88a8d7 (patch) | |
| tree | 5b8429e8d151719fd3622e6ecba02a2e650c1a0b | |
| parent | 2a50487dd280a6599d9775a13b03b8dd6fdd8ea1 (diff) | |
| download | gitlab-ce-94fdf6a4e033e54d35996a6e546003392d88a8d7.tar.gz | |
Merge branch 'minor-improvement-to-k8s-monitoring-docs' into 'master'
Improve link for CI environment variable, wording.
See merge request gitlab-org/gitlab-ce!17252
| -rw-r--r-- | doc/user/project/integrations/prometheus_library/kubernetes.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/project/integrations/prometheus_library/kubernetes.md b/doc/user/project/integrations/prometheus_library/kubernetes.md index 106241ff191..02adc562028 100644 --- a/doc/user/project/integrations/prometheus_library/kubernetes.md +++ b/doc/user/project/integrations/prometheus_library/kubernetes.md @@ -28,6 +28,6 @@ Prometheus server up and running. You have two options here: In order to isolate and only display relevant CPU and Memory metrics for a given environment, GitLab needs a method to detect which containers it is running. Because these metrics are tracked at the container level, traditional Kubernetes labels are not available. -Instead, the [Deployment](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/) or [DaemonSet](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/) name should begin with the name of the [environment](../../../../ci/environments.md). It can be followed by a `-` and additional content if desired. For example, a deployment name of `review-homepage-5620p5` would match the `review/homepage` environment. +Instead, the [Deployment](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/) or [DaemonSet](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/) name should begin with [CI_ENVIRONMENT_SLUG](../../../../ci/variables/README.md#predefined-variables-environment-variables). It can be followed by a `-` and additional content if desired. For example, a deployment name of `review-homepage-5620p5` would match the `review/homepage` environment. -If you are using [GitLab Auto-Deploy](../../../../ci/autodeploy/index.md) and one of the two [provided Kubernetes monitoring solutions](../prometheus.md#getting-started-with-prometheus-monitoring), the naming will be correctly set automatically. +If you are using [GitLab Auto-Deploy](../../../../ci/autodeploy/index.md) and one of the two [provided Kubernetes monitoring solutions](../prometheus.md#getting-started-with-prometheus-monitoring), the `environment` label will be automatically added. |