diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-11-02 23:23:23 +0300 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-11-02 23:27:28 +0300 |
| commit | 765ddaeb856d1bbd893ea5b9c820a2b47556e652 (patch) | |
| tree | 064303a8a48dda72ec2957656f1028620706b121 /config/initializers | |
| parent | c9f0070b649cac40eb7a93639726aee63a1f4cc8 (diff) | |
Only enable unicorn metrics when not in sidekiq mode.
+ remove rebased test case
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/7_prometheus_metrics.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb index 135448d5a89..e8f33593fe0 100644 --- a/config/initializers/7_prometheus_metrics.rb +++ b/config/initializers/7_prometheus_metrics.rb @@ -29,6 +29,9 @@ Sidekiq.configure_server do |config| end if Gitlab::Metrics.prometheus_metrics_enabled? - Gitlab::Metrics::Samplers::UnicornSampler.initialize_instance(Settings.monitoring.unicorn_sampler_interval).start + unless Sidekiq.server? + Gitlab::Metrics::Samplers::UnicornSampler.initialize_instance(Settings.monitoring.unicorn_sampler_interval).start + end + Gitlab::Metrics::Samplers::RubySampler.initialize_instance(Settings.monitoring.ruby_sampler_interval).start end |