sensu-extensions 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4bc92d117b837c89057ba3c0dec38b2bd76db80
-  data.tar.gz: f3fc9a6727262dca6e5d84991e767d0e5c91fdcb
+  metadata.gz: 04d00508af30e89a1a38b0650a63f074e811ada1
+  data.tar.gz: 5083b62566dba206901dc347e25c62ab3194d381
 SHA512:
-  metadata.gz: 9cfeb24e06c88fb9966a8f882a70a5554bc92b33e9fd42986585a140890a9ac567cb36674fde37e147f6ba8019552edf09753bc9e59bc735dad71fd66b6e19a5
-  data.tar.gz: fb778e2d246b5764e37d25142b85a23ead28bd2001f5b40461b2e426d645e85d41248264bd5fdf1d3c23cdf589f7491f85b7927a17188a6163710a0c5ae1327e
+  metadata.gz: 0946b60f6b1cfd83a3f0cf8752be939efc4486de04d59c479c5a46ceafd72327de614d671de30c8f872a77a9a3556528f826b856bbf2439a17f8c9eb00d87081
+  data.tar.gz: a199a58d8a12fcbc7156426da9f2d71fbf12d0821d9b696c683a8f564c0dde70c1fc94a5bcb911235c5c66f054d2c8115c7cd73ad008252f8ba418b529a04ccd

data/.travis.yml

@@ -1,3 +1,4 @@
+sudo: false
 language: ruby
 rvm:
   - 1.8.7

data/lib/sensu/extensions/loader.rb

@@ -80,7 +80,7 @@ module Sensu
       def load_directory(directory)
         warning("loading extension files from directory", :directory => directory)
         path = directory.gsub(/\\(?=\S)/, "/")
-        Dir.glob(File.join(path, "**/*.rb")).each do |file|
+        Dir.glob(File.join(path, "**{,/*/**}/*.rb")).each do |file|
           load_file(file)
         end
       end

data/sensu-extensions.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-extensions"
-  spec.version       = "1.1.0"
+  spec.version       = "1.2.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu extension loader library"

data/spec/assets/config.json

@@ -1,11 +1 @@
-{
-    "filters": {
-        "production": {
-            "attributes": {
-                "client": {
-                    "environment": "production"
-                }
-            }
-        }
-    }
-}
+{}

data/spec/assets/extensions_symlinked/symlinked_check.rb

@@ -0,0 +1,17 @@
+module Sensu
+  module Extension
+    class SymlinkedCheck < Check
+      def name
+        "symlinked_check"
+      end
+
+      def description
+        "returns 'foo'"
+      end
+
+      def run
+        yield "foo", 0
+      end
+    end
+  end
+end

data/spec/extensions_spec.rb

@@ -40,21 +40,20 @@ describe "Sensu::Extensions" do
 
   it "can load extensions from a directory" do
     extensions = Sensu::Extensions.load(:extension_dir => @extension_dir)
-    expect(extensions.loaded_files.size).to eq(2)
+    expect(extensions.loaded_files.size).to eq(3)
     expect(extensions.handler_exists?("test")).to be(true)
     expect(extensions.check_exists?("mock_check")).to be(true)
   end
 
   it "can load extensions from one or more directories" do
     extensions = Sensu::Extensions.load(:extension_dirs => [@extension_dir])
-    expect(extensions.loaded_files.size).to eq(2)
+    expect(extensions.loaded_files.size).to eq(3)
     expect(extensions.handler_exists?("test")).to be(true)
     expect(extensions.check_exists?("mock_check")).to be(true)
   end
 
   it "can load the built-in extensions" do
     extensions = Sensu::Extensions.load
-    expect(extensions.filter_exists?("attributes")).to be(true)
     expect(extensions.mutator_exists?("json")).to be(true)
     expect(extensions.mutator_exists?("ruby_hash")).to be(true)
     expect(extensions.mutator_exists?("only_check_output")).to be(true)

data/spec/loader_spec.rb

@@ -39,10 +39,10 @@ describe "Sensu::Extensions::Loader" do
     expect(@loader.loaded_files).to be_empty
   end
 
-  it "can load extensions from a directory" do
+  it "can load extensions from a directory containing directory symlinks" do
     @loader.load_directory(@extension_dir)
-    expect(@loader.warnings.size).to eq(6)
-    expect(@loader.loaded_files.size).to eq(2)
+    expect(@loader.warnings.size).to eq(7)
+    expect(@loader.loaded_files.size).to eq(3)
     extension = Sensu::Extension::Test.new
     expect(extension).to respond_to(:name, :description, :definition, :safe_run, :stop, :has_key?, :[])
     extension = Sensu::Extension::MockCheck.new
@@ -79,7 +79,6 @@ describe "Sensu::Extensions::Loader" do
     expect(@loader.all).to include(extension)
     expect(@loader.handler_exists?("debug")).to be(true)
     expect(@loader.mutator_exists?("only_check_output")).to be(true)
-    expect(@loader.filter_exists?("attributes")).to be(true)
   end
 
   it "can load specific extension categories for a sensu client" do
@@ -93,7 +92,6 @@ describe "Sensu::Extensions::Loader" do
     @loader.load_instances("server")
     expect(@loader.handler_exists?("debug")).to be(true)
     expect(@loader.mutator_exists?("only_check_output")).to be(true)
