summaryrefslogtreecommitdiff
path: root/config/prometheus
diff options
context:
space:
mode:
authorJoshua Lambert <joshua@gitlab.com>2017-11-06 21:11:18 +0000
committerJoshua Lambert <joshua@gitlab.com>2017-11-06 18:23:54 -0500
commit1fea51d85c0f47e3a92c36ee4d15dea446ee2cc4 (patch)
treeed90828f112105fe2808445709830cbc21ed8f35 /config/prometheus
parent045795d0d93dfe426cac668d612aa031114df930 (diff)
downloadgitlab-ce-1fea51d85c0f47e3a92c36ee4d15dea446ee2cc4.tar.gz
Updates CE metrics with updated versions from EE for supported metrics (EE version includes additional items for EE specific features)remove-per-cpu-metrics
Diffstat (limited to 'config/prometheus')
-rw-r--r--config/prometheus/additional_metrics.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/prometheus/additional_metrics.yml b/config/prometheus/additional_metrics.yml
index 33b897f46e2..190eeb59a2c 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_filter}}) / count(container_memory_usage_bytes{container_name!="POD",%{environment_filter}})) /1024/1024'
+ - 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'
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_filter}}[2m])) by (cpu) * 100'
+ - query_range: 'sum(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="%{ci_environment_slug}"}[2m])) * 100'
label: CPU
unit: "%"
series: