diff options
author | Stan Hu <stanhu@gmail.com> | 2019-02-07 01:36:33 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-02-07 01:36:33 +0300 |
commit | e059cca42c6cba94ed5f477bf01f437fc07f380a (patch) | |
tree | 4b22cecf520dd48463298433e38f4d4c7de70b44 /lib | |
parent | ca154f0ff4f15d717a0fcf7a3cb75921ba6880ee (diff) | |
parent | e1ea47bb5c79212559ef866951b24fc4d01a34c0 (diff) |
Merge branch 'bjk/56788_unicorn_labels' into 'master'
Clean up unicorn sampler metric labels
Closes #56788
See merge request gitlab-org/gitlab-ce!24626
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/metrics/samplers/unicorn_sampler.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/metrics/samplers/unicorn_sampler.rb b/lib/gitlab/metrics/samplers/unicorn_sampler.rb index 4c4ec026823..4c5b849cc51 100644 --- a/lib/gitlab/metrics/samplers/unicorn_sampler.rb +++ b/lib/gitlab/metrics/samplers/unicorn_sampler.rb @@ -23,13 +23,13 @@ module Gitlab def sample Raindrops::Linux.tcp_listener_stats(tcp_listeners).each do |addr, stats| - unicorn_active_connections.set({ type: 'tcp', address: addr }, stats.active) - unicorn_queued_connections.set({ type: 'tcp', address: addr }, stats.queued) + unicorn_active_connections.set({ socket_type: 'tcp', socket_address: addr }, stats.active) + unicorn_queued_connections.set({ socket_type: 'tcp', socket_address: addr }, stats.queued) end Raindrops::Linux.unix_listener_stats(unix_listeners).each do |addr, stats| - unicorn_active_connections.set({ type: 'unix', address: addr }, stats.active) - unicorn_queued_connections.set({ type: 'unix', address: addr }, stats.queued) + unicorn_active_connections.set({ socket_type: 'unix', socket_address: addr }, stats.active) + unicorn_queued_connections.set({ socket_type: 'unix', socket_address: addr }, stats.queued) end end |