sensu-plugin 0.1.3 → 0.1.4.beta

data/lib/sensu-handler.rb

@@ -2,6 +2,14 @@ require 'net/http'
 require 'json'
 
 module Sensu
+
+  NET_HTTP_REQ_CLASS = {
+    'GET' => Net::HTTP::Get,
+    'POST' => Net::HTTP::Post,
+    'DELETE' => Net::HTTP::Delete,
+    'PUT' => Net::HTTP::Put,
+  }
+
   class Handler
 
     # Implementing classes should override this.
@@ -15,8 +23,9 @@ module Sensu
 
     def filter
       filter_disabled
-      filter_repeated unless @event['action'] == 'resolve'
+      filter_repeated
       filter_silenced
+      filter_dependencies
     end
 
     # This works just like Plugin::CLI's autorun.
@@ -30,27 +39,30 @@ module Sensu
       end
     end
 
-    # Unfortunately, we need to reimplement config loading. I'm not sure there's
-    # a good way to allow overriding these paths.
-
-    CONFIGS = ['/etc/sensu/config.json'] + Dir['/etc/sensu/conf.d/*.json']
+    def config_files
+      if ENV['SENSU_CONFIG_FILES']
+        ENV['SENSU_CONFIG_FILES'].split(':')
+      else
+        ['/etc/sensu/config.json'] + Dir['/etc/sensu/conf.d/*.json']
+      end
+    end
 
     def load_config(filename)
       JSON.parse(File.open(filename, 'r').read) rescue Hash.new
     end
 
     def settings
-      @settings ||= CONFIGS.map {|f| load_config(f) }.reduce {|a, b| a.deep_merge(b) }
+      @settings ||= config_files.map {|f| load_config(f) }.reduce {|a, b| a.deep_merge(b) }
     end
 
     def read_event(file)
       begin
         @event = ::JSON.parse(file.read)
         @event['occurrences'] ||= 1
-        @event['check'] ||= Hash.new
-        @event['client'] ||= Hash.new
-      rescue => e
-        puts 'Error reading event: ' + e.message
+        @event['check']       ||= Hash.new
+        @event['client']      ||= Hash.new
+      rescue => error
+        puts 'error reading event: ' + error.message
         exit 0
       end
     end
@@ -62,7 +74,7 @@ module Sensu
       handler.handle
     end
 
-    # Helpers and filters
+    # Helpers and filters.
 
     def bail(msg)
       puts msg + ': ' + @event['client']['name'] + '/' + @event['check']['name']
@@ -71,15 +83,9 @@ module Sensu
 
     def api_request(method, path, &blk)
       http = Net::HTTP.new(settings['api']['host'], settings['api']['port'])
-      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)
+      req = NET_HTTP_REQ_CLASS[method.to_s.upcase].new(path)
+      if settings['api']['user'] && settings['api']['password']
+        req.basic_auth(settings['api']['user'], settings['api']['password'])
       end
       yield(req) if block_given?
       http.request(req)
@@ -93,50 +99,79 @@ module Sensu
 
     def filter_repeated
       occurrences = @event['check']['occurrences'] || 1
-      interval = @event['check']['interval'] || 30
-      refresh = @event['check']['refresh'] || 1800
+      interval    = @event['check']['interval']    || 30
+      refresh     = @event['check']['refresh']     || 1800
       if @event['occurrences'] < occurrences
         bail 'not enough occurrences'
       end
-      if @event['occurrences'] > occurrences
-        n = refresh.fdiv(interval).to_i
-        bail 'only repeating alert every ' + n.to_s + ' occurrences' unless @event['occurrences'] % n == 0
+      if @event['occurrences'] > occurrences && @event['action'] == 'create'
+        number = refresh.fdiv(interval).to_i
+        unless @event['occurrences'] % number == 0
+          bail 'only handling every ' + number.to_s + ' occurrences'
+        end
       end
     end
 
+    def stash_exists?(path)
+      api_request(:GET, '/stash' + path).code == '200'
+    end
+
     def filter_silenced
-      begin
-        timeout(3) do
-          if stash_exists?('/silence/' + @event['client']['name'])
-            bail 'client alerts silenced'
-          end
-          if stash_exists?('/silence/' + @event['client']['name'] + '/' + @event['check']['name'])
-            bail 'check alerts silenced'
+      stashes = {
+        'client' => '/silence/' + @event['client']['name'],
+        'check'  => '/silence/' + @event['client']['name'] + '/' + @event['check']['name']
+      }
+      stashes.each do |scope, path|
+        begin
+          timeout(2) do
+            if stash_exists?(path)
+              bail scope + ' alerts silenced'
+            end
           end
+        rescue Timeout::Error
+          puts 'timed out while attempting to query the sensu api for a stash'
         end
-      rescue Timeout::Error
-        puts 'Timed out while attempting to query the Sensu API for stashes'
       end
     end
 
-    def stash_exists?(path)
-      api_request(:GET, '/stash' + path).code == '200'
+    def event_exists?(client, check)
+      api_request(:GET, '/event/' + client + '/' + check).code == '200'
+    end
+
+    def filter_dependencies
+      if @event['check'].has_key?('dependencies')
+        if @event['check']['dependencies'].is_a?(Array)
+          @event['check']['dependencies'].each do |check|
+            begin
+              timeout(2) do
+                if event_exists?(@event['client']['name'], check)
+                  bail 'check dependency event exists'
+                end
+              end
+            rescue Timeout::Error
+              puts 'timed out while attempting to query the sensu api for an event'
+            end
+          end
+        end
+      end
     end
 
   end
+
 end
 
-# Copied from Sensu (0.9.3)
+# Monkey Patching.
 
 class Array
   def deep_merge(other_array, &merger)
     concat(other_array).uniq
   end
 end
+
 class Hash
   def deep_merge(other_hash, &merger)
-    merger ||= proc do |k, oldval, newval|
-      oldval.deep_merge(newval, &merger) rescue newval
+    merger ||= proc do |key, old_value, new_value|
+      old_value.deep_merge(new_value, &merger) rescue new_value
     end
     merge(other_hash, &merger)
   end

data/lib/sensu-plugin.rb

@@ -1,6 +1,6 @@
 module Sensu
   module Plugin
-    VERSION = "0.1.3"
+    VERSION = "0.1.4.beta"
     EXIT_CODES = {
       'OK' => 0,
       'WARNING' => 1,

data/test/handle_filter_test.rb

@@ -0,0 +1,55 @@
+require 'rubygems'
+require 'minitest/autorun'
+require 'json'
+
+class TestFilterExternal < MiniTest::Unit::TestCase
+  include SensuPluginTestHelper
+
+  def setup
+    set_script 'external/handle-filter'
+  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_resolve_enough_occurrences
+    event = {
+      'client' => { 'name' => 'test' },
+      'check' => { 'name' => 'test', 'occurrences' => 2},
+      'occurrences' => 3
+    }
+    output = run_script_with_input(JSON.generate(event))
+    assert_equal(0, $?.exitstatus)
+    assert_match(/^Event:/, output)
+  end
+
+  def test_resolve_enough_occurrences_exactly
+    event = {
+      'client' => { 'name' => 'test' },
+      'check' => { 'name' => 'test', 'occurrences' => 2},
+      'occurrences' => 2
+    }
+    output = run_script_with_input(JSON.generate(event))
+    assert_equal(0, $?.exitstatus)
+    assert_match(/^Event:/, output)
+  end
+
+  def test_dependency_event_exists
+    event = {
+      'client' => { 'name' => 'test' },
+      'check' => { 'name' => 'test', 'dependencies' => ['foo', 'bar'] },
+      'occurrences' => 1
+    }
+    output = run_script_with_input(JSON.generate(event))
+    assert_equal(0, $?.exitstatus)
+    assert_match(/dependency event exists/, output)
+  end
+end

metadata

@@ -1,82 +1,115 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: sensu-plugin
-version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 31098201
+  prerelease: true
+  segments: 
+  - 0
+  - 1
+  - 4
+  - beta
+  version: 0.1.4.beta
 platform: ruby
-authors:
+authors: 
 - Decklin Foster
+- Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-07-09 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &70113831789080 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70113831789080
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: mixlib-cli
-  requirement: &70113831788560 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70113831788560
+  version_requirements: *id002
 description: Plugins and helper libraries for Sensu, a monitoring framework
-email:
+email: 
 - decklin@red-bean.com
+- portertech@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/sensu-handler.rb
 - lib/sensu-plugin/check/cli.rb
 - lib/sensu-plugin/cli.rb
 - lib/sensu-plugin/metric/cli.rb
-- lib/sensu-plugin/util/procs.rb
 - lib/sensu-plugin.rb
 - test/external_check_test.rb
 - test/external_handler_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
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Sensu Plugins
-test_files:
+test_files: 
 - test/external_check_test.rb
 - test/external_handler_test.rb
 - test/external_metric_test.rb
+- test/handle_filter_test.rb
 - test/helper.rb

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

@@ -1,14 +0,0 @@
-require 'sensu-plugin/check/cli'
-
-module Sensu
-  module Plugin
-    module Util
-      module Procs
-
-        class << self
-        end
-
-      end
-    end
-  end
-end