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
4985ba22
Commit
4985ba22
authored
Feb 08, 2018
by
Pawel Chojnacki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small review fixes
parent
b8a50050
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/views/projects/services/prometheus/_show.html.haml
app/views/projects/services/prometheus/_show.html.haml
+2
-2
spec/ee/spec/controllers/projects/prometheus/metrics_controller_spec.rb
...ontrollers/projects/prometheus/metrics_controller_spec.rb
+1
-1
No files found.
app/views/projects/services/prometheus/_show.html.haml
View file @
4985ba22
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
=
link_to
s_
(
'PrometheusService|More information'
),
help_page_path
(
'user/project/integrations/prometheus'
)
=
link_to
s_
(
'PrometheusService|More information'
),
help_page_path
(
'user/project/integrations/prometheus'
)
.col-lg-9
.col-lg-9
.panel.panel-default.custom-monitored-metrics.js-panel-custom-monitored-metrics
{
data:
{
"active-custom-metrics"
=>
"#{project_prometheus_metrics_path(@project, :json)}"
}
}
.panel.panel-default.custom-monitored-metrics.js-panel-custom-monitored-metrics
{
data:
{
active_custom_metrics:
project_prometheus_metrics_path
(
@project
,
:json
)
}
}
.panel-heading
.panel-heading
%h3
.panel-title
%h3
.panel-title
=
s_
(
'PrometheusService|Custom application metrics'
)
=
s_
(
'PrometheusService|Custom application metrics'
)
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
=
link_to
s_
(
'PrometheusService|New metric'
),
new_project_prometheus_metric_path
(
@project
),
class:
'btn btn-success'
=
link_to
s_
(
'PrometheusService|New metric'
),
new_project_prometheus_metric_path
(
@project
),
class:
'btn btn-success'
%ul
.list-unstyled.metrics-list.hidden.js-custom-metrics-list
%ul
.list-unstyled.metrics-list.hidden.js-custom-metrics-list
.panel.panel-default.js-panel-monitored-metrics
{
data:
{
"active-metrics"
=>
"#{active_common_project_prometheus_metrics_path(@project, :json)}"
}
}
.panel.panel-default.js-panel-monitored-metrics
{
data:
{
active_metrics:
active_common_project_prometheus_metrics_path
(
@project
,
:json
)
}
}
.panel-heading
.panel-heading
%h3
.panel-title
%h3
.panel-title
=
s_
(
'PrometheusService|Common metrics'
)
=
s_
(
'PrometheusService|Common metrics'
)
...
...
spec/ee/spec/controllers/projects/prometheus/metrics_controller_spec.rb
View file @
4985ba22
...
@@ -104,7 +104,7 @@ describe Projects::Prometheus::MetricsController do
...
@@ -104,7 +104,7 @@ describe Projects::Prometheus::MetricsController do
context
'format json'
do
context
'format json'
do
let!
(
:metric
)
{
create
(
:prometheus_metric
,
project:
project
)
}
let!
(
:metric
)
{
create
(
:prometheus_metric
,
project:
project
)
}
it
'
remove
the metric'
do
it
'
destroys
the metric'
do
delete
:destroy
,
project_params
(
id:
metric
.
id
,
format: :json
)
delete
:destroy
,
project_params
(
id:
metric
.
id
,
format: :json
)
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
response
).
to
have_gitlab_http_status
(
200
)
...
...
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