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/controllers/projects/prometheus/metrics_controller.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'app/controllers/projects/prometheus') diff --git a/app/controllers/projects/prometheus/metrics_controller.rb b/app/controllers/projects/prometheus/metrics_controller.rb index 255fbf254fb..ec3c49059e1 100644 --- a/app/controllers/projects/prometheus/metrics_controller.rb +++ b/app/controllers/projects/prometheus/metrics_controller.rb @@ -1,6 +1,8 @@ module Projects module Prometheus class MetricsController < Projects::ApplicationController + include PrometheusAdapterLocator + before_action :authorize_admin_project! before_action :require_prometheus_metrics! @@ -20,10 +22,6 @@ module Projects private - def prometheus_adapter - project.prometheus_service - end - def require_prometheus_metrics! render_404 unless prometheus_adapter.can_query? end -- cgit v1.2.1