sensu-plugin 1.4.7 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ee4157c3228691cda625cfbcf332338f27830c1
-  data.tar.gz: 197b857efa2675e3b64780688853c73f08e08c51
+  metadata.gz: e3baa8a659398d40bd3ee8ae30f9ce2fe69078eb
+  data.tar.gz: 802b2d8ab27edc4ca6834d2cf33b2ad0ece76b6e
 SHA512:
-  metadata.gz: 292668bb594aa82898675e6012c1f12d284c4a9cf7086562c57787ca1545d3a7eec2cee9e5a24ab51a22fe5d520befa9e5639310cd882889a13ef663243901e6
-  data.tar.gz: f560e992ac333a3b973a06bb06beef32cd1a332a62cf374ae38e607a985be396d9d987a0b821ca9f877e897d66bf1a5fd3b02d1f9cd14e29372b2d3139f33d91
+  metadata.gz: 826f3b874c986cce0e3923293a93bc4a612872496afb9ad4e75a997c6fadbdbc33c935d7bbc49fc12ae752677141b544ef7763079455b39941c8d6777808b4c3
+  data.tar.gz: 5299d3bd34f0fb9588d23f83a8d4666833defa5571aaa5d090556905dbff601ca43ccea8b8770155921588539375bd4891c67e77b8d5d3cd6e37aed32479e4ee

data/lib/sensu-handler.rb

@@ -42,28 +42,13 @@ module Sensu
       end
     end
 
-    # 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?
-      if deprecated_filtering_globally_disabled?
-        return false
-      else
-        @event['check']['enable_deprecated_filtering'].nil? || \
-        @event['check']['enable_deprecated_filtering'].to_s == "true"
-      end
+      @event['check'].fetch('enable_deprecated_filtering', false).to_s == "true"
     end
 
     # Evaluates whether the event should be processed by the
@@ -72,8 +57,7 @@ module Sensu
     #
     # @return [TrueClass, FalseClass]
     def deprecated_occurrence_filtering_enabled?
-      @event['check']['enable_deprecated_occurrence_filtering'].nil? || \
-      @event['check']['enable_deprecated_occurrence_filtering'].to_s == "true"
+      @event['check'].fetch('enable_deprecated_occurrence_filtering', false).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.7"
+    VERSION = "2.0.0"
     EXIT_CODES = {
       'OK'       => 0,
       'WARNING'  => 1,

data/lib/sensu-plugin/cli.rb

@@ -60,11 +60,11 @@ module Sensu
             exit e.status
           rescue OptionParser::InvalidOption => e
             puts "Invalid check argument(s): #{e.message}, #{e.backtrace}"
-            exit 1
+            exit 3
           rescue Exception => e
             # This can't call check.critical, as the check may have failed to construct
             puts "Check failed to run: #{e.message}, #{e.backtrace}"
-            exit 2
+            exit 3
           end
           check.warning "Check did not exit! You should call an exit code method."
         end

data/test/external_check_test.rb

@@ -39,7 +39,7 @@ class TestCheckExternal < MiniTest::Test
 
   def test_exception
     output = run_script '-f'
-    assert $?.exitstatus == 2 && output.include?('failed')
+    assert $?.exitstatus == 3 && output.include?('failed')
   end
 
   def test_argv
@@ -49,7 +49,7 @@ class TestCheckExternal < MiniTest::Test
 
   def test_bad_commandline
     output = run_script '--doesnotexist'
-    assert $?.exitstatus == 1 && output.include?('doesnotexist') && output.include?('invalid option')
+    assert $?.exitstatus == 3 && output.include?('doesnotexist') && output.include?('invalid option')
   end
 
   def test_bad_require

data/test/handle_filter_test.rb

@@ -11,7 +11,12 @@ class TestFilterExternal < MiniTest::Test
   def test_create_not_enough_occurrences
     event = {
       'client' => { 'name' => 'test' },
-      'check' => { 'name' => 'test', 'occurrences' => 2 },
+      'check' => {
+        'name' => 'test',
+        'occurrences' => 2,
+        'enable_deprecated_filtering' => true,
+        'enable_deprecated_occurrence_filtering' => true
+      },
       'occurrences' => 1,
       'action' => 'create'
     }
@@ -23,7 +28,12 @@ class TestFilterExternal < MiniTest::Test
   def test_create_enough_occurrences
     event = {
       'client' => { 'name' => 'test' },
-      'check' => { 'name' => 'test', 'occurrences' => 2 },
+      'check' => {
+        'name' => 'test',
+        'occurrences' => 2,
+        'enable_deprecated_filtering' => true,
+        'enable_deprecated_occurrence_filtering' => true
+      },
       'occurrences' => 2,
       'action' => 'create'
     }
@@ -35,7 +45,12 @@ class TestFilterExternal < MiniTest::Test
   def test_resolve_not_enough_occurrences
     event = {
       'client' => { 'name' => 'test' },
-      'check' => { 'name' => 'test', 'occurrences' => 2 },
+      'check' => {
+        'name' => 'test',
+        'occurrences' => 2,
+        'enable_deprecated_filtering' => true,
+        'enable_deprecated_occurrence_filtering' => true
+      },
       'occurrences' => 1,
       'action' => 'resolve'
     }
@@ -47,7 +62,11 @@ class TestFilterExternal < MiniTest::Test
   def test_resolve_enough_occurrences
     event = {
       'client' => { 'name' => 'test' },
-      'check' => { 'name' => 'test', 'occurrences' => 2 },
+      'check' => {
+        'name' => 'test',
+        'occurrences' => 2,
+        'enable_deprecated_filtering' => true
+      },
       'occurrences' => 2,
       'action' => 'resolve'
     }
@@ -59,7 +78,11 @@ class TestFilterExternal < MiniTest::Test
   def test_refresh_enough_occurrences
     event = {
       'client' => { 'name' => 'test' },
-      'check' => { 'name' => 'test' },
+      'check' => {
+        'name' => 'test',
+        'enable_deprecated_filtering' => true,
+        'enable_deprecated_occurrence_filtering' => true
+      },
       'occurrences' => 61,
       'action' => 'create'
     }
@@ -71,7 +94,11 @@ class TestFilterExternal < MiniTest::Test
   def test_refresh_not_enough_occurrences
     event = {
       'client' => { 'name' => 'test' },
-      'check' => { 'name' => 'test' },
+      'check' => {
+        'name' => 'test',
+        'enable_deprecated_filtering' => true,
+        'enable_deprecated_occurrence_filtering' => true
+      },
       'occurrences' => 60,
       'action' => 'create'
     }
@@ -107,7 +134,11 @@ class TestFilterExternal < MiniTest::Test
   def test_dependency_event_exists
     event = {
       'client' => { 'name' => 'test' },
-      'check' => { 'name' => 'test', 'dependencies' => ['foo', 'bar'] },
+      'check' => {
+        'name' => 'test',
+        'dependencies' => ['foo', 'bar'],
+        'enable_deprecated_filtering' => true
+      },
       'occurrences' => 1
     }
     output = run_script_with_input(JSON.generate(event))
@@ -119,7 +150,7 @@ class TestFilterExternal < MiniTest::Test
     'warning: event filtering in sensu-plugin is deprecated, see http://bit.ly/sensu-plugin'
   end
 
-  def test_filter_deprecation_warning_exists_by_default
+  def test_filter_deprecation_warning_is_not_present_by_default
     event = {
       'client' => { 'name' => 'test' },
       'check' => { 'name' => 'test', 'refresh' => 30 },
@@ -128,7 +159,7 @@ class TestFilterExternal < MiniTest::Test
     }
     output = run_script_with_input(JSON.generate(event))
     assert_equal(0, $?.exitstatus)
-    assert_match(/#{filter_deprecation_string}/, output)
+    refute_match(/#{filter_deprecation_string}/, output)
   end
 
   def test_filter_deprecation_warning_exists_when_explicitly_enabled
@@ -184,7 +215,7 @@ class TestFilterExternal < MiniTest::Test
     'warning: occurrence filtering in sensu-plugin is deprecated, see http://bit.ly/sensu-plugin'
   end
 
-  def test_occurrence_filter_deprecation_warning_exists_by_default
+  def test_occurrence_filter_deprecation_warning_not_present_by_default
     event = {
       'client' => { 'name' => 'test' },
       'check' => { 'name' => 'test', 'refresh' => 30 },
@@ -193,15 +224,16 @@ class TestFilterExternal < MiniTest::Test
     }
     output = run_script_with_input(JSON.generate(event))
     assert_equal(0, $?.exitstatus)
-    assert_match(/#{occurrence_filter_deprecation_string}/, output)
+    refute_match(/#{occurrence_filter_deprecation_string}/, output)
   end
 
-  def test_occurrence_filter_deprecation_warning_exists_when_explicitly_enabled
+  def test_occurrence_filter_deprecation_warning_present_when_explicitly_enabled
     event = {
       'client' => { 'name' => 'test' },
       'check' => {
         'name' => 'test',
         'refresh' => 30,
+        'enable_deprecated_filtering' => true,
         'enable_deprecated_occurrence_filtering' => true
       },
       'occurrences' => 60,
@@ -212,12 +244,13 @@ class TestFilterExternal < MiniTest::Test
     assert_match(/#{occurrence_filter_deprecation_string}/, output)
   end
 
-  def test_occurrence_filter_deprecation_warning_does_not_exist_when_explicitly_disabled
+  def test_occurrence_filter_deprecation_warning_not_present_when_explicitly_disabled
     event = {
       'client' => { 'name' => 'test' },
       'check' => {
         'name' => 'unfiltered test',
         'refresh' => 30,
+        'enable_deprecated_filtering' => true,
         'enable_deprecated_occurrence_filtering' => false
       },
       'occurrences' => 60,

data/test/test_helper.rb

@@ -1,5 +1,4 @@
 require 'rubygems'
-gem 'minitest' if RUBY_VERSION < '1.9.0'
 require 'minitest/autorun'
 
 module SensuPluginTestHelper

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugin
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 2.0.0
 platform: ruby
 authors:
 - Decklin Foster
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-20 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -29,16 +29,16 @@ dependencies:
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -101,9 +101,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -111,17 +111,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Sensu Plugins
 test_files:
+- test/deep_merge_test.rb
 - test/external_check_test.rb
-- test/handle_helper_test.rb
+- test/external_handler_argument_test.rb
+- test/external_handler_test.rb
 - test/external_metric_test.rb
 - test/handle_filter_test.rb
-- test/deep_merge_test.rb
+- test/handle_helper_test.rb
 - test/mutator_test.rb
 - test/test_helper.rb
-- test/external_handler_argument_test.rb
-- test/external_handler_test.rb