move additional_metrics.yaml into prometheus/ config folder
This commit is contained in:
parent
6e4d533421
commit
8b69523b01
|
@ -27,7 +27,7 @@ module Gitlab
|
||||||
end
|
end
|
||||||
|
|
||||||
def load_yaml_file
|
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
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -475,7 +475,7 @@ describe Environment, models: true do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns the additional metrics from the deployment service' do
|
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)
|
.with(environment)
|
||||||
.and_return(:fake_metrics)
|
.and_return(:fake_metrics)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue