sensu-plugin 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f7c3f8899f53b4d8ee6bddd6c5784a8a1bfaa9a
-  data.tar.gz: f4602264337a31598521a7148b7ea50c2332c77a
+  metadata.gz: 0b8bf9dc7a64cb5b2a2359146d1d8cfa747fc8e6
+  data.tar.gz: 52223d03497178da064f55e89e307d1ab86dfef4
 SHA512:
-  metadata.gz: 4796d2c5b1a1bd17e718a385911c5e1b9bf578e2ef0f8076161d9d7b49cf0bc3094964ab95de5420c85936ff1bf13a834ce586b101feafd43bfb07102efe38dc
-  data.tar.gz: 908cd78083ecd040fc1d1a9f818536f5cbbdeb363ec4d1e4d8de1b766f81ded2740654dbfea2755584600fb0a85a4ce62d6142819389c52a8e0edb913a07d329
+  metadata.gz: d698f30f72883a2024bb7096c14cc42ec4fa740a12e337c7903018b76b2e30444030fe907b8dc962d3f2a87c2dac6fc08b2400ec00fb36d84d9f0f4d83a654f5
+  data.tar.gz: 5768eb08725dc2f4d723a2dc367587854f108082c08804fa6679982fd70ce684fcbb4f1f8867171a27cff6119ff94d1015594162ccdd465d619edec46f8eef13

data/lib/sensu-handler.rb

@@ -76,6 +76,9 @@ module Sensu
     end
 
     def api_request(method, path, &blk)
+      if not settings.has_key?('api')
+        raise "api.json settings not found."
+      end
       http = Net::HTTP.new(settings['api']['host'], settings['api']['port'])
       req = net_http_req_class(method).new(path)
       if settings['api']['user'] && settings['api']['password']
@@ -133,6 +136,8 @@ module Sensu
               bail scope + ' alerts silenced'
             end
           end
+        rescue Errno::ECONNREFUSED
+          puts 'connection refused attempting to query the sensu api for a stash'
         rescue Timeout::Error
           puts 'timed out while attempting to query the sensu api for a stash'
         end
@@ -154,6 +159,8 @@ module Sensu
                   bail 'check dependency event exists'
                 end
               end
+            rescue Errno::ECONNREFUSED
+              puts 'connection refused attempting to query the sensu api for an event'
             rescue Timeout::Error
               puts 'timed out while attempting to query the sensu api for an event'
             end

data/lib/sensu-plugin.rb

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

data/lib/sensu-plugin/utils.rb

@@ -3,7 +3,9 @@ module Sensu
     module Utils
 
       def config_files
-        if ENV['SENSU_CONFIG_FILES']
+        if ENV['SENSU_LOADED_TEMPFILE']
+          IO.read(ENV['SENSU_LOADED_TEMPFILE']).split(':')
+        elsif ENV['SENSU_CONFIG_FILES']
           ENV['SENSU_CONFIG_FILES'].split(':')
         else
           ['/etc/sensu/config.json'] + Dir['/etc/sensu/conf.d/**/*.json']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugin
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Decklin Foster
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json