summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-07-17 06:25:56 +0000
committerMike Greiling <mike@pixelcog.com>2017-07-20 17:04:18 -0500
commit290306f314d27fb29d439ec1187678554a3fd7f9 (patch)
tree35237e0999f2a9d0e5e9d6c1e44c14e92857df07
parent9f2cf6c295b286a36c553dc65c26cb1410f9cff8 (diff)
downloadgitlab-ce-290306f314d27fb29d439ec1187678554a3fd7f9.tar.gz
Merge branch '35174-fix-aws-elb-query' into 'master'
Fix incorrect AWS ELB metrics. Closes #35174 See merge request !12902
-rw-r--r--config/prometheus/additional_metrics.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/prometheus/additional_metrics.yml b/config/prometheus/additional_metrics.yml
index d33fae4182d..60355e9140c 100644
--- a/config/prometheus/additional_metrics.yml
+++ b/config/prometheus/additional_metrics.yml
@@ -7,7 +7,7 @@
- aws_elb_request_count_sum
weight: 1
queries:
- - query_range: 'sum(aws_elb_request_count_sum{%{environment_filter}}) * 60'
+ - query_range: 'sum(aws_elb_request_count_sum{%{environment_filter}}) / 60'
label: Total
unit: req / sec
- title: "Latency"