From f864f8a7aafa45b0e4c04e4312f89da4b1227c0f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 20 Dec 2019 12:07:40 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/models/environment.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'app/models/environment.rb') diff --git a/app/models/environment.rb b/app/models/environment.rb index 82bf0f9a615..84a72fee77b 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -208,7 +208,7 @@ class Environment < ApplicationRecord end def metrics - prometheus_adapter.query(:environment, self) if has_metrics? && prometheus_adapter.can_query? + prometheus_adapter.query(:environment, self) if has_metrics_and_can_query? end def prometheus_status @@ -216,7 +216,7 @@ class Environment < ApplicationRecord end def additional_metrics(*args) - return unless has_metrics? + return unless has_metrics_and_can_query? prometheus_adapter.query(:additional_metrics_environment, self, *args.map(&:to_f)) end @@ -285,6 +285,10 @@ class Environment < ApplicationRecord private + def has_metrics_and_can_query? + has_metrics? && prometheus_adapter.can_query? + end + def generate_slug self.slug = Gitlab::Slug::Environment.new(name).generate end -- cgit v1.2.1