diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-05-07 15:00:22 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-05-07 15:00:22 +0000 |
| commit | aea8d02c284ba37e61bd5fbe4ce4245629e3a074 (patch) | |
| tree | dce3648dbe83088d924f6422244e3949bc33149b /doc | |
| parent | 33e78f9ebd35b4132e9f18057f517d92cbefb9cd (diff) | |
| parent | e03189f53086bc40f0a6f128d140d33e62ee5606 (diff) | |
| download | gitlab-ce-aea8d02c284ba37e61bd5fbe4ce4245629e3a074.tar.gz | |
Merge branch 'jl-fix-nginx-metrics' into 'master'
Fix nginx metric names
Closes #45163
See merge request gitlab-org/gitlab-ce!18770
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user/project/integrations/prometheus_library/nginx.md | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/user/project/integrations/prometheus_library/nginx.md b/doc/user/project/integrations/prometheus_library/nginx.md index fea3231006b..557487e1a75 100644 --- a/doc/user/project/integrations/prometheus_library/nginx.md +++ b/doc/user/project/integrations/prometheus_library/nginx.md @@ -10,17 +10,19 @@ The [Prometheus service](../prometheus.md) must be enabled. ## Metrics supported +NGINX server metrics are detected, which tracks the pages and content directly served by NGINX. + | Name | Query | | ---- | ----- | -| Throughput (req/sec) | sum(rate(nginx_responses_total{server_zone!="*", server_zone!="_", %{environment_filter}}[2m])) by (status_code) | -| Latency (ms) | avg(nginx_upstream_response_msecs_avg{%{environment_filter}}) | -| HTTP Error Rate (HTTP Errors / sec) | rate(nginx_responses_total{status_code="5xx", %{environment_filter}}[2m])) | +| Throughput (req/sec) | sum(rate(nginx_server_requests{server_zone!="*", server_zone!="_", %{environment_filter}}[2m])) by (code) | +| Latency (ms) | avg(nginx_server_requestMsec{%{environment_filter}}) | +| HTTP Error Rate (HTTP Errors / sec) | sum(rate(nginx_server_requests{code="5xx", %{environment_filter}}[2m])) | ## Configuring Prometheus to monitor for NGINX metrics To get started with NGINX monitoring, you should first enable the [VTS statistics](https://github.com/vozlt/nginx-module-vts)) module for your NGINX server. This will capture and display statistics in an HTML readable form. Next, you should install and configure the [NGINX VTS exporter](https://github.com/hnlq715/nginx-vts-exporter) which parses these statistics and translates them into a Prometheus monitoring endpoint. -If you are using NGINX as your Kubernetes ingress, there is [upcoming direct support](https://github.com/kubernetes/ingress/pull/423) for enabling Prometheus monitoring in the 0.9.0 release. +If you are using NGINX as your Kubernetes ingress, GitLab will [automatically detect](nginx_ingress.md) the metrics once enabled in 0.9.0 and later releases. ## Specifying the Environment label |