bipbip 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55c1dbf48d878af4db59a599c4648de4e816915a
-  data.tar.gz: d486c85920ccb663eb3353b7fc4f2d8287f2c4ff
+  metadata.gz: 083225503257d0bef472a8af9249318fb5f8ebf1
+  data.tar.gz: c9ebda005ce2b5034b34a688c8e767849255f6e7
 SHA512:
-  metadata.gz: 65b3de0b0503c1d36c670f70cc5bbc52f63affd8977cd08f33657c8b791c8583f5971fd5e5abcc08454bd9841b8cf138cfbff1f05f66eb97e4f9f6041451b1df
-  data.tar.gz: 3191d6f6dfb6f35a59ecde3f7b3c105a1218da5586f113604f04cdcaf5eef32b6382b26b94ed609dfcc11e8f54c994370c36e8b751d0eebdb05b3ae27b06214e
+  metadata.gz: 244d5a7981d237a0e7ca25df707a41fc2d76b5d696c800c67d9c3ed2a4dcf0b4edfb059cd27a5e225aab75a5da4975e3beaeabfe401e6818ebc1606a3d468fad
+  data.tar.gz: 76ea6d676ed59161fb69829621a49193f91484cc86a2a915905a434e91c416652697c21844c1ebe40ff9f7ac8cc8aa6ae33f5345fe229a015c93f77ce2ab4270

data/README.md

@@ -44,6 +44,13 @@ services:
     plugin: redis
     hostname: localhost
     port: 6379
+  - 
+    plugin: resque
+    hostname: localhost
+    port: 6379
+    database: 10
+    namespace: resque-prefix
+    frequency: 60
   -
     plugin: gearman
     hostname: localhost
@@ -89,6 +96,8 @@ hostname: localhost
 port: 11211
 ```
 
+You can also set an override frequency per service in the main config or in these included configs.
+
 Plugins
 -------
 #### fastcgi-php-fpm

data/lib/bipbip/agent.rb

@@ -56,13 +56,16 @@ module Bipbip
       services = config['services'].to_a
       if config['include']
         include_path = File.expand_path(config['include'].to_s, File.dirname(config_file))
+        
         files = Dir[include_path + '/**/*.yaml', include_path + '/**/*.yml']
         services += files.map { |file| YAML.load(File.open(file)) }
-      end
+      end      
+      
       @plugins = services.map do |service|
         service_name = service['plugin'].to_s
-        service_config = service.reject { |key, value| ['plugin'].include?(key) }
-        Bipbip::Plugin.factory(service_name, service_config, config['frequency'])
+        frequency = service['frequency'].nil? ? config['frequency'] : service['frequency'].to_i
+        service_config = service.reject { |key, value| ['plugin','frequency'].include?(key) }
+        Bipbip::Plugin.factory(service_name, service_config, frequency)
       end
 
       storages = config['storages'].to_a

data/lib/bipbip/plugin/redis.rb

@@ -10,9 +10,19 @@ module Bipbip
       [
           {:name => 'total_commands_processed', :type => 'counter', :unit => 'Commands'},
           {:name => 'used_memory', :type => 'gauge', :unit => 'b'},
+          {:name => 'used_memory_rss', :type => 'gauge', :unit => 'b'},
+          {:name => 'mem_fragmentation_ratio', :type => 'gauge', :unit => 'Frag'},
+          {:name => 'connected_clients', :type => 'gauge', :unit => 'Clients'},
+          {:name => 'blocked_clients', :type => 'gauge', :unit => 'BlockedClients'},
       ]
     end
 
+    def float_roundings
+      {
+          'mem_fragmentation_ratio' => 2
+      }
+    end
+
     def monitor
       redis = RedisClient.new(
           :host => config['hostname'],
@@ -21,9 +31,15 @@ module Bipbip
       stats = redis.info
       redis.quit
 
+      roundings = float_roundings
       data = {}
+
       metrics_names.each do |key|
-        data[key] = stats[key].to_i
+        if !roundings[key].nil?
+          data[key] = stats[key].to_f.round(roundings[key])
+        else
+          data[key] = stats[key].to_i
+        end
       end
       data
     end

data/lib/bipbip/plugin/resque.rb

@@ -0,0 +1,55 @@
+require 'redis'
+require 'resque'
+
+module Bipbip
+
+  class Plugin::Resque < Plugin
+
+    def metrics_schema
+      schema_list = [
+          {:name => 'num_workers', :type => 'counter', :unit => 'Workers'},
+          {:name => 'num_idle_workers', :type => 'counter', :unit => 'Workers'},
+          {:name => 'num_active_workers', :type => 'counter', :unit => 'Workers'},
+      ]
+
+      with_resque_connection do
+        ::Resque.queues.each do |queue|
+          schema_list << {:name => "queue_size_#{sanitize_queue_name(queue)}", :type => 'gauge', :unit => 'Jobs'}
+        end
+      end
+
+      schema_list
+    end
+
+    def sanitize_queue_name(queue)
+      queue.gsub(/\s/, '-')
+    end
+
+    def with_resque_connection
+      redis = ::Redis.new(
+          :host => config['hostname'] || 'localhost',
+          :port => config['port'] || 6369
+      )
+      redis.select config['database']
+      ::Resque.redis = redis
+      ::Resque.redis.namespace = config['namespace'] unless config['namespace'].nil?
+
+      yield
+
+      redis.quit
+    end
+
+    def monitor
+      data = {}
+      with_resque_connection do
+        data['num_workers'] = ::Resque.workers.count
+        data['num_idle_workers'] = ::Resque.workers.select { |w| w.idle? }.count
+        data['num_active_workers'] = data['num_workers'] - data['num_idle_workers']
+        ::Resque.queues.each do |queue|
+          data["queue_size_#{sanitize_queue_name(queue)}"] = ::Resque.size(queue).to_i
+        end
+      end
+      data
+    end
+  end
+end

data/lib/bipbip/version.rb

@@ -1,3 +1,3 @@
 module Bipbip
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bipbip
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Cargo Media
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-09 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: copperegg
@@ -82,6 +82,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: resque
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.25'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +151,7 @@ files:
 - lib/bipbip/plugin/nginx.rb
 - lib/bipbip/plugin/php_apc.rb
 - lib/bipbip/plugin/redis.rb
+- lib/bipbip/plugin/resque.rb
 - lib/bipbip/storage.rb
 - lib/bipbip/storage/copperegg.rb
 - lib/bipbip/version.rb