ohai 13.1.0 → 13.2.0

data/lib/ohai/plugins/mono.rb

@@ -44,7 +44,7 @@ Ohai.plugin(:Mono) do
         languages[:mono] = mono unless mono.empty?
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Mono plugin: Could not shell_out "mono -V". Skipping plugin')
+      Ohai::Log.debug('Plugin Mono: Could not shell_out "mono -V". Skipping plugin')
     end
   end
 end

data/lib/ohai/plugins/nodejs.rb

@@ -34,7 +34,7 @@ Ohai.plugin(:Nodejs) do
         languages[:nodejs] = nodejs if nodejs[:version]
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Nodejs plugin: Could not shell_out "node -v". Skipping plugin')
+      Ohai::Log.debug('Plugin Nodejs: Could not shell_out "node -v". Skipping plugin')
     end
   end
 end

data/lib/ohai/plugins/openstack.rb

@@ -32,10 +32,10 @@ Ohai.plugin(:Openstack) do
     # detect a manufacturer of OpenStack Foundation
     if get_attribute(:dmi, :system, :all_records, 0, :Manufacturer) =~ /OpenStack/
       Ohai::Log.debug("Plugin Openstack: has_openstack_dmi? == true")
-      return true
+      true
     else
       Ohai::Log.debug("Plugin Openstack: has_openstack_dmi? == false")
-      return false
+      false
     end
   end
 
@@ -43,17 +43,17 @@ Ohai.plugin(:Openstack) do
   def openstack_hint?
     if hint?("openstack")
       Ohai::Log.debug("Plugin Openstack: openstack hint present")
-      return true
+      true
     else
       Ohai::Log.debug("Plugin Openstack: openstack hint not present")
-      return false
+      false
     end
   end
 
   # dreamhost systems have the dhc-user on them
   def openstack_provider
     return "dreamhost" if get_attribute("etc", "passwd", "dhc-user")
-    return "openstack"
+    "openstack"
   end
 
   collect_data do

data/lib/ohai/plugins/packages.rb

@@ -94,8 +94,14 @@ Ohai.plugin(:Packages) do
     # Package Name:Fileset:Level
     # On aix, filesets are packages and levels are versions
     pkgs.each do |pkg|
-      _, name, version = pkg.split(":")
-      packages[name] = { "version" => version }
+      name, fileset, version, _, _, _, pkg_type = pkg.split(":")
+      if pkg_type == "R"
+        # RPM
+        packages[name] = { "version" => version }
+      else
+        # LPP
+        packages[fileset] = { "version" => version }
+      end
     end
   end
 

data/lib/ohai/plugins/perl.rb

@@ -39,7 +39,7 @@ Ohai.plugin(:Perl) do
         languages[:perl] = perl unless perl.empty?
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Perl plugin: Could not shell_out "perl -V:version -V:archname". Skipping plugin')
+      Ohai::Log.debug('Plugin Perl: Could not shell_out "perl -V:version -V:archname". Skipping plugin')
     end
   end
 end

data/lib/ohai/plugins/php.rb

@@ -46,7 +46,7 @@ Ohai.plugin(:PHP) do
         languages[:php] = php unless php.empty?
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Php plugin: Could not shell_out "php -v". Skipping plugin')
+      Ohai::Log.debug('Plugin Php: Could not shell_out "php -v". Skipping plugin')
     end
   end
 end

data/lib/ohai/plugins/powershell.rb

@@ -51,7 +51,7 @@ Ohai.plugin(:Powershell) do
         languages[:powershell] = powershell unless powershell.empty?
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Powershell plugin: Could not shell_out "powershell.exe -NoLogo -NonInteractive -NoProfile -command $PSVersionTable". Skipping plugin')
+      Ohai::Log.debug('Plugin Powershell: Could not shell_out "powershell.exe -NoLogo -NonInteractive -NoProfile -command $PSVersionTable". Skipping plugin')
     end
   end
 

data/lib/ohai/plugins/python.rb

@@ -37,7 +37,7 @@ Ohai.plugin(:Python) do
         languages[:python] = python unless python.empty?
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Python plugin: Could not shell_out "python -c "import sys; print (sys.version)"". Skipping plugin')
+      Ohai::Log.debug('Plugin Python: Could not shell_out "python -c "import sys; print (sys.version)"". Skipping plugin')
     end
   end
 end

data/lib/ohai/plugins/rackspace.rb

@@ -92,7 +92,7 @@ Ohai.plugin(:Rackspace) do
       end
     end
   rescue Ohai::Exceptions::Exec
