summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPawel Chojnacki <pawel@chojnacki.ws>2017-06-07 12:41:06 +0200
committerPawel Chojnacki <pawel@chojnacki.ws>2017-06-07 12:41:06 +0200
commit6eb96b2019d392d906a64108dbe83b3ce7cce758 (patch)
tree83aea91fbd68a20f0c5244d5622c4db44ee9cb60
parentdbb3c28088b63c8cf40a90c599b6eedb4dfbbb66 (diff)
downloadgitlab-ce-6eb96b2019d392d906a64108dbe83b3ce7cce758.tar.gz
Use `key?` instead of `has_key?`
-rw-r--r--lib/gitlab/prometheus/additional_metrics_parser.rb4
-rw-r--r--lib/gitlab/prometheus/queries/query_additional_metrics.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/prometheus/additional_metrics_parser.rb b/lib/gitlab/prometheus/additional_metrics_parser.rb
index eb168ce8f9c..18eb79a44be 100644
--- a/lib/gitlab/prometheus/additional_metrics_parser.rb
+++ b/lib/gitlab/prometheus/additional_metrics_parser.rb
@@ -14,14 +14,14 @@ module Gitlab
end
def metric_from_entry(entry)
- missing_fields = [:title, :required_metrics, :weight, :queries].select { |key| !entry.has_key?(key) }
+ missing_fields = [:title, :required_metrics, :weight, :queries].select { |key| !entry.key?(key) }
raise ParsingError.new("entry missing required fields #{missing_fields}") unless missing_fields.empty?
Metric.new(entry[:title], entry[:required_metrics], entry[:weight], entry[:y_label], entry[:queries])
end
def group_from_entry(entry)
- missing_fields = [:group, :priority, :metrics].select { |key| !entry.has_key?(key) }
+ missing_fields = [:group, :priority, :metrics].select { |key| !entry.key?(key) }
raise ParsingError.new("entry missing required fields #{missing_fields}") unless missing_fields.empty?
group = MetricGroup.new(entry[:group], entry[:priority])
diff --git a/lib/gitlab/prometheus/queries/query_additional_metrics.rb b/lib/gitlab/prometheus/queries/query_additional_metrics.rb
index 46029a1889a..dd888b2bc1d 100644
--- a/lib/gitlab/prometheus/queries/query_additional_metrics.rb
+++ b/lib/gitlab/prometheus/queries/query_additional_metrics.rb
@@ -44,7 +44,7 @@ module Gitlab
def process_query(context, query)
query_with_result = query.dup
query_with_result[:result] =
- if query.has_key?(:query_range)
+ if query.key?(:query_range)
client_query_range(query[:query_range] % context, start: context[:timeframe_start], stop: context[:timeframe_end])
else
client_query(query[:query] % context, time: context[:timeframe_end])