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 /config | |
| 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 'config')
| -rw-r--r-- | config/prometheus/additional_metrics.yml | 12 |
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) |