sensu-plugin 0.1.7 → 0.2.0

data/lib/sensu-handler.rb

@@ -68,13 +68,15 @@ module Sensu
       occurrences = @event['check']['occurrences'] || 1
       interval    = @event['check']['interval']    || 30
       refresh     = @event['check']['refresh']     || 1800
-      if @event['occurrences'] < occurrences
-        bail 'not enough occurrences'
-      end
-      if @event['occurrences'] > occurrences && @event['action'] == 'create'
-        number = refresh.fdiv(interval).to_i
-        unless number == 0 || @event['occurrences'] % number == 0
-          bail 'only handling every ' + number.to_s + ' occurrences'
+      if @event['action'] == 'create'
+        if @event['occurrences'] < occurrences
+          bail 'not enough occurrences'
+        end
+        if @event['occurrences'] > occurrences
+          number = refresh.fdiv(interval).to_i
+          unless number == 0 || @event['occurrences'] % number == 0
+            bail 'only handling every ' + number.to_s + ' occurrences'
+          end
         end
       end
     end
@@ -84,11 +86,12 @@ module Sensu
     end
 
     def filter_silenced
-      stashes = {
-        'client' => '/silence/' + @event['client']['name'],
-        'check'  => '/silence/' + @event['client']['name'] + '/' + @event['check']['name']
-      }
-      stashes.each do |scope, path|
+      stashes = [
+        ['client', '/silence/' + @event['client']['name']],
+        ['check', '/silence/' + @event['client']['name'] + '/' + @event['check']['name']],
+        ['check', '/silence/all/' + @event['check']['name']]
+      ]
+      stashes.each do |(scope, path)|
         begin
           timeout(2) do
             if stash_exists?(path)

data/lib/sensu-plugin.rb

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

data/lib/sensu-plugin/cli.rb

@@ -8,9 +8,9 @@ module Sensu
 
       attr_accessor :argv
 
-      def initialize
-        super
-        self.argv = self.parse_options
+      def initialize(argv=ARGV)
+        super()
+        self.argv = self.parse_options(argv)
       end
 
       # Implementing classes should override this to produce appropriate

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

@@ -28,6 +28,17 @@ module Sensu
           end
         end
 
+        class Statsd < Sensu::Plugin::CLI
+          def output(*args)
+            if args[0].is_a?(Exception) || args[1].nil?
+              puts args[0].to_s
+            else
+              type = args[2] || 'kv'
+              puts [args[0..1].join(':'), type].join('|')
+            end
+          end
+        end
+
       end
     end
   end

data/test/external_metric_test.rb

@@ -28,3 +28,22 @@ class TestGraphiteMetricExternal < MiniTest::Unit::TestCase
   end
 
 end
+
+class TestStatsdMetricExternal < MiniTest::Unit::TestCase
+  include SensuPluginTestHelper
+
+  def setup
+    set_script 'external/statsd-output'
+  end
+
+  def test_statsd
+    lines = run_script.split("\n")
+    assert lines.size == 2
+    lines.each do |line|
+      assert line.split('|').size == 2
+      assert line.split('|').first.split(':').size == 2
+    end
+  end
+
+end
+

data/test/handle_filter_test.rb

@@ -9,22 +9,36 @@ class TestFilterExternal < MiniTest::Unit::TestCase
     set_script 'external/handle-filter'
   end
 
-  def test_resolve_not_enough_occurrences
+  def test_create_not_enough_occurrences
     event = {
       'client' => { 'name' => 'test' },
       'check' => { 'name' => 'test', 'occurrences' => 2 },
-      'occurrences' => 1
+      'occurrences' => 1,
+      'action' => 'create'
     }
     output = run_script_with_input(JSON.generate(event))
     assert_equal(0, $?.exitstatus)
     assert_match(/^not enough occurrences/, output)
   end
 
-  def test_resolve_enough_occurrences
+  def test_create_enough_occurrences
     event = {
       'client' => { 'name' => 'test' },
       'check' => { 'name' => 'test', 'occurrences' => 2 },
-      'occurrences' => 3
+      'occurrences' => 2,
+      'action' => 'create'
+    }
+    output = run_script_with_input(JSON.generate(event))
+    assert_equal(0, $?.exitstatus)
+    assert_match(/^Event:/, output)
+  end
+
+  def test_resolve_not_enough_occurrences
+    event = {
+      'client' => { 'name' => 'test' },
+      'check' => { 'name' => 'test', 'occurrences' => 2 },
+      'occurrences' => 1,
+      'action' => 'resolve'
     }
     output = run_script_with_input(JSON.generate(event))
     assert_equal(0, $?.exitstatus)
@@ -79,17 +93,6 @@ class TestFilterExternal < MiniTest::Unit::TestCase
     assert_match(/^Event:/, output)
   end
 
-  def test_resolve_not_enough_occurrences
-    event = {
-      'client' => { 'name' => 'test' },
-      'check' => { 'name' => 'test', 'occurrences' => 2 },
-      'occurrences' => 1
-    }
-    output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
-    assert_match(/^not enough occurrences/, output)
-  end
-
   def test_dependency_event_exists
     event = {
       'client' => { 'name' => 'test' },

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu-plugin
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 7
-  version: 0.1.7
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Decklin Foster
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-14 00:00:00 -07:00
+date: 2013-09-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,15 +89,15 @@ extra_rdoc_files: []
 
 files: 
 - lib/sensu-handler.rb
-- lib/sensu-plugin.rb
 - lib/sensu-plugin/check/cli.rb
 - lib/sensu-plugin/cli.rb
 - lib/sensu-plugin/metric/cli.rb
 - lib/sensu-plugin/utils.rb
+- lib/sensu-plugin.rb
 - test/external_check_test.rb
 - test/external_handler_test.rb
-- test/handle_filter_test.rb
 - test/external_metric_test.rb
+- test/handle_filter_test.rb
 - test/helper.rb
 has_rdoc: true
 homepage: https://github.com/sonian/sensu-plugin
@@ -136,6 +136,6 @@ summary: Sensu Plugins
 test_files: 
 - test/external_check_test.rb
 - test/external_handler_test.rb
-- test/handle_filter_test.rb
 - test/external_metric_test.rb
+- test/handle_filter_test.rb
 - test/helper.rb