ohai 13.12.6 → 14.0.28

data/lib/ohai/plugins/docker.rb

@@ -0,0 +1,57 @@
+#
+# Copyright:: 2018 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+Ohai.plugin(:Docker) do
+  require "json"
+
+  provides "docker"
+  depends "virtualization"
+
+  def docker_info_json
+    so = shell_out("docker info --format '{{json .}}'")
+    if so.exitstatus == 0
+      return JSON.parse(so.stdout)
+    end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Docker: Could not shell_out "docker info --format \'{{json .}}\'". Skipping plugin')
+  end
+
+  def docker_ohai_data(shellout_data)
+    docker Mash.new
+    docker[:version_string] = shellout_data["ServerVersion"]
+    docker[:version] = shellout_data["ServerVersion"].split("-")[0] if shellout_data["ServerVersion"] # guard this so missing data doesn't fail the run
+    docker[:runtimes] = shellout_data["Runtimes"]
+    docker[:root_dir] = shellout_data["DockerRootDir"]
+    docker[:containers] = {}
+    docker[:containers][:total] = shellout_data["Containers"]
+    docker[:containers][:running] = shellout_data["ContainersRunning"]
+    docker[:containers][:paused] = shellout_data["ContainersPaused"]
+    docker[:containers][:stopped] = shellout_data["ContainersStopped"]
+    docker[:plugins] = shellout_data["Plugins"]
+    docker[:networking] = {}
+    docker[:networking][:ipv4_forwarding] = shellout_data["IPv4Forwarding"]
+    docker[:networking][:bridge_nf_iptables] = shellout_data["BridgeNfIptables"]
+    docker[:networking][:bridge_nf_ipv6_iptables] = shellout_data["BridgeNfIp6tables"]
+    docker[:swarm] = shellout_data["Swarm"]
+  end
+
+  collect_data do
+    if virtualization[:systems][:docker]
+      docker_ohai_data(docker_info_json)
+    end
+  end
+end

data/lib/ohai/plugins/ec2.rb

@@ -42,10 +42,10 @@ Ohai.plugin(:EC2) do
   def has_ec2_amazon_dmi?
     # detect a version of '4.2.amazon'
     if file_val_if_exists("/sys/class/dmi/id/bios_vendor") =~ /Amazon/
-      Ohai::Log.debug("Plugin EC2: has_ec2_amazon_dmi? == true")
+      logger.trace("Plugin EC2: has_ec2_amazon_dmi? == true")
       true
     else
-      Ohai::Log.debug("Plugin EC2: has_ec2_amazon_dmi? == false")
+      logger.trace("Plugin EC2: has_ec2_amazon_dmi? == false")
       false
     end
   end
@@ -57,10 +57,10 @@ Ohai.plugin(:EC2) do
   def has_ec2_xen_dmi?
     # detect a version of '4.2.amazon'
     if file_val_if_exists("/sys/class/dmi/id/bios_version") =~ /amazon/
-      Ohai::Log.debug("Plugin EC2: has_ec2_xen_dmi? == true")
+      logger.trace("Plugin EC2: has_ec2_xen_dmi? == true")
       true
     else
-      Ohai::Log.debug("Plugin EC2: has_ec2_xen_dmi? == false")
+      logger.trace("Plugin EC2: has_ec2_xen_dmi? == false")
       false
     end
   end
@@ -69,10 +69,10 @@ Ohai.plugin(:EC2) do
   # @return [Boolean] do we have a Xen UUID or not?
   def has_ec2_xen_uuid?
     if file_val_if_exists("/sys/hypervisor/uuid") =~ /^ec2/
-      Ohai::Log.debug("Plugin EC2: has_ec2_xen_uuid? == true")
+      logger.trace("Plugin EC2: has_ec2_xen_uuid? == true")
       return true
     end
-    Ohai::Log.debug("Plugin EC2: has_ec2_xen_uuid? == false")
+    logger.trace("Plugin EC2: has_ec2_xen_uuid? == false")
     false
   end
 
@@ -85,11 +85,11 @@ Ohai.plugin(:EC2) do
       require "wmi-lite/wmi"
       wmi = WmiLite::Wmi.new
       if wmi.first_of("Win32_ComputerSystemProduct")["identifyingnumber"] =~ /^ec2/
