diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-11-07 07:19:01 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-11-07 07:19:01 +0000 |
| commit | e99ddb6f374c9f79c1c78e808c5e9bd983bed227 (patch) | |
| tree | 5f37af2344c855ebbf3666b8d05128d3a99b82ad /config | |
| parent | d7224c81601638dae1dab6fbf72942a19a44074b (diff) | |
| parent | 1fea51d85c0f47e3a92c36ee4d15dea446ee2cc4 (diff) | |
| download | gitlab-ce-e99ddb6f374c9f79c1c78e808c5e9bd983bed227.tar.gz | |
Merge branch 'remove-per-cpu-metrics' into 'master'
Updates CE metrics with updated versions from EE
See merge request gitlab-org/gitlab-ce!15229
Diffstat (limited to 'config')
| -rw-r--r-- | config/prometheus/additional_metrics.yml | 4 |
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: |