Commit graph

9 commits

Author SHA1 Message Date
GitLab Bot
294a256ae3 Add latest changes from gitlab-org/gitlab@master 2021-05-26 00:11:07 +00:00
GitLab Bot
c59765a50a Add latest changes from gitlab-org/gitlab@master 2020-06-24 18:09:03 +00:00
GitLab Bot
3ad11f24ca Add latest changes from gitlab-org/gitlab@master 2019-12-22 09:07:51 +00:00
GitLab Bot
9763c08170 Add latest changes from gitlab-org/gitlab@master 2019-12-17 03:07:45 +00:00
GitLab Bot
175b4fa261 Add latest changes from gitlab-org/gitlab@master 2019-12-11 18:08:10 +00:00
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