diff options
| author | Joshua Lambert <joshua@gitlab.com> | 2017-03-10 17:10:28 -0500 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-03-14 12:17:09 -0600 |
| commit | 8d7f95cfd8497971e5f58ae8d18195138182390c (patch) | |
| tree | 283de8b85cabc6a58e33bacedeb9ceccf28f6457 | |
| parent | c972868b89fc8e5cd46f43cc79f18814e599b35a (diff) | |
| download | gitlab-ce-8d7f95cfd8497971e5f58ae8d18195138182390c.tar.gz | |
Update the queries in the tests as well.
| -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) |