kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '13806-fix' into 'master' 

Add nil check for Gitlab.config.prometheus

Closes #13806

See merge request gitlab-org/gitlab-ce!32201
This commit is contained in:
Lin Jen-Shin 2019-08-27 10:45:27 +00:00
parent 7efafa601f b99cf2024d
commit f6d3a47bde
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/gitlab/database_importers/self_monitoring/project/create_service.rb
View File

@ -173,7 +173,7 @@ module Gitlab
end
def prometheus_enabled?
Gitlab.config.prometheus.enable
Gitlab.config.prometheus.enable if Gitlab.config.prometheus
rescue Settingslogic::MissingSetting
log_error(_('prometheus.enable is not present in gitlab.yml'))
@ -181,7 +181,7 @@ module Gitlab
end
def prometheus_listen_address
Gitlab.config.prometheus.listen_address
Gitlab.config.prometheus.listen_address if Gitlab.config.prometheus
rescue Settingslogic::MissingSetting
log_error(_('prometheus.listen_address is not present in gitlab.yml'))

11
spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb
View File

@ -197,6 +197,17 @@ describe Gitlab::DatabaseImporters::SelfMonitoring::Project::CreateService do
end
end
context 'when prometheus setting is nil' do
before do
stub_config(prometheus: nil)
end
it 'does not fail' do
expect(result).to include(status: :success)
expect(project.prometheus_service).to be_nil
end
end
context 'when prometheus setting is disabled in gitlab.yml' do
let(:prometheus_settings) do
{