summaryrefslogtreecommitdiff
path: root/config/prometheus
diff options
context:
space:
mode:
authorJoshua Lambert <joshua@gitlab.com>2017-07-19 21:22:46 -0400
committerJoshua Lambert <joshua@gitlab.com>2017-07-20 16:59:30 -0400
commit3193fd44e80d649f4460b0601028f94fd0196dba (patch)
treed1557877de1b694bd6956fca2e3d4f0b40aaf111 /config/prometheus
parent729ac897fd98b7cadee6af3f764a2efc4ecde43e (diff)
downloadgitlab-ce-3193fd44e80d649f4460b0601028f94fd0196dba.tar.gz
Add HA Proxy metrics, fix NGINX
Diffstat (limited to 'config/prometheus')
-rw-r--r--config/prometheus/additional_metrics.yml23
1 files changed, 22 insertions, 1 deletions
diff --git a/config/prometheus/additional_metrics.yml b/config/prometheus/additional_metrics.yml
index 60355e9140c..3b31d388e52 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_requests_total{code="5xx",%{environment_filter}}[2m])) / sum(rate(haproxy_frontend_http_requests_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