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
33c45e98
Commit
33c45e98
authored
Jan 23, 2020
by
Ryan Cobb
Committed by
Peter Leitzen
Jan 25, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add logs-path to metrics data
parent
53190361
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
ee/app/helpers/ee/environments_helper.rb
ee/app/helpers/ee/environments_helper.rb
+2
-1
ee/spec/helpers/ee/environments_helper_spec.rb
ee/spec/helpers/ee/environments_helper_spec.rb
+2
-1
No files found.
ee/app/helpers/ee/environments_helper.rb
View file @
33c45e98
...
...
@@ -46,7 +46,8 @@ module EE
"validate-query-path"
=>
validate_query_project_prometheus_metrics_path
(
project
),
"custom-metrics-available"
=>
"
#{
custom_metrics_available?
(
project
)
}
"
,
"alerts-endpoint"
=>
project_prometheus_alerts_path
(
project
,
environment_id:
environment
.
id
,
format: :json
),
"prometheus-alerts-available"
=>
"
#{
can?
(
current_user
,
:read_prometheus_alerts
,
project
)
}
"
"prometheus-alerts-available"
=>
"
#{
can?
(
current_user
,
:read_prometheus_alerts
,
project
)
}
"
,
"logs-path"
=>
project_logs_path
(
project
)
}
super
.
merge
(
ee_metrics_data
)
...
...
ee/spec/helpers/ee/environments_helper_spec.rb
View file @
33c45e98
...
...
@@ -26,7 +26,8 @@ describe EnvironmentsHelper do
'validate-query-path'
=>
validate_query_project_prometheus_metrics_path
(
project
),
'custom-metrics-available'
=>
'false'
,
'alerts-endpoint'
=>
project_prometheus_alerts_path
(
project
,
environment_id:
environment
.
id
,
format: :json
),
'prometheus-alerts-available'
=>
'true'
'prometheus-alerts-available'
=>
'true'
,
'logs-path'
=>
project_logs_path
(
project
)
)
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