elesai 0.10.11 → 0.11.0

data/lib/elesai/action/check.rb

@@ -9,7 +9,7 @@ module Elesai; module Action
     include Senedsa
 
     def initialize(arguments,options)
-      @options = options.merge!({ :monitor => :nagios, :mode => :active })
+      @options = options.merge!({ :monitor => :nagios, :mode => :active, :diskcachepolicy => nil })
       @arguments = []
       @lsi = nil
 
@@ -17,11 +17,13 @@ module Elesai; module Action
       opts.banner = "Usage: #{ID} [options] check [check_options]"
       opts.separator ""
       opts.separator "Check Options"
-      opts.on('-M', '--monitor [nagios]',            [:nagios],            "Monitoring system")                                 { |o| @options[:monitor]        = o }
-      opts.on('-m', '--mode [active|passive]',       [:active, :passive],  "Monitoring mode")                                   { |o| @options[:mode]           = o }
-      opts.on('-H', '--nsca_hostname HOSTNAME',      String,               "NSCA hostname to send passive checks")              { |o| @options[:nsca_hostame]   = o }
-      opts.on('-c', '--config CONFIG',               String,               "Path to Senedsa (send_nsca) configuration" )        { |o| @options[:senedsa_config] = o }
-      opts.on('-S', '--svc_descr SVC_DESR',          String,               "Nagios service description")                        { |o| @options[:svc_descr]      = o }
+      opts.on('--hotspare MIN',                      Integer,              "Minimum number of hotspares")                       { |o| @options[:hotspare]        = o }
+      opts.on('--diskcachepolicy DISKCACHEPOLICY',   String,               "Disk cache policy/Disk Write Cache checks")         { |o| @options[:diskcachepolicy] = o }
+      opts.on('-M', '--monitor [nagios]',            [:nagios],            "Monitoring system")                                 { |o| @options[:monitor]         = o }
+      opts.on('-m', '--mode [active|passive]',       [:active, :passive],  "Monitoring mode")                                   { |o| @options[:mode]            = o }
+      opts.on('-H', '--nsca_hostname HOSTNAME',      String,               "NSCA hostname to send passive checks")              { |o| @options[:nsca_hostame]    = o }
+      opts.on('-c', '--config CONFIG',               String,               "Path to Senedsa (send_nsca) configuration" )        { |o| @options[:senedsa_config]  = o }
+      opts.on('-S', '--svc_descr SVC_DESR',          String,               "Nagios service description")                        { |o| @options[:svc_descr]       = o }
       opts.order!(arguments)
 
       options_valid?
@@ -34,6 +36,8 @@ module Elesai; module Action
       plugin_output = ""
       plugin_status = ""
 
+      hotspare = 0
+
       @lsi.physicaldrives.each do |id,physicaldrive|
         drive_plugin_string = "[PD:#{physicaldrive._id}:#{physicaldrive[:size]}:#{physicaldrive[:mediatype]}:#{physicaldrive[:pdtype]}]"
         unless physicaldrive[:firmwarestate].state == :online or physicaldrive[:firmwarestate].state == :hotspare
@@ -49,15 +53,25 @@ module Elesai; module Action
           plugin_output += " #{drive_plugin_string}:PredictiveFailure:#{physicaldrive[:predictivefailurecount]}"
           plugin_status = :warning if plugin_status.empty?
         end
+        hotspare += 1 if physicaldrive[:firmwarestate].state == :hotspare
+      end
+
+      if hotspare < @options[:hotspare].to_i
+        plugin_status = :warning unless plugin_status == :critical
+        plugin_output += " hotspare low watermark (require #{@options[:hotspare]}, have #{hotspare})"
       end
 
       @lsi.virtualdrives.each do |vd|
         vd_plugin_string = "[VD:#{vd._id}]"
+        if @options[:diskcachepolicy] and vd[:diskcachepolicy] != @options[:diskcachepolicy]
+          plugin_output += " #{vd_plugin_string}:diskcachepolicy is not #{@options[:diskcachepolicy]}"
+          plugin_status = :warning
+        end
         case vd[:state]
           when :offline, :failed
             plugin_output += " #{vd_plugin_string}:#{vd[:state]}"
             plugin_status = :critical
-          when :partialdegraded, :degraded
+          when :partially_degraded, :degraded
             plugin_output += " #{vd_plugin_string}:#{vd[:state]}"
             plugin_status = :warning if plugin_status != :critical
           when :optimal
@@ -66,6 +80,10 @@ module Elesai; module Action
             plugin_status = :unknown
             plugin_output += " #{vd_plugin_string}:#{vd[:state]}"
         end
+        unless vd[:currentcachepolicy] =~ /^WriteBack/ and @lsi.bbus[0][:firmwarestatus][:learncycleactive] != 'Yes'
+          plugin_status = :warning
+          plugin_output += " #{vd_plugin_string}:(not in writeback mode)"
+        end
       end
 
       @lsi.bbus.each do |bbu|
@@ -87,21 +105,23 @@ module Elesai; module Action
         end
 
         if bbu[:batterytype] == 'iBBU'
-          if bbu[:firmwarestatus][:learncycleactive] == 'Yes'
-            plugin_output += " learn cycle enabled: [BBU:absolutestateofcharge:#{bbu[:gasgaugestatus][:absolutestateofcharge]}]"
+          if bbu[:batterystate] != 'Operational'
+            plugin_output += " [BBU:#{bbu._id}:batterystate:#{bbu[:batterystate]}]"
+            plugin_status = :warning
           else
-            unless bbu[:firmwarestatus][:voltage] == 'OK'
-              plugin_output += " [BBU:#{bbu._id}:voltage:#{bbu[:firmwarestatus][:voltage]}]"
-              plugin_status = :warning if plugin_status == ""
-            end
-            if bbu[:firmwarestatus][:chargingstatus] == 'None' or bbu[:gasgaugestatus][:discharging] == 'No'
-              if bbu[:gasgaugestatus][:absolutestateofcharge].number <= 50
-                plugin_output += " [BBU:absolutestateofcharge:#{bbu[:gasgaugestatus][:absolutestateofcharge]}]"
-                plugin_status = :warning if plugin_status == ""
+            if bbu[:firmwarestatus][:learncycleactive] == 'Yes'
+              plugin_output += " learn cycle enabled: [BBU:absolutestateofcharge:#{bbu[:gasgaugestatus][:absolutestateofcharge]}]"
+            else
+              unless bbu[:firmwarestatus][:voltage] == 'OK'
+                plugin_output += " [BBU:#{bbu._id}:voltage:#{bbu[:firmwarestatus][:voltage]}]"
+                plugin_status = :warning if plugin_status == ''
               end
-              if bbu[:capacityinfo][:remainingcapacity].number <= bbu[:capacityinfo][:remainingcapacityalarm].number
-                plugin_output += " [BBU:remainingcapacity:#{bbu[:capacityinfo][:remainingcapacityalarm]}]"
-                plugin_status = :warning if plugin_status == ""
+              remainingcapacity = bbu[:capacityinfo][:remainingcapacity].number
+              designcapacity = bbu[:designinfo][:designcapacity].number
+              bbupercent = (remainingcapacity.to_f / designcapacity.to_f) * 100
+              if bbupercent < 70
+                plugin_output += " [BBU: #{bbupercent.to_i} percent of original capacity remaining]"
+                plugin_status = :warning if plugin_status == ''
               end
             end
           end
@@ -109,8 +129,13 @@ module Elesai; module Action
       end
 
       if plugin_output.empty? and plugin_status.empty?
-        @lsi.adapters.each do |adapter|
-          plugin_output += " [#{adapter._id}: #{adapter[:versions][:productname].gsub(/\s+/,'_')} OK]"
+        if @lsi.adapters.empty?
+          plugin_status = :warning
+          plugin_output = 'no adapters found'
+        else
+          @lsi.adapters.each do |adapter|
+            plugin_output += " [#{adapter._id}: #{adapter[:versions][:productname].gsub(/\s+/,'_')} OK]"
+          end
         end
       end
       plugin_status = :ok if plugin_status.empty?

data/lib/elesai/cli.rb

@@ -64,7 +64,7 @@ module Elesai
         opts.on('-V', '--version',                                             "Display #{ID} version")                              { output_message VERSION, 0 }
         opts.on_tail('--help',                                                 "Show this message")                                  { @options[:HELP] = true }
 
-        opts.order!(@arguments)
+        opts.order!(@arguments) unless @whoami == :check_lsi
         output_message opts, 0 if (@arguments.size == 0 and @whoami != :check_lsi) or @options[:HELP]
 
         @action = @whoami == :check_lsi ? :check : @arguments.shift.to_sym

data/lib/elesai/megacli/megacli.rb

@@ -163,7 +163,7 @@ module Elesai; module Megacli
           v = v.scan(/[A-Z]/).join
         when :inquirydata
           v = v.gsub(/\s+/,' ')
-        when :relativedtateofcharge, :absolutestateofcharge, :remainingcapacityalarm, :remainingcapacity
+        when :relativestateofcharge, :absolutestateofcharge, :remainingcapacity, :designcapacity # :remainingcapacityalarm is treated a plain string
           m = /(?<number>[0-9\.]+)\s+(?<unit>[A-Za-z%]+)/.match(v)
           v = LSI::BBU::NumberUnit.new(m[:number].to_f,m[:unit])
       end

data/lib/elesai/version.rb

@@ -1,3 +1,3 @@
 module Elesai
-  VERSION = "0.10.11"
+  VERSION = '0.11.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elesai
 version: !ruby/object:Gem::Version
-  version: 0.10.11
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workflow