From bc58f625c4a964212fd991982417cb5b561b0c99 Mon Sep 17 00:00:00 2001 From: Joshua Lambert Date: Tue, 7 Nov 2017 16:51:11 +0000 Subject: Adjust metrics to ignore Job tag to support k8s 1.7+ --- config/prometheus/additional_metrics.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/prometheus') diff --git a/config/prometheus/additional_metrics.yml b/config/prometheus/additional_metrics.yml index 190eeb59a2c..073948a965a 100644 --- a/config/prometheus/additional_metrics.yml +++ b/config/prometheus/additional_metrics.yml @@ -145,7 +145,7 @@ - container_memory_usage_bytes weight: 1 queries: - - query_range: '(sum(container_memory_usage_bytes{container_name!="POD",environment="%{ci_environment_slug}"}) / count(container_memory_usage_bytes{container_name!="POD",environment="%{ci_environment_slug}"})) /1024/1024' + - query_range: '(sum(avg(container_memory_usage_bytes{container_name!="POD",environment="production"}) without (job))) / count(avg(container_memory_usage_bytes{container_name!="POD",environment="production"}) without (job)) /1024/1024' label: Average unit: MB - title: "CPU Utilization" @@ -154,7 +154,7 @@ - container_cpu_usage_seconds_total weight: 1 queries: - - query_range: 'sum(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="%{ci_environment_slug}"}[2m])) * 100' + - query_range: 'avg(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="%{ci_environment_slug}"}[2m])) * 100) without (job)' label: CPU unit: "%" series: -- cgit v1.2.3