ohai 6.24.2 → 7.0.0.rc.0

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

@@ -16,87 +16,153 @@
 # limitations under the License.
 #
 
-#http://github.com/mdkent/ohai/commit/92f51aa18b6add9682510a87dcf94835ea72b04d
+require 'ohai/mixin/network_constants'
 
-require "sigar"
+Ohai.plugin(:Network) do
+  include Ohai::Mixin::NetworkConstants
 
-sigar = Sigar.new
+  provides "network", "network/interfaces"
+  provides "counters/network", "counters/network/interfaces"
 
-provides "network", "counters/network"
+  def sigar_encaps_lookup(encap)
+    return "Loopback" if encap.eql?("Local Loopback")
+    return "PPP" if encap.eql?("Point-to-Point Protocol")
+    return "SLIP" if encap.eql?("Serial Line IP")
+    return "VJSLIP" if encap.eql?("VJ Serial Line IP")
+    return "IPIP" if encap.eql?("IPIP Tunnel")
+    return "6to4" if encap.eql?("IPv6-in-IPv4")
+    encap
+  end
 
-ninfo = sigar.net_info
+  def fetch_interfaces(sigar)
+    iface = Mash.new
+    net_counters = Mash.new
 
-network[:default_interface] = ninfo.default_gateway_interface
+    sigar.net_interface_list.each do |cint|
+      iface[cint] = Mash.new
 
-network[:default_gateway] = ninfo.default_gateway
+      if cint =~ /^(\w+)(\d+.*)/
+        iface[cint][:type] = $1
+        iface[cint][:number] = $2
+      end
 
-def encaps_lookup(encap)
-  return "Loopback" if encap.eql?("Local Loopback")
-  return "PPP" if encap.eql?("Point-to-Point Protocol")
-  return "SLIP" if encap.eql?("Serial Line IP")
-  return "VJSLIP" if encap.eql?("VJ Serial Line IP")
-  return "IPIP" if encap.eql?("IPIP Tunnel")
-  return "6to4" if encap.eql?("IPv6-in-IPv4")
-  encap
-end
+      ifconfig = sigar.net_interface_config(cint)
+      iface[cint][:encapsulation] = sigar_encaps_lookup(ifconfig.type)
 
-iface = Mash.new
+      iface[cint][:addresses] = Mash.new
+      # Backwards compat: loopback has no hwaddr
+      if (ifconfig.flags & Sigar::IFF_LOOPBACK) == 0
+        iface[cint][:addresses][ifconfig.hwaddr] = { "family" => "lladdr" }
+      end
+      if ifconfig.address != "0.0.0.0"
+        iface[cint][:addresses][ifconfig.address] = { "family" => "inet" }
+        # Backwards compat: no broadcast on tunnel or loopback dev
+        if (((ifconfig.flags & Sigar::IFF_POINTOPOINT) == 0) &&
+            ((ifconfig.flags & Sigar::IFF_LOOPBACK) == 0))
+          iface[cint][:addresses][ifconfig.address]["broadcast"] = ifconfig.broadcast
+        end
+        iface[cint][:addresses][ifconfig.address]["netmask"] = ifconfig.netmask
+      end
 
-net_counters = Mash.new
+      if ifconfig.prefix6_length != 0
+        iface[cint][:addresses][ifconfig.address6] = { "family" => "inet6" }
+        iface[cint][:addresses][ifconfig.address6]["prefixlen"] = ifconfig.prefix6_length.to_s
+        iface[cint][:addresses][ifconfig.address6]["scope"] = Sigar.net_scope_to_s(ifconfig.scope6)
+      end
 
-sigar.net_interface_list.each do |cint|
-  iface[cint] = Mash.new
-  if cint =~ /^(\w+)(\d+.*)/
-    iface[cint][:type] = $1
-    iface[cint][:number] = $2
-  end
-  ifconfig = sigar.net_interface_config(cint)
-  iface[cint][:encapsulation] = encaps_lookup(ifconfig.type)
-  iface[cint][:addresses] = Mash.new
-  # Backwards compat: loopback has no hwaddr
-  if (ifconfig.flags & Sigar::IFF_LOOPBACK) == 0
-    iface[cint][:addresses][ifconfig.hwaddr] = { "family" => "lladdr" }
-  end
-  if ifconfig.address != "0.0.0.0"
-    iface[cint][:addresses][ifconfig.address] = { "family" => "inet" }
-    # Backwards compat: no broadcast on tunnel or loopback dev
-    if (((ifconfig.flags & Sigar::IFF_POINTOPOINT) == 0) &&
-          ((ifconfig.flags & Sigar::IFF_LOOPBACK) == 0))
-      iface[cint][:addresses][ifconfig.address]["broadcast"] = ifconfig.broadcast
+      iface[cint][:flags] = Sigar.net_interface_flags_to_s(ifconfig.flags).split(' ')
+      iface[cint][:mtu] = ifconfig.mtu.to_s
+      iface[cint][:queuelen] = ifconfig.tx_queue_len.to_s
+
+      net_counters[cint] = Mash.new unless net_counters[cint]
+      if (!cint.include?(":"))
+        ifstat = sigar.net_interface_stat(cint)
+        net_counters[cint][:rx] = { "packets" => ifstat.rx_packets.to_s, "errors"     => ifstat.rx_errors.to_s,
+          "drop"    => ifstat.rx_dropped.to_s, "overrun"    => ifstat.rx_overruns.to_s,
+          "frame"   => ifstat.rx_frame.to_s,   "bytes"      => ifstat.rx_bytes.to_s }
+        net_counters[cint][:tx] = { "packets" => ifstat.tx_packets.to_s, "errors"     => ifstat.tx_errors.to_s,
+          "drop"    => ifstat.tx_dropped.to_s, "overrun"    => ifstat.tx_overruns.to_s,
+          "carrier" => ifstat.tx_carrier.to_s, "collisions" => ifstat.tx_collisions.to_s,
+          "bytes"   => ifstat.tx_bytes.to_s }
+      end
     end
-    iface[cint][:addresses][ifconfig.address]["netmask"] = ifconfig.netmask
-  end
-  iface[cint][:flags] = Sigar.net_interface_flags_to_s(ifconfig.flags).split(' ')
-  iface[cint][:mtu] = ifconfig.mtu.to_s
-  iface[cint][:queuelen] = ifconfig.tx_queue_len.to_s
-  if ifconfig.prefix6_length != 0
-    iface[cint][:addresses][ifconfig.address6] = { "family" => "inet6" }
-    iface[cint][:addresses][ifconfig.address6]["prefixlen"] = ifconfig.prefix6_length.to_s
-    iface[cint][:addresses][ifconfig.address6]["scope"] = Sigar.net_scope_to_s(ifconfig.scope6)
+
+    begin
+      sigar.arp_list.each do |arp|
+        next unless iface[arp.ifname] # this should never happen
+        iface[arp.ifname][:arp] = Mash.new unless iface[arp.ifname][:arp]
+        iface[arp.ifname][:arp][arp.address] = arp.hwaddr
+      end
+    rescue
+      #64-bit AIX for example requires 64-bit caller
+    end
+
+    [iface, net_counters]
   end
-  net_counters[cint] = Mash.new unless net_counters[cint]
-  if (!cint.include?(":"))
-    ifstat = sigar.net_interface_stat(cint)
-    net_counters[cint][:rx] = { "packets" => ifstat.rx_packets.to_s, "errors"     => ifstat.rx_errors.to_s,
-                                "drop"    => ifstat.rx_dropped.to_s, "overrun"    => ifstat.rx_overruns.to_s,
-                                "frame"   => ifstat.rx_frame.to_s,   "bytes"      => ifstat.rx_bytes.to_s }
-    net_counters[cint][:tx] = { "packets" => ifstat.tx_packets.to_s, "errors"     => ifstat.tx_errors.to_s,
-                                "drop"    => ifstat.tx_dropped.to_s, "overrun"    => ifstat.tx_overruns.to_s,
-                                "carrier" => ifstat.tx_carrier.to_s, "collisions" => ifstat.tx_collisions.to_s,
-                                "bytes"   => ifstat.tx_bytes.to_s }
+
+  # sigar-only, from network_route plugin
+  def flags(flags)
+    f = ""
+    if (flags & Sigar::RTF_UP) != 0
+      f += "U"
+    end
+    if (flags & Sigar::RTF_GATEWAY) != 0
+      f += "G"
+    end
+    if (flags & Sigar::RTF_HOST) != 0
+      f += "H"
+    end
+    f
   end
-end
 
-begin
-  sigar.arp_list.each do |arp|
-    next unless iface[arp.ifname] # this should never happen
-    iface[arp.ifname][:arp] = Mash.new unless iface[arp.ifname][:arp]
-    iface[arp.ifname][:arp][arp.address] = arp.hwaddr
+  collect_data(:hpux) do
+    require "sigar"
+    sigar = Sigar.new
+
+    network Mash.new unless network
+    network[:interfaces] = Mash.new unless network[:interfaces]
+    counters Mash.new unless counters
+    counters[:network] = Mash.new unless counters[:network]
+
+    ninfo = sigar.net_info
+    network[:default_interface] = ninfo.default_gateway_interface
+    network[:default_gateway] = ninfo.default_gateway
+
+    iface, net_counters = fetch_interfaces(sigar)
+    counters[:network][:interfaces] = net_counters
+    network["interfaces"] = iface
   end
-rescue
-  #64-bit AIX for example requires 64-bit caller
-end
 
-counters[:network][:interfaces] = net_counters
+  collect_data(:default) do
+    require "sigar"
+    sigar = Sigar.new
 
-network["interfaces"] = iface
+    network Mash.new unless network
+    network[:interfaces] = Mash.new unless network[:interfaces]
+    counters Mash.new unless counters
+    counters[:network] = Mash.new unless counters[:network]
+
+    ninfo = sigar.net_info
+    network[:default_interface] = ninfo.default_gateway_interface
+    network[:default_gateway] = ninfo.default_gateway
+
+    iface, net_counters = fetch_interfaces(sigar)
+    counters[:network][:interfaces] = net_counters
+    network[:interfaces] = iface
+
+    sigar.net_route_list.each do |route|
+      next unless network[:interfaces][route.ifname] # this
+      # should never happen
+      network[:interfaces][route.ifname][:route] = Mash.new unless network[:interfaces][route.ifname][:route]
+      route_data={}
+      Ohai::Mixin::NetworkConstants::SIGAR_ROUTE_METHODS.each do |m|
+        if(m == :flags)
+          route_data[m]=flags(route.send(m))
+        else
+          route_data[m]=route.send(m)
+        end
+      end
+      network[:interfaces][route.ifname][:route][route.destination] = route_data
+    end
+  end
+end

data/lib/ohai/plugins/sigar/network_route.rb

@@ -16,39 +16,44 @@
 # limitations under the License.
 #
 
-require "sigar"
-require_plugin "network"
+require 'ohai/mixin/network_constants'
 
-provides "network"
+Ohai.plugin(:NetworkRoutes) do
+  include Ohai::Mixin::NetworkConstants
 
-def flags(flags)
-  f = ""
-  if (flags & Sigar::RTF_UP) != 0
-    f += "U"
-  end
-  if (flags & Sigar::RTF_GATEWAY) != 0
-    f += "G"
-  end
-  if (flags & Sigar::RTF_HOST) != 0
-    f += "H"
+  provides "network/interfaces/adapters/route"
+  depends "network/interfaces"
+
+  def flags(flags)
+    f = ""
+    if (flags & Sigar::RTF_UP) != 0
+      f += "U"
+    end
+    if (flags & Sigar::RTF_GATEWAY) != 0
+      f += "G"
+    end
+    if (flags & Sigar::RTF_HOST) != 0
+      f += "H"
+    end
+    f
   end
-  f
-end
 
-# From sigar: include/sigar.h sigar_net_route_t
-SIGAR_ROUTE_METHODS = [:destination, :gateway, :mask, :flags, :refcnt, :use, :metric, :mtu, :window, :irtt, :ifname]
+  collect_data(:default) do
+    require "sigar"
+    sigar = Sigar.new
 
-sigar=Sigar.new
-sigar.net_route_list.each do |route|
-  next unless network[:interfaces][route.ifname] # this should never happen
-  network[:interfaces][route.ifname][:route] = Mash.new unless network[:interfaces][route.ifname][:route]
-  route_data={}
-  SIGAR_ROUTE_METHODS.each do |m|
-    if(m == :flags)
-      route_data[m]=flags(route.send(m))
-    else
-      route_data[m]=route.send(m)
+    sigar.net_route_list.each do |route|
+      next unless network[:interfaces][route.ifname] # this should never happen
+      network[:interfaces][route.ifname][:route] = Mash.new unless network[:interfaces][route.ifname][:route]
+      route_data={}
+      Ohai::Mixin::NetworkConstants::SIGAR_ROUTE_METHODS.each do |m|
+        if(m == :flags)
+          route_data[m]=flags(route.send(m))
+        else
+          route_data[m]=route.send(m)
+        end
+      end
+      network[:interfaces][route.ifname][:route][route.destination] = route_data
     end
   end
-  network[:interfaces][route.ifname][:route][route.destination] = route_data
 end

data/lib/ohai/plugins/sigar/platform.rb

@@ -16,11 +16,15 @@
 # limitations under the License.
 #
 
-require "sigar"
+Ohai.plugin(:Platform) do
+  provides "platform", "platform_version", "platform_family"
 
-provides "platform", "platform_version"
+  collect_data(:hpux) do
+    require "sigar"
+    sys = Sigar.new.sys_info
 
-sys = Sigar.new.sys_info
-
-platform sys.name.downcase
-platform_version sys.version
+    platform sys.name.downcase
+    platform_version sys.version
+    platform_family platform
+  end
+end

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

@@ -1,33 +1,41 @@
-#$ psrinfo -v
-#Status of virtual processor 0 as of: 01/11/2009 23:31:55
-#  on-line since 05/29/2008 15:05:28.
-#  The i386 processor operates at 2660 MHz,
-#        and has an i387 compatible floating point processor.
-#Status of virtual processor 1 as of: 01/11/2009 23:31:55
-#  on-line since 05/29/2008 15:05:30.
-#  The i386 processor operates at 2660 MHz,
-#        and has an i387 compatible floating point processor.
-#Status of virtual processor 2 as of: 01/11/2009 23:31:55
-#  on-line since 05/29/2008 15:05:30.
-#  The i386 processor operates at 2660 MHz,
-#        and has an i387 compatible floating point processor.
-#Status of virtual processor 3 as of: 01/11/2009 23:31:55
-#  on-line since 05/29/2008 15:05:30.
-#  The i386 processor operates at 2660 MHz,
-#        and has an i387 compatible floating point processor.
-#Status of virtual processor 4 as of: 01/11/2009 23:31:55
-#  on-line since 05/29/2008 15:05:30.
-#  The i386 processor operates at 2660 MHz,
-#        and has an i387 compatible floating point processor.
-#Status of virtual processor 5 as of: 01/11/2009 23:31:55
-#  on-line since 05/29/2008 15:05:30.
-#  The i386 processor operates at 2660 MHz,
-#        and has an i387 compatible floating point processor.
-#Status of virtual processor 6 as of: 01/11/2009 23:31:55
-#  on-line since 05/29/2008 15:05:30.
-#  The i386 processor operates at 2660 MHz,
-#        and has an i387 compatible floating point processor.
-#Status of virtual processor 7 as of: 01/11/2009 23:31:55
-#  on-line since 05/29/2008 15:05:30.
-#  The i386 processor operates at 2660 MHz,
-#        and has an i387 compatible floating point processor.
+#
+# 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(:CPU) do
+  provides "cpu"
+
+  collect_data(:solaris2) do
+    cpu Mash.new
+    cpu[:total] = shell_out("psrinfo | wc -l").stdout.to_i
+    cpu[:real] = shell_out("psrinfo -p").stdout.to_i
+
+    processor_info = shell_out("psrinfo -v -p | grep Hz").stdout
+    processors = processor_info.split(/^    [^\s]/)
+    processors.each_with_index do |processor, i|
+      cpu_info, model_name = processor.split("\n      ")
+      cpu_info = cpu_info.tr("()","").split
+
+      index = i.to_s
+      cpu[index] = Mash.new
+      cpu[index]['vendor_id'] = cpu_info[1]
+      cpu[index]['family'] = cpu_info[4]
+      cpu[index]['model'] = cpu_info[6]
+      cpu[index]['stepping'] = cpu_info[8]
+      cpu[index]['model_name'] = model_name.strip
+      cpu[index]['mhz'] = cpu_info[10]
+    end
+  end
+end

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

