diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2018-04-02 16:54:34 -0500 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2018-04-06 14:37:46 -0500 |
| commit | 6ed3580be624cf739c753013ef8b4c45262e9738 (patch) | |
| tree | d3cab10d116d9bcf500bd516e9fbbdca8b07ea53 /config/prometheus | |
| parent | 146954d0bbf149a4f5c9cf206024dc192e84231f (diff) | |
| download | gitlab-ce-6ed3580be624cf739c753013ef8b4c45262e9738.tar.gz | |
Update labels for latency, cpu and memory metrics
Diffstat (limited to 'config/prometheus')
| -rw-r--r-- | config/prometheus/additional_metrics.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/prometheus/additional_metrics.yml b/config/prometheus/additional_metrics.yml index c4f60eb2687..228d26b51aa 100644 --- a/config/prometheus/additional_metrics.yml +++ b/config/prometheus/additional_metrics.yml @@ -26,7 +26,7 @@ weight: 1 queries: - query_range: 'avg(nginx_upstream_response_msecs_avg{upstream=~"%{kube_namespace}-%{ci_environment_slug}-.*"})' - label: Average + label: Pod average unit: ms - title: "HTTP Error Rate" y_label: "HTTP 500 Errors / Sec" @@ -146,7 +146,7 @@ weight: 1 queries: - query_range: 'avg(sum(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-([^c].*|c([^a]|a([^n]|n([^a]|a([^r]|r[^y])))).*|)-(.*)",namespace="%{kube_namespace}"}) by (job)) without (job) / count(avg(container_memory_usage_bytes{container_name!="POD",pod_name=~"^%{ci_environment_slug}-([^c].*|c([^a]|a([^n]|n([^a]|a([^r]|r[^y])))).*|)-(.*)",namespace="%{kube_namespace}"}) without (job)) /1024/1024' - label: Average + label: Pod average unit: MB - title: "CPU Usage" y_label: "Cores per Pod" @@ -155,5 +155,5 @@ weight: 1 queries: - query_range: 'avg(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-([^c].*|c([^a]|a([^n]|n([^a]|a([^r]|r[^y])))).*|)-(.*)",namespace="%{kube_namespace}"}[15m])) by (job)) without (job) / count(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-([^c].*|c([^a]|a([^n]|n([^a]|a([^r]|r[^y])))).*|)-(.*)",namespace="%{kube_namespace}"}[15m])) by (pod_name))' - label: Average + label: Pod average unit: "cores"
\ No newline at end of file |