diff options
author | syasonik <syasonik@gitlab.com> | 2019-04-16 17:16:51 +0800 |
---|---|---|
committer | syasonik <syasonik@gitlab.com> | 2019-04-24 18:23:03 +0800 |
commit | 1596e5556030ab3990a7d0117bf7d4306417c052 (patch) | |
tree | eae4948ea5a057df1bda629122f9bbbf688abac3 | |
parent | 35c412327cd0a0897d4d81aa80c88782c98fdd89 (diff) | |
download | gitlab-ce-1596e5556030ab3990a7d0117bf7d4306417c052.tar.gz |
Cleanup misnamed or unnecessary files
-rw-r--r-- | app/services/metrics_dashboard_processing_service.rb | 116 | ||||
-rw-r--r-- | spec/fixtures/lib/gitlab/metrics_dashboard/sample_dashboard.yml (renamed from spec/fixtures/services/metrics_dashboard_processing_service.yml) | 0 | ||||
-rw-r--r-- | spec/lib/gitlab/metrics_dashboard/processor_spec.rb | 2 |
3 files changed, 1 insertions, 117 deletions
diff --git a/app/services/metrics_dashboard_processing_service.rb b/app/services/metrics_dashboard_processing_service.rb deleted file mode 100644 index 6dc8db00934..00000000000 --- a/app/services/metrics_dashboard_processing_service.rb +++ /dev/null @@ -1,116 +0,0 @@ -# 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 diff --git a/spec/fixtures/services/metrics_dashboard_processing_service.yml b/spec/fixtures/lib/gitlab/metrics_dashboard/sample_dashboard.yml index ebfe06da6db..ebfe06da6db 100644 --- a/spec/fixtures/services/metrics_dashboard_processing_service.yml +++ b/spec/fixtures/lib/gitlab/metrics_dashboard/sample_dashboard.yml diff --git a/spec/lib/gitlab/metrics_dashboard/processor_spec.rb b/spec/lib/gitlab/metrics_dashboard/processor_spec.rb index de1702d3314..0b3ee90d3e8 100644 --- a/spec/lib/gitlab/metrics_dashboard/processor_spec.rb +++ b/spec/lib/gitlab/metrics_dashboard/processor_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe Gitlab::MetricsDashboard::Processor do 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 let(:dashboard) { JSON.parse(described_class.new(dashboard_yml, project).process, symbolize_names: true) } |