diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-08-01 22:11:59 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-08-01 22:11:59 +0200 |
| commit | ba97a42193d85182cf0974b8aac508d40b6f368a (patch) | |
| tree | d92821afc76b41d21c7c927a36c60daea4c4929b | |
| parent | feb94e8ea3b003938f5df963d3c61757ffe27bcb (diff) | |
| download | gitlab-ce-pawel/add_more_variables_to_additional_metrics-35267.tar.gz | |
Remove default arguments for common query contextpawel/add_more_variables_to_additional_metrics-35267
| -rw-r--r-- | lib/gitlab/prometheus/queries/additional_metrics_environment_query.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/prometheus/queries/query_additional_metrics.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab/prometheus/queries/additional_metrics_environment_query.rb b/lib/gitlab/prometheus/queries/additional_metrics_environment_query.rb index 580153556ea..db4708b22e4 100644 --- a/lib/gitlab/prometheus/queries/additional_metrics_environment_query.rb +++ b/lib/gitlab/prometheus/queries/additional_metrics_environment_query.rb @@ -6,7 +6,9 @@ module Gitlab def query(environment_id) Environment.find_by(id: environment_id).try do |environment| - query_metrics(common_query_context(environment)) + query_metrics( + common_query_context(environment, timeframe_start: 8.hours.ago.to_f, timeframe_end: Time.now.to_f) + ) end end end diff --git a/lib/gitlab/prometheus/queries/query_additional_metrics.rb b/lib/gitlab/prometheus/queries/query_additional_metrics.rb index d5f219ce6f9..7ac6162b54d 100644 --- a/lib/gitlab/prometheus/queries/query_additional_metrics.rb +++ b/lib/gitlab/prometheus/queries/query_additional_metrics.rb @@ -71,7 +71,7 @@ module Gitlab result.select { |group| group.metrics.any? } end - def common_query_context(environment, timeframe_start: 8.hours.ago.to_f, timeframe_end: Time.now.to_f) + def common_query_context(environment, timeframe_start:, timeframe_end:) { timeframe_start: timeframe_start, timeframe_end: timeframe_end, |