sensu-plugin 0.1.2 → 0.1.3

data/lib/sensu-handler.rb

@@ -69,9 +69,20 @@ module Sensu
       exit 0
     end
 
-    def api_request(*path)
+    def api_request(method, path, &blk)
       http = Net::HTTP.new(settings['api']['host'], settings['api']['port'])
-      http.request(Net::HTTP::Get.new(path.join('/')))
+      req = case method.to_s.upcase
+      when 'GET'
+        Net::HTTP::Get.new(path)
+      when 'POST'
+        Net::HTTP::Post.new(path)
+      when 'DELETE'
+        Net::HTTP::Delete.new(path)
+      when 'PUT'
+        Net::HTTP::Put.new(path)
+      end
+      yield(req) if block_given?
+      http.request(req)
     end
 
     def filter_disabled
@@ -96,10 +107,10 @@ module Sensu
     def filter_silenced
       begin
         timeout(3) do
-          if api_request('/stash/silence', @event['client']['name']).code == '200'
+          if stash_exists?('/silence/' + @event['client']['name'])
             bail 'client alerts silenced'
           end
-          if api_request('/stash/silence', @event['client']['name'], @event['check']['name']).code == '200'
+          if stash_exists?('/silence/' + @event['client']['name'] + '/' + @event['check']['name'])
             bail 'check alerts silenced'
           end
         end
@@ -108,6 +119,10 @@ module Sensu
       end
     end
 
+    def stash_exists?(path)
+      api_request(:GET, '/stash' + path).code == '200'
+    end
+
   end
 end
 

data/lib/sensu-plugin.rb

@@ -1,6 +1,6 @@
 module Sensu
   module Plugin
-    VERSION = "0.1.2"
+    VERSION = "0.1.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.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-13 00:00:00.000000000 Z
+date: 2012-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70202734882620 !ruby/object:Gem::Requirement
+  requirement: &70113831789080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70202734882620
+  version_requirements: *70113831789080
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
-  requirement: &70202734881980 !ruby/object:Gem::Requirement
+  requirement: &70113831788560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70202734881980
+  version_requirements: *70113831788560
 description: Plugins and helper libraries for Sensu, a monitoring framework
 email:
 - decklin@red-bean.com