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
2a6edc33
Commit
2a6edc33
authored
Mar 17, 2020
by
syasonik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename ProjectMetrics to used term
parent
5eeb2ecc
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
11 additions
and
11 deletions
+11
-11
app/services/metrics/dashboard/clone_dashboard_service.rb
app/services/metrics/dashboard/clone_dashboard_service.rb
+1
-1
app/services/metrics/dashboard/self_monitoring_dashboard_service.rb
...es/metrics/dashboard/self_monitoring_dashboard_service.rb
+1
-1
app/services/metrics/dashboard/system_dashboard_service.rb
app/services/metrics/dashboard/system_dashboard_service.rb
+2
-2
ee/spec/lib/ee/gitlab/metrics/dashboard/processor_spec.rb
ee/spec/lib/ee/gitlab/metrics/dashboard/processor_spec.rb
+1
-1
ee/spec/services/metrics/dashboard/clone_dashboard_service_spec.rb
...ervices/metrics/dashboard/clone_dashboard_service_spec.rb
+1
-1
lib/gitlab/metrics/dashboard/stages/custom_metrics_details_inserter.rb
...trics/dashboard/stages/custom_metrics_details_inserter.rb
+1
-1
lib/gitlab/metrics/dashboard/stages/custom_metrics_inserter.rb
...itlab/metrics/dashboard/stages/custom_metrics_inserter.rb
+1
-1
spec/lib/gitlab/metrics/dashboard/processor_spec.rb
spec/lib/gitlab/metrics/dashboard/processor_spec.rb
+2
-2
spec/services/metrics/dashboard/clone_dashboard_service_spec.rb
...ervices/metrics/dashboard/clone_dashboard_service_spec.rb
+1
-1
No files found.
app/services/metrics/dashboard/clone_dashboard_service.rb
View file @
2a6edc33
...
...
@@ -16,7 +16,7 @@ module Metrics
def
sequences
@sequences
||=
{
::
Metrics
::
Dashboard
::
SystemDashboardService
::
DASHBOARD_PATH
=>
[
::
Gitlab
::
Metrics
::
Dashboard
::
Stages
::
CommonMetricsInserter
,
::
Gitlab
::
Metrics
::
Dashboard
::
Stages
::
Project
MetricsInserter
,
::
Gitlab
::
Metrics
::
Dashboard
::
Stages
::
Custom
MetricsInserter
,
::
Gitlab
::
Metrics
::
Dashboard
::
Stages
::
Sorter
].
freeze
}.
freeze
end
...
...
app/services/metrics/dashboard/self_monitoring_dashboard_service.rb
View file @
2a6edc33
...
...
@@ -9,7 +9,7 @@ module Metrics
DASHBOARD_NAME
=
'Default'
SEQUENCE
=
[
STAGES
::
Project
MetricsInserter
,
STAGES
::
Custom
MetricsInserter
,
STAGES
::
EndpointInserter
,
STAGES
::
Sorter
].
freeze
...
...
app/services/metrics/dashboard/system_dashboard_service.rb
View file @
2a6edc33
...
...
@@ -10,8 +10,8 @@ module Metrics
SEQUENCE
=
[
STAGES
::
CommonMetricsInserter
,
STAGES
::
Project
MetricsInserter
,
STAGES
::
Project
MetricsDetailsInserter
,
STAGES
::
Custom
MetricsInserter
,
STAGES
::
Custom
MetricsDetailsInserter
,
STAGES
::
EndpointInserter
,
STAGES
::
Sorter
].
freeze
...
...
ee/spec/lib/ee/gitlab/metrics/dashboard/processor_spec.rb
View file @
2a6edc33
...
...
@@ -13,7 +13,7 @@ describe Gitlab::Metrics::Dashboard::Processor do
let
(
:sequence
)
do
[
Gitlab
::
Metrics
::
Dashboard
::
Stages
::
CommonMetricsInserter
,
Gitlab
::
Metrics
::
Dashboard
::
Stages
::
Project
MetricsInserter
,
Gitlab
::
Metrics
::
Dashboard
::
Stages
::
Custom
MetricsInserter
,
Gitlab
::
Metrics
::
Dashboard
::
Stages
::
EndpointInserter
,
Gitlab
::
Metrics
::
Dashboard
::
Stages
::
Sorter
,
::
EE
::
Gitlab
::
Metrics
::
Dashboard
::
Stages
::
AlertsInserter
...
...
ee/spec/services/metrics/dashboard/clone_dashboard_service_spec.rb
View file @
2a6edc33
...
...
@@ -31,7 +31,7 @@ describe Metrics::Dashboard::CloneDashboardService, :use_clean_rails_memory_stor
}
end
it_behaves_like
'valid dashboard cloning process'
,
::
Metrics
::
Dashboard
::
SystemDashboardService
::
DASHBOARD_PATH
,
[
STAGES
::
CommonMetricsInserter
,
STAGES
::
Project
MetricsInserter
,
STAGES
::
Sorter
]
it_behaves_like
'valid dashboard cloning process'
,
::
Metrics
::
Dashboard
::
SystemDashboardService
::
DASHBOARD_PATH
,
[
STAGES
::
CommonMetricsInserter
,
STAGES
::
Custom
MetricsInserter
,
STAGES
::
Sorter
]
it_behaves_like
'valid dashboard cloning process'
,
::
Metrics
::
Dashboard
::
ClusterDashboardService
::
DASHBOARD_PATH
,
[
STAGES
::
CommonMetricsInserter
,
STAGES
::
Sorter
]
end
end
...
...
lib/gitlab/metrics/dashboard/stages/
project
_metrics_details_inserter.rb
→
lib/gitlab/metrics/dashboard/stages/
custom
_metrics_details_inserter.rb
View file @
2a6edc33
...
...
@@ -4,7 +4,7 @@ module Gitlab
module
Metrics
module
Dashboard
module
Stages
class
Project
MetricsDetailsInserter
<
BaseStage
class
Custom
MetricsDetailsInserter
<
BaseStage
def
transform!
dashboard
[
:panel_groups
].
each
do
|
panel_group
|
next
unless
panel_group
...
...
lib/gitlab/metrics/dashboard/stages/
project
_metrics_inserter.rb
→
lib/gitlab/metrics/dashboard/stages/
custom
_metrics_inserter.rb
View file @
2a6edc33
...
...
@@ -4,7 +4,7 @@ module Gitlab
module
Metrics
module
Dashboard
module
Stages
class
Project
MetricsInserter
<
BaseStage
class
Custom
MetricsInserter
<
BaseStage
# Inserts project-specific metrics into the dashboard
# config. If there are no project-specific metrics,
# this will have no effect.
...
...
spec/lib/gitlab/metrics/dashboard/processor_spec.rb
View file @
2a6edc33
...
...
@@ -11,8 +11,8 @@ describe Gitlab::Metrics::Dashboard::Processor do
let
(
:sequence
)
do
[
Gitlab
::
Metrics
::
Dashboard
::
Stages
::
CommonMetricsInserter
,
Gitlab
::
Metrics
::
Dashboard
::
Stages
::
Project
MetricsInserter
,
Gitlab
::
Metrics
::
Dashboard
::
Stages
::
Project
MetricsDetailsInserter
,
Gitlab
::
Metrics
::
Dashboard
::
Stages
::
Custom
MetricsInserter
,
Gitlab
::
Metrics
::
Dashboard
::
Stages
::
Custom
MetricsDetailsInserter
,
Gitlab
::
Metrics
::
Dashboard
::
Stages
::
EndpointInserter
,
Gitlab
::
Metrics
::
Dashboard
::
Stages
::
Sorter
]
...
...
spec/services/metrics/dashboard/clone_dashboard_service_spec.rb
View file @
2a6edc33
...
...
@@ -83,7 +83,7 @@ describe Metrics::Dashboard::CloneDashboardService, :use_clean_rails_memory_stor
allow
(
::
Gitlab
::
Metrics
::
Dashboard
::
Processor
).
to
receive
(
:new
).
and_return
(
double
(
process:
file_content_hash
))
end
it_behaves_like
'valid dashboard cloning process'
,
::
Metrics
::
Dashboard
::
SystemDashboardService
::
DASHBOARD_PATH
,
[
STAGES
::
CommonMetricsInserter
,
STAGES
::
Project
MetricsInserter
,
STAGES
::
Sorter
]
it_behaves_like
'valid dashboard cloning process'
,
::
Metrics
::
Dashboard
::
SystemDashboardService
::
DASHBOARD_PATH
,
[
STAGES
::
CommonMetricsInserter
,
STAGES
::
Custom
MetricsInserter
,
STAGES
::
Sorter
]
context
'selected branch already exists'
do
let
(
:branch
)
{
'existing_branch'
}
...
...
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