-    Ohai::Log.debug("rackspace plugin: Unable to find xenstore-ls, cannot capture region information for Rackspace cloud")
+    Ohai::Log.debug("Plugin Rackspace: Unable to find xenstore-ls, cannot capture region information for Rackspace cloud")
     nil
   end
 
@@ -104,7 +104,7 @@ Ohai.plugin(:Rackspace) do
       rackspace[:instance_id] = so.stdout.gsub(/instance-/, "")
     end
   rescue Ohai::Exceptions::Exec
-    Ohai::Log.debug("rackspace plugin: Unable to find xenstore-read, cannot capture instance ID information for Rackspace cloud")
+    Ohai::Log.debug("Plugin Rackspace: Unable to find xenstore-read, cannot capture instance ID information for Rackspace cloud")
     nil
   end
 
@@ -119,7 +119,7 @@ Ohai.plugin(:Rackspace) do
         if so.exitstatus == 0
           networks.push(FFI_Yajl::Parser.new.parse(so.stdout))
         else
-          Ohai::Log.debug("rackspace plugin: Unable to capture custom private networking information for Rackspace cloud")
+          Ohai::Log.debug("Plugin Rackspace: Unable to capture custom private networking information for Rackspace cloud")
           return false
         end
       end
@@ -128,7 +128,7 @@ Ohai.plugin(:Rackspace) do
       networks.delete_if { |hash| hash["label"] == "public" }
     end
   rescue Ohai::Exceptions::Exec
-    Ohai::Log.debug("rackspace plugin: Unable to capture custom private networking information for Rackspace cloud")
+    Ohai::Log.debug("Plugin Rackspace: Unable to capture custom private networking information for Rackspace cloud")
     nil
   end
 

data/lib/ohai/plugins/rust.rb

@@ -28,7 +28,7 @@ Ohai.plugin(:Rust) do
         languages[:rust] = rust if rust[:version]
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Rust plugin: Could not shell_out "rustc --version". Skipping plugin')
+      Ohai::Log.debug('Plugin Rust: Could not shell_out "rustc --version". Skipping plugin')
     end
   end
 end

data/lib/ohai/plugins/solaris2/dmi.rb

@@ -25,7 +25,7 @@ Ohai.plugin(:DMI) do
     # if we already have a "dmi" with keys (presumably from dmidecode), don't try smbios
     # note that a single key just means dmidecode exited with its version
     if (dmi.class.to_s == "Mash") && (dmi.keys.length > 1)
-      Ohai::Log.debug("skipping smbios output, since DMI information has already been provided")
+      Ohai::Log.debug("Plugin DMI: skipping smbios output, since DMI information has already been provided")
       return
     end
 
@@ -118,7 +118,7 @@ Ohai.plugin(:DMI) do
       # remove/replace any characters that don't fall inside permissible ASCII range, or whitespace
       line = raw_line.gsub(/[^\x20-\x7E\n\t\r]/, ".")
       if line != raw_line
-        Ohai::Log.debug("converted characters from line:\n#{raw_line}")
+        Ohai::Log.debug("Plugin DMI: converted characters from line:\n#{raw_line}")
       end
 
       if header_information = header_information_line.match(line)
@@ -137,7 +137,7 @@ Ohai.plugin(:DMI) do
           dmi_record[:type] = Ohai::Common::DMI.id_lookup(id)
 
         else
-          Ohai::Log.debug("unrecognized header type; skipping")
+          Ohai::Log.debug("Plugin DMI: unrecognized header type; skipping")
           dmi_record = nil
           next
         end

data/lib/ohai/plugins/solaris2/network.rb

@@ -180,11 +180,11 @@ Ohai.plugin(:Network) do
           else
             matches[:name]
           end
-        Ohai::Log.debug("found interface device: #{network[:default_interface]} #{matches[:name]}")
+        Ohai::Log.debug("Plugin Network: found interface device: #{network[:default_interface]} #{matches[:name]}")
       end
       matches = /gateway: (\S+)/.match(line)
       if matches
-        Ohai::Log.debug("found gateway: #{matches[1]}")
+        Ohai::Log.debug("Plugin Network: found gateway: #{matches[1]}")
         network[:default_gateway] = matches[1]
       end
     end

data/lib/ohai/plugins/ssh_host_key.rb

@@ -44,7 +44,7 @@ Ohai.plugin(:SSHHostKey) do
                     # Darwin
                     "/etc/sshd_config"
                   else
-                    Ohai::Log.debug("Failed to find sshd configuration file")
+                    Ohai::Log.debug("Plugin SSHHostKey: Failed to find sshd configuration file")
                     nil
                   end
 

data/lib/ohai/plugins/uptime.rb