-        Ohai::Log.debug("Plugin EC2: has_ec2_identifying_number? == true")
+        logger.trace("Plugin EC2: has_ec2_identifying_number? == true")
         return true
       end
     else
-      Ohai::Log.debug("Plugin EC2: has_ec2_identifying_number? == false")
+      logger.trace("Plugin EC2: has_ec2_identifying_number? == false")
       false
     end
   end
@@ -116,7 +116,7 @@ Ohai.plugin(:EC2) do
 
   collect_data do
     if looks_like_ec2?
-      Ohai::Log.debug("Plugin EC2: looks_like_ec2? == true")
+      logger.trace("Plugin EC2: looks_like_ec2? == true")
       ec2 Mash.new
       fetch_metadata.each do |k, v|
         # fetch_metadata returns IAM security credentials, including the IAM user's
@@ -132,11 +132,11 @@ Ohai.plugin(:EC2) do
       ec2[:region] = fetch_dynamic_data["region"]
       # ASCII-8BIT is equivalent to BINARY in this case
       if ec2[:userdata] && ec2[:userdata].encoding.to_s == "ASCII-8BIT"
-        Ohai::Log.debug("Plugin EC2: Binary UserData Found. Storing in base64")
+        logger.trace("Plugin EC2: Binary UserData Found. Storing in base64")
         ec2[:userdata] = Base64.encode64(ec2[:userdata])
       end
     else
-      Ohai::Log.debug("Plugin EC2: looks_like_ec2? == false")
+      logger.trace("Plugin EC2: looks_like_ec2? == false")
       false
     end
   end

data/lib/ohai/plugins/elixir.rb

@@ -30,7 +30,7 @@ Ohai.plugin(:Elixir) do
         languages[:elixir] = elixir
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Plugin Elixir: Could not shell_out "elixir -v". Skipping plugin')
+      logger.trace('Plugin Elixir: Could not shell_out "elixir -v". Skipping plugin')
     end
   end
 end

data/lib/ohai/plugins/erlang.rb

@@ -34,7 +34,7 @@ Ohai.plugin(:Erlang) do
         erlang[:nif_version] = output[2]
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Plugin Erlang: Could not shell_out "erl -eval \'erlang:display(erlang:system_info(otp_release)), erlang:display(erlang:system_info(version)), erlang:display(erlang:system_info(nif_version)), halt().\'  -noshell". Skipping data')
+      logger.trace('Plugin Erlang: Could not shell_out "erl -eval \'erlang:display(erlang:system_info(otp_release)), erlang:display(erlang:system_info(version)), erlang:display(erlang:system_info(nif_version)), halt().\'  -noshell". Skipping data')
     end
 
     begin
@@ -51,7 +51,7 @@ Ohai.plugin(:Erlang) do
         end
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Plugin Erlang: Could not shell_out "erl +V". Skipping data')
+      logger.trace('Plugin Erlang: Could not shell_out "erl +V". Skipping data')
     end
 
     languages[:erlang] = erlang unless erlang.empty?

data/lib/ohai/plugins/eucalyptus.rb

@@ -40,15 +40,15 @@ Ohai.plugin(:Eucalyptus) do
 
   # detect if the mac address starts with d0:0d
   def has_euca_mac?
-    network[:interfaces].values.each do |iface|
+    network[:interfaces].each_value do |iface|
       mac = get_mac_address(iface[:addresses])
       if mac =~ /^[dD]0:0[dD]:/
-        Ohai::Log.debug("Plugin Eucalyptus: has_euca_mac? == true (#{mac})")
+        logger.trace("Plugin Eucalyptus: has_euca_mac? == true (#{mac})")
         return true
       end
     end
 
-    Ohai::Log.debug("Plugin Eucalyptus: has_euca_mac? == false")
+    logger.trace("Plugin Eucalyptus: has_euca_mac? == false")
     false
   end
 
@@ -60,7 +60,7 @@ Ohai.plugin(:Eucalyptus) do
 
   collect_data do
     if looks_like_euca?
