diff options
| author | Ryan Cobb <rcobb@gitlab.com> | 2019-07-03 16:19:15 -0700 |
|---|---|---|
| committer | Ryan Cobb <rcobb@gitlab.com> | 2019-07-09 17:02:08 -0600 |
| commit | 36f39eb3189a4caa5225214570de3bfdcd418df1 (patch) | |
| tree | 5667a649c146496c5ca41e936a1c87f2c7ace9ca /lib | |
| parent | 3cabc5581e4d96180c83fbe3d24362bb2c64f2be (diff) | |
| download | gitlab-ce-36f39eb3189a4caa5225214570de3bfdcd418df1.tar.gz | |
Remove CommonMetricsImporter patch
Remove CommonMetricsImporter patch and change all references to
CommonMetrics::Importer. Move specs into their appropriate folders. Also
cleans up some common_metric importer namespacing.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/importers/common_metrics/importer.rb | 10 | ||||
| -rw-r--r-- | lib/gitlab/importers/common_metrics/prometheus_metric_enums.rb | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/gitlab/importers/common_metrics/importer.rb b/lib/gitlab/importers/common_metrics/importer.rb index 8dbdb03409a..aded55c64c7 100644 --- a/lib/gitlab/importers/common_metrics/importer.rb +++ b/lib/gitlab/importers/common_metrics/importer.rb @@ -13,7 +13,7 @@ module Gitlab end def execute - ::Gitlab::Importers::CommonMetrics::PrometheusMetric.reset_column_information + CommonMetrics::PrometheusMetric.reset_column_information process_content do |id, attributes| find_or_build_metric!(id) @@ -62,17 +62,17 @@ module Gitlab def find_or_build_metric!(id) raise MissingQueryId unless id - ::Gitlab::Importers::CommonMetrics::PrometheusMetric.common.find_by(identifier: id) || - ::Gitlab::Importers::CommonMetrics::PrometheusMetric.new(common: true, identifier: id) + CommonMetrics::PrometheusMetric.common.find_by(identifier: id) || + CommonMetrics::PrometheusMetric.new(common: true, identifier: id) end # rubocop: enable CodeReuse/ActiveRecord def find_group_title_key(title) - ::Gitlab::Importers::CommonMetrics::PrometheusMetricEnums.groups[find_group_title(title)] + CommonMetrics::PrometheusMetricEnums.groups[find_group_title(title)] end def find_group_title(title) - ::Gitlab::Importers::CommonMetrics::PrometheusMetricEnums.group_titles.invert[title] + CommonMetrics::PrometheusMetricEnums.group_titles.invert[title] end end end diff --git a/lib/gitlab/importers/common_metrics/prometheus_metric_enums.rb b/lib/gitlab/importers/common_metrics/prometheus_metric_enums.rb index dbf4c9e9b55..f73d05b3a35 100644 --- a/lib/gitlab/importers/common_metrics/prometheus_metric_enums.rb +++ b/lib/gitlab/importers/common_metrics/prometheus_metric_enums.rb @@ -38,3 +38,5 @@ module Gitlab end end end + +::Gitlab::Importers::CommonMetrics::PrometheusMetricEnums.prepend EE::Gitlab::Importers::CommonMetrics::PrometheusMetricEnums |