-    expect(@loader.filter_exists?("attributes")).to be(true)
     expect(@loader.check_exists?("mock_check")).to be(false)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-extensions
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-em
@@ -164,7 +164,6 @@ files:
 - README.md
 - Rakefile
 - lib/sensu/extensions.rb
-- lib/sensu/extensions/filters/attributes.rb
 - lib/sensu/extensions/handlers/debug.rb
 - lib/sensu/extensions/loader.rb
 - lib/sensu/extensions/mutators/json.rb
@@ -175,8 +174,8 @@ files:
 - spec/assets/extensions/error.rb
 - spec/assets/extensions/mock_check.rb
 - spec/assets/extensions/test.rb
+- spec/assets/extensions_symlinked/symlinked_check.rb
 - spec/extensions_spec.rb
-- spec/filters/attributes_spec.rb
 - spec/handlers/debug_spec.rb
 - spec/helpers.rb
 - spec/loader_spec.rb
@@ -212,8 +211,8 @@ test_files:
 - spec/assets/extensions/error.rb
 - spec/assets/extensions/mock_check.rb
 - spec/assets/extensions/test.rb
+- spec/assets/extensions_symlinked/symlinked_check.rb
 - spec/extensions_spec.rb
-- spec/filters/attributes_spec.rb
 - spec/handlers/debug_spec.rb
 - spec/helpers.rb
 - spec/loader_spec.rb

data/lib/sensu/extensions/filters/attributes.rb

@@ -1,71 +0,0 @@
-require "sensu/extension"
-
-module Sensu
-  module Sandbox
-    def self.eval(eval_string, value=nil)
-      result = Proc.new do
-        $SAFE = (RUBY_VERSION < "2.1.0" ? 4 : 3)
-        Kernel.eval(eval_string)
-      end
-      result.call
-    end
-  end
-
-  module Extension
-    class Attributes < Filter
-      def name
-        "attributes"
-      end
-
-      def description
-        "filters events using event attributes"
-      end
-
-      def run(event, options)
-        status = filter_event?(options[:filter_name], event) ? 0 : 1
-        yield "", status
-      end
-
-      def eval_attribute_value(raw_eval_string, value)
-        begin
-          eval_string = raw_eval_string.gsub(/^eval:(\s+)?/, "")
-          !!Sandbox.eval(eval_string, value)
-        rescue => error
-          @logger.error("filter attribute eval error", {
-            :raw_eval_string => raw_eval_string,
-            :value => value,
-            :error => error.to_s
-          })
-          false
-        end
-      end
-
-      def attributes_match?(hash_one, hash_two)
-        hash_one.all? do |key, value_one|
-          value_two = hash_two[key]
-          case
-          when value_one == value_two
-            true
-          when value_one.is_a?(Hash) && value_two.is_a?(Hash)
-            attributes_match?(value_one, value_two)
-          when value_one.is_a?(String) && value_one.start_with?("eval:")
-            eval_attribute_value(value_one, value_two)
-          else
-            false
-          end
-        end
-      end
-
-      def filter_event?(filter_name, event)
-        if @settings.filter_exists?(filter_name)
-          filter = @settings[:filters][filter_name]
-          matched = attributes_match?(filter[:attributes], event)
-          filter[:negate] ? matched : !matched
-        else
-          @logger.error("unknown filter", :filter_name => filter_name)
-          false
-        end
-      end
-    end
-  end
-end

data/spec/filters/attributes_spec.rb

@@ -1,53 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "helpers")
-require "sensu/extensions/filters/attributes"
-
-describe "Sensu::Extension::Attributes" do
-  include Helpers
-
-  before do
-    @extension = Sensu::Extension::Attributes.new
-    @extension.logger = logger
-    @extension.settings = settings
-  end
-
-  it "can determine if filter attributes match an event" do
-    attributes = {
-      :occurrences => 1
-    }
-    event = event_template
-    expect(@extension.attributes_match?(attributes, event)).to be(true)
-    event[:occurrences] = 2
-    expect(@extension.attributes_match?(attributes, event)).to be(false)
-    attributes[:occurrences] = "eval: value == 1 || value % 60 == 0"
-    event[:occurrences] = 1
-    expect(@extension.attributes_match?(attributes, event)).to be(true)
-    event[:occurrences] = 2
-    expect(@extension.attributes_match?(attributes, event)).to be(false)
-    event[:occurrences] = 120
-    expect(@extension.attributes_match?(attributes, event)).to be(true)
-  end
-
-  it "can run, filtering an event with a nonexistent filter" do
-    event = event_template
-    options = {:filter_name => "nonexistent"}
-    @extension.safe_run(event, options) do |output, status|
-      expect(output).to eq("")
-      expect(status).to eq(1)
-    end
-  end
-
-  it "can run, filtering an event with a filter" do
-    event = event_template
-    event[:client][:environment] = "development"
-    options = {:filter_name => "production"}
-    @extension.safe_run(event, options) do |output, status|
-      expect(output).to eq("")
-      expect(status).to eq(0)
-      event[:client][:environment] = "production"
-      @extension.safe_run(event, options) do |output, status|
-        expect(output).to eq("")
-        expect(status).to eq(1)
-      end
-    end
-  end
-end