-      Ohai::Log.debug("Plugin Eucalyptus: looks_like_euca? == true")
+      logger.trace("Plugin Eucalyptus: looks_like_euca? == true")
       eucalyptus Mash.new
       fetch_metadata.each do |k, v|
         # Eucalyptus 3.4+ supports IAM roles and Instance Profiles much like AWS
@@ -75,7 +75,7 @@ Ohai.plugin(:Eucalyptus) do
       end
       eucalyptus[:userdata] = fetch_userdata
     else
-      Ohai::Log.debug("Plugin Eucalyptus: looks_like_euca? == false")
+      logger.trace("Plugin Eucalyptus: looks_like_euca? == false")
       false
     end
   end

data/lib/ohai/plugins/gce.rb

@@ -43,11 +43,11 @@ Ohai.plugin(:GCE) do
 
   collect_data do
     if looks_like_gce?
-      Ohai::Log.debug("Plugin GCE: looks_like_gce? == true")
+      logger.trace("Plugin GCE: looks_like_gce? == true")
       gce Mash.new
       fetch_metadata.each { |k, v| gce[k] = v }
     else
-      Ohai::Log.debug("Plugin GCE: looks_like_gce? == false")
+      logger.trace("Plugin GCE: looks_like_gce? == false")
       false
     end
   end

data/lib/ohai/plugins/go.rb

@@ -28,7 +28,7 @@ Ohai.plugin(:Go) do
         languages[:go] = go
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Plugin Go: Could not shell_out "go version". Skipping plugin')
+      logger.trace('Plugin Go: Could not shell_out "go version". Skipping plugin')
     end
   end
 end

data/lib/ohai/plugins/groovy.rb

@@ -32,7 +32,7 @@ Ohai.plugin(:Groovy) do
         languages[:groovy] = groovy
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Plugin Groovy: Could not shell_out "groovy -v". Skipping plugin')
+      logger.trace('Plugin Groovy: Could not shell_out "groovy -v". Skipping plugin')
     end
   end
 end

data/lib/ohai/plugins/haskell.rb

@@ -39,7 +39,7 @@ Ohai.plugin(:Haskell) do
         haskell[:ghc][:description] = so.stdout.chomp
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Plugin Haskell: Could not shell_out "ghc --version". Skipping data')
+      logger.trace('Plugin Haskell: Could not shell_out "ghc --version". Skipping data')
     end
 
     # Check for ghci
@@ -54,7 +54,7 @@ Ohai.plugin(:Haskell) do
         haskell[:ghci][:description] = so.stdout.chomp
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Plugin Haskell: Could not shell_out "ghci --version". Skipping data')
+      logger.trace('Plugin Haskell: Could not shell_out "ghci --version". Skipping data')
     end
 
     # Check for cabal
@@ -70,7 +70,7 @@ Ohai.plugin(:Haskell) do
         haskell[:cabal][:description] = so.stdout.split("\n")[0].chomp
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Plugin Haskell: Could not shell_out "cabal --version". Skipping data')
+      logger.trace('Plugin Haskell: Could not shell_out "cabal --version". Skipping data')
     end
 
     # Check for stack
@@ -87,7 +87,7 @@ Ohai.plugin(:Haskell) do
         haskell[:stack][:description] = so.stdout.chomp
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Plugin Haskell: Could not shell_out "stack --version". Skipping data')
+      logger.trace('Plugin Haskell: Could not shell_out "stack --version". Skipping data')
     end
 
     languages[:haskell] = haskell unless haskell.empty?

data/lib/ohai/plugins/hostname.rb

@@ -103,18 +103,18 @@ Ohai.plugin(:Hostname) do
       # Sometimes... very rarely, but sometimes, 'hostname --fqdn' falsely
       # returns a blank string. WTF.
       if ourfqdn.nil? || ourfqdn.empty?
-        Ohai::Log.debug("Plugin Hostname: hostname returned an empty string, retrying once.")
+        logger.trace("Plugin Hostname: hostname returned an empty string, retrying once.")
         ourfqdn = resolve_fqdn
       end
 
       if ourfqdn.nil? || ourfqdn.empty?
