diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-07-24 06:47:49 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-07-24 15:01:21 -0500 |
| commit | 7a8ba13718b41ac1b99eddc613d9a4966a1e78f7 (patch) | |
| tree | 1fe72b9be370e670ec9ff4cc5475f2a54120cb90 /config | |
| parent | e76aa93671d05a66371deebfb99b1000e22a8b41 (diff) | |
| download | gitlab-ce-7a8ba13718b41ac1b99eddc613d9a4966a1e78f7.tar.gz | |
Merge branch '35330-fix-nginx-add-haproxy' into 'master'
Fix NGINX Error Rate query, include HA Proxy
See merge request !13005
Diffstat (limited to 'config')
| -rw-r--r-- | config/prometheus/additional_metrics.yml | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/config/prometheus/additional_metrics.yml b/config/prometheus/additional_metrics.yml index 60355e9140c..61d39e7bfcf 100644 --- a/config/prometheus/additional_metrics.yml +++ b/config/prometheus/additional_metrics.yml @@ -1,3 +1,24 @@ +- group: HA Proxy + priority: 10 + metrics: + - title: "Throughput" + y_label: "Requests / Sec" + required_metrics: + - haproxy_frontend_http_requests_total + weight: 1 + queries: + - query_range: 'sum(rate(haproxy_frontend_http_requests_total{%{environment_filter}}[2m]))' + label: Total + unit: req / sec + - title: "HTTP Error Rate" + y_label: "Error Rate (%)" + required_metrics: + - haproxy_frontend_http_responses_total + weight: 1 + queries: + - query_range: 'sum(rate(haproxy_frontend_http_responses_total{code="5xx",%{environment_filter}}[2m])) / sum(rate(haproxy_frontend_http_responses_total{%{environment_filter}}[2m]))' + label: HTTP Errors + unit: "%" - group: AWS Elastic Load Balancer priority: 10 metrics: @@ -56,7 +77,7 @@ - nginx_responses_total weight: 1 queries: - - query_range: 'sum(nginx_responses_total{status_code="5xx", %{environment_filter}}) / sum(nginx_responses_total{server_zone!="*", server_zone!="_", %{environment_filter}})' + - query_range: 'sum(rate(nginx_responses_total{status_code="5xx", %{environment_filter}}[2m])) / sum(rate(nginx_requests_total{server_zone!="*", server_zone!="_", %{environment_filter}}[2m]))' label: HTTP Errors unit: "%" - group: Kubernetes |