riemann-rpush 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78fd53dc3d251144a8e4a2e3166ccf3258f6eb70
-  data.tar.gz: 3a6b5a485e7384476999362a57791cfd3cdecc55
+  metadata.gz: 2f63311c03d5e1f6f5414b2234b043323b59f60d
+  data.tar.gz: 6100e82f93f010e90255e59acb4c7e82376661df
 SHA512:
-  metadata.gz: 41405ff53ee71dac6eb7a309435f0fcf1db0e0635726957244f11ce6e425703be68b032d29f3c4a7fbf7a585d2e90bdf4a23a74b26e7635a0053e2565358441c
-  data.tar.gz: 590fb77a8a52e21ec2e8d69cbd56104dfafad0798682d0e79854ebe5a0d511ba28d80c4153e9e8125648773599e8b993e6830a6800fa5c88c119975969186578
+  metadata.gz: 3145b9e3d34da18fc7658a26faf69b08186d2f9425fd42a2ed01bdaf2e3d98b8d39c7adb367ee91e2e481d0b787b66d89a8b71506896661f101455292df025a8
+  data.tar.gz: e7e0fbbe6c6238bb1e0cf317e00af7c52ab94ba5b75220d6e000820714ceb036f20e5a69b9e9c439f68d6621d53cf8a86f92de090096a46c3ae8115b796c32d8

data/bin/riemann-rpush

@@ -11,6 +11,7 @@ class Riemann::Tools::Rpush
   opt :redis_url, "Redis URL", :default => ''
   opt :queue_size_warning, "Queue size warning threshold",   :type => Integer, :default => 20
   opt :queue_size_critical, "Queue size critical threshold", :type => Integer, :default => 100
+  opt :treat_sent_as, "Treat already sent notifications as", :type => String, :default => 'apns'
 
   def initialize
     @redis = ::Redis.new({url: opts[:redis_url]})
@@ -19,23 +20,71 @@ class Riemann::Tools::Rpush
   end
 
   def tick
-    queue_size = @redis.scard('rpush:notifications:all')
+    keys = @redis.smembers('rpush:notifications:all')
 
-    state = if queue_size >= @queue_size_critical
+    types_count(keys).each_pair do |type, count|
+      deliver_type_count(type, count)
+    end
+
+    deliver_total(keys.size)
+  end
+
+  private
+  def types_count(keys)
+    keys.inject({
+      'apns'  => 0,
+      'gcm'   => 0,
+      'wns'   => 0
+    }) do |h, key|
+      type = get_notification_type(key)
+      if type
+        h[type] ||= 0
+        h[type] += 1
+      end
+      h
+    end
+  end
+
+  def get_notification_type(key)
+    type = @redis.hget("rpush:notifications:#{key}", 'type')
+    type.encode("ASCII-8BIT", invalid: :replace, replace: '').match(/Redis::(.*)::Notification/)[1].downcase
+  rescue
+    opts.fetch(:treat_sent_as)
+  end
+
+  def deliver_total(total)
+    state = if total >= @queue_size_critical
       'critical'
-    elsif queue_size >= @queue_size_warning
+    elsif total >= @queue_size_warning
       'warning'
     else
       'ok'
     end
 
     msg = {
-      metric: queue_size,
+      metric: total,
       service: 'rpush queue size',
       state: state
     }
     report msg
   end
+
+  def deliver_type_count(type, count)
+    state = if count >= @queue_size_critical
+      'critical'
+    elsif count >= @queue_size_warning
+      'warning'
+    else
+      'ok'
+    end
+
+    msg = {
+      metric: count,
+      service: "rpush #{type}-queue size",
+      state: state
+    }
+    report msg
+  end
 end
 
 Riemann::Tools::Rpush.run

data/riemann-rpush.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "riemann-rpush"
-  spec.version       = '0.0.3'
+  spec.version       = '0.0.4'
   spec.authors       = ["Fernando Alonso"]
   spec.email         = ["krakatoa1987@gmail.com"]
   spec.summary       = %q{Riemann agent to collect Rpush metrics}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-rpush
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Fernando Alonso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-tools