diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-08-15 11:41:06 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-08-15 11:41:06 +0000 |
| commit | 2c71a94744eba516d10725302ce7ffeb5d4625ab (patch) | |
| tree | 483b572f99d676ef806b703e260710a0bb22d0a8 /lib | |
| parent | 97c7b9e88661945e7eb6b010796d523279242272 (diff) | |
| parent | 6fc7033725f15c4e0d289b4f3cfa4a298fc46867 (diff) | |
| download | gitlab-ce-2c71a94744eba516d10725302ce7ffeb5d4625ab.tar.gz | |
Merge branch '65278-livesum-puma-phase' into 'master'
Remove :puma_phase metrics
See merge request gitlab-org/gitlab-ce!31773
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/metrics/samplers/puma_sampler.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/gitlab/metrics/samplers/puma_sampler.rb b/lib/gitlab/metrics/samplers/puma_sampler.rb index 4e835f37c04..8a24d4f3663 100644 --- a/lib/gitlab/metrics/samplers/puma_sampler.rb +++ b/lib/gitlab/metrics/samplers/puma_sampler.rb @@ -15,7 +15,6 @@ module Gitlab puma_workers: ::Gitlab::Metrics.gauge(:puma_workers, 'Total number of workers'), puma_running_workers: ::Gitlab::Metrics.gauge(:puma_running_workers, 'Number of active workers'), puma_stale_workers: ::Gitlab::Metrics.gauge(:puma_stale_workers, 'Number of stale workers'), - puma_phase: ::Gitlab::Metrics.gauge(:puma_phase, 'Phase number (increased during phased restarts)'), puma_running: ::Gitlab::Metrics.gauge(:puma_running, 'Number of running threads'), puma_queued_connections: ::Gitlab::Metrics.gauge(:puma_queued_connections, 'Number of connections in that worker\'s "todo" set waiting for a worker thread'), puma_active_connections: ::Gitlab::Metrics.gauge(:puma_active_connections, 'Number of threads processing a request'), @@ -54,7 +53,6 @@ module Gitlab last_status = worker['last_status'] labels = { worker: "worker_#{worker['index']}" } - metrics[:puma_phase].set(labels, worker['phase']) set_worker_metrics(last_status, labels) if last_status.present? end end @@ -76,7 +74,6 @@ module Gitlab metrics[:puma_workers].set(labels, stats['workers']) metrics[:puma_running_workers].set(labels, stats['booted_workers']) metrics[:puma_stale_workers].set(labels, stats['old_workers']) - metrics[:puma_phase].set(labels, stats['phase']) end def set_worker_metrics(stats, labels = {}) |