diff options
| author | Evan Read <eread@gitlab.com> | 2018-11-21 09:38:22 +1000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2018-11-21 09:38:22 +1000 |
| commit | 7554fa84159e74e2bd076af74f062a3118e95846 (patch) | |
| tree | 0a4ff87acf154660583a00a6a78e2e475f317988 | |
| parent | 233af8f1731734aaad7e5055af39f26c16608649 (diff) | |
| download | gitlab-ce-docs/fix-ingress-nginx-links.tar.gz | |
Fix 404ing links for NGINX ingress controllerdocs/fix-ingress-nginx-links
| -rw-r--r-- | doc/user/project/integrations/prometheus_library/nginx_ingress.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/user/project/integrations/prometheus_library/nginx_ingress.md b/doc/user/project/integrations/prometheus_library/nginx_ingress.md index a1db79538a4..40ac855c74f 100644 --- a/doc/user/project/integrations/prometheus_library/nginx_ingress.md +++ b/doc/user/project/integrations/prometheus_library/nginx_ingress.md @@ -1,8 +1,8 @@ # Monitoring NGINX Ingress Controller -> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13438) in GitLab 9.5 +> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13438) in GitLab 9.5. -GitLab has support for automatically detecting and monitoring the Kubernetes NGINX ingress controller. This is provided by leveraging the built in Prometheus metrics included in [version 0.9.0](https://github.com/kubernetes/ingress/blob/master/controllers/nginx/Changelog.md#09-beta1) and above of the ingress. +GitLab has support for automatically detecting and monitoring the Kubernetes NGINX ingress controller. This is provided by leveraging the built in Prometheus metrics included in [version 0.9.0](https://github.com/kubernetes/ingress-nginx/blob/master/Changelog.md#09-beta1) and above of the ingress. ## Requirements @@ -38,7 +38,7 @@ When used in conjunction with the GitLab deployed Prometheus service, response m ### Manually setting up NGINX Ingress for Prometheus monitoring -Version 0.9.0 and above of [NGINX ingress](https://github.com/kubernetes/ingress/tree/master/controllers/nginx) have built-in support for exporting Prometheus metrics. To enable, a ConfigMap setting must be passed: `enable-vts-status: "true"`. Once enabled, a Prometheus metrics endpoint will start running on port 10254. +Version 0.9.0 and above of [NGINX ingress](https://github.com/kubernetes/ingress-nginx) have built-in support for exporting Prometheus metrics. To enable, a ConfigMap setting must be passed: `enable-vts-status: "true"`. Once enabled, a Prometheus metrics endpoint will start running on port 10254. Next, the ingress needs to be annotated for Prometheus monitoring. Two new annotations need to be added: |