summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-09-10 18:22:24 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2018-09-10 18:22:24 +0000
commite39e8f8f95b64e5dc3b7877389d8113ace9eed0c (patch)
tree6cf78f7328b9079a85cd3bbb9bc78e7c95252074
parent2054199b47c0b92194f4551ad69e84cb5b9d9edf (diff)
parentd5212033cf1b94aefb51129117dcbeac97d2e4a6 (diff)
downloadgitlab-ce-e39e8f8f95b64e5dc3b7877389d8113ace9eed0c.tar.gz
Merge branch 'bvl-move-import-common-metrics-migration' into 'master'
Reset column information before running CommonMetricsImporter Closes #51305 See merge request gitlab-org/gitlab-ce!21647
-rw-r--r--db/importers/common_metrics_importer.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/db/importers/common_metrics_importer.rb b/db/importers/common_metrics_importer.rb
index 3a150e8fc5f..01fbbd6866b 100644
--- a/db/importers/common_metrics_importer.rb
+++ b/db/importers/common_metrics_importer.rb
@@ -40,6 +40,8 @@ module Importers
end
def execute
+ PrometheusMetric.reset_column_information
+
process_content do |id, attributes|
find_or_build_metric!(id)
.update!(**attributes)