sensu-plugins-nrpe 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cacc759dd4190c30893d69efba9887f6f3d9ada
-  data.tar.gz: 9c91ef4a04036a1682c976180928d82d17582403
+  metadata.gz: 3e47916432d40967d18de41b63599144b938009e
+  data.tar.gz: 2694ffff657bea897da2ddd51a16d3b6540b2a1e
 SHA512:
-  metadata.gz: 1e22001e13007ad2983debee1e15a333c563a65c319f59259d26354f5a79f87fd3dfce2a1a1dab72651bdca9a90cb0893678c3ab4f0f90bfc7180095f6262eec
-  data.tar.gz: cd6dcd4b7c3bd4a59729a97df65570fc541a877371de440768af6ce4931891bf09094c4453b7b07673305a51e7d006e2c972b2782096557c8aec2dff1ab8f190
+  metadata.gz: 3c99b8d6f177b466493d985bd05863678a3cd0301ba6fa5dc132ef363df16ee96095a3c7af33b4a8989b5b33204561b1e638ae9ce0ed32e31ed062dbfbf2effe
+  data.tar.gz: bd2a1df7e32a63ae356be8a6b95831b0259e29c5c2cacd820af9b3673aff299e74ee9bae4107943c422918851208d0a6ee8085fee8ce71778a6776a97c4ba500

data/CHANGELOG.md

@@ -5,6 +5,15 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## Unreleased
 
+## [0.0.2] - 2016-08-11
+
+### Fixed
+- simplify check-nrpe.rb output due to variances in different nagios plugin check results
+
+### Changed
+- move regex comment from code to header in check-nrpe.rb and metrics-nrpe.rb
+- drop obsolete comparison option
+
 ## 0.0.1 - 2016-08-03
 
 ### Added

data/bin/check-nrpe.rb

@@ -13,6 +13,9 @@
 #   check-nrpe -H host -c check_plugin -a 'plugin args'
 #   check-nrpe -H host -c check_plugin -a 'plugin args' -m "(P|p)attern to match\.?"
 #
+# NOTES:
+#   regex from https://github.com/naparuba/shinken/blob/master/shinken/misc/perfdata.py
+#
 # LICENSE:
 #   Copyright (c) 2016 Scott Saunders <scosist@gmail.com>
 #   Based on check-snmp.rb by Deepak Mohan Das   <deepakmdass88@gmail.com>
@@ -55,11 +58,6 @@ class CheckNRPE < Sensu::Plugin::Check::CLI
          short: '-m match',
          description: 'Regex pattern to match against returned buffer'
 
-  option :comparison,
-         short: '-o comparison operator',
-         description: 'Operator used to compare data with warning/critial values. Can be set to "le" (<=), "ge" (>=).',
-         default: 'ge'
-
   def run
     begin
       request = Nrpeclient::CheckNrpe.new({:host=> "#{config[:host]}", :port=> "#{config[:port]}", :ssl=> config[:ssl]})
@@ -69,11 +67,6 @@ class CheckNRPE < Sensu::Plugin::Check::CLI
     rescue => e
       unknown "An unknown error occured: #{e.inspect}"
     end
-    operators = { 'le' => :<=, 'ge' => :>= }
-    symbol = operators[config[:comparison]]
-    criticals = []
-    warnings = []
-    okays = []
 
     if config[:match]
       if response.buffer.to_s =~ /#{config[:match]}/
@@ -82,24 +75,17 @@ class CheckNRPE < Sensu::Plugin::Check::CLI
         critical "Buffer: #{response.buffer} failed to match Pattern: #{config[:match]}"
       end
     else
-      perfdata = response.buffer.split('|')[1].scan(/([^=]+=\S+)/)
-      # regex from https://github.com/naparuba/shinken/blob/master/shinken/misc/perfdata.py
-      perfdata.each do |pd|
-        metric = /^([^=]+)=([\d\.\-\+eE]+)([\w\/%]*);?([\d\.\-\+eE:~@]+)?;?([\d\.\-\+eE:~@]+)?;?([\d\.\-\+eE]+)?;?([\d\.\-\+eE]+)?;?\s*/.match(pd[0]) # rubocop:disable LineLength
-        criticals << "Critical state detected for #{config[:check]} on #{metric[1].strip}, value: #{metric[2].to_f}#{metric[3].strip}." if "#{metric[2]}".to_f.send(symbol, "#{metric[5]}".to_f)
-        # #YELLOW
-        warnings << "Warning state detected for #{config[:check]} on #{metric[1].strip}, value: #{metric[2].to_f}#{metric[3].strip}." if ("#{metric[2]}".to_f.send(symbol, "#{metric[4]}".to_f)) && !("#{metric[2]}".to_f.send(symbol, "#{metric[5]}".to_f)) # rubocop:disable LineLength
-        unless "#{metric[2]}".to_f.send(symbol, "#{metric[4]}".to_f)
-          okays << "All is well for #{config[:check]} on #{metric[1].strip}, value: #{metric[2].to_f}#{metric[3].strip}."
-        end
-      end
-      unless criticals.empty?
-        critical criticals.join(' ')
-      end
-      unless warnings.empty?
-        warning warnings.join(' ')
+      response_captures = response.buffer.scan(/[A-Z ]*?([A-Z]+)\s?[:-]{1}\s(.*)/)
+      response_status = response_captures[0][0].downcase
+      response_data = response_captures[0][1]
+      case response_status
+      when "critical"
+        critical response_data
+      when "warning"
+        warning response_data
+      else
+        ok response_data
       end
-      ok okays.join(' ')
     end
   end
 end

data/bin/metrics-nrpe.rb

@@ -11,6 +11,9 @@
 # USAGE:
 #   check-nrpe -H host -c check_plugin -a 'plugin args' -p prefix -s suffix
 #
+# NOTES:
+#   regex from https://github.com/naparuba/shinken/blob/master/shinken/misc/perfdata.py
+#
 # LICENSE:
 #   Copyright (c) 2016 Scott Saunders <scosist@gmail.com>
 #   Based on metrics-snmp.rb by Double Negative Limited
@@ -74,7 +77,6 @@ class NRPEGraphite < Sensu::Plugin::Metric::CLI::Graphite
     end
     config[:host] = config[:host].gsub('.', '_') if config[:graphite]
     perfdata = response.buffer.split('|')[1].scan(/([^=]+=\S+)/)
-    # regex from https://github.com/naparuba/shinken/blob/master/shinken/misc/perfdata.py
     perfdata.each do |pd|
       metric = /^([^=]+)=([\d\.\-\+eE]+)([\w\/%]*);?([\d\.\-\+eE:~@]+)?;?([\d\.\-\+eE:~@]+)?;?([\d\.\-\+eE]+)?;?([\d\.\-\+eE]+)?;?\s*/.match(pd[0]) # rubocop:disable LineLength
       if config[:prefix]

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

@@ -2,7 +2,7 @@ module SensuPluginsNrpe
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 1
+    PATCH = 2
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-nrpe
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin