Commit 4e0613da authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch 'rc/add_custom_dashboard_base_path' into 'master'

Add custom-dashboard-base-path to dashboard data

See merge request gitlab-org/gitlab!33878
parents 20c7ec4c a0b88b96
...@@ -95,7 +95,8 @@ module EnvironmentsHelper ...@@ -95,7 +95,8 @@ module EnvironmentsHelper
'empty-loading-svg-path' => image_path('illustrations/monitoring/loading.svg'), 'empty-loading-svg-path' => image_path('illustrations/monitoring/loading.svg'),
'empty-no-data-svg-path' => image_path('illustrations/monitoring/no_data.svg'), 'empty-no-data-svg-path' => image_path('illustrations/monitoring/no_data.svg'),
'empty-no-data-small-svg-path' => image_path('illustrations/chart-empty-state-small.svg'), 'empty-no-data-small-svg-path' => image_path('illustrations/chart-empty-state-small.svg'),
'empty-unable-to-connect-svg-path' => image_path('illustrations/monitoring/unable_to_connect.svg') 'empty-unable-to-connect-svg-path' => image_path('illustrations/monitoring/unable_to_connect.svg'),
'custom-dashboard-base-path' => Metrics::Dashboard::CustomDashboardService::DASHBOARD_ROOT
} }
end end
end end
......
...@@ -40,7 +40,8 @@ describe EnvironmentsHelper do ...@@ -40,7 +40,8 @@ describe EnvironmentsHelper do
'validate-query-path' => validate_query_project_prometheus_metrics_path(project), 'validate-query-path' => validate_query_project_prometheus_metrics_path(project),
'custom-metrics-available' => 'true', 'custom-metrics-available' => 'true',
'alerts-endpoint' => project_prometheus_alerts_path(project, environment_id: environment.id, format: :json), 'alerts-endpoint' => project_prometheus_alerts_path(project, environment_id: environment.id, format: :json),
'prometheus-alerts-available' => 'true' 'prometheus-alerts-available' => 'true',
'custom-dashboard-base-path' => Metrics::Dashboard::CustomDashboardService::DASHBOARD_ROOT
) )
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment