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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
18183f40
Commit
18183f40
authored
Apr 16, 2019
by
syasonik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use existing common metrics
parent
7eb796e6
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
276 deletions
+1
-276
app/controllers/projects/environments_controller.rb
app/controllers/projects/environments_controller.rb
+0
-1
app/services/metrics_dashboard_service.rb
app/services/metrics_dashboard_service.rb
+1
-1
config/prometheus/system_dashboard.yml
config/prometheus/system_dashboard.yml
+0
-274
No files found.
app/controllers/projects/environments_controller.rb
View file @
18183f40
...
@@ -13,7 +13,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController
...
@@ -13,7 +13,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController
before_action
only:
[
:metrics
,
:additional_metrics
]
do
before_action
only:
[
:metrics
,
:additional_metrics
]
do
push_frontend_feature_flag
(
:metrics_time_window
)
push_frontend_feature_flag
(
:metrics_time_window
)
push_frontend_feature_flag
(
:environment_metrics_use_prometheus_endpoint
)
push_frontend_feature_flag
(
:environment_metrics_use_prometheus_endpoint
)
push_frontend_feature_flag
(
:environment_metrics_show_multiple_dashboards
)
end
end
def
index
def
index
...
...
app/services/metrics_dashboard_service.rb
View file @
18183f40
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
# Fetches the metrics dashboard layout and supplemented the output with DB info.
# Fetches the metrics dashboard layout and supplemented the output with DB info.
class
MetricsDashboardService
class
MetricsDashboardService
SYSTEM_DASHBOARD_NAME
=
'
system_dashboard
'
SYSTEM_DASHBOARD_NAME
=
'
common_metrics
'
SYSTEM_DASHBOARD_PATH
=
Rails
.
root
.
join
(
'config'
,
'prometheus'
,
"
#{
SYSTEM_DASHBOARD_NAME
}
.yml"
)
SYSTEM_DASHBOARD_PATH
=
Rails
.
root
.
join
(
'config'
,
'prometheus'
,
"
#{
SYSTEM_DASHBOARD_NAME
}
.yml"
)
def
initialize
(
project
)
def
initialize
(
project
)
...
...
config/prometheus/system_dashboard.yml
deleted
100644 → 0
View file @
7eb796e6
This diff is collapsed.
Click to expand it.
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