resque_to_cloudwatch 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11e5ee66485c3ad30e8ceb3c2c62918025b90433
-  data.tar.gz: c5cdef90cef5a6ac4dc60619add241626425707d
+  metadata.gz: e688f02a4e8350b45d45cbb941e1730695fce9e7
+  data.tar.gz: 97bd4396f9274ede34bea4a61de46107379bf51a
 SHA512:
-  metadata.gz: 0d66e4be36c5b12e0fa3084630c6bfd39accee9d5fbb983ae66aefd2536c99cea7a1199bfb1d4e621fa4490293892ba3437486b94a60c8bb57c3d350d8514e9e
-  data.tar.gz: 956431e69c343e0dabff5e28a128b322269c602862ba764b8b6014595a48ba0f931fe7ec2021e0caee77bd021a85628e58a36794eba8df8fa61cdaed2e25fc5b
+  metadata.gz: 8d350622314c3713b29f232b9dab78ff3629e0ced410c15aa86eef5f7257845b3a58fa617e92d7b12ad31c160ed765b0bff9e05a611eb3c56a4574cc253f744a
+  data.tar.gz: 91f2c68bf7607025efd1bedd4c7cae82eaf2395cdbaabccbcdde34df48bfed5146d8b2b19358b4032be7733840c768990ef20a7166ec86de02b5fb098f8f230d

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+test_config.yaml

data/.ruby-gemset

@@ -1 +1 @@
-ops-cloudwatchd
+resque_to_cloudwatch

data/README.md

@@ -1,7 +1,8 @@
 # resque_to_cloudwatch
 
-This is a gem containing a daemon for submitting Resque queue lengths to AWS
-Cloudwatch. In addition, it can submit this metric to Graphite.
+This is a gem containing a daemon for submitting Resque queue lengths and the number
+of Resque workers currently working to AWS Cloudwatch. In addition, it can (optionally) 
+submit this metric to Graphite.
 
 ## Usage
 
@@ -32,17 +33,17 @@ Your AWS access key/secret key pair.
 
 #### `region`
 
-Region of Cloudwatch the metric should be submitted to.
+Region of Cloudwatch the metrics should be submitted to.
 
 #### `project`, `namespace`, `hostname`
 
 These can actually contain any text - they are submitted as "dimensions" along
 with the metric value. A single metric in Cloudwatch is uniquely identified by 
-its name (hardcoded to `jobs_queued` in this gem), and any dimensions it has.
-At Forward3D, we have a number of autoscaling "projects" (codebases), so we use
-the project dimension to represent that. Namespace is more important, as that
-determines how the metric is categorised in the Cloudwatch interface. Hostname
-can be anything - we set it to the hostname of the submitting machine.
+its name (hardcoded to `jobs_queued` and `workers_working` in this gem), and any 
+dimensions it has. At Forward3D, we have a number of autoscaling "projects" 
+(codebases), so we use the project dimension to represent that. Namespace is more 
+important, as that determines how the metric is categorised in the Cloudwatch interface. 
+Hostname can be anything - we set it to the hostname of the submitting machine.
 
 #### `redis_host`, `redis_port`
 
@@ -61,4 +62,4 @@ The period of the EventMachine loop - how often stats are collected and sent.
 
 The Graphite metric name will look like this:
 
-    resque_to_cloudwatch.namespace.hostname.project
+    resque_to_cloudwatch.namespace.metric_name.hostname.project

data/bin/resque_to_cloudwatch

@@ -17,21 +17,28 @@ end.parse!
 
 options[:config] ||= "#{File.expand_path("../../config.yaml", __FILE__)}"
 config = ResqueToCloudwatch::Config.new(options[:config])
-collector = ResqueToCloudwatch::Collector.new(config)
 
 # Initialize senders we're going to use
 senders = []
 senders << ResqueToCloudwatch::CloudwatchSender.new(config)
 senders << ResqueToCloudwatch::GraphiteSender.new(config) if config.enable_graphite
-
 $log.info "Senders in use: #{senders.join(", ")}"
 $log.info "Entering EventMachine loop with period of #{config.period} seconds"
 
+# Initialize collectors we're going to use
+collectors = []
+collectors << ResqueToCloudwatch::QueueLengthCollector.new(config)
+collectors << ResqueToCloudwatch::WorkersWorkingCollector.new(config)
+$log.info "Collectors in use: #{collectors.join(", ")}"
+
+
 EventMachine.run do
   EventMachine.add_periodic_timer(config.period) do
     senders.each do |sender|
       begin
-        sender.send_value(collector.get_queue_length)
+        collectors.each do |collector|
+          sender.send_value(collector.get_value, collector.metric_name)
+        end
       rescue => e
         $log.error "Exception sending or collecting data with sender #{sender}: #{e.message}"
         e.backtrace.each do |line|