@@ -40,7 +40,7 @@ Ohai.plugin(:Uptime) do
         return [usec, seconds_to_human(usec)]
       end
     end
-    return [nil, nil]
+    [nil, nil]
   end
 
   collect_data(:darwin) do

data/lib/ohai/plugins/{solaris2/zpools.rb → zpools.rb}

@@ -1,6 +1,6 @@
 #
 # Author:: Jason J. W. Williams (williamsjj@digitar.com)
-# Copyright:: Copyright (c) 2011-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) 2011-2017 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,42 +18,65 @@
 
 Ohai.plugin(:Zpools) do
   provides "zpools"
+  depends "platform_family"
 
-  collect_data(:solaris2) do
-    pools = Mash.new
+  # If zpool status doesn't know about a field it returns '-'.
+  # We don't want to fill a field with that
+  def sanitize_value(value)
+    value == "-" ? nil : value
+  end
 
+  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+|-)$/
+        Ohai::Log.debug("Plugin Zpools: Parsing zpool list line: #{line.chomp}")
         pools[$1] = Mash.new
-        pools[$1][:pool_size] = $2
-        pools[$1][:pool_allocated] = $3
-        pools[$1][:pool_free] = $4
-        pools[$1][:capacity_used] = $5
-        pools[$1][:dedup_factor] = $6
-        pools[$1][:health] = $7
-        pools[$1][:zpool_version] = $8
+        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
+    pools
+  end
+
+  collect_data(:solaris2, :linux, :freebsd, :openbsd, :netbsd, :dragonflybsd) do
+    pools = gather_pool_info
 
     # Grab individual health for devices in the zpools
     pools.keys.each do |pool|
       pools[pool][:devices] = Mash.new
+
       # Run "zpool status" as non-root user (adm) so that
       # the command won't try to open() each device which can
       # hang the command if any of the disks are bad.
-      so = shell_out("su adm -c \"zpool status #{pool}\"")
+      if platform_family == "solaris2"
+        command = "su adm -c \"zpool status #{pool}\""
+      else
+        command = "zpool status #{pool}"
+      end
+
+      so = shell_out(command)
       so.stdout.lines do |line|
         case line
-        when /^\s+(c[-_a-zA-Z0-9]+)\s+([-_a-zA-Z0-9]+)\s+(\d+)\s+(\d+)\s+(\d+)$/
+        # linux: http://rubular.com/r/J3wQC6E2lH
+        # solaris: http://rubular.com/r/FqOBzUQQ4p
+        # freebsd: http://rubular.com/r/RYkMNlytXl
+        when /^\s+((sd|c|ad|da)[-_a-zA-Z0-9]+)\s+([-_a-zA-Z0-9]+)\s+(\d+)\s+(\d+)\s+(\d+)$/
+          Ohai::Log.debug("Plugin Zpools: Parsing zpool status line: #{line.chomp}")
           pools[pool][:devices][$1] = Mash.new
-          pools[pool][:devices][$1][:state] = $2
+          pools[pool][:devices][$1][:state] = $3
           pools[pool][:devices][$1][:errors] = Mash.new
-          pools[pool][:devices][$1][:errors][:read] = $3
-          pools[pool][:devices][$1][:errors][:write] = $4
-          pools[pool][:devices][$1][:errors][:checksum] = $5
+          pools[pool][:devices][$1][:errors][:read] = $4
+          pools[pool][:devices][$1][:errors][:write] = $5
+          pools[pool][:devices][$1][:errors][:checksum] = $6
         end
       end
     end

data/lib/ohai/util/file_helper.rb

@@ -26,11 +26,11 @@ module Ohai
         paths.each do |path|
           filename = File.join(path, cmd)
           if File.executable?(filename)
-            Ohai::Log.debug("Plugin #{self.name}: found #{cmd} at #{filename}")
+            Ohai::Log.debug("Plugin #{name}: found #{cmd} at #{filename}")
             return filename
           end
         end
-        Ohai::Log.debug("Plugin #{self.name}: did not find #{cmd}")
+        Ohai::Log.debug("Plugin #{name}: did not find #{cmd}")
         false
       end
     end

data/lib/ohai/version.rb

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

data/spec/data/plugins/lslpp.output

@@ -47,3 +47,4 @@ devices.common.IBM.ethernet:devices.common.IBM.ethernet.rte:7.1.1.16: : :C:F:Com
 devices.common.IBM.fc:devices.common.IBM.fc.hba-api:7.1.1.16: : :C:F:Common HBA API Library: : : : : : :0:0:/:1228
 devices.common.IBM.fc:devices.common.IBM.fc.rte:7.1.1.16: : :C:F:Common IBM FC Software: : : : : : :0:0:/:1228
 devices.common.IBM.fda:devices.common.IBM.fda.diag:7.1.0.0: : :C: :Common Diskette Adapter and Device Diagnostics: : : : : : :0:0:/:1036
