resque-cloudwatch-metrics 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 733c1beb5e744c021fd6367622aa79aa5f9c0ad7
-  data.tar.gz: 93cca39a1c74279ed2b35ed394f59895dd51289d
+  metadata.gz: 7c911ab4ce8fdc6e886d16ba91e7e73ff850ef69
+  data.tar.gz: 6532bffdca221cdf3bb2657a3544263ee35b8792
 SHA512:
-  metadata.gz: f824a25e5cef1afe76edfbbbc4a04754caa044fb206731e5f4fffd1ae13454b0202716d7a3f487ffbe39dcacb7cc6d783cb5d486141b1b0710ff71a6f62dd889
-  data.tar.gz: 98b97cf81fa69c0b6ef21a73fedcedbd78937871d3e057a58ce610026856a3a444ef90c422c8e3480f9841ca232241d9b08883ebad5f21a3a69db5688be9151d
+  metadata.gz: 5169a01442cfa8948a710ccc2c8ad8e34ec91f14c233d2180752fd7a238a45e5e0cb4ac97abdc5c73ab72505a21fec18140a1e4e20ddc1839c4bf4b918d70c18
+  data.tar.gz: 0de3324587cee5b870e5c53246b45f74d7bdc08af51ac70f28d9e388e047f1b04a6a5f74ca4ded85a6bb51543826cf01a8dc9796cf6648eda79f72e3049df61c

data/README.md

@@ -39,6 +39,16 @@ Usage: resque-cloudwatch-metrics [options]
         --redis-namespace <namespace>
         --cw-namespace <namespace>
     -i, --interval <interval>
