elesai 0.10.5 → 0.10.11

data/lib/elesai/action/check.rb

@@ -38,8 +38,8 @@ module Elesai; module Action
         drive_plugin_string = "[PD:#{physicaldrive._id}:#{physicaldrive[:size]}:#{physicaldrive[:mediatype]}:#{physicaldrive[:pdtype]}]"
         unless physicaldrive[:firmwarestate].state == :online or physicaldrive[:firmwarestate].state == :hotspare
           plugin_output += " #{drive_plugin_string}:#{physicaldrive[:firmwarestate].state}"
-          plugin_status = :critical if physicaldrive[:firmwarestate] == :failed
-          plugin_status = :warning if plugin_status.empty?
+          plugin_status = :critical if physicaldrive[:firmwarestate].state == :failed
+          plugin_status = :warning if  physicaldrive[:firmwarestate].state == :rebuild and plugin_status != :critical
         end
         unless physicaldrive[:mediaerrorcount].to_i < 10
           plugin_output += " #{drive_plugin_string}:MediaError:#{physicaldrive[:mediaerrorcount]}"
@@ -53,19 +53,30 @@ module Elesai; module Action
 
       @lsi.virtualdrives.each do |vd|
         vd_plugin_string = "[VD:#{vd._id}]"
-        unless vd[:state] == :optimal
-          plugin_output += " #{vd_plugin_string}:#{vd[:state]}"
-          plugin_status = :critical
+        case vd[:state]
+          when :offline, :failed
+            plugin_output += " #{vd_plugin_string}:#{vd[:state]}"
+            plugin_status = :critical
+          when :partialdegraded, :degraded
+            plugin_output += " #{vd_plugin_string}:#{vd[:state]}"
+            plugin_status = :warning if plugin_status != :critical
+          when :optimal
+            a = 1
+          else
+            plugin_status = :unknown
+            plugin_output += " #{vd_plugin_string}:#{vd[:state]}"
         end
       end
 
       @lsi.bbus.each do |bbu|
 
-        [:temperature, :learncyclestatus].each do |attr|
-          unless bbu[:firmwarestatus][attr] == 'OK'
-            plugin_output += " [BBU:#{bbu._id}:#{attr}:#{bbu[:firmwarestatus][attr]}]"
-            plugin_status = :warning if plugin_status == ""
-          end
+        unless bbu[:firmwarestatus][:temperature] == 'OK'
+          plugin_output += " [BBU:#{bbu._id}:temperature:#{bbu[:firmwarestatus][:temperature]}:#{bbu[:temperature].gsub(/\s/,'')}]"
+        end
+
+        unless bbu[:firmwarestatus][:learncyclestatus] == 'OK'
+          plugin_output += " [BBU:#{bbu._id}:learncyclestatus:#{bbu[:firmwarestatus][:learncyclestatus]}]"
+          plugin_status = :warning if plugin_status == ""
         end
 
         [:batterypackmissing, :batteryreplacementrequired].each do |attr|
@@ -80,11 +91,11 @@ module Elesai; module Action
             plugin_output += " learn cycle enabled: [BBU:absolutestateofcharge:#{bbu[:gasgaugestatus][:absolutestateofcharge]}]"
           else
             unless bbu[:firmwarestatus][:voltage] == 'OK'
-              plugin_output += " [BBU:#{bbu._id}:#{attr}:#{bbu[:firmwarestatus][attr]}]"
+              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 <= 65
+              if bbu[:gasgaugestatus][:absolutestateofcharge].number <= 50
                 plugin_output += " [BBU:absolutestateofcharge:#{bbu[:gasgaugestatus][:absolutestateofcharge]}]"
                 plugin_status = :warning if plugin_status == ""
               end

data/lib/elesai/action/show.rb

@@ -14,7 +14,7 @@ module Elesai; module Action
       opts = OptionParser.new
       opts.banner = "Usage: #{ID} [options] show <component>"
       opts.separator ""
-      opts.separator "      <component> is physicaldisk|pd, virtualdisk|vd, bbu"
+      opts.separator "      <component> is adapter, physicaldisk|pd, virtualdisk|vd, bbu"
       opts.order!(@arguments)
 
       options_valid?

data/lib/elesai/version.rb

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

metadata

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