sensu-plugins-sensu 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2a48f5448ae128816efb0bcc6435d5cae5670a7
-  data.tar.gz: f31f95bbf5a84e793ea767e23787f408ae241a90
+  metadata.gz: 2870929cd3cd4f899088cb6ec55104e76807d063
+  data.tar.gz: 3e346d7facc6bf08e84d1993a40e1d4e1345faad
 SHA512:
-  metadata.gz: 975c86c23b6a520a7589520577fb69cc174fc790d80f1fe18d84054f52ecda966c6be7ee02d7cbb67d57695cb70f1a06e55aea7255226f81e9bdc2e1f9730704
-  data.tar.gz: 9eb37672b302b8ec703f9074effe22c6f5b508708acd624ee3953c56b01d713e05bda461d2932e460835f88916918416fff3dc4b0fe85634eef6c01a675396d7
+  metadata.gz: a90af312010e2d9ba78c824d54c64f3fd50918d1d647a1601cd221b31b2cd92e6a5448271df7ab57503048316e1ff1cd5365a1fb8555d93abf5aca56b2ec649e
+  data.tar.gz: 40800095ddbdcd9559a2b8411094a841f4295884bec1ea137ec6bde7d4ce77f7753d7511c1f297f475448c50b9c9653024bbe11d899447b40e36af6306f7a4e5

data/CHANGELOG.md

@@ -5,6 +5,16 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [2.0.0] - 2017-08-20
+### Breaking Changes
+- check-aggregates.rb: Changed the default behaviour to alert with the severity of the aggregated checks.
+
+### Added
+- check-aggregates.rb: Added new flag to ignore severities. If --ignore-severity is supplied all non-ok will count for critical, critical_count, warning and warning_count option.
+
+### Fixed
+- handler-sensu-deregister.rb: Fix undefined variable in case of API error.
+
 ## [1.1.1] - 2017-08-01
 ### Added
 - Ruby 2.4 testing (@Evesy)
@@ -55,6 +65,7 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - initial release
 
 [Unreleased]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/1.1.1...HEAD
+[2.0.0]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/1.1.1...2.0.0
 [1.1.1]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/1.1.0...1.1.1
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/0.1.0...1.0.0

data/bin/check-aggregate.rb

@@ -88,23 +88,23 @@ class CheckAggregate < Sensu::Plugin::Check::CLI
   option :warning,
          short: '-W PERCENT',
          long: '--warning PERCENT',
-         description: 'PERCENT non-ok before warning',
+         description: 'PERCENT warning before warning (can be change with --ignore-severity)',
          proc: proc(&:to_i)
 
   option :warning_count,
          long: '--warning_count INTEGER',
-         description: 'number of nodes in warning before warning',
+         description: 'number of nodes in warning before warning (can be change with --ignore-severity)',
          proc: proc(&:to_i)
 
   option :critical,
          short: '-C PERCENT',
          long: '--critical PERCENT',
-         description: 'PERCENT non-ok before critical',
+         description: 'PERCENT critical before critical (can be change with --ignore-severity)',
          proc: proc(&:to_i)
 
   option :critical_count,
          long: '--critical_count INTEGER',
-         description: 'number of node in critical before critical',
+         description: 'number of node in critical before critical (can be change with --ignore-severity)',
          proc: proc(&:to_i)
 
   option :pattern,
@@ -124,6 +124,12 @@ class CheckAggregate < Sensu::Plugin::Check::CLI
          long: '--message MESSAGE',
          description: 'A custom error MESSAGE'
 
+  option :ignore_severity,
+         long: '--ignore-severity',
+         description: 'Ignore severities, all non-ok will count for critical, critical_count, warning and warning_count option',
+         boolean: true,
+         default: false
+
   def api_request(resource)
     verify_mode = OpenSSL::SSL::VERIFY_PEER
     verify_mode = OpenSSL::SSL::VERIFY_NONE if config[:insecure]
@@ -209,21 +215,25 @@ class CheckAggregate < Sensu::Plugin::Check::CLI
   end
 
   def compare_thresholds(aggregate)
-    percent_non_zero = (100 - (aggregate[:ok].to_f / aggregate[:total].to_f) * 100).to_i
-    message = ''
-    if aggregate[:outputs]
-      aggregate[:outputs].each do |output, count|
-        message << "\n" + output.to_s if count == 1
+    message = config[:message] || 'Number of non-zero results exceeds threshold'
+    message += ' (%d%% %s)'
+    message += "\n" + aggregate[:outputs] if aggregate[:outputs]
+
+    if config[:ignore_severity]
+      percent_non_zero = (100 - (aggregate[:ok].to_f / aggregate[:total].to_f) * 100).to_i
+      if config[:critical] && percent_non_zero >= config[:critical]
+        critical format(message, percent_non_zero, 'non-zero')
+      elsif config[:warning] && percent_non_zero >= config[:warning]
+        warning format(message, percent_non_zero, 'non-zero')
       end
     else
-      message = config[:message] || 'Number of non-zero results exceeds threshold'
-      message += " (#{percent_non_zero}% non-zero)"
-    end
-
-    if config[:critical] && percent_non_zero >= config[:critical]
-      critical message
-    elsif config[:warning] && percent_non_zero >= config[:warning]
-      warning message
+      percent_warning = (aggregate[:warning].to_f / aggregate[:total].to_f * 100).to_i
+      percent_critical = (aggregate[:critical].to_f / aggregate[:total].to_f * 100).to_i
+      if config[:critical] && percent_critical >= config[:critical]
+        critical format(message, percent_critical, 'critical')
+      elsif config[:warning] && percent_warning >= config[:warning]
+        warning format(message, percent_warning, 'warning')
+      end
     end
   end
 
@@ -247,21 +257,26 @@ class CheckAggregate < Sensu::Plugin::Check::CLI
   end
 
   def compare_thresholds_count(aggregate)
-    number_of_nodes_reporting_down = aggregate[:total].to_i - aggregate[:ok].to_i
-    message = ''
-    if aggregate[:outputs]
-      aggregate[:outputs].each do |output, count|
-        message << "\n" + output.to_s if count == 1
+    message = config[:message] || 'Number of nodes down exceeds threshold'
+    message += " (%s out of #{aggregate[:total]} nodes reporting %s)"
+    message += "\n" + aggregate[:outputs] if aggregate[:outputs]
+
+    if config[:ignore_severity]
+      number_of_nodes_reporting_down = aggregate[:total].to_i - aggregate[:ok].to_i
+      if config[:critical_count] && number_of_nodes_reporting_down >= config[:critical_count]
+        critical format(message, number_of_nodes_reporting_down, 'not ok')
+      elsif config[:warning_count] && number_of_nodes_reporting_down >= config[:warning_count]
+        warning format(message, number_of_nodes_reporting_down, 'not ok')
       end
     else
-      message = config[:message] || 'Number of nodes down exceeds threshold'
-      message += " (#{number_of_nodes_reporting_down} out of #{aggregate[:total]} nodes reporting not ok)"
-    end
+      nodes_reporting_warning = aggregate[:warning].to_i
+      nodes_reporting_critical = aggregate[:critical].to_i
 
-    if config[:critical_count] && number_of_nodes_reporting_down >= config[:critical_count]
-      critical message
-    elsif config[:warning_count] && number_of_nodes_reporting_down >= config[:warning_count]
-      warning message
+      if config[:critical_count] && nodes_reporting_critical >= config[:critical_count]
+        critical format(message, nodes_reporting_critical, 'critical')
+      elsif config[:warning_count] && nodes_reporting_warning >= config[:warning_count]
+        warning format(message, nodes_reporting_warning, 'warning')
+      end
     end
   end
 

data/lib/sensu-plugins-sensu/version.rb

@@ -1,9 +1,9 @@
 module SensuPluginsSensu
   # This defines the version of the gem
   module Version
-    MAJOR = 1
-    MINOR = 1
-    PATCH = 1
+    MAJOR = 2
+    MINOR = 0
+    PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-sensu
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2017-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin