ohai 14.0.28 → 14.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a1f5745602a7d261d2346fe002fc0a4dc7fbd4416e762fe32f0bbf90023e3a8
-  data.tar.gz: 7b0c9a614a3317d7efb17e046d886057974b9af94805eaa41e38652abfee6786
+  metadata.gz: 7df4dd6c34ba7a1c5bb097c52ae9e0ffb6a7ce4048d9b1a86c6aaaafa254f121
+  data.tar.gz: e00d3d6086d05d0cbb5148fca5a50feb4173a6fbea67308de815e922ba01b19a
 SHA512:
-  metadata.gz: fecf7d1a694d21150317858122036b1b88c3914ee6c1ac6559b8cd2af99c68befbceb8ed823eb1baa732357582eb2eee050b183099d27b81872e4efb74ee8a8e
-  data.tar.gz: 2bf44d42fe0ddd207ac2fbaa9d054efc9d80087d6a32d90b4fba5befbfe30efa29267b415fd2585c6cea673e4fca45187dfe990c98288a28bf925f74f9923324
+  metadata.gz: 1cebf6a450da08fc94f2b2ef08b7935acbc4a0e0006d574324ad15282a503454ff5afaa4babd0cb6a959f81a046d06c151bfa0b1f7fdf58fe4b87439ea205090
+  data.tar.gz: 29b5fed44d109190a2f1cfcdd52965f8aef6a9d15c74fac2c6412773142041b8433fbbb491072d0a2b54cabeeaad040a60c757196df1655ca1c81fb7ddc3a69d

data/lib/ohai/plugins/zpools.rb

@@ -28,21 +28,26 @@ Ohai.plugin(:Zpools) do
 
   def gather_pool_info
     pools = Mash.new
-    # Grab ZFS zpools overall health and attributes
-    so = shell_out("zpool list -H -o name,size,alloc,free,cap,dedup,health,version")
-    so.stdout.lines do |line|
-      case line
-      when /^([-_0-9A-Za-z]*)\s+([.0-9]+[MGTPE])\s+([.0-9]+[MGTPE])\s+([.0-9]+[MGTPE])\s+(\d+%)\s+([.0-9]+x)\s+([-_0-9A-Za-z]+)\s+(\d+|-)$/
-        logger.trace("Plugin Zpools: Parsing zpool list line: #{line.chomp}")
-        pools[$1] = Mash.new
-        pools[$1][:pool_size] = sanitize_value($2)
-        pools[$1][:pool_allocated] = sanitize_value($3)
-        pools[$1][:pool_free] = sanitize_value($4)
-        pools[$1][:capacity_used] = sanitize_value($5)
-        pools[$1][:dedup_factor] = sanitize_value($6)
-        pools[$1][:health] = sanitize_value($7)
-        pools[$1][:zpool_version] = sanitize_value($8)
+    begin
+      # Grab ZFS zpools overall health and attributes
+      so = shell_out("zpool list -H -o name,size,alloc,free,cap,dedup,health,version")
+      so.stdout.lines do |line|
+        case line
+        when /^([-_0-9A-Za-z]*)\s+([.0-9]+[MGTPE])\s+([.0-9]+[MGTPE])\s+([.0-9]+[MGTPE])\s+(\d+%)\s+([.0-9]+x)\s+([-_0-9A-Za-z]+)\s+(\d+|-)$/
+          Ohai::Log.debug("Plugin Zpools: Parsing zpool list line: #{line.chomp}")
+          pools[$1] = Mash.new
+          pools[$1][:pool_size] = sanitize_value($2)
+          pools[$1][:pool_allocated] = sanitize_value($3)
+          pools[$1][:pool_free] = sanitize_value($4)
+          pools[$1][:capacity_used] = sanitize_value($5)
+          pools[$1][:dedup_factor] = sanitize_value($6)
+          pools[$1][:health] = sanitize_value($7)
+          pools[$1][:zpool_version] = sanitize_value($8)
+        end
       end
+
+    rescue Ohai::Exceptions::Exec
+      Ohai::Log.debug('Plugin Zpools: Could not shell_out "zpool list -H -o name,size,alloc,free,cap,dedup,health,version". Skipping plugin.')
     end
     pools
   end
@@ -82,6 +87,6 @@ Ohai.plugin(:Zpools) do
     end
 
     # Set the zpools data
-    zpools pools
+    zpools pools unless pools.empty?
   end
 end

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "14.0.28"
+  VERSION = "14.0.29"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 14.0.28
+  version: 14.0.29
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-17 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -542,7 +542,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON