diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-21 16:20:26 +0000 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-03-21 09:29:53 -0700 |
| commit | f01352f1d8224d00e07e7e70ec43590db80a5667 (patch) | |
| tree | 7cefe24b48c149b90d0f2ffe986aaec9fc3349cb /spec | |
| parent | 761dda4b60a3c9849aabd2364c738c1547ee718e (diff) | |
| download | gitlab-ce-f01352f1d8224d00e07e7e70ec43590db80a5667.tar.gz | |
Merge branch '29302-improve-the-prometheus-queries-for-multiple-container-environments' into 'master'
Resolve "Fix the Prometheus queries for multiple container environments"
Closes #29302
See merge request !9949
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/support/prometheus_helpers.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/prometheus_helpers.rb b/spec/support/prometheus_helpers.rb index a52d8f37d14..4afdbd68304 100644 --- a/spec/support/prometheus_helpers.rb +++ b/spec/support/prometheus_helpers.rb @@ -1,10 +1,10 @@ module PrometheusHelpers def prometheus_memory_query(environment_slug) - %{sum(container_memory_usage_bytes{container_name="app",environment="#{environment_slug}"})/1024/1024} + %{(sum(container_memory_usage_bytes{container_name="app",environment="#{environment_slug}"}) / count(container_memory_usage_bytes{container_name="app",environment="#{environment_slug}"})) /1024/1024} end def prometheus_cpu_query(environment_slug) - %{sum(rate(container_cpu_usage_seconds_total{container_name="app",environment="#{environment_slug}"}[2m]))} + %{sum(rate(container_cpu_usage_seconds_total{container_name="app",environment="#{environment_slug}"}[2m])) / count(container_cpu_usage_seconds_total{container_name="app",environment="#{environment_slug}"}) * 100} end def prometheus_query_url(prometheus_query) |