X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/cc78cdd0b29d1d1a966b36dca357392d35597eb7..9d63b4d5154d333e93d8ff317e1126a17ad1890f:/cookbooks/hardware/templates/default/ohai.rb.erb diff --git a/cookbooks/hardware/templates/default/ohai.rb.erb b/cookbooks/hardware/templates/default/ohai.rb.erb index 8c7d633ab..63f4806d9 100644 --- a/cookbooks/hardware/templates/default/ohai.rb.erb +++ b/cookbooks/hardware/templates/default/ohai.rb.erb @@ -317,6 +317,8 @@ Ohai.plugin(:Hardware) do disk = nil IO.popen(%w(ssacli controller all show config detail)).each do |line| + next unless line.valid_encoding? + if line =~ /^Smart (?:Array|HBA) (\S+) / controller = { :id => devices[:controllers].count, @@ -377,6 +379,7 @@ Ohai.plugin(:Hardware) do elsif array && line =~ /^ Status:\s+(.*\S)\s*$/ case Regexp.last_match(1) when "OK" then array[:status] = "optimal" + when "Interim Recovery Mode" then array[:status] = "degraded" else array[:status] = "unknown" end elsif array && line =~ /^ (\S[^:]+):\s+(.*\S)\s*$/