@@ -16,161 +16,161 @@
 # limitations under the License.
 #
 
-require_plugin "dmi"
+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') and (dmi.keys.length > 1) 
-  Ohai::Log.debug('skipping smbios output, since DMI information has already been provided')
-  return
-end
-
-dmi Mash.new
-
-# bad Solaris shows strings defined by system instead of SMB IDs 
-# this is what the *real* IDs are:
-# pulled from http://src.opensolaris.org/source/xref/nwam/nwam1/usr/src/uts/common/sys/smbios.h
-smb_to_id = {
-  'SMB_TYPE_BIOS' =>         0, # BIOS information (R)
-  'SMB_TYPE_SYSTEM' =>       1, # system information (R)
-  'SMB_TYPE_BASEBOARD' =>    2, # base board
-  'SMB_TYPE_CHASSIS' =>      3, # system enclosure or chassis (R)
-  'SMB_TYPE_PROCESSOR' =>    4, # processor (R)
-  'SMB_TYPE_MEMCTL' =>       5, # memory controller (O)
-  'SMB_TYPE_MEMMOD' =>       6, # memory module (O)
-  'SMB_TYPE_CACHE' =>        7, # processor cache (R)
-  'SMB_TYPE_PORT' =>         8, # port connector
-  'SMB_TYPE_SLOT' =>         9, # upgradeable system slot (R)
-  'SMB_TYPE_OBDEVS' =>       10, # on-board devices
-  'SMB_TYPE_OEMSTR' =>       11, # OEM string table
-  'SMB_TYPE_SYSCONFSTR' =>   12, # system configuration string table
-  'SMB_TYPE_LANG' =>         13, # BIOS language information
-  'SMB_TYPE_GROUP' =>        14, # group associations
-  'SMB_TYPE_EVENTLOG' =>     15, # system event log
-  'SMB_TYPE_MEMARRAY' =>     16, # physical memory array (R)
-  'SMB_TYPE_MEMDEVICE' =>    17, # memory device (R)
-  'SMB_TYPE_MEMERR32' =>     18, # 32-bit memory error information
-  'SMB_TYPE_MEMARRAYMAP' =>  19, # memory array mapped address (R)
-  'SMB_TYPE_MEMDEVICEMAP' => 20, # memory device mapped address (R)
-  'SMB_TYPE_POINTDEV' =>     21, # built-in pointing device
-  'SMB_TYPE_BATTERY' =>      22, # portable battery
-  'SMB_TYPE_RESET' =>        23, # system reset settings
-  'SMB_TYPE_SECURITY' =>     24, # hardware security settings
-  'SMB_TYPE_POWERCTL' =>     25, # system power controls
-  'SMB_TYPE_VPROBE' =>       26, # voltage probe
-  'SMB_TYPE_COOLDEV' =>      27, # cooling device
-  'SMB_TYPE_TPROBE' =>       28, # temperature probe
-  'SMB_TYPE_IPROBE' =>       29, # current probe
-  'SMB_TYPE_OOBRA' =>        30, # out-of-band remote access facility
-  'SMB_TYPE_BIS' =>          31, # boot integrity services
-  'SMB_TYPE_BOOT' =>         32, # system boot status (R)
-  'SMB_TYPE_MEMERR64' =>     33, # 64-bit memory error information
-  'SMB_TYPE_MGMTDEV' =>      34, # management device
-  'SMB_TYPE_MGMTDEVCP' =>    35, # management device component
-  'SMB_TYPE_MGMTDEVDATA' =>  36, # management device threshold data
-  'SMB_TYPE_MEMCHAN' =>      37, # memory channel
-  'SMB_TYPE_IPMIDEV' =>      38, # IPMI device information
-  'SMB_TYPE_POWERSUP' =>     39, # system power supply
-  'SMB_TYPE_INACTIVE' =>     126, # inactive table entry
-  'SMB_TYPE_EOT' =>          127, # end of table
-  'SMB_TYPE_OEM_LO' =>       128, # start of OEM-specific type range
-  'SUN_OEM_EXT_PROCESSOR' => 132, # processor extended info
-  'SUN_OEM_PCIEXRC' =>       138, # PCIE RootComplex/RootPort info
-  'SUN_OEM_EXT_MEMARRAY' =>  144, # phys memory array extended info
-  'SUN_OEM_EXT_MEMDEVICE' => 145, # memory device extended info
-  'SMB_TYPE_OEM_HI' =>       256, # end of OEM-specific type range
-}
-
-# all output lines should fall within one of these patterns
-header_type_line = /^ID\s+SIZE\s+TYPE/
-header_information_line = /^(\d+)\s+(\d+)\s+(\S+)\s+\(([^\)]+)\)/
-blank_line = /^\s*$/
-data_key_value_line = /^  ([^:]+): (.*)/
-data_key_only_line = /^  (\S.*)(:\s*)?$/
-extended_data_line = /^\t(\S+) \((.+)\)/
-
-dmi_record = nil
-field = nil
-
-popen4("smbios") do |pid, stdin, stdout, stderr|
-  stdin.close
-  
-  # ==== EXAMPLE: ====
-  # ID    SIZE TYPE
-  # 0     40   SMB_TYPE_BIOS (BIOS information)
-  # 
-  #   Vendor: HP
-  #   Version String: 2.16  
-  # ... similar lines trimmed
-  #   Characteristics: 0x7fc9da80
-  #         SMB_BIOSFL_PCI (PCI is supported)
-  # ... similar lines trimmed
-  # note the second level of indentation is via a *tab*
-  stdout.each do |raw_line|
-    next if header_type_line.match(raw_line)
-    next if blank_line.match(raw_line)
-
-    # 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}")
+  collect_data(:solaris2) 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') and (dmi.keys.length > 1) 
+      Ohai::Log.debug('skipping smbios output, since DMI information has already been provided')
+      return
     end
 
