move additional_metrics.yaml into prometheus/ config folder

This commit is contained in:
Pawel Chojnacki 2017-06-16 20:54:15 +02:00
parent 6e4d533421
commit 8b69523b01
3 changed files with 2 additions and 2 deletions

View File

@ -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

View File

@ -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)