From 8b69523b014c9557bcb03bf0e695331ea9621312 Mon Sep 17 00:00:00 2001 From: Pawel Chojnacki Date: Fri, 16 Jun 2017 20:54:15 +0200 Subject: [PATCH] move additional_metrics.yaml into prometheus/ config folder --- config/{ => prometheus}/additional_metrics.yml | 0 lib/gitlab/prometheus/additional_metrics_parser.rb | 2 +- spec/models/environment_spec.rb | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename config/{ => prometheus}/additional_metrics.yml (100%) diff --git a/config/additional_metrics.yml b/config/prometheus/additional_metrics.yml similarity index 100% rename from config/additional_metrics.yml rename to config/prometheus/additional_metrics.yml diff --git a/lib/gitlab/prometheus/additional_metrics_parser.rb b/lib/gitlab/prometheus/additional_metrics_parser.rb index 70151e8c6ad..c07afbac9ea 100644 --- a/lib/gitlab/prometheus/additional_metrics_parser.rb +++ b/lib/gitlab/prometheus/additional_metrics_parser.rb @@ -27,7 +27,7 @@ module Gitlab end def load_yaml_file - YAML.load_file(Rails.root.join('config/additional_metrics.yml')) + YAML.load_file(Rails.root.join('config/prometheus/additional_metrics.yml')) end end end diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb index f36c165ef7d..b0635c6a90a 100644 --- a/spec/models/environment_spec.rb +++ b/spec/models/environment_spec.rb @@ -475,7 +475,7 @@ describe Environment, models: true do end it 'returns the additional metrics from the deployment service' do - expect(environment.prometheus_service).to receive(:additional_environment_metrics) + expect(project.prometheus_service).to receive(:additional_environment_metrics) .with(environment) .and_return(:fake_metrics)