diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2018-01-04 02:45:57 +0100 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2018-01-04 02:45:57 +0100 |
| commit | 80d4c0675f5715d724be20d47cafa372524e3ed1 (patch) | |
| tree | a7eb85470d83f374d2fa013f297fcfeeb0ab135f /lib/gitlab/prometheus | |
| parent | 249c9a8cf63b5b36b86499720804a5180e640537 (diff) | |
| download | gitlab-ce-80d4c0675f5715d724be20d47cafa372524e3ed1.tar.gz | |
Add test checking if prometheus integration is enabled after prometheus is installed
Diffstat (limited to 'lib/gitlab/prometheus')
| -rw-r--r-- | lib/gitlab/prometheus/queries/environment_query.rb | 26 | ||||
| -rw-r--r-- | lib/gitlab/prometheus/queries/matched_metrics_query.rb | 2 |
2 files changed, 13 insertions, 15 deletions
diff --git a/lib/gitlab/prometheus/queries/environment_query.rb b/lib/gitlab/prometheus/queries/environment_query.rb index 1d17d3cfd56..8f1453f31bf 100644 --- a/lib/gitlab/prometheus/queries/environment_query.rb +++ b/lib/gitlab/prometheus/queries/environment_query.rb @@ -2,22 +2,20 @@ module Gitlab module Prometheus module Queries class EnvironmentQuery < BaseQuery - def query(environment_id) - ::Environment.find_by(id: environment_id).try do |environment| - environment_slug = environment.slug - timeframe_start = 8.hours.ago.to_f - timeframe_end = Time.now.to_f + def query + environment_slug = environment.slug + timeframe_start = 8.hours.ago.to_f + timeframe_end = Time.now.to_f - memory_query = raw_memory_usage_query(environment_slug) - cpu_query = raw_cpu_usage_query(environment_slug) + memory_query = raw_memory_usage_query(environment_slug) + cpu_query = raw_cpu_usage_query(environment_slug) - { - memory_values: client_query_range(memory_query, start: timeframe_start, stop: timeframe_end), - memory_current: client_query(memory_query, time: timeframe_end), - cpu_values: client_query_range(cpu_query, start: timeframe_start, stop: timeframe_end), - cpu_current: client_query(cpu_query, time: timeframe_end) - } - end + { + memory_values: client_query_range(memory_query, start: timeframe_start, stop: timeframe_end), + memory_current: client_query(memory_query, time: timeframe_end), + cpu_values: client_query_range(cpu_query, start: timeframe_start, stop: timeframe_end), + cpu_current: client_query(cpu_query, time: timeframe_end) + } end end end diff --git a/lib/gitlab/prometheus/queries/matched_metrics_query.rb b/lib/gitlab/prometheus/queries/matched_metrics_query.rb index 4c3edccc71a..d21f64a252b 100644 --- a/lib/gitlab/prometheus/queries/matched_metrics_query.rb +++ b/lib/gitlab/prometheus/queries/matched_metrics_query.rb @@ -4,7 +4,7 @@ module Gitlab class MatchedMetricsQuery < BaseQuery MAX_QUERY_ITEMS = 40.freeze - def query + def query(_ = nil) groups_data.map do |group, data| { group: group.name, |