diff options
author | Sarah Yasonik <syasonik@gitlab.com> | 2019-06-14 18:55:08 +0300 |
---|---|---|
committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-06-14 18:55:08 +0300 |
commit | 1b7464ed84c3cf86d72b456f1c5220abdd01825a (patch) | |
tree | 8834deb46740b3a839b1fdf405c322b5437701d8 /lib | |
parent | ae853dba6b9e5f45aea0d14965c9691840db78f7 (diff) |
Specify a dropdown name for dashboards
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/metrics/dashboard/project_dashboard_service.rb | 13 | ||||
-rw-r--r-- | lib/gitlab/metrics/dashboard/system_dashboard_service.rb | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/lib/gitlab/metrics/dashboard/project_dashboard_service.rb b/lib/gitlab/metrics/dashboard/project_dashboard_service.rb index e88658e4f9f..5a1c4ecf886 100644 --- a/lib/gitlab/metrics/dashboard/project_dashboard_service.rb +++ b/lib/gitlab/metrics/dashboard/project_dashboard_service.rb @@ -13,12 +13,23 @@ module Gitlab def all_dashboard_paths(project) file_finder(project) .list_files_for(DASHBOARD_ROOT) - .map { |filepath| { path: filepath, default: false } } + .map do |filepath| + { + path: filepath, + display_name: name_for_path(filepath), + default: false + } + end end def file_finder(project) Gitlab::Template::Finders::RepoTemplateFinder.new(project, DASHBOARD_ROOT, '.yml') end + + # Grabs the filepath after the base directory. + def name_for_path(filepath) + filepath.delete_prefix("#{DASHBOARD_ROOT}/") + end end private diff --git a/lib/gitlab/metrics/dashboard/system_dashboard_service.rb b/lib/gitlab/metrics/dashboard/system_dashboard_service.rb index 67509ed4230..82421572f4a 100644 --- a/lib/gitlab/metrics/dashboard/system_dashboard_service.rb +++ b/lib/gitlab/metrics/dashboard/system_dashboard_service.rb @@ -7,11 +7,13 @@ module Gitlab module Dashboard class SystemDashboardService < Gitlab::Metrics::Dashboard::BaseService SYSTEM_DASHBOARD_PATH = 'config/prometheus/common_metrics.yml' + SYSTEM_DASHBOARD_NAME = 'Default' class << self def all_dashboard_paths(_project) [{ path: SYSTEM_DASHBOARD_PATH, + display_name: SYSTEM_DASHBOARD_NAME, default: true }] end |