sensu-plugin 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a18d4d1ea86bbfe682e0659f26d4da91f130882e
-  data.tar.gz: 0aa638b240b441302ac016601320a063c7fca8cb
+  metadata.gz: 0f7c3f8899f53b4d8ee6bddd6c5784a8a1bfaa9a
+  data.tar.gz: f4602264337a31598521a7148b7ea50c2332c77a
 SHA512:
-  metadata.gz: 1c8b01c99bb54fb66a1560a98e5cdea279763b1c66b1a351e408a9cf642bd1eebe97f1ccddbbc0f3889ef25d13e3aca1e657d3dbbf1f6c769e7dd0c650a91dbd
-  data.tar.gz: 35ea2fcd499c24e31f24ae6a734aa9722b03cdb63361246e1162d026d7a892e611584abdc94fd2a454c4363845e13c0e1fcb656cc21da6f1f80f0e32d36aae2a
+  metadata.gz: 4796d2c5b1a1bd17e718a385911c5e1b9bf578e2ef0f8076161d9d7b49cf0bc3094964ab95de5420c85936ff1bf13a834ce586b101feafd43bfb07102efe38dc
+  data.tar.gz: 908cd78083ecd040fc1d1a9f818536f5cbbdeb363ec4d1e4d8de1b766f81ded2740654dbfea2755584600fb0a85a4ce62d6142819389c52a8e0edb913a07d329

data/lib/sensu-handler.rb

@@ -94,17 +94,17 @@ module Sensu
     def filter_repeated
       defaults = {
         'occurrences' => 1,
-        'interval'    => 30,
-        'refresh'     => 1800
+        'interval' => 30,
+        'refresh' => 1800
       }
 
       if settings['sensu_plugin'].is_a?(Hash)
         defaults.merge!(settings['sensu_plugin'])
       end
 
-      occurrences = @event['check']['occurrences'] || defaults['occurrences']
-      interval    = @event['check']['interval']    || defaults['interval']
-      refresh     = @event['check']['refresh']     || defaults['refresh']
+      occurrences = (@event['check']['occurrences'] || defaults['occurrences']).to_i
+      interval = (@event['check']['interval'] || defaults['interval']).to_i
+      refresh = (@event['check']['refresh'] || defaults['refresh']).to_i
       if @event['occurrences'] < occurrences
         bail 'not enough occurrences'
       end

data/lib/sensu-plugin.rb

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

data/lib/sensu-plugin/cli.rb

@@ -56,6 +56,9 @@ module Sensu
           check.run
         rescue SystemExit => e
           exit e.status
+        rescue OptionParser::InvalidOption => e
+          puts "Invalid check argument(s): #{e.message}, #{e.backtrace}"
+          exit 1
         rescue Exception => e
           # This can't call check.critical, as the check may have failed to construct
           puts "Check failed to run: #{e.message}, #{e.backtrace}"

data/lib/sensu-plugin/metric/cli.rb

@@ -23,7 +23,7 @@ module Sensu
               puts args[0].to_s
             else
               args[2] ||= Time.now.to_i
-              puts args[0..2].join("\t")
+              puts args[0..2].join("\s")
             end
           end
         end

data/test/external_check_test.rb

@@ -49,6 +49,6 @@ class TestCheckExternal < MiniTest::Unit::TestCase
 
   def test_bad_commandline
     output = run_script '--doesnotexist'
-    assert $?.exitstatus == 2 && output.include?('doesnotexist') && output.include?('invalid option')
+    assert $?.exitstatus == 1 && output.include?('doesnotexist') && output.include?('invalid option')
   end
 end

data/test/external_metric_test.rb

@@ -23,7 +23,7 @@ class TestGraphiteMetricExternal < MiniTest::Unit::TestCase
 
   def test_multi
     lines = run_script.split("\n")
-    assert lines.size == 2 && lines.all? {|line| line.split("\t").size == 3 }
+    assert lines.size == 2 && lines.all? {|line| line.split("\s").size == 3 }
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugin
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Decklin Foster