diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-07-05 00:51:01 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-07-05 00:51:01 +0200 |
| commit | 1eca48819a7cc78a5e96d617332bbee0365e6dca (patch) | |
| tree | f792cf6298382a7888e4bf27dcabadaf79cfece2 | |
| parent | 6d60e265b1bb0212803d301d723c12affe366397 (diff) | |
| download | gitlab-ce-1eca48819a7cc78a5e96d617332bbee0365e6dca.tar.gz | |
Merge prometheus unicorn sampler settigns within monitoring settings
| -rw-r--r-- | config/gitlab.yml.example | 6 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 7 | ||||
| -rw-r--r-- | config/initializers/8_metrics.rb | 2 |
3 files changed, 4 insertions, 11 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index c31b7e12fdc..e588b813c50 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -543,14 +543,12 @@ production: &base # enabled: true # host: localhost # port: 3808 - prometheus: - # Time between sampling of unicorn socket metrics, in seconds - # unicorn_sampler_interval: 10 - ## Monitoring # Built in monitoring settings monitoring: + # Time between sampling of unicorn socket metrics, in seconds + # unicorn_sampler_interval: 10 # IP whitelist to access monitoring endpoints ip_whitelist: - 127.0.0.0/8 diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 56869f9b934..ef3122f5cf9 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -499,12 +499,7 @@ Settings.webpack.dev_server['port'] ||= 3808 # Settings['monitoring'] ||= Settingslogic.new({}) Settings.monitoring['ip_whitelist'] ||= ['127.0.0.1/8'] - -# -# Prometheus metrics settings -# -Settings['prometheus'] ||= Settingslogic.new({}) -Settings.prometheus['unicorn_sampler_interval'] ||= 10 +Settings.monitoring['unicorn_sampler_interval'] ||= 10 # # Testing settings diff --git a/config/initializers/8_metrics.rb b/config/initializers/8_metrics.rb index d56fd7a6cfa..5e34aac6527 100644 --- a/config/initializers/8_metrics.rb +++ b/config/initializers/8_metrics.rb @@ -119,7 +119,7 @@ def instrument_classes(instrumentation) end # rubocop:enable Metrics/AbcSize -Gitlab::Metrics::UnicornSampler.initialize_instance(Settings.prometheus.unicorn_sampler_interval).start +Gitlab::Metrics::UnicornSampler.initialize_instance(Settings.monitoring.unicorn_sampler_interval).start Gitlab::Application.configure do |config| # 0 should be Sentry to catch errors in this middleware |