diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
| commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
| tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/services/metrics/dashboard | |
| parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
| download | gitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/services/metrics/dashboard')
3 files changed, 6 insertions, 5 deletions
diff --git a/app/services/metrics/dashboard/base_service.rb b/app/services/metrics/dashboard/base_service.rb index 514793694ba..c2a0f22e73e 100644 --- a/app/services/metrics/dashboard/base_service.rb +++ b/app/services/metrics/dashboard/base_service.rb @@ -13,7 +13,8 @@ module Metrics STAGES::EndpointInserter, STAGES::PanelIdsInserter, STAGES::Sorter, - STAGES::AlertsInserter + STAGES::AlertsInserter, + STAGES::UrlValidator ].freeze def get_dashboard diff --git a/app/services/metrics/dashboard/self_monitoring_dashboard_service.rb b/app/services/metrics/dashboard/self_monitoring_dashboard_service.rb index d97668d1c7c..8599c23c206 100644 --- a/app/services/metrics/dashboard/self_monitoring_dashboard_service.rb +++ b/app/services/metrics/dashboard/self_monitoring_dashboard_service.rb @@ -6,7 +6,7 @@ module Metrics module Dashboard class SelfMonitoringDashboardService < ::Metrics::Dashboard::PredefinedDashboardService DASHBOARD_PATH = 'config/prometheus/self_monitoring_default.yml' - DASHBOARD_NAME = 'Default' + DASHBOARD_NAME = N_('Default dashboard') SEQUENCE = [ STAGES::CustomMetricsInserter, @@ -23,7 +23,7 @@ module Metrics def all_dashboard_paths(_project) [{ path: DASHBOARD_PATH, - display_name: DASHBOARD_NAME, + display_name: _(DASHBOARD_NAME), default: true, system_dashboard: false }] diff --git a/app/services/metrics/dashboard/system_dashboard_service.rb b/app/services/metrics/dashboard/system_dashboard_service.rb index ed4b78ba159..db5599b4def 100644 --- a/app/services/metrics/dashboard/system_dashboard_service.rb +++ b/app/services/metrics/dashboard/system_dashboard_service.rb @@ -6,7 +6,7 @@ module Metrics module Dashboard class SystemDashboardService < ::Metrics::Dashboard::PredefinedDashboardService DASHBOARD_PATH = 'config/prometheus/common_metrics.yml' - DASHBOARD_NAME = 'Default' + DASHBOARD_NAME = N_('Default dashboard') SEQUENCE = [ STAGES::CommonMetricsInserter, @@ -22,7 +22,7 @@ module Metrics def all_dashboard_paths(_project) [{ path: DASHBOARD_PATH, - display_name: DASHBOARD_NAME, + display_name: _(DASHBOARD_NAME), default: true, system_dashboard: true }] |