+wget:wget-1.9.1-3:1.9.1-3: : :C:R:A utility for retrieving files using the HTTP or FTP protocols.: :/bin/rpm -e wget: : : : :0: :/opt/freeware:Wed Nov 5 01:37:09 MST 2014

data/spec/unit/plugins/darwin/cpu_spec.rb

@@ -21,17 +21,64 @@ require_relative "../../../spec_helper.rb"
 describe Ohai::System, "Darwin cpu plugin" do
   before(:each) do
     @plugin = get_plugin("darwin/cpu")
+    @stdout = <<-CTL
+hw.ncpu: 8
+hw.byteorder: 1234
+hw.memsize: 17179869184
+hw.activecpu: 8
+hw.packages: 1
+hw.tbfrequency: 1000000000
+hw.l3cachesize: 6291456
+hw.l2cachesize: 262144
+hw.l1dcachesize: 32768
+hw.l1icachesize: 32768
+hw.cachelinesize: 64
+hw.cpufrequency: 2800000000
+hw.busfrequency: 100000000
+hw.pagesize32: 4096
+hw.pagesize: 4096
+hw.cpufamily: 280134364
+hw.cpu64bit_capable: 1
+hw.cpusubtype: 8
+hw.cputype: 7
+hw.logicalcpu_max: 8
+hw.logicalcpu: 8
+hw.physicalcpu_max: 4
+hw.physicalcpu: 4
+hw.targettype: Mac
+hw.cputhreadtype: 1
+machdep.cpu.thread_count: 8
+machdep.cpu.core_count: 4
+machdep.cpu.address_bits.virtual: 48
+machdep.cpu.address_bits.physical: 39
+machdep.cpu.cache.size: 256
+machdep.cpu.cache.L2_associativity: 8
+machdep.cpu.cache.linesize: 64
+machdep.cpu.processor_flag: 5
+machdep.cpu.microcode_version: 15
+machdep.cpu.cores_per_package: 8
+machdep.cpu.logical_per_package: 16
+machdep.cpu.extfeatures: SYSCALL XD 1GBPAGE EM64T LAHF LZCNT RDTSCP TSCI
+machdep.cpu.leaf7_features: SMEP ERMS RDWRFSGS TSC_THREAD_OFFSET BMI1 HLE AVX2 BMI2 INVPCID RTM FPU_CSDS
+machdep.cpu.features: FPU VME DE PSE TSC MSR PAE MCE CX8 APIC SEP MTRR PGE MCA CMOV PAT PSE36 CLFSH DS ACPI MMX FXSR SSE SSE2 SS HTT TM PBE SSE3 PCLMULQDQ DTES64 MON DSCPL VMX SMX EST TM2 SSSE3 FMA CX16 TPR PDCM SSE4.1 SSE4.2 x2APIC MOVBE POPCNT AES PCID XSAVE OSXSAVE SEGLIM64 TSCTMR AVX1.0 RDRAND F16C
+machdep.cpu.brand: 0
+machdep.cpu.signature: 263777
+machdep.cpu.extfeature_bits: 142473169152
+machdep.cpu.leaf7_feature_bits: 12219
+machdep.cpu.feature_bits: 9221960262849657855
+machdep.cpu.stepping: 1
+machdep.cpu.extfamily: 0
+machdep.cpu.extmodel: 4
+machdep.cpu.model: 70
+machdep.cpu.family: 6
+machdep.cpu.brand_string: Intel(R) Core(TM) i7-4980HQ CPU @ 2.80GHz
+machdep.cpu.vendor: GenuineIntel
+machdep.cpu.max_ext: 2147483656
+machdep.cpu.max_basic: 13
+CTL
+
     allow(@plugin).to receive(:collect_os).and_return(:darwin)
-    allow(@plugin).to receive(:shell_out).with("sysctl -n hw.packages").and_return(mock_shell_out(0, "1", ""))
-    allow(@plugin).to receive(:shell_out).with("sysctl -n hw.physicalcpu").and_return(mock_shell_out(0, "4", ""))
-    allow(@plugin).to receive(:shell_out).with("sysctl -n hw.logicalcpu").and_return(mock_shell_out(0, "8", ""))
-    allow(@plugin).to receive(:shell_out).with("sysctl -n hw.cpufrequency").and_return(mock_shell_out(0, "2300000000", ""))
-    allow(@plugin).to receive(:shell_out).with("sysctl -n machdep.cpu.vendor").and_return(mock_shell_out(0, "GenuineIntel\n", ""))
-    allow(@plugin).to receive(:shell_out).with("sysctl -n machdep.cpu.brand_string").and_return(mock_shell_out(0, "Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz\n", ""))
-    allow(@plugin).to receive(:shell_out).with("sysctl -n machdep.cpu.model").and_return(mock_shell_out(0, "58", ""))
-    allow(@plugin).to receive(:shell_out).with("sysctl -n machdep.cpu.family").and_return(mock_shell_out(0, "6", ""))
-    allow(@plugin).to receive(:shell_out).with("sysctl -n machdep.cpu.stepping").and_return(mock_shell_out(0, "9", ""))
-    allow(@plugin).to receive(:shell_out).with("sysctl -n machdep.cpu.features").and_return(mock_shell_out(0, "FPU VME DE PSE TSC MSR PAE MCE CX8 APIC SEP MTRR PGE MCA CMOV PAT PSE36 CLFSH DS ACPI MMX FXSR SSE SSE2 SS HTT TM PBE SSE3 PCLMULQDQ DTES64 MON DSCPL VMX EST TM2 SSSE3 CX16 TPR PDCM SSE4.1 SSE4.2 x2APIC POPCNT AES PCID XSAVE OSXSAVE TSCTMR AVX1.0 RDRAND F16C", ""))
+    allow(@plugin).to receive(:shell_out).with("sysctl -a").and_return(mock_shell_out(0, @stdout, ""))
     @plugin.run
   end
 
@@ -47,31 +94,31 @@ describe Ohai::System, "Darwin cpu plugin" do
     expect(@plugin[:cpu][:real]).to eq(1)
   end
 
-  it "should set cpu[:mhz] to 2300" do
-    expect(@plugin[:cpu][:mhz]).to eq(2300)
+  it "should set cpu[:mhz] to 2800" do
+    expect(@plugin[:cpu][:mhz]).to eq(2800)
   end
 
   it "should set cpu[:vendor_id] to GenuineIntel" do
     expect(@plugin[:cpu][:vendor_id]).to eq("GenuineIntel")
   end
 
-  it "should set cpu[:model_name] to Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz" do
-    expect(@plugin[:cpu][:model_name]).to eq("Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz")
+  it "should set cpu[:model_name] to Intel(R) Core(TM) i7-4980HQ CPU @ 2.80GHz" do
+    expect(@plugin[:cpu][:model_name]).to eq("Intel(R) Core(TM) i7-4980HQ CPU @ 2.80GHz")
   end
 
-  it "should set cpu[:model] to 58" do
-    expect(@plugin[:cpu][:model]).to eq(58)
+  it "should set cpu[:model] to 70" do
+    expect(@plugin[:cpu][:model]).to eq(70)
   end
 
   it "should set cpu[:family] to 6" do
     expect(@plugin[:cpu][:family]).to eq(6)
   end
 
-  it "should set cpu[:stepping] to 9" do
-    expect(@plugin[:cpu][:stepping]).to eq(9)
+  it "should set cpu[:stepping] to 1" do
+    expect(@plugin[:cpu][:stepping]).to eq(1)
   end
 
   it "should set cpu[:flags] to array of flags" do
-    expect(@plugin[:cpu][:flags]).to eq(["fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", "cx8", "apic", "sep", "mtrr", "pge", "mca", "cmov", "pat", "pse36", "clfsh", "ds", "acpi", "mmx", "fxsr", "sse", "sse2", "ss", "htt", "tm", "pbe", "sse3", "pclmulqdq", "dtes64", "mon", "dscpl", "vmx", "est", "tm2", "ssse3", "cx16", "tpr", "pdcm", "sse4.1", "sse4.2", "x2apic", "popcnt", "aes", "pcid", "xsave", "osxsave", "tsctmr", "avx1.0", "rdrand", "f16c"])
+    expect(@plugin[:cpu][:flags]).to eq(["fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", "cx8", "apic", "sep", "mtrr", "pge", "mca", "cmov", "pat", "pse36", "clfsh", "ds", "acpi", "mmx", "fxsr", "sse", "sse2", "ss", "htt", "tm", "pbe", "sse3", "pclmulqdq", "dtes64", "mon", "dscpl", "vmx", "smx", "est", "tm2", "ssse3", "fma", "cx16", "tpr", "pdcm", "sse4.1", "sse4.2", "x2apic", "movbe", "popcnt", "aes", "pcid", "xsave", "osxsave", "seglim64", "tsctmr", "avx1.0", "rdrand", "f16c"])
   end
 end