rnagios 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccc2b6228857341c8852cbd7fae32795c2456a96
-  data.tar.gz: 57cc3cbe0a9d47aefb9f12d614bd33db10c18d78
+  metadata.gz: 88ca321fd55063124516f59aae279cb493116805
+  data.tar.gz: e5ab19f6e4a6d7f67697b7e8601228642e356cfa
 SHA512:
-  metadata.gz: cbbcd31d3f14a7fe2391b48c82519af9ade376dac30693b3b6dd5d9519dc5d50297c9cfd98a818069ce72acf0c75033aabdaf93e8deadb7caaddef892976e0c1
-  data.tar.gz: 93747faba10d44d4ff00c25024e1b687bbee621568dca3ad4c245a13f8ef0948450a2125247d27b97cd7b1849efbac490b71978a49b9b277884f5606a424323c
+  metadata.gz: f06b79ec7a24528f5ef3ff8c756acd93c70606c74be1e9fec1307a63625a9c0b5f9dc83a78c7bf096e8772ec22ead916482186c4104317e227a20182dd1c2f5f
+  data.tar.gz: f3239d00aa645c363c6043ff10cefbc44fabacaf52b1424c0a9fb2a14f0726693b29c130c724821c39da49bde667b0af2f5c53f5f228039a66b4852bc2c64ce5

data/lib/rnagios/plugin.rb

@@ -119,8 +119,8 @@ class Plugin
   #
   # Scripts should call this method at the very end.  The general
   # flow of a script running on UNIX/Linux should be as follows:
-  # 
-  #   class MyCheck < Nagios::Plugin
+  #
+  #   class MyCheck < Plugin
   #     def measure
   #       stat = ActiveStatus.new
   #       stat.status = <...service check code goes here, returns Nagios::Status::<constant> status...>
@@ -161,7 +161,8 @@ class Plugin
     status = measure
 
     # Mark the end time for Nagios performance stats
-    end_time = Time.now        
+    end_time = Time.now
+    time_took = end_time - start_time
 
     # Since we can't effectively check for exceptions, we make
     # sure we get a good Status
@@ -173,7 +174,7 @@ class Plugin
       raise NagiosError.new('Status passive code is invalid')
     elsif status.is_a? ActiveStatus
       if status.is_a? NscaServiceStatus
-        if !valid_passive_code? status 
+        if !valid_passive_code? status
           raise NagiosError.new('Status passive code is invalid')
         end
       elsif !valid_exit_code? status
@@ -183,13 +184,31 @@ class Plugin
       raise NagiosError.new('Status message must not be nil or empty')
     end
 
-    # Status checks out as valid -- we now format the output based on
-    # the type of Status received
+    # Status checks out as valid -- we now check the warning and critical
+    # times and format the output based on the type of Status received
     if status.is_a? NscaHostStatus
       status.message = format_passive_host_check(status)
     elsif status.is_a? NscaServiceStatus
+      if valid_value_w && valid_value_c
+        if time_took >= @w && time_took < @c && status.status != ActiveStatus::WARNING
+          status.status = ActiveStatus::WARNING
+          status.message += '; check time >= ' + @w
+        elsif time_took >= @c && status.status != ActiveStatus::CRITICAL
+          status.status = ActiveStatus::CRITICAL
+          status.message += '; check time >= ' + @c
+        end
+      end
       status.message = format_passive_service_check(status)
     else
+      if valid_value_w && valid_value_c
+        if time_took >= @w && time_took < @c && status.status != ActiveStatus::WARNING
+          status.status = ActiveStatus::WARNING
+          status.message += '; check time >= ' + @w
+        elsif time_took >= @c && status.status != ActiveStatus::CRITICAL
+          status.status = ActiveStatus::CRITICAL
+          status.message += '; check time >= ' + @c
+        end
+      end
       status.message = format_active_service_check(status, start_time, end_time)
     end
 
@@ -215,7 +234,7 @@ class Plugin
   #       message = 'Everything looks good'
   #     elsif random_measure == 2
   #       status = ActiveStatus::WARNING
-  #       message = 'Keep an eye on this service' 
+  #       message = 'Keep an eye on this service'
   #     elsif random_measure == 3
   #       status = ActiveStatus::CRITICAL
   #       message = 'There''s a problem'
@@ -369,4 +388,11 @@ private
       end
     end
 
+    def valid_value_w()
+      @w.is_a?(Integer) && @w > 0
+    end
+
+    def valid_value_c()
+      @c.is_a?(Integer) && @c > 0
+    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rnagios
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Roger A. Rubio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies: []
 description: Make your own plugins in Ruby for Nagios to run on the Nagios server
   or as NSCA plugins on remote servers.