diff options
| -rw-r--r-- | db/importers/common_metrics_importer.rb | 10 | ||||
| -rw-r--r-- | spec/db/importers/common_metrics_importer_spec.rb | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/db/importers/common_metrics_importer.rb b/db/importers/common_metrics_importer.rb index 9e6d2dd0518..3a150e8fc5f 100644 --- a/db/importers/common_metrics_importer.rb +++ b/db/importers/common_metrics_importer.rb @@ -9,11 +9,11 @@ module Importers aws_elb: -3, nginx: -4, kubernetes: -5, - + # custom groups business: 0, response: 1, - system: 2, + system: 2 } scope :common, -> { where(common: true) } @@ -38,7 +38,7 @@ module Importers def initialize(file = 'config/prometheus/common_metrics.yml') @content = YAML.load_file(file) end - + def execute process_content do |id, attributes| find_or_build_metric!(id) @@ -80,12 +80,12 @@ module Importers query: query['query_range'], unit: query['unit']) - blk.call(query['id'], attributes) + yield(query['id'], attributes) end def find_or_build_metric!(id) raise MissingQueryId unless id - + PrometheusMetric.common.find_by(identifier: id) || PrometheusMetric.new(common: true, identifier: id) end diff --git a/spec/db/importers/common_metrics_importer_spec.rb b/spec/db/importers/common_metrics_importer_spec.rb index e49eee182c7..30945f3ba51 100644 --- a/spec/db/importers/common_metrics_importer_spec.rb +++ b/spec/db/importers/common_metrics_importer_spec.rb @@ -118,4 +118,4 @@ describe Importers::CommonMetricsImporter do end end end -end
\ No newline at end of file +end |