Merge branch 'remove-per-cpu-metrics' into 'master'

Updates CE metrics with updated versions from EE

See merge request gitlab-org/gitlab-ce!15229
This commit is contained in:
Tim Zallmann 2017-11-07 07:19:01 +00:00
commit e99ddb6f37

View file

@ -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: