sensu-plugin 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a04e3d35dcd589036160b24040b8a6ec4d35f4f7
-  data.tar.gz: 009d80cc7864e9e83770e085cf86b466526d8be1
+  metadata.gz: 199e68bec79e47836d7e573bb0fc039261a0c2d1
+  data.tar.gz: 1a45e9b8588e9b731bae15a330a6f292253911d7
 SHA512:
-  metadata.gz: 7c4d8da32fe8006478ea1bd6bcf415547bbf5ce99699cdd4b085bc313a01b88930ed9a7ce97a28b3b614333ff21b593b297572e5d18b0f80585f30009ff0ab22
-  data.tar.gz: 94cbaef69b207ba420b02b7c1de2d2bbb6e7e6c235ab8d6074d0fee430148e9174892b518ec27fea6ae2a7bf9dd0a23bcbca78990e9382a5b053dfc82689df42
+  metadata.gz: 4202e7fe226e1103a6f1f99e60cc3ef6538aab9e6736928330e49d3699ad66f9f1dadd34c8fccd4903650c35655445d3d6121607b89578bbbcb934e8fcc5a93b
+  data.tar.gz: a0addd66de1c4688a9af53ac93a931c2e4805cb63abdf260e34faeab3a2dd5dc74a4b91fbd4908baf85203724b7f84118b5c07ad654d1c48604db2f51810204f

data/lib/sensu-handler.rb

@@ -42,20 +42,38 @@ module Sensu
       end
     end
 
-    # Evaluates whether the event should be processed by any of the filter methods in
-    # this library. Defaults to true (i.e. deprecated filters are run by default.)
+    # Evaluates whether deprecated filtering is explicitly disabled
+    # via global Sensu configuration. Defaults to false,
+    # i.e. deprecated filters are run by default.
+    #
+    # @return [TrueClass, FalseClass]
+    def deprecated_filtering_globally_disabled?
+      global_settings = settings.fetch('sensu_plugin', {})
+      global_settings['disable_deprecated_filtering'].to_s == "true"
+    end
+
+    # Evaluates whether the event should be processed by any of the
+    # filter methods in this library. Defaults to true,
+    # i.e. deprecated filters are run by default.
     #
     # @return [TrueClass, FalseClass]
     def deprecated_filtering_enabled?
-      @event['check']['enable_deprecated_filtering'].nil? || @event['check']['enable_deprecated_filtering'] == true
+      if deprecated_filtering_globally_disabled?
+        return false
+      else
+        @event['check']['enable_deprecated_filtering'].nil? || \
+        @event['check']['enable_deprecated_filtering'].to_s == "true"
+      end
     end
 
-    # Evaluates whether the event should be processed by the filter_repeated method. Defaults to true (i.e.
-    # filter_repeated will filter events by default)
+    # Evaluates whether the event should be processed by the
+    # filter_repeated method. Defaults to true, i.e. filter_repeated
+    # will filter events by default.
     #
     # @return [TrueClass, FalseClass]
     def deprecated_occurrence_filtering_enabled?
-      @event['check']['enable_deprecated_occurrence_filtering'].nil? || @event['check']['enable_deprecated_occurrence_filtering'] == true
+      @event['check']['enable_deprecated_occurrence_filtering'].nil? || \
+      @event['check']['enable_deprecated_occurrence_filtering'].to_s == "true"
     end
 
     # This works just like Plugin::CLI's autorun.

data/lib/sensu-plugin.rb

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

data/test/handle_filter_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'tempfile'
 
 class TestFilterExternal < MiniTest::Test
   include SensuPluginTestHelper
@@ -158,6 +159,27 @@ class TestFilterExternal < MiniTest::Test
     refute_match(/#{filter_deprecation_string}/, output)
   end
 
+  def test_filter_deprecation_warning_does_not_exist_when_globaly_disabled
+    event = {
+      'client' => { 'name' => 'test' },
+      'check' => {
+        'name' => 'globaly unfiltered test',
+        'refresh' => 30
+      },
+      'occurrences' => 60,
+      'action' => 'create',
+    }
+
+    settings_file = Tempfile.new('global_filter_disable')
+    settings_file.write('{"sensu_plugin": { "disable_deprecated_filtering": true }}')
+    settings_file.close
+    ENV['SENSU_CONFIG_FILES'] = settings_file.path
+    output = run_script_in_env_with_input(JSON.generate(event), ENV)
+    ENV['SENSU_CONFIG_FILES'] = nil
+    assert_equal(0, $?.exitstatus)
+    refute_match(/#{filter_deprecation_string}/, output)
+  end
+
   def occurrence_filter_deprecation_string
     'warning: occurrence filtering in sensu-plugin is deprecated, see http://bit.ly/sensu-plugin'
   end

data/test/test_helper.rb

@@ -21,6 +21,14 @@ module SensuPluginTestHelper
     end
   end
 
+  def run_script_in_env_with_input(input, env, *args)
+    IO.popen(env, ([@script] + args).join(' '), 'r+') do |child|
+      child.puts input
+      child.close_write
+      child.read
+    end
+  end
+
   def fixture_path
     File.expand_path('../fixtures', __FILE__)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugin
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Decklin Foster
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json