From 8ad9cd5581dafeb7a24da7ed119a30761a0a72fe Mon Sep 17 00:00:00 2001 From: Pawel Chojnacki Date: Thu, 1 Mar 2018 18:14:54 +0100 Subject: Implement PrometheusDeploymentLocator + fix metrics controller --- app/models/environment.rb | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'app/models/environment.rb') diff --git a/app/models/environment.rb b/app/models/environment.rb index 57960a7c3b3..baba023c92d 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -1,4 +1,6 @@ class Environment < ActiveRecord::Base + include PrometheusAdapterLocator + # Used to generate random suffixes for the slug LETTERS = 'a'..'z' NUMBERS = '0'..'9' @@ -224,27 +226,6 @@ class Environment < ActiveRecord::Base project.deployment_platform end - def prometheus_adapter - @prometheus_adapter ||= if service_prometheus_adapter.can_query? - service_prometheus_adapter - else - cluster_prometheus_adapter - end - end - - def service_prometheus_adapter - project.find_or_initialize_service('prometheus') - end - - def cluster_prometheus_adapter - return unless deployment_platform.respond_to?(:cluster) - - cluster = deployment_platform.cluster - return unless cluster.application_prometheus&.installed? - - cluster.application_prometheus - end - private # Slugifying a name may remove the uniqueness guarantee afforded by it being -- cgit v1.2.1