-    if header_information = header_information_line.match(line)
-      dmi_record = {}
+    dmi Mash.new
 
-      # look up SMB ID
-      if smb_to_id.has_key?(header_information[3])
-        dmi_record[:type] = DMI.id_lookup(smb_to_id[header_information[3]])
+    # bad Solaris shows strings defined by system instead of SMB IDs 
+    # this is what the *real* IDs are:
+    # pulled from http://src.opensolaris.org/source/xref/nwam/nwam1/usr/src/uts/common/sys/smbios.h
+    smb_to_id = {
+      'SMB_TYPE_BIOS' =>         0, # BIOS information (R)
+      'SMB_TYPE_SYSTEM' =>       1, # system information (R)
+      'SMB_TYPE_BASEBOARD' =>    2, # base board
+      'SMB_TYPE_CHASSIS' =>      3, # system enclosure or chassis (R)
+      'SMB_TYPE_PROCESSOR' =>    4, # processor (R)
+      'SMB_TYPE_MEMCTL' =>       5, # memory controller (O)
+      'SMB_TYPE_MEMMOD' =>       6, # memory module (O)
+      'SMB_TYPE_CACHE' =>        7, # processor cache (R)
+      'SMB_TYPE_PORT' =>         8, # port connector
+      'SMB_TYPE_SLOT' =>         9, # upgradeable system slot (R)
+      'SMB_TYPE_OBDEVS' =>       10, # on-board devices
+      'SMB_TYPE_OEMSTR' =>       11, # OEM string table
+      'SMB_TYPE_SYSCONFSTR' =>   12, # system configuration string table
+      'SMB_TYPE_LANG' =>         13, # BIOS language information
+      'SMB_TYPE_GROUP' =>        14, # group associations
+      'SMB_TYPE_EVENTLOG' =>     15, # system event log
+      'SMB_TYPE_MEMARRAY' =>     16, # physical memory array (R)
+      'SMB_TYPE_MEMDEVICE' =>    17, # memory device (R)
+      'SMB_TYPE_MEMERR32' =>     18, # 32-bit memory error information
+      'SMB_TYPE_MEMARRAYMAP' =>  19, # memory array mapped address (R)
+      'SMB_TYPE_MEMDEVICEMAP' => 20, # memory device mapped address (R)
+      'SMB_TYPE_POINTDEV' =>     21, # built-in pointing device
+      'SMB_TYPE_BATTERY' =>      22, # portable battery
+      'SMB_TYPE_RESET' =>        23, # system reset settings
+      'SMB_TYPE_SECURITY' =>     24, # hardware security settings
+      'SMB_TYPE_POWERCTL' =>     25, # system power controls
+      'SMB_TYPE_VPROBE' =>       26, # voltage probe
+      'SMB_TYPE_COOLDEV' =>      27, # cooling device
+      'SMB_TYPE_TPROBE' =>       28, # temperature probe
+      'SMB_TYPE_IPROBE' =>       29, # current probe
+      'SMB_TYPE_OOBRA' =>        30, # out-of-band remote access facility
+      'SMB_TYPE_BIS' =>          31, # boot integrity services
+      'SMB_TYPE_BOOT' =>         32, # system boot status (R)
+      'SMB_TYPE_MEMERR64' =>     33, # 64-bit memory error information
+      'SMB_TYPE_MGMTDEV' =>      34, # management device
+      'SMB_TYPE_MGMTDEVCP' =>    35, # management device component
+      'SMB_TYPE_MGMTDEVDATA' =>  36, # management device threshold data
+      'SMB_TYPE_MEMCHAN' =>      37, # memory channel
+      'SMB_TYPE_IPMIDEV' =>      38, # IPMI device information
+      'SMB_TYPE_POWERSUP' =>     39, # system power supply
+      'SMB_TYPE_INACTIVE' =>     126, # inactive table entry
+      'SMB_TYPE_EOT' =>          127, # end of table
+      'SMB_TYPE_OEM_LO' =>       128, # start of OEM-specific type range
+      'SUN_OEM_EXT_PROCESSOR' => 132, # processor extended info
+      'SUN_OEM_PCIEXRC' =>       138, # PCIE RootComplex/RootPort info
+      'SUN_OEM_EXT_MEMARRAY' =>  144, # phys memory array extended info
+      'SUN_OEM_EXT_MEMDEVICE' => 145, # memory device extended info
+      'SMB_TYPE_OEM_HI' =>       256, # end of OEM-specific type range
+    }
 
