4 commits

Author	SHA1	Message	Date
GitLab Bot	b1bcdba89b	Add latest changes from gitlab-org/gitlab@master	2019-10-22 12:06:20 +00:00
Aleksei Lipniagov	dcfaf49550	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	2019-08-19 12:52:07 +00:00
Aleksei Lipniagov	13676e021c	Fix pid discovery for Unicorn in PidProvider	2019-07-26 15:02:21 +00:00
Aleksei Lipniagov	22e2917b18	Fix pid providing for Prometheus ... Use relative worker identifier for metrics (instead of Process.pid) and identify when Unicorn/Puma/Sidekiq is used. Previously, it was assumed that all metrics are gathered from Unicorn due to hardcoded implementation which was incorrect.	2019-07-18 13:54:11 +00:00