data/lib/resque_to_cloudwatch.rb

@@ -5,4 +5,4 @@ $log = Logger.new($stdout)
 require_relative "resque_to_cloudwatch/config.rb"
 require_relative "resque_to_cloudwatch/cloudwatch_sender.rb"
 require_relative "resque_to_cloudwatch/graphite_sender.rb"
-require_relative "resque_to_cloudwatch/collector.rb"
+require_relative "resque_to_cloudwatch/collectors.rb"

data/lib/resque_to_cloudwatch/cloudwatch_sender.rb

@@ -8,12 +8,12 @@ module ResqueToCloudwatch
       @config = config
     end
     
-    def send_value(value)
+    def send_value(value, metric_name)
       cw = AWS::CloudWatch.new
       cw.client.put_metric_data({
-        :namespace      => "#{@config.namespace}/resque_queues",
+        :namespace      => "#{@config.namespace}/resque",
         :metric_data    => [
-          :metric_name  => "jobs_queued",
+          :metric_name  => metric_name,
           :dimensions   => [
             {
               :name  => 'hostname',
@@ -28,7 +28,7 @@ module ResqueToCloudwatch
           :unit  => 'Count'
         ]
       })
-      $log.info "CloudwatchSender: Sent metric value #{value}"
+      $log.info "CloudwatchSender: Sent metric value #{value} for #{metric_name}"
     end
     
     def inspect

data/lib/resque_to_cloudwatch/collectors.rb

@@ -0,0 +1,48 @@
+module ResqueToCloudwatch
+  class QueueLengthCollector
+   
+    def initialize(config)
+      @config = config
+    end
+    
+    def get_value
+      redis = Redis.new(:host => @config.redis_host, :port => @config.redis_port)
+      redis.smembers('resque:queues').map do |queue_key|
+        redis.llen("resque:queue:#{queue_key}")
+      end.reduce(:+)
+    end
+    
+    def metric_name
+      "resque_queues"
+    end
+    
+    def to_s
+      metric_name
+    end
+    
+  end
+  
+  class WorkersWorkingCollector
+    
+    def initialize(config)
+      @config = config
+    end
+    
+    def get_value
+      redis = Redis.new(:host => @config.redis_host, :port => @config.redis_port)
+      redis.smembers('resque:workers').select do |worker_key|
+        redis.exists("resque:worker:#{worker_key}")
+      end.length
+    end
+    
+    def metric_name
+      "resque_workers_working"
+    end
+    
+    def to_s
+      metric_name
+    end
+    
+  end
+  
+end

data/lib/resque_to_cloudwatch/graphite_sender.rb

@@ -8,12 +8,12 @@ module ResqueToCloudwatch
       @config = config
     end
     
-    def send_value(value)
+    def send_value(value, metric_name)
       graphite = Graphite.new({:host => @config.graphite_host, :port => @config.graphite_port})
       graphite.send_metrics({
-        "resque_to_cloudwatch.#{@config.namespace}.#{@config.hostname}.#{@config.project}" => value
+        "resque_to_cloudwatch.#{@config.namespace}.#{metric_name}.#{@config.hostname}.#{@config.project}" => value
       })
-      $log.info "GraphiteSender: sent metric value #{value}"
+      $log.info "GraphiteSender: sent metric value #{value} for #{metric_name}"
     end
     
     def inspect

data/lib/resque_to_cloudwatch/version.rb

@@ -1,3 +1,3 @@
 module ResqueToCloudwatch
-  VERSION = "1.1.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque_to_cloudwatch
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Andy Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,7 +113,7 @@ files:
 - config.yaml
 - lib/resque_to_cloudwatch.rb
 - lib/resque_to_cloudwatch/cloudwatch_sender.rb
-- lib/resque_to_cloudwatch/collector.rb
+- lib/resque_to_cloudwatch/collectors.rb
 - lib/resque_to_cloudwatch/config.rb
 - lib/resque_to_cloudwatch/graphite_sender.rb
 - lib/resque_to_cloudwatch/version.rb
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Submit Resque queue lengths to AWS Cloudwatch

data/lib/resque_to_cloudwatch/collector.rb

@@ -1,16 +0,0 @@
-module ResqueToCloudwatch
-  class Collector
-   
-    def initialize(config)
-      @config = config
-    end
-    
-    def get_queue_length
-      redis = Redis.new(:host => @config.redis_host, :port => @config.redis_port)
-      redis.smembers('resque:queues').map do |queue_key|
-        redis.llen("resque:queue:#{queue_key}")
-      end.reduce(:+)
-    end
-    
-  end
-end