diff options
| author | Joshua Lambert <joshua.lambert@gmail.com> | 2018-02-28 14:55:15 -0500 |
|---|---|---|
| committer | Joshua Lambert <joshua.lambert@gmail.com> | 2018-02-28 14:55:15 -0500 |
| commit | 9b9af870f2a94a20b91753d62fcfe65c4d4f977e (patch) | |
| tree | 20c1bbf987fad134e4c10834e328504ac1a852cb | |
| parent | 15966c309850ac3377a9b8770efe3cd5033273ed (diff) | |
| download | gitlab-ce-9b9af870f2a94a20b91753d62fcfe65c4d4f977e.tar.gz | |
Final updates for metrics
| -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 1628af9c38d..c4f60eb2687 100644 --- a/config/prometheus/additional_metrics.yml +++ b/config/prometheus/additional_metrics.yml @@ -140,7 +140,7 @@ priority: 5 metrics: - title: "Memory Usage" - y_label: "Memory Usage (MB)" + y_label: "Memory Used per Pod" required_metrics: - container_memory_usage_bytes weight: 1 @@ -149,11 +149,11 @@ label: Average unit: MB - title: "CPU Usage" - y_label: "Cores" + y_label: "Cores per Pod" required_metrics: - container_cpu_usage_seconds_total 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)' + - 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 unit: "cores"
\ No newline at end of file |