summaryrefslogtreecommitdiff
path: root/config/prometheus
diff options
context:
space:
mode:
authorJoshua Lambert <joshua.lambert@gmail.com>2018-05-07 00:46:10 -0400
committerJoshua Lambert <joshua.lambert@gmail.com>2018-05-07 00:46:10 -0400
commit16db6d16ee11b659007fcb033e81b3035d8679ac (patch)
tree2775c38e358e585a086c6fe6fe8bb2f8302ba891 /config/prometheus
parent58aa2d7f395be4aee38b5202ef1666879505c737 (diff)
downloadgitlab-ce-16db6d16ee11b659007fcb033e81b3035d8679ac.tar.gz
Fix nginx metric names
Diffstat (limited to 'config/prometheus')
-rw-r--r--config/prometheus/additional_metrics.yml12
1 files changed, 6 insertions, 6 deletions
diff --git a/config/prometheus/additional_metrics.yml b/config/prometheus/additional_metrics.yml
index 10ca612b246..13732384953 100644
--- a/config/prometheus/additional_metrics.yml
+++ b/config/prometheus/additional_metrics.yml
@@ -103,10 +103,10 @@
- title: "Throughput"
y_label: "Requests / Sec"
required_metrics:
- - nginx_responses_total
+ - nginx_server_requests
weight: 1
queries:
- - query_range: 'sum(rate(nginx_responses_total{server_zone!="*", server_zone!="_", %{environment_filter}}[2m])) by (status_code)'
+ - query_range: 'sum(rate(nginx_server_requests{server_zone!="*", server_zone!="_", %{environment_filter}}[2m])) by (code)'
unit: req / sec
label: Status Code
series:
@@ -121,19 +121,19 @@
- title: "Latency"
y_label: "Latency (ms)"
required_metrics:
- - nginx_upstream_response_msecs_avg
+ - nginx_server_requestMsec
weight: 1
queries:
- - query_range: 'avg(nginx_upstream_response_msecs_avg{%{environment_filter}})'
+ - query_range: 'avg(nginx_server_requestMsec{%{environment_filter}})'
label: Upstream
unit: ms
- title: "HTTP Error Rate"
y_label: "HTTP 500 Errors / Sec"
required_metrics:
- - nginx_responses_total
+ - nginx_server_requests
weight: 1
queries:
- - query_range: 'sum(rate(nginx_responses_total{status_code="5xx", %{environment_filter}}[2m]))'
+ - query_range: 'sum(rate(nginx_server_requests{code="5xx", %{environment_filter}}[2m]))'
label: HTTP Errors
unit: "errors / sec"
- group: System metrics (Kubernetes)