Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 1 deletions

diff --git a/lib/gitlab/metrics/dashboard/finder.rb b/lib/gitlab/metrics/dashboard/finder.rb
index 0374484d357..3dd86c8685d 100644
--- a/lib/gitlab/metrics/dashboard/finder.rb
+++ b/lib/gitlab/metrics/dashboard/finder.rb
@@ -65,7 +65,7 @@ module Gitlab
           def find_all_paths_from_source(project)
             Gitlab::Metrics::Dashboard::Cache.delete_all!
 
-            system_service.all_dashboard_paths(project)
+            default_dashboard_path(project)
             .+ project_service.all_dashboard_paths(project)
           end
 
@@ -79,6 +79,18 @@ module Gitlab
             ::Metrics::Dashboard::ProjectDashboardService
           end
 
+          def self_monitoring_service
+            ::Metrics::Dashboard::SelfMonitoringDashboardService
+          end
+
+          def default_dashboard_path(project)
+            if project.self_monitoring?
+              self_monitoring_service.all_dashboard_paths(project)
+            else
+              system_service.all_dashboard_paths(project)
+            end
+          end
+
           def service_for(options)
             Gitlab::Metrics::Dashboard::ServiceSelector.call(options)
           end
diff --git a/lib/gitlab/metrics/dashboard/service_selector.rb b/lib/gitlab/metrics/dashboard/service_selector.rb
index 5a3007e4814..24ea85a5a95 100644
--- a/lib/gitlab/metrics/dashboard/service_selector.rb
+++ b/lib/gitlab/metrics/dashboard/service_selector.rb
@@ -18,6 +18,7 @@ module Gitlab
             ::Metrics::Dashboard::DefaultEmbedService,
             ::Metrics::Dashboard::SystemDashboardService,
             ::Metrics::Dashboard::PodDashboardService,
+            ::Metrics::Dashboard::SelfMonitoringDashboardService,
             ::Metrics::Dashboard::ProjectDashboardService
           ].freeze