diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-06-07 21:31:00 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-06-07 21:31:00 +0000 |
| commit | 58ae01cbdd0c78463673b8734bf457648d453240 (patch) | |
| tree | 11a17d69fa75c3dbfb86175fa5d3f64b7b95c738 | |
| parent | b0c6466e4cd6f29b80f7dba0aa75d3a8dc677fed (diff) | |
| parent | 19adcaf1bf36828a66e519e3c87b3f6a65eae261 (diff) | |
| download | gitlab-ce-58ae01cbdd0c78463673b8734bf457648d453240.tar.gz | |
Merge branch 'jl-update-error-rate-to-percent' into 'master'
Update NGINX error rate to a percentage
See merge request gitlab-org/gitlab-ce!19471
| -rw-r--r-- | config/prometheus/additional_metrics.yml | 8 | ||||
| -rw-r--r-- | doc/user/project/integrations/prometheus_library/nginx_ingress.md | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/config/prometheus/additional_metrics.yml b/config/prometheus/additional_metrics.yml index 13732384953..c994bad7865 100644 --- a/config/prometheus/additional_metrics.yml +++ b/config/prometheus/additional_metrics.yml @@ -29,14 +29,14 @@ label: Pod average unit: ms - title: "HTTP Error Rate" - y_label: "HTTP 500 Errors / Sec" + y_label: "HTTP Errors" required_metrics: - nginx_upstream_responses_total weight: 1 queries: - - query_range: 'sum(rate(nginx_upstream_responses_total{status_code="5xx", upstream=~"%{kube_namespace}-%{ci_environment_slug}-.*"}[2m]))' - label: HTTP Errors - unit: "errors / sec" + - query_range: 'sum(rate(nginx_upstream_responses_total{status_code="5xx", upstream=~"%{kube_namespace}-%{ci_environment_slug}-.*"}[2m])) / sum(rate(nginx_upstream_responses_total{upstream=~"%{kube_namespace}-%{ci_environment_slug}-.*"}[2m])) * 100' + label: 5xx Errors + unit: "%" - group: Response metrics (HA Proxy) priority: 10 metrics: diff --git a/doc/user/project/integrations/prometheus_library/nginx_ingress.md b/doc/user/project/integrations/prometheus_library/nginx_ingress.md index 590b1c4275a..a1db79538a4 100644 --- a/doc/user/project/integrations/prometheus_library/nginx_ingress.md +++ b/doc/user/project/integrations/prometheus_library/nginx_ingress.md @@ -14,7 +14,7 @@ GitLab has support for automatically detecting and monitoring the Kubernetes NGI | ---- | ----- | | Throughput (req/sec) | sum(rate(nginx_upstream_responses_total{upstream=~"%{kube_namespace}-%{ci_environment_slug}-.*"}[2m])) by (status_code) | | Latency (ms) | avg(nginx_upstream_response_msecs_avg{upstream=~"%{kube_namespace}-%{ci_environment_slug}-.*"}) | -| HTTP Error Rate (HTTP Errors / sec) | sum(rate(nginx_upstream_responses_total{status_code="5xx", upstream=~"%{kube_namespace}-%{ci_environment_slug}-.*"}[2m])) | +| HTTP Error Rate (%) | sum(rate(nginx_upstream_responses_total{status_code="5xx", upstream=~"%{kube_namespace}-%{ci_environment_slug}-.*"}[2m])) / sum(rate(nginx_upstream_responses_total{upstream=~"%{kube_namespace}-%{ci_environment_slug}-.*"}[2m])) * 100 | ## Configuring NGINX ingress monitoring |