diff options
| author | Jose Ivan Vargas Lopez <jvargas@gitlab.com> | 2017-03-21 16:20:24 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-21 16:20:24 +0000 |
| commit | 222cfda9c3690ac7f77be5ecc74d35dad266b72d (patch) | |
| tree | 26074bd0b149a72d6f3451c92b7b5138f4c0f985 /spec/support/prometheus_helpers.rb | |
| parent | fa7f409f13b75d5494aae0765e7fef19f58af426 (diff) | |
| download | gitlab-ce-222cfda9c3690ac7f77be5ecc74d35dad266b72d.tar.gz | |
Resolve "Fix the Prometheus queries for multiple container environments"
Diffstat (limited to 'spec/support/prometheus_helpers.rb')
| -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) |