sensu-plugin 0.0.1 → 0.0.3

data/lib/sensu-handler.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'sensu/config'
 
 module Sensu
   class Handler
@@ -36,6 +37,19 @@ module Sensu
       end
     end
 
+    # Unfortunately, we need to reimplement config loading. I'm not sure there's
+    # a good way to allow overriding these paths.
+
+    CONFIGS = ['/etc/sensu/config.json'] + Dir['/etc/sensu/conf.d/*.json']
+
+    def load_config(filename)
+      JSON.parse(File.open(filename, 'r').read) rescue Hash.new
+    end
+
+    def settings
+      @settings ||= CONFIGS.map {|f| load_config(f) }.reduce {|a, b| a.deep_merge(b) }
+    end
+
     at_exit do
       handler = @@autorun.new
       event = ::JSON.parse(STDIN.read)
@@ -46,3 +60,14 @@ module Sensu
 
   end
 end
+
+# Copied from Sensu (0.8.19)
+
+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
+    end
+    self.merge(hash, &merger)
+  end
+end

data/lib/sensu-plugin.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-15 00:00:00.000000000 Z
+date: 2011-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70296568612360 !ruby/object:Gem::Requirement
+  requirement: &70160334903060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70296568612360
+  version_requirements: *70160334903060
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
-  requirement: &70296568611860 !ruby/object:Gem::Requirement
+  requirement: &70160334902480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70296568611860
+  version_requirements: *70160334902480
 description: Plugins and helper libraries for Sensu, a monitoring framework
 email:
 - decklin@red-bean.com