diff options
| author | Aleksei Lipniagov <alipniagov@gitlab.com> | 2019-08-19 12:52:07 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-08-19 12:52:07 +0000 |
| commit | dcfaf49550866a291c316f2901e4274d587e7d37 (patch) | |
| tree | b6e6e436383ad699d85720542463ebe63098bf9d /config/initializers | |
| parent | 1d604d490960102ec9c6692a304015cd344319cd (diff) | |
| download | gitlab-ce-dcfaf49550866a291c316f2901e4274d587e7d37.tar.gz | |
Clean Sidekiq metrics from multiproc dir on start
After moving the multiproc dir cleanup into `config.ru`:`warmup`, we
stopped cleaning Sidekiq metrics dir which is not correct.
This MR intended to fix that. More details:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31668
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/7_prometheus_metrics.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb index 70e5dcd042e..143b34b5368 100644 --- a/config/initializers/7_prometheus_metrics.rb +++ b/config/initializers/7_prometheus_metrics.rb @@ -32,6 +32,9 @@ end Sidekiq.configure_server do |config| config.on(:startup) do + # webserver metrics are cleaned up in config.ru: `warmup` block + Prometheus::CleanupMultiprocDirService.new.execute + Gitlab::Metrics::SidekiqMetricsExporter.instance.start end end |