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
1596e555
Commit
1596e555
authored
Apr 16, 2019
by
syasonik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup misnamed or unnecessary files
parent
35c41232
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
117 deletions
+1
-117
app/services/metrics_dashboard_processing_service.rb
app/services/metrics_dashboard_processing_service.rb
+0
-116
spec/fixtures/lib/gitlab/metrics_dashboard/sample_dashboard.yml
...ixtures/lib/gitlab/metrics_dashboard/sample_dashboard.yml
+0
-0
spec/lib/gitlab/metrics_dashboard/processor_spec.rb
spec/lib/gitlab/metrics_dashboard/processor_spec.rb
+1
-1
No files found.
app/services/metrics_dashboard_processing_service.rb
deleted
100644 → 0
View file @
35c41232
# frozen_string_literal: true
class
MetricsDashboardProcessingService
DEFAULT_PANEL_TYPE
=
'area-chart'
def
initialize
(
dashboard
,
project
)
@dashboard
=
dashboard
.
deep_transform_keys
(
&
:to_sym
)
@project
=
project
end
def
process
insert_metric_ids!
sort_groups!
sort_panels!
insert_project_metrics!
@dashboard
.
to_json
end
private
# ------- Processing Steps -----------
# For each metric in the dashboard config, attempts to find a corresponding
# database record. If found, includes the record's id in the dashboard config.
def
insert_metric_ids!
for_metrics
do
|
metric
|
metric_record
=
common_metrics
.
find
{
|
m
|
m
.
identifier
==
metric
[
:id
]
}
metric
[
:metric_id
]
=
metric_record
.
id
if
metric_record
end
end
# Inserts project-specific metrics into the dashboard config.
# If there are no project-specific metrics, this will have no effect.
def
insert_project_metrics!
project_metrics
.
each
do
|
project_metric
|
group
=
find_or_create_group
(
@dashboard
[
:panel_groups
],
project_metric
)
panel
=
find_or_create_panel
(
group
[
:panels
],
project_metric
)
find_or_create_metric
(
panel
[
:metrics
],
project_metric
)
end
end
# Sorts the groups in the dashboard by the :priority key
def
sort_groups!
@dashboard
[
:panel_groups
]
=
@dashboard
[
:panel_groups
].
sort_by
{
|
group
|
group
[
:priority
]
}
end
# Sorts the panels in the dashboard by the :weight key
def
sort_panels!
@dashboard
[
:panel_groups
].
each
do
|
group
|
group
[
:panels
]
=
group
[
:panels
].
sort_by
{
|
panel
|
panel
[
:weight
]
}
end
end
# ------- Processing Helpers -----------
def
project_metrics
@project
.
prometheus_metrics
end
def
common_metrics
@common_metrics
||=
::
PrometheusMetric
.
common
end
def
for_metrics
@dashboard
[
:panel_groups
].
each
do
|
panel_group
|
panel_group
[
:panels
].
each
do
|
panel
|
panel
[
:metrics
].
each
do
|
metric
|
yield
metric
end
end
end
end
def
find_or_create_group
(
panel_groups
,
metric
)
target_group
=
panel_groups
.
find
{
|
group
|
group
[
:group
]
==
metric
.
group_title
}
unless
target_group
target_group
=
{
group:
metric
.
group_title
,
priority:
metric
.
priority
,
panels:
[]
}
panel_groups
<<
target_group
end
target_group
end
def
find_or_create_panel
(
panels
,
metric
)
panel_identifiers
=
[
DEFAULT_PANEL_TYPE
,
metric
.
title
,
metric
.
y_label
]
target_panel
=
panels
.
find
{
|
panel
|
panel
.
values_at
(
:type
,
:title
,
:y_label
)
==
panel_identifiers
}
unless
target_panel
target_panel
=
{
type:
DEFAULT_PANEL_TYPE
,
title:
metric
.
title
,
y_label:
metric
.
y_label
,
metrics:
[]
}
panels
<<
target_panel
end
target_panel
end
def
find_or_create_metric
(
metrics
,
metric
)
target_metric
=
metrics
.
find
{
|
m
|
m
[
:id
]
==
metric
.
identifier
}
unless
target_metric
target_metric
=
metric
.
queries
.
first
.
merge
(
metric_id:
metric
.
id
)
metrics
<<
target_metric
end
target_metric
end
end
spec/fixtures/
services/metrics_dashboard_processing_service
.yml
→
spec/fixtures/
lib/gitlab/metrics_dashboard/sample_dashboard
.yml
View file @
1596e555
File moved
spec/lib/gitlab/metrics_dashboard/processor_spec.rb
View file @
1596e555
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
Gitlab
::
MetricsDashboard
::
Processor
do
describe
Gitlab
::
MetricsDashboard
::
Processor
do
let
(
:project
)
{
build
(
:project
)
}
let
(
:project
)
{
build
(
:project
)
}
let
(
:dashboard_yml
)
{
YAML
.
load_file
(
'spec/fixtures/
services/metrics_dashboard_processing_service
.yml'
)
}
let
(
:dashboard_yml
)
{
YAML
.
load_file
(
'spec/fixtures/
lib/gitlab/metrics_dashboard/sample_dashboard
.yml'
)
}
describe
'process'
do
describe
'process'
do
let
(
:dashboard
)
{
JSON
.
parse
(
described_class
.
new
(
dashboard_yml
,
project
).
process
,
symbolize_names:
true
)
}
let
(
:dashboard
)
{
JSON
.
parse
(
described_class
.
new
(
dashboard_yml
,
project
).
process
,
symbolize_names:
true
)
}
...
...
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