-      else
-        dmi_record[:type] = header_information[3].downcase
-        Ohai::Log.debug("unrecognized header type; falling back to #{dmi_record[:type]}")
-      end
+    # all output lines should fall within one of these patterns
+    header_type_line = /^ID\s+SIZE\s+TYPE/
+    header_information_line = /^(\d+)\s+(\d+)\s+(\S+)\s+\(([^\)]+)\)/
+    blank_line = /^\s*$/
+    data_key_value_line = /^  ([^:]+): (.*)/
+    data_key_only_line = /^  (\S.*)(:\s*)?$/
+    extended_data_line = /^\t(\S+) \((.+)\)/
 
-      dmi[dmi_record[:type]] = Mash.new unless dmi.has_key?(dmi_record[:type])
-      dmi[dmi_record[:type]][:all_records] = [] unless dmi[dmi_record[:type]].has_key?(:all_records)
-      dmi_record[:position] = dmi[dmi_record[:type]][:all_records].length
-      dmi[dmi_record[:type]][:all_records].push(Mash.new)
-      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:record_id] = header_information[1]
-      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:size] = header_information[2]
-      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:application_identifier] = header_information[4]
-      field = nil
-    
-    elsif data = data_key_value_line.match(line)
-      if dmi_record == nil
-        Ohai::Log.debug("unexpected data line found before header; discarding:\n#{line}")
-        next
-      end
-      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][data[1]] = data[2]
-      field = data[1]
-    
-    elsif data = data_key_only_line.match(line)
-      if dmi_record == nil
-        Ohai::Log.debug("unexpected data line found before header; discarding:\n#{line}")
-        next
-      end
-      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][data[1]] = ''
-      field = data[1]
-    
-    elsif extended_data = extended_data_line.match(line)
-      if dmi_record == nil
-        Ohai::Log.debug("unexpected extended data line found before header; discarding:\n#{line}")
-        next
-      end
-      if field == nil
-        Ohai::Log.debug("unexpected extended data line found outside data section; discarding:\n#{line}")
-        next
+    dmi_record = nil
+    field = nil
+
+    so = shell_out("smbios")
+    # ==== EXAMPLE: ====
+    # ID    SIZE TYPE
+    # 0     40   SMB_TYPE_BIOS (BIOS information)
+    # 
+    #   Vendor: HP
+    #   Version String: 2.16  
+    # ... similar lines trimmed
+    #   Characteristics: 0x7fc9da80
+    #         SMB_BIOSFL_PCI (PCI is supported)
+    # ... similar lines trimmed
+    # note the second level of indentation is via a *tab*
+    so.stdout.lines do |raw_line|
+      next if header_type_line.match(raw_line)
+      next if blank_line.match(raw_line)
+
+      # 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}")
       end
