diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-28 10:26:08 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-28 10:26:08 +0300 |
| commit | 96c4a15eae9b93a2bfb512309e860da50d2e2636 (patch) | |
| tree | cf5f4cf12ae735bfdb1891fafd94d851322c42eb /config | |
| parent | 9bc176b2c39f1c27ce8ed4c13cf06e53331c16c9 (diff) | |
| parent | b5aac468693f6ffaada170aebedc623768ce87d4 (diff) | |
Merge branch 'master' into 'sh-augment-lograge-output'
# Conflicts:
# config/initializers/lograge.rb
Diffstat (limited to 'config')
| -rw-r--r-- | config/prometheus/additional_metrics.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config/prometheus/additional_metrics.yml b/config/prometheus/additional_metrics.yml index 61d39e7bfcf..5eb01d62924 100644 --- a/config/prometheus/additional_metrics.yml +++ b/config/prometheus/additional_metrics.yml @@ -1,4 +1,4 @@ -- group: HA Proxy +- group: Response metrics (HA Proxy) priority: 10 metrics: - title: "Throughput" @@ -19,7 +19,7 @@ - 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 +- group: Response metrics (AWS ELB) priority: 10 metrics: - title: "Throughput" @@ -50,7 +50,7 @@ - query_range: 'sum(aws_elb_httpcode_backend_5_xx_sum{%{environment_filter}}) / sum(aws_elb_request_count_sum{%{environment_filter}})' label: HTTP Errors unit: "%" -- group: NGINX +- group: Response metrics (NGINX) priority: 10 metrics: - title: "Throughput" @@ -80,7 +80,7 @@ - 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 +- group: System metrics (Kubernetes) priority: 5 metrics: - title: "Memory Usage" |