sensu-plugin 0.0.6 → 0.1.0

data/lib/sensu-plugin.rb

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

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

@@ -15,8 +15,12 @@ module Sensu
           end
         end
 
-        def format_output(status, output)
-          "#{self.class.check_name}: #{status} - #{output}"
+        def message(msg)
+          @message = msg
+        end
+
+        def output(msg=@message)
+          puts "#{self.class.check_name} #{@status}" + (msg ? ": #{msg}" : "")
         end
 
       end

data/lib/sensu-plugin/cli.rb

@@ -11,8 +11,7 @@ module Sensu
       # Implementing classes should override this to produce appropriate
       # output for their handler.
 
-      def format_output(status, output)
-        output
+      def output(*args)
       end
 
       # This will define 'ok', 'warning', 'critical', and 'unknown'
@@ -20,7 +19,8 @@ module Sensu
 
       Sensu::Plugin::EXIT_CODES.each do |status, code|
         define_method(status.downcase) do |*args|
-          puts format_output(status, *args)
+          @status = status
+          output(*args)
           exit(code)
         end
       end
@@ -52,7 +52,7 @@ module Sensu
         rescue SystemExit => e
           exit e.status
         rescue Exception => e
-          self.new.critical "Check failed to run: #{e}"
+          self.new.critical "Check failed to run: #{e.message}, #{e.backtrace}"
         end
         self.new.warning "Check did not exit! You should call an exit code method."
       end

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

@@ -4,11 +4,23 @@ require 'json'
 module Sensu
   module Plugin
     class Metric
-      class CLI < Sensu::Plugin::CLI
+      class CLI
 
-        def format_output(status, output)
-          output[:timestamp] ||= Time.now.to_i
-          ::JSON.generate(output)
+        class JSON < Sensu::Plugin::CLI
+          def output(obj=nil)
+            unless obj.nil? || obj.is_a?(String) || obj.is_a?(Exception)
+              obj['timestamp'] ||= Time.now.to_i
+              puts ::JSON.generate(obj)
+            end
+          end
+        end
+
+        class Graphite < Sensu::Plugin::CLI
+          def output(path=nil, value=nil, timestamp=Time.now.to_i)
+            unless path.nil? || path.is_a?(Exception) || value.nil?
+              puts [path, value, timestamp].join("\t")
+            end
+          end
         end
 
       end

data/lib/sensu-plugin/util/procs.rb

@@ -6,17 +6,6 @@ module Sensu
       module Procs
 
         class << self
-          def get_procs
-            `which tasklist`; $? == 0 ? `tasklist` : `ps aux`
-          end
-
-          def find_proc(name)
-            get_procs.split("\n").find {|ln| ln.include?(name) }
-          end
-
-          def find_proc_regex(pat)
-            get_procs.split("\n").find {|ln| ln =~ pat }
-          end
         end
 
       end

data/test/external_check_test.rb

@@ -1,18 +1,11 @@
-#!/usr/bin/env ruby
-
 require 'rubygems'
 require 'minitest/autorun'
 
 class TestCheckExternal < MiniTest::Unit::TestCase
+  include SensuPluginTestHelper
 
   def setup
-    @script = File.join(File.dirname(__FILE__), 'external/check-options')
-  end
-
-  def run_script(*args)
-    IO.popen([@script] + args, 'r+') do |child|
-      child.read
-    end
+    set_script 'external/check-options'
   end
 
   def test_ok
@@ -35,6 +28,11 @@ class TestCheckExternal < MiniTest::Unit::TestCase
     assert $?.exitstatus == 3
   end
 
+  def test_override
+    output = run_script '-O'
+    assert $?.exitstatus == 0 && !output.include?('argv =')
+  end
+
   def test_fallthrough
     run_script
     assert $?.exitstatus == 1

data/test/external_handler_test.rb

@@ -1,21 +1,12 @@
-#!/usr/bin/env ruby
-
 require 'rubygems'
 require 'minitest/autorun'
 require 'json'
 
 class TestHandlerExternal < MiniTest::Unit::TestCase
+  include SensuPluginTestHelper
 
   def setup
-    @script = File.join(File.dirname(__FILE__), 'external/handle-nofilter')
-  end
-
-  def run_script(event)
-    output = IO.popen(@script, 'r+') do |child|
-      child.puts JSON.generate(event)
-      child.close_write
-      child.read
-    end
+    set_script 'external/handle-nofilter'
   end
 
   def test_handled
@@ -24,13 +15,13 @@ class TestHandlerExternal < MiniTest::Unit::TestCase
       'check' => { 'name' => 'test' },
       'occurrences' => 1,
     }
-    output = run_script(event)
+    output = run_script_with_input(JSON.generate(event))
     assert $?.exitstatus == 0 && output =~ /Event:.*test/
   end
 
   def test_missing_keys
     event = {}
-    output = run_script(event)
+    output = run_script_with_input(JSON.generate(event))
     assert $?.exitstatus == 0 && output =~ /Event:/
   end
 

data/test/external_metric_test.rb

@@ -0,0 +1,30 @@
+require 'rubygems'
+require 'minitest/autorun'
+
+class TestMetricExternal < MiniTest::Unit::TestCase
+  include SensuPluginTestHelper
+
+  def setup
+    set_script 'external/trivial-metric'
+  end
+
+  def test_ok
+    output = JSON.parse(run_script)
+    assert $?.exitstatus == 0 && output.key?('timestamp')
+  end
+
+end
+
+class TestGraphiteMetricExternal < MiniTest::Unit::TestCase
+  include SensuPluginTestHelper
+
+  def setup
+    set_script 'external/multi-output'
+  end
+
+  def test_multi
+    lines = run_script.split("\n")
+    assert lines.size == 2 && lines.all? {|line| line.split("\t").size == 3 }
+  end
+
+end

data/test/helper.rb

@@ -0,0 +1,24 @@
+require 'rubygems'
+require 'minitest/autorun'
+
+module SensuPluginTestHelper
+
+  def set_script(script)
+    @script = File.join(File.dirname(__FILE__), script)
+  end
+
+  def run_script(*args)
+    IO.popen([@script] + args, 'r+') do |child|
+      child.read
+    end
+  end
+
+  def run_script_with_input(input, *args)
+    IO.popen([@script] + args, 'r+') do |child|
+      child.puts input
+      child.close_write
+      child.read
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-30 00:00:00.000000000 Z
+date: 2012-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70176373322360 !ruby/object:Gem::Requirement
+  requirement: &70146182369580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70176373322360
+  version_requirements: *70146182369580
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
-  requirement: &70176373321840 !ruby/object:Gem::Requirement
+  requirement: &70146182367580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70176373321840
+  version_requirements: *70146182367580
 description: Plugins and helper libraries for Sensu, a monitoring framework
 email:
 - decklin@red-bean.com
@@ -48,6 +48,8 @@ files:
 - lib/sensu-plugin.rb
 - test/external_check_test.rb
 - test/external_handler_test.rb
+- test/external_metric_test.rb
+- test/helper.rb
 homepage: https://github.com/sonian/sensu-plugin
 licenses:
 - MIT
@@ -76,3 +78,5 @@ summary: Sensu Plugins
 test_files:
 - test/external_check_test.rb
 - test/external_handler_test.rb
+- test/external_metric_test.rb
+- test/helper.rb