Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a0b88b96
Commit
a0b88b96
authored
Jun 08, 2020
by
Ryan Cobb
Committed by
Mayra Cabrera
Jun 08, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add custom-dashboard-base-path to dashboard data
parent
631b3f2a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
app/helpers/environments_helper.rb
app/helpers/environments_helper.rb
+2
-1
spec/helpers/environments_helper_spec.rb
spec/helpers/environments_helper_spec.rb
+2
-1
No files found.
app/helpers/environments_helper.rb
View file @
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
...
...
spec/helpers/environments_helper_spec.rb
View file @
a0b88b96
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment