diff options
author | Ben Kochie <superq@gmail.com> | 2019-01-24 10:15:40 +0100 |
---|---|---|
committer | Ben Kochie <bjk@gitlab.com> | 2019-02-06 14:19:51 +0100 |
commit | 54438ad04bc27e45b78a3d44466ab4f83a0bff0a (patch) | |
tree | 4f184c424cb398ce5ad17f0636e6238ecebd0939 /lib/gitlab/metrics | |
parent | 3f3067fc6ab43bfce95ef546acf9c1a0d9dd4ebe (diff) | |
download | gitlab-ce-54438ad04bc27e45b78a3d44466ab4f83a0bff0a.tar.gz |
Clean up unicorn sampler metric labels
Change `type` and `address` labels to be less generic to avoid conflicts
with other systems.
Diffstat (limited to 'lib/gitlab/metrics')
-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 |