-        Ohai::Log.debug("Plugin Hostname: hostname returned an empty string twice and will" +
+        logger.trace("Plugin Hostname: hostname returned an empty string twice and will" +
                         "not be set.")
       else
         fqdn ourfqdn
       end
     rescue
-      Ohai::Log.debug(
+      logger.trace(
         "Plugin Hostname: hostname returned an error, probably no domain set")
     end
     domain collect_domain
@@ -135,19 +135,19 @@ Ohai.plugin(:Hostname) do
       # Sometimes... very rarely, but sometimes, 'hostname --fqdn' falsely
       # returns a blank string. WTF.
       if ourfqdn.nil? || ourfqdn.empty?
-        Ohai::Log.debug("Plugin Hostname: hostname --fqdn returned an empty string, retrying " +
+        logger.trace("Plugin Hostname: hostname --fqdn returned an empty string, retrying " +
                         "once.")
         ourfqdn = from_cmd("hostname --fqdn")
       end
 
       if ourfqdn.nil? || ourfqdn.empty?
-        Ohai::Log.debug("Plugin Hostname: hostname --fqdn returned an empty string twice and " +
+        logger.trace("Plugin Hostname: hostname --fqdn returned an empty string twice and " +
                         "will not be set.")
       else
         fqdn ourfqdn
       end
     rescue
-      Ohai::Log.debug("Plugin Hostname: hostname --fqdn returned an error, probably no domain set")
+      logger.trace("Plugin Hostname: hostname --fqdn returned an error, probably no domain set")
     end
     domain collect_domain
   end

data/lib/ohai/plugins/init_package.rb

@@ -20,6 +20,6 @@ Ohai.plugin(:InitPackage) do
   provides "init_package"
 
   collect_data(:linux) do
-    init_package File.exists?("/proc/1/comm") ? File.open("/proc/1/comm").gets.chomp : "init"
+    init_package File.exist?("/proc/1/comm") ? File.open("/proc/1/comm").gets.chomp : "init"
   end
 end

data/lib/ohai/plugins/java.rb

@@ -42,7 +42,7 @@ Ohai.plugin(:Java) do
       languages[:java] = java unless java.empty?
     end
   rescue Ohai::Exceptions::Exec
-    Ohai::Log.debug('Plugin Java: Could not shell_out "java -mx64m -version". Skipping plugin')
+    logger.trace('Plugin Java: Could not shell_out "java -mx64m -version". Skipping plugin')
   end
 
   # On Mac OS X, the development tools include "stubs" for JVM executables that

data/lib/ohai/plugins/kernel.rb

@@ -4,7 +4,7 @@
 # Author:: Bryan McLellan (<btm@loftninjas.org>)
 # Author:: Claire McQuin (<claire@chef.io>)
 # Author:: James Gartrell (<jgartrel@gmail.com>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) 2008-2018 Chef Software, Inc.
 # Copyright:: Copyright (c) 2009 Bryan McLellan
 # License:: Apache License, Version 2.0
 #
@@ -26,6 +26,7 @@ Ohai.plugin(:Kernel) do
   provides "kernel", "kernel/modules"
 
   # common initial kernel attribute values
+  # @return [Mash] basic kernel properties from uname
   def init_kernel
     kernel Mash.new
     [["uname -s", :name], ["uname -r", :release],
@@ -38,6 +39,7 @@ Ohai.plugin(:Kernel) do
   end
 
   # common *bsd code for collecting modules data
+  # @return [Mash]
   def bsd_modules(path)
     modules = Mash.new
     so = shell_out("#{Ohai.abs_path(path)}")
@@ -50,24 +52,104 @@ Ohai.plugin(:Kernel) do
     modules
   end
 
-  # windows
-  def machine_lookup(sys_type)
-    return "i386" if sys_type.eql?("X86-based PC")
-    return "x86_64" if sys_type.eql?("x64-based PC")
+  # given the OperatingSystemSKU value from WMI's Win32_OperatingSystem class
+  # https://msdn.microsoft.com/en-us/library/aa394239(v=vs.85).aspx
+  # return if we're on a Server Core installation
+  # @param [String] sku OperatingSystemSKU value from Win32_OperatingSystem
+  # @return [boolean]
+  def server_core?(sku)
+    return true if [
+      12, # Server Datacenter Core
+      39, # Server Datacenter without Hyper-V Core
+      14, # Server Enterprise Core
+      41, # Server Enterprise without Hyper-V Core
+      13, # Server Standard Core
+      40, # Server Standard without Hyper-V Core
+      63, # Small Business Server Premium Core
+      53, # Server Solutions Premium Core
+      46, # Storage Server Enterprise Core
+      43, # Storage Server Express Core
+      44, # Storage Server Standard Core
+      45, # Storage Server Workgroup Core
+      29 # Web Server Core
+    ].include?(sku)
+    false
+  end
+
+  # given the SystemType value from WMI's Win32_ComputerSystem class
+  # https://msdn.microsoft.com/en-us/library/aa394102(v=vs.85).aspx
+  # return the architecture type
+  # @param [String] sys_type SystemType value from Win32_ComputerSystem
+  # @return [String] x86_64 or i386
+  def arch_lookup(sys_type)
+    return "x86_64" if sys_type == "x64-based PC"
+    return "i386" if sys_type == "X86-based PC"
     sys_type
   end
 
-  # windows
-  def os_lookup(sys_type)
-    return "Unknown" if sys_type.to_s.eql?("0")
-    return "Other" if sys_type.to_s.eql?("1")
-    return "MSDOS" if sys_type.to_s.eql?("14")
-    return "WIN3x" if sys_type.to_s.eql?("15")
-    return "WIN95" if sys_type.to_s.eql?("16")
-    return "WIN98" if sys_type.to_s.eql?("17")
-    return "WINNT" if sys_type.to_s.eql?("18")
-    return "WINCE" if sys_type.to_s.eql?("19")
-    nil
+  # given the ProductType value from WMI's Win32_OperatingSystem class
+  # https://msdn.microsoft.com/en-us/library/aa394239(v=vs.85).aspx
+  # return either workstation or server
+  # @param [Integer] type ProductType value from Win32_OperatingSystem
+  # @return [String] Workstation or Server
+  def product_type_decode(type)
+    return "Workstation" if type == 1
+    "Server"
+  end
+
+  # decode the OSType field from WMI Win32_OperatingSystem class
+  # https://msdn.microsoft.com/en-us/library/aa394239(v=vs.85).aspx
+  # @param [Integer] sys_type OSType value from Win32_OperatingSystem
+  # @return [String] the human consumable OS type value
+  def os_type_decode(sys_type)
+    case sys_type
+    when 18 then "WINNT" # most likely so first
+    when 0 then "Unknown"
+    when 1 then "Other"
+    when 14 then "MSDOS"
+    when 15 then "WIN3x"
+    when 16 then "WIN95"
+    when 17 then "WIN98"
+    when 19 then "WINCE"
+    else nil
+    end
+  end
+
+  # decode the PCSystemType field from WMI Win32_OperatingSystem class
+  # https://msdn.microsoft.com/en-us/library/aa394239(v=vs.85).aspx
+  # @param [Integer] type the integer value from PCSystemType
+  # @return [String] the human consumable OS type value
+  def pc_system_type_decode(type)
+    case type
+    when 4 then "Enterprise Server" # most likely so first
+    when 0 then "Unspecified"
+    when 1 then "Desktop"
+    when 2 then "Mobile"
+    when 3 then "Workstation"
+    when 5 then "SOHO Server"
+    when 6 then "Appliance PC"
+    when 7 then "Performance Server"
+    when 8 then "Maximum"
+    else nil
+    end
+  end
+
+  # see if a WMI name is blacklisted so we can avoid writing out
+  # useless data to ohai
+  # @param [String] name the wmi name to check
+  # @return [Boolean] is the wmi name blacklisted
+  def blacklisted_wmi_name?(name)
+    [
+     "creation_class_name", # this is just the wmi name
+     "cs_creation_class_name", # this is just the wmi name
+     "oem_logo_bitmap", # this is the entire OEM bitmap file
+     "total_swap_space_size", # already in memory plugin
+     "total_virtual_memory_size", # already in memory plugin
+     "total_virtual_memory_size", # already in memory plugin
+     "free_physical_memory", # already in memory plugin
+     "free_space_in_paging_files", # already in memory plugin
+     "free_virtual_memory", # already in memory plugin
+    ].include?(name)
   end
 
   collect_data(:default) do
@@ -94,7 +176,7 @@ Ohai.plugin(:Kernel) do
     kernel[:modules] = modules
   end
 
-  collect_data(:freebsd) do
+  collect_data(:freebsd, :dragonflybsd) do
     kernel init_kernel
     kernel[:os] = kernel[:name]
 
@@ -138,18 +220,6 @@ Ohai.plugin(:Kernel) do
     kernel[:modules] = bsd_modules("/usr/bin/modstat")
   end
 
-  collect_data(:dragonflybsd) do
-    kernel init_kernel
-    kernel[:os] = kernel[:name]
-
-    so = shell_out("uname -i")
-    kernel[:ident] = so.stdout.split($/)[0]
-    so = shell_out("sysctl kern.securelevel")
-    kernel[:securelevel] = so.stdout.split($/).select { |e| e =~ /kern.securelevel: (.+)$/ }
-
-    kernel[:modules] = bsd_modules("/sbin/kldstat")
-  end
-
   collect_data(:solaris2) do
     kernel init_kernel
 
@@ -168,7 +238,7 @@ Ohai.plugin(:Kernel) do
     #  6  1180000   4623   1   1  specfs (filesystem for specfs)
     module_description = /[\s]*([\d]+)[\s]+([a-f\d]+)[\s]+([a-f\d]+)[\s]+(?:[\-\d]+)[\s]+(?:[\d]+)[\s]+([\S]+)[\s]+\((.+)\)$/
     so.stdout.lines do |line|
-      if mod = module_description.match(line)
+      if ( mod = module_description.match(line) )
         modules[mod[4]] = { :id => mod[1].to_i, :loadaddr => mod[2], :size => mod[3].to_i(16), :description => mod[5] }
       end
     end
@@ -189,26 +259,25 @@ Ohai.plugin(:Kernel) do
     host = wmi.first_of("Win32_OperatingSystem")
     kernel[:os_info] = Mash.new
     host.wmi_ole_object.properties_.each do |p|
+      next if blacklisted_wmi_name?(p.name.wmi_underscore)
       kernel[:os_info][p.name.wmi_underscore.to_sym] = host[p.name.downcase]
     end
 
     kernel[:name] = "#{kernel[:os_info][:caption]}"
     kernel[:release] = "#{kernel[:os_info][:version]}"
     kernel[:version] = "#{kernel[:os_info][:version]} #{kernel[:os_info][:csd_version]} Build #{kernel[:os_info][:build_number]}"
-    kernel[:os] = os_lookup(kernel[:os_info][:os_type]) || languages[:ruby][:host_os]
+    kernel[:os] = os_type_decode(kernel[:os_info][:os_type]) || languages[:ruby][:host_os]
+    kernel[:product_type] = product_type_decode(kernel[:os_info][:product_type])
+    kernel[:server_core] = server_core?(kernel[:os_info][:operating_system_sku])
 
-    host = wmi.first_of("Win32_ComputerSystem")
     kernel[:cs_info] = Mash.new
-    cs_info_blacklist = [
-      "oem_logo_bitmap",
-    ]
+    host = wmi.first_of("Win32_ComputerSystem")
     host.wmi_ole_object.properties_.each do |p|
-      if !cs_info_blacklist.include?(p.name.wmi_underscore)
-        kernel[:cs_info][p.name.wmi_underscore.to_sym] = host[p.name.downcase]
-      end
+      next if blacklisted_wmi_name?(p.name.wmi_underscore)
+      kernel[:cs_info][p.name.wmi_underscore.to_sym] = host[p.name.downcase]
     end
 
-    kernel[:machine] = machine_lookup("#{kernel[:cs_info][:system_type]}")
-
+    kernel[:machine] = arch_lookup("#{kernel[:cs_info][:system_type]}")
+    kernel[:system_type] = pc_system_type_decode(kernel[:cs_info][:pc_system_type])
   end
 end