-      # overwrite "raw" value with a new Mash
-      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field] = Mash.new unless dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field].class.to_s == 'Mash'
-      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field][extended_data[1]] = extended_data[2]
 
-    else
-      Ohai::Log.debug("unrecognized output line; discarding:\n#{line}")
+      if header_information = header_information_line.match(line)
+        dmi_record = {}
+
+        # look up SMB ID
+        if smb_to_id.has_key?(header_information[3])
+          dmi_record[:type] = DMI.id_lookup(smb_to_id[header_information[3]])
 
+        else
+          dmi_record[:type] = header_information[3].downcase
+          Ohai::Log.debug("unrecognized header type; falling back to #{dmi_record[:type]}")
+        end
+
+        dmi[dmi_record[:type]] = Mash.new unless dmi.has_key?(dmi_record[:type])
+        dmi[dmi_record[:type]][:all_records] = [] unless dmi[dmi_record[:type]].has_key?(:all_records)
+        dmi_record[:position] = dmi[dmi_record[:type]][:all_records].length
+        dmi[dmi_record[:type]][:all_records].push(Mash.new)
+        dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:record_id] = header_information[1]
+        dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:size] = header_information[2]
+        dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:application_identifier] = header_information[4]
+        field = nil
+
+      elsif data = data_key_value_line.match(line)
+        if dmi_record == nil
+          Ohai::Log.debug("unexpected data line found before header; discarding:\n#{line}")
+          next
+        end
+        dmi[dmi_record[:type]][:all_records][dmi_record[:position]][data[1]] = data[2]
+        field = data[1]
+
+      elsif data = data_key_only_line.match(line)
+        if dmi_record == nil
+          Ohai::Log.debug("unexpected data line found before header; discarding:\n#{line}")
+          next
+        end
+        dmi[dmi_record[:type]][:all_records][dmi_record[:position]][data[1]] = ''
+        field = data[1]
+
+      elsif extended_data = extended_data_line.match(line)
+        if dmi_record == nil
+          Ohai::Log.debug("unexpected extended data line found before header; discarding:\n#{line}")
+          next
+        end
+        if field == nil
+          Ohai::Log.debug("unexpected extended data line found outside data section; discarding:\n#{line}")
+          next
+        end
+        # overwrite "raw" value with a new Mash
+        dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field] = Mash.new unless dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field].class.to_s == 'Mash'
+        dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field][extended_data[1]] = extended_data[2]
+
+      else
+        Ohai::Log.debug("unrecognized output line; discarding:\n#{line}")
+
+      end
     end
+
+    DMI.convenience_keys(dmi)
   end
 end
-
-DMI.convenience_keys(dmi)