diff options
| author | syasonik <syasonik@gitlab.com> | 2019-04-16 15:00:51 +0800 |
|---|---|---|
| committer | syasonik <syasonik@gitlab.com> | 2019-04-24 18:23:03 +0800 |
| commit | 18183f404e492bcdb9818e2fb29b50dafdbca247 (patch) | |
| tree | e136ae2a66a2c72ec13580a9973f643c2d400591 /app | |
| parent | 7eb796e6b1b1c6e3ceeb85746bc7d9e8f9a519de (diff) | |
| download | gitlab-ce-18183f404e492bcdb9818e2fb29b50dafdbca247.tar.gz | |
Use existing common metrics
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/environments_controller.rb | 1 | ||||
| -rw-r--r-- | app/services/metrics_dashboard_service.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb index ea25ae22bcf..b10f0c7b7db 100644 --- a/app/controllers/projects/environments_controller.rb +++ b/app/controllers/projects/environments_controller.rb @@ -13,7 +13,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController before_action only: [:metrics, :additional_metrics] do push_frontend_feature_flag(:metrics_time_window) push_frontend_feature_flag(:environment_metrics_use_prometheus_endpoint) - push_frontend_feature_flag(:environment_metrics_show_multiple_dashboards) end def index diff --git a/app/services/metrics_dashboard_service.rb b/app/services/metrics_dashboard_service.rb index 3502c1ca221..92aeafa5eea 100644 --- a/app/services/metrics_dashboard_service.rb +++ b/app/services/metrics_dashboard_service.rb @@ -2,7 +2,7 @@ # Fetches the metrics dashboard layout and supplemented the output with DB info. class MetricsDashboardService - SYSTEM_DASHBOARD_NAME = 'system_dashboard' + SYSTEM_DASHBOARD_NAME = 'common_metrics' SYSTEM_DASHBOARD_PATH = Rails.root.join('config', 'prometheus', "#{SYSTEM_DASHBOARD_NAME}.yml") def initialize(project) |