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
1009bc5b
Commit
1009bc5b
authored
Apr 06, 2020
by
rpereira2
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct the metrics and custom_metrics partials
parent
4c7eeecd
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
.haml-lint_todo.yml
.haml-lint_todo.yml
+0
-1
app/views/projects/services/prometheus/_custom_metrics.html.haml
...ws/projects/services/prometheus/_custom_metrics.html.haml
+2
-2
app/views/projects/services/prometheus/_metrics.html.haml
app/views/projects/services/prometheus/_metrics.html.haml
+2
-0
No files found.
.haml-lint_todo.yml
View file @
1009bc5b
...
@@ -409,7 +409,6 @@ linters:
...
@@ -409,7 +409,6 @@ linters:
-
'
ee/app/views/projects/push_rules/_index.html.haml'
-
'
ee/app/views/projects/push_rules/_index.html.haml'
-
'
ee/app/views/projects/services/gitlab_slack_application/_help.html.haml'
-
'
ee/app/views/projects/services/gitlab_slack_application/_help.html.haml'
-
'
ee/app/views/projects/services/gitlab_slack_application/_slack_integration_form.html.haml'
-
'
ee/app/views/projects/services/gitlab_slack_application/_slack_integration_form.html.haml'
-
'
ee/app/views/projects/services/prometheus/_metrics.html.haml'
-
'
ee/app/views/projects/settings/slacks/edit.html.haml'
-
'
ee/app/views/projects/settings/slacks/edit.html.haml'
-
'
ee/app/views/shared/_additional_email_text.html.haml'
-
'
ee/app/views/shared/_additional_email_text.html.haml'
-
'
ee/app/views/shared/_mirror_update_button.html.haml'
-
'
ee/app/views/shared/_mirror_update_button.html.haml'
...
...
app/views/projects/services/prometheus/_custom_metrics.html.haml
View file @
1009bc5b
...
@@ -10,7 +10,9 @@
...
@@ -10,7 +10,9 @@
.card-header
.card-header
%strong
%strong
=
s_
(
'PrometheusService|Custom metrics'
)
=
s_
(
'PrometheusService|Custom metrics'
)
-# haml-lint:disable NoPlainNodes
%span
.badge.badge-pill.js-custom-monitored-count
0
%span
.badge.badge-pill.js-custom-monitored-count
0
-# haml-lint:enable NoPlainNodes
=
link_to
s_
(
'PrometheusService|New metric'
),
new_project_prometheus_metric_path
(
project
),
class:
'btn btn-success js-new-metric-button hidden'
=
link_to
s_
(
'PrometheusService|New metric'
),
new_project_prometheus_metric_path
(
project
),
class:
'btn btn-success js-new-metric-button hidden'
.card-body
.card-body
.flash-container.hidden
.flash-container.hidden
...
@@ -26,5 +28,3 @@
...
@@ -26,5 +28,3 @@
%p
.text-tertiary.m-3.js-new-metric-text.hidden
%p
.text-tertiary.m-3.js-new-metric-text.hidden
=
s_
(
'PrometheusService|No custom metrics have been created. Create one using the button above'
)
=
s_
(
'PrometheusService|No custom metrics have been created. Create one using the button above'
)
%ul
.list-unstyled.metrics-list.hidden.js-custom-metrics-list
%ul
.list-unstyled.metrics-list.hidden.js-custom-metrics-list
=
render_ce
'projects/services/prometheus/metrics'
,
project:
project
app/views/projects/services/prometheus/_metrics.html.haml
View file @
1009bc5b
-
project
=
local_assigns
.
fetch
(
:project
)
-
project
=
local_assigns
.
fetch
(
:project
)
=
render
'projects/services/prometheus/custom_metrics'
,
project:
project
.col-lg-3
.col-lg-3
%p
%p
=
s_
(
'PrometheusService|Common metrics are automatically monitored based on a library of metrics from popular exporters.'
)
=
s_
(
'PrometheusService|Common metrics are automatically monitored based on a library of metrics from popular exporters.'
)
...
...
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