sensu-plugin 0.1.1 → 0.1.2

data/lib/sensu-handler.rb

@@ -15,7 +15,7 @@ module Sensu
 
     def filter
       filter_disabled
-      filter_repeated
+      filter_repeated unless @event['action'] == 'resolve'
       filter_silenced
     end
 
@@ -111,13 +111,18 @@ module Sensu
   end
 end
 
-# Copied from Sensu (0.8.19)
+# Copied from Sensu (0.9.3)
 
+class Array
+  def deep_merge(other_array, &merger)
+    concat(other_array).uniq
+  end
+end
 class Hash
-  def deep_merge(hash)
-    merger = proc do |key, value1, value2|
-      value1.is_a?(Hash) && value2.is_a?(Hash) ? value1.merge(value2, &merger) : value2
+  def deep_merge(other_hash, &merger)
+    merger ||= proc do |k, oldval, newval|
+      oldval.deep_merge(newval, &merger) rescue newval
     end
-    self.merge(hash, &merger)
+    merge(other_hash, &merger)
   end
 end

data/lib/sensu-plugin.rb

@@ -1,6 +1,6 @@
 module Sensu
   module Plugin
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
     EXIT_CODES = {
       'OK' => 0,
       'WARNING' => 1,

data/lib/sensu-plugin/cli.rb

@@ -12,6 +12,7 @@ module Sensu
       # output for their handler.
 
       def output(*args)
+        puts "Sensu::Plugin::CLI: #{args}"
       end
 
       # This will define 'ok', 'warning', 'critical', and 'unknown'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-09 00:00:00.000000000 Z
+date: 2012-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70294828191900 !ruby/object:Gem::Requirement
+  requirement: &70202734882620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70294828191900
+  version_requirements: *70202734882620
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
-  requirement: &70294828189640 !ruby/object:Gem::Requirement
+  requirement: &70202734881980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70294828189640
+  version_requirements: *70202734881980
 description: Plugins and helper libraries for Sensu, a monitoring framework
 email:
 - decklin@red-bean.com