diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 15:12:25 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 15:12:25 +0000 |
| commit | 068b3a417794ab8506b2e149301b3a60c01df078 (patch) | |
| tree | 26ce51b45ae535a6fc47fb04cad8da42ec408a2f /metrics_server/settings_overrides.rb | |
| parent | 62c78157be8fe8888787162293f13945a5fa5d3e (diff) | |
| download | gitlab-ce-068b3a417794ab8506b2e149301b3a60c01df078.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'metrics_server/settings_overrides.rb')
| -rw-r--r-- | metrics_server/settings_overrides.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/metrics_server/settings_overrides.rb b/metrics_server/settings_overrides.rb index 8572b4f86b0..b3fd39229d5 100644 --- a/metrics_server/settings_overrides.rb +++ b/metrics_server/settings_overrides.rb @@ -9,6 +9,11 @@ # Here we make the necessary constants available conditionally. require_relative 'override_rails_constants' unless Object.const_defined?('Rails') +# We need to supply this outside of Rails because: +# RubySampler needs Gitlab::Metrics needs Gitlab::Metrics::Prometheus needs Gitlab::CurrentSettings needs ::Settings +# to check for `prometheus_metrics_enabled`. We therefore simply redirect it to our own Settings type. +require_relative 'override_gitlab_current_settings' unless Object.const_defined?('Gitlab::CurrentSettings') + require_relative '../config/settings' # rubocop:enable Naming/FileName |