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
905f6960
Commit
905f6960
authored
Jan 03, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
0ef643f3
e216ac2c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/views/projects/services/prometheus/_metrics.html.haml
app/views/projects/services/prometheus/_metrics.html.haml
+1
-1
app/views/projects/services/prometheus/_show.html.haml
app/views/projects/services/prometheus/_show.html.haml
+1
-1
No files found.
app/views/projects/services/prometheus/_metrics.html.haml
View file @
905f6960
-
project
=
local_assigns
.
fetch
(
:project
)
.card.js-panel-monitored-metrics
{
data:
{
active_metrics:
active_common_project_prometheus_metrics_path
(
project
,
:json
),
metrics_help_path:
help_page_path
(
'user/project/integrations/prometheus_library/
metrics
'
)
}
}
.card.js-panel-monitored-metrics
{
data:
{
active_metrics:
active_common_project_prometheus_metrics_path
(
project
,
:json
),
metrics_help_path:
help_page_path
(
'user/project/integrations/prometheus_library/
index
'
)
}
}
.card-header
=
s_
(
'PrometheusService|Common metrics'
)
%span
.badge.badge-pill.js-monitored-count
0
...
...
app/views/projects/services/prometheus/_show.html.haml
View file @
905f6960
...
...
@@ -4,7 +4,7 @@
=
s_
(
'PrometheusService|Metrics'
)
%p
=
s_
(
'PrometheusService|Common metrics are automatically monitored based on a library of metrics from popular exporters.'
)
=
link_to
s_
(
'PrometheusService|More information'
),
help_page_path
(
'user/project/integrations/prometheus_library/
metrics
'
),
target:
'_blank'
,
rel:
"noopener noreferrer"
=
link_to
s_
(
'PrometheusService|More information'
),
help_page_path
(
'user/project/integrations/prometheus_library/
index
'
),
target:
'_blank'
,
rel:
"noopener noreferrer"
.col-lg-9
=
render
'projects/services/prometheus/metrics'
,
project:
@project
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