From b06de4bb8ef3278657551b7b89645e9f2a4ca873 Mon Sep 17 00:00:00 2001 From: Rick Sherman Date: Wed, 8 Jun 2016 13:06:31 -0500 Subject: [PATCH] (RE-7014) update statsd to use gauge for running/ready Previously was using increment which was incorrect for that particular application. --- lib/vmpooler/pool_manager.rb | 4 ++-- spec/vmpooler/pool_manager_spec.rb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb index 6490a93..5f54169 100644 --- a/lib/vmpooler/pool_manager.rb +++ b/lib/vmpooler/pool_manager.rb @@ -570,8 +570,8 @@ module Vmpooler begin if $statsd - $statsd.increment($config[:statsd]['prefix'] + '.ready.' + pool['name'], $redis.scard('vmpooler__ready__' + pool['name'])) - $statsd.increment($config[:statsd]['prefix'] + '.running.' + pool['name'], $redis.scard('vmpooler__running__' + pool['name'])) + $statsd.gauge($config[:statsd]['prefix'] + '.ready.' + pool['name'], $redis.scard('vmpooler__ready__' + pool['name'])) + $statsd.gauge($config[:statsd]['prefix'] + '.running.' + pool['name'], $redis.scard('vmpooler__running__' + pool['name'])) elsif $graphite $graphite.log($config[:graphite]['prefix'] + '.ready.' + pool['name'], $redis.scard('vmpooler__ready__' + pool['name'])) $graphite.log($config[:graphite]['prefix'] + '.running.' + pool['name'], $redis.scard('vmpooler__running__' + pool['name'])) diff --git a/spec/vmpooler/pool_manager_spec.rb b/spec/vmpooler/pool_manager_spec.rb index 694fc4f..9adeab9 100644 --- a/spec/vmpooler/pool_manager_spec.rb +++ b/spec/vmpooler/pool_manager_spec.rb @@ -314,8 +314,8 @@ describe 'Pool Manager' do allow(redis).to receive(:scard).with('vmpooler__pending__pool1').and_return(0) allow(redis).to receive(:scard).with('vmpooler__running__pool1').and_return(5) - expect(statsd).to receive(:increment).with('vmpooler.ready.pool1', 1) - expect(statsd).to receive(:increment).with('vmpooler.running.pool1', 5) + expect(statsd).to receive(:gauge).with('vmpooler.ready.pool1', 1) + expect(statsd).to receive(:gauge).with('vmpooler.running.pool1', 5) subject._check_pool(config[:pools][0]) end @@ -323,9 +323,9 @@ describe 'Pool Manager' do allow(redis).to receive(:scard).with('vmpooler__running__pool1').and_return(1) allow(redis).to receive(:scard).with('vmpooler__ready__pool1').and_return(0) allow(redis).to receive(:scard).with('vmpooler__pending__pool1').and_return(0) - allow(statsd).to receive(:increment).with('vmpooler.running.pool1', 1) + allow(statsd).to receive(:gauge).with('vmpooler.running.pool1', 1) - expect(statsd).to receive(:increment).with('vmpooler.ready.pool1', 0) + expect(statsd).to receive(:gauge).with('vmpooler.ready.pool1', 0) subject._check_pool(config[:pools][0]) end end