diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-06-14 08:12:54 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-06-14 08:12:54 +0300 |
| commit | 2ede009678dd42d62ffa1bf8844f9fc890aed502 (patch) | |
| tree | 4675ac1d926c81d3db415345ce07db139c44c960 | |
| parent | 97e65c03d6b80afaadc3318419d64e2a4e37389e (diff) | |
| parent | 5c297aa8535e48975f82eac21bcdad9d3b255fda (diff) | |
Merge branch 'rc/add_back_sidekiq_exporter' into 'master'
Add back sidekiq metrics exporter
See merge request gitlab-org/gitlab-ce!29647
| -rw-r--r-- | config/initializers/7_prometheus_metrics.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb index 4da683014d4..68f8487d377 100644 --- a/config/initializers/7_prometheus_metrics.rb +++ b/config/initializers/7_prometheus_metrics.rb @@ -19,6 +19,12 @@ Gitlab::Application.configure do |config| config.middleware.insert(1, Gitlab::Metrics::RequestsRackMiddleware) end +Sidekiq.configure_server do |config| + config.on(:startup) do + Gitlab::Metrics::SidekiqMetricsExporter.instance.start + end +end + if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled? Gitlab::Cluster::LifecycleEvents.on_worker_start do defined?(::Prometheus::Client.reinitialize_on_pid_change) && Prometheus::Client.reinitialize_on_pid_change |