diff options
author | Joshua Lambert <joshua@gitlab.com> | 2017-03-28 14:03:02 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-03-28 14:03:02 +0000 |
commit | ae4af05568e08c16a790dd08e01693e1e8db8592 (patch) | |
tree | 06c3f3f1d881c57c9abaf8e51e46cafd3bdbecc9 /spec/support | |
parent | ad831ace7ed8d2ed999b15f8350aaa51f0490124 (diff) | |
download | gitlab-ce-ae4af05568e08c16a790dd08e01693e1e8db8592.tar.gz |
Support wider range of monitored environments with Prometheus
Diffstat (limited to 'spec/support')
-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 4afdbd68304..cc79b11616a 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}"}) / count(container_memory_usage_bytes{container_name="app",environment="#{environment_slug}"})) /1024/1024} + %{(sum(container_memory_usage_bytes{container_name!="POD",environment="#{environment_slug}"}) / count(container_memory_usage_bytes{container_name!="POD",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])) / count(container_cpu_usage_seconds_total{container_name="app",environment="#{environment_slug}"}) * 100} + %{sum(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="#{environment_slug}"}[2m])) / count(container_cpu_usage_seconds_total{container_name!="POD",environment="#{environment_slug}"}) * 100} end def prometheus_query_url(prometheus_query) |