+        --skip-pending
+        --skip-processed
+        --skip-failed
+        --skip-queues
+        --skip-workers
+        --skip-working
+        --skip-pending-per-queue
+        --not-working
+        --processing
+        --dryrun
 ```
 
 ## Development

data/docker/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk-core (2.6.41)
+    aws-sdk-core (2.6.44)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
     aws-sigv4 (1.0.0)
@@ -20,7 +20,7 @@ GEM
       redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    resque-cloudwatch-metrics (0.3.0)
+    resque-cloudwatch-metrics (0.4.0)
       aws-sdk-core (~> 2)
       resque (~> 1)
     sinatra (1.4.7)

data/lib/resque/cloudwatch/metrics.rb

@@ -22,6 +22,8 @@ module Resque
         def parse_arguments(args)
           options = {}
           redis = {}
+          skip = []
+          extra = []
 
           opt = OptionParser.new
           opt.on('-h', '--host <host>')           { |v| redis[:host] = v }
@@ -33,21 +35,41 @@ module Resque
           opt.on('--redis-namespace <namespace>') { |v| options[:redis_namespace] = v }
           opt.on('--cw-namespace <namespace>')    { |v| options[:cw_namespace] = v }
           opt.on('-i', '--interval <interval>')   { |v| options[:interval] = v.to_f }
+          opt.on('--skip-pending')                { skip << :pending }
+          opt.on('--skip-processed')              { skip << :processed }
+          opt.on('--skip-failed')                 { skip << :failed }
+          opt.on('--skip-queues')                 { skip << :queues }
+          opt.on('--skip-workers')                { skip << :workers }
+          opt.on('--skip-working')                { skip << :working }
+          opt.on('--skip-pending-per-queue')      { skip << :pending_per_queue }
+          opt.on('--not-working')                 { extra << :not_working }
+          opt.on('--processing')                  { extra << :processing }
+          opt.on('--dryrun')                      { options[:dryrun] = true }
           opt.parse(args)
 
           options[:redis] ||= redis unless redis.empty?
+
+          metric = {}
+          metric[:skip] = skip unless skip.empty?
+          metric[:extra] = extra unless extra.empty?
+          options[:metric] = metric unless metric.empty?
+
           options
         end
       end
 
       def initialize(redis: nil,
                      redis_namespace: nil,
+                     cw_namespace: DEFAULT_CW_NAMESPACE,
                      interval: nil,
-                     cw_namespace: DEFAULT_CW_NAMESPACE)
+                     metric: {},
+                     dryrun: false)
         Resque.redis = redis if redis
         @redis_namespace = redis_namespace
         @interval = interval
         @cw_namespace = cw_namespace
+        @metric_options = metric
+        @dryrun = dryrun
       end
 
       def run
@@ -67,7 +89,7 @@ module Resque
       def run_once
         put_metric_data(
           redis_namespaces
-            .map { |redis_namespace| Metric.create(redis_namespace) }
+            .map { |redis_namespace| Metric.create(redis_namespace, @metric_options) }
             .flat_map(&:to_cloudwatch_metric_data)
         )
       end
@@ -88,16 +110,30 @@ module Resque
       end
 
       def put_metric_data(metric_data)
+        if @dryrun
+          dump_metric_data(metric_data)
+          return
+        end
+
         metric_data.each_slice(MAX_METRIC_DATA_PER_PUT).map do |data|
-          Thread.start(data) do |data|
-            cloudwatch.put_metric_data(
+          Thread.start(data, cloudwatch) do |data_, cloudwatch_|
+            cloudwatch_.put_metric_data(
               namespace: @cw_namespace,
-              metric_data: data,
+              metric_data: data_,
             )
           end
         end.each(&:join)
       end
 
+      def dump_metric_data(metric_data)
+        puts metric_data.to_json(
+          indent:    ' ' * 2,
+          space:     ' ',
+          object_nl: "\n",
+          array_nl:  "\n",
+        )
+      end
+
       def cloudwatch
         @_cloudwatch ||= Aws::CloudWatch::Client.new
       end

data/lib/resque/cloudwatch/metrics/metric.rb

@@ -6,18 +6,21 @@ module Resque
   module CloudWatch
     class Metrics
       class Metric
+        DEFAULT_METRIC_NAMES = %i(pending processed failed queues workers working).freeze
+
         class << self
           @@mutex = Mutex.new
 
-          def create(namespace)
+          def create(namespace, skip: [], extra: [])
             @@mutex.synchronize do
               Resque.redis.namespace = namespace
               new(
                 Time.now,
                 namespace,
                 Resque.info,
-                current_queue_sizes,
+                !skip.include?(:pending_per_queue) && current_queue_sizes,
                 get_previous_processed(namespace),
+                skip: skip, extra: extra,
               ).tap do |metric|
                 set_previous_processed(namespace, metric.processed)
               end
@@ -31,22 +34,24 @@ module Resque
           end
 
           def get_previous_processed(namespace)
-            @_previous_processed ||= {}
-            @_previous_processed[namespace]
+            @previous_processed ||= {}
+            @previous_processed[namespace]
           end
 
           def set_previous_processed(namespace, previous_processed)
-            @_previous_processed ||= {}
-            @_previous_processed[namespace] = previous_processed
+            @previous_processed ||= {}
+            @previous_processed[namespace] = previous_processed
           end
         end
 
-        def initialize(time, namespace, info, queue_sizes, previous_processed)
+        def initialize(time, namespace, info, queue_sizes, previous_processed, skip: [], extra: [])
           @time = time
           @namespace = namespace
           @info = info
           @queue_sizes = queue_sizes
           @previous_processed = previous_processed
+          @skip = skip
+          @extra = extra
         end
 
         def pending;   @info[:pending];   end
@@ -65,16 +70,27 @@ module Resque
         end
 
         def to_cloudwatch_metric_data
-          %i(pending processed failed queues workers working not_working processing).map do |key|
+          metric_data = metric_names.map do |key|
             build_cloudwatch_metric_datum(camelize(key.to_s), public_send(key))
-          end +
-          @queue_sizes.map do |name, size|
-            build_cloudwatch_metric_datum('Pending', size, queue: name)
           end
+
+          if @queue_sizes
+            metric_data.concat(
+              @queue_sizes.map do |name, size|
+                build_cloudwatch_metric_datum('Pending', size, Queue: name)
+              end
+            )
+          end
+
+          metric_data
         end
 
         private
 
+        def metric_names
+          DEFAULT_METRIC_NAMES - @skip + @extra
+        end
+
         def build_cloudwatch_metric_datum(metric_name, value, dimensions = {})
           {
             metric_name: metric_name,
@@ -86,7 +102,7 @@ module Resque
         end
 
         def default_dimensions
-          @_default_dimensions = Dimensions.new(namespace: @namespace.to_s)
+          Dimensions.new(Namespace: @namespace.to_s)
         end
 
         def incremental_size_of_processed

data/lib/resque/cloudwatch/metrics/version.rb

@@ -3,7 +3,7 @@
 module Resque
   module CloudWatch
     class Metrics
-      VERSION = '0.3.0'
+      VERSION = '0.4.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-cloudwatch-metrics
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Masaki Takeuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-28 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core