ohai 13.12.6 → 14.0.28

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

@@ -114,8 +114,8 @@ Ohai.plugin(:Network) do
       # Query macaddress
       e_so = shell_out("entstat -d #{interface} | grep \"Hardware Address\"")
       iface[interface][:addresses] = Mash.new unless iface[interface][:addresses]
-      e_so.stdout.lines.each do |line|
-        if line =~ /Hardware Address: (\S+)/
+      e_so.stdout.lines.each do |l|
+        if l =~ /Hardware Address: (\S+)/
           iface[interface][:addresses][$1.upcase] = { "family" => "lladdr" }
           macaddress $1.upcase unless shell_out("uname -W").stdout.to_i > 0
         end

data/lib/ohai/plugins/aix/virtualization.rb

@@ -140,7 +140,7 @@ Ohai.plugin(:Virtualization) do
           breadcrumb.each do |node|
             evalstr << "[\'#{node}\']"
           end
-          wpars[wpar_name][breadcrumb[-1]] = eval evalstr
+          wpars[wpar_name][breadcrumb[-1]] = eval evalstr # rubocop: disable Security/Eval
         end
       end
       virtualization[:wpars] = wpars unless wpars.empty?

data/lib/ohai/plugins/azure.rb

@@ -30,16 +30,16 @@ Ohai.plugin(:Azure) do
     # project for details
     azure_metadata_from_hints = hint?("azure")
     if azure_metadata_from_hints
-      Ohai::Log.debug("Plugin Azure: Azure hint is present. Parsing any hint data.")
+      logger.trace("Plugin Azure: Azure hint is present. Parsing any hint data.")
       azure Mash.new
       azure_metadata_from_hints.each { |k, v| azure[k] = v }
       azure["metadata"] = parse_metadata
     elsif has_waagent? || has_dhcp_option_245?
-      Ohai::Log.debug("Plugin Azure: No hints present, but system appears to be on Azure.")
+      logger.trace("Plugin Azure: No hints present, but system appears to be on Azure.")
       azure Mash.new
       azure["metadata"] = parse_metadata
     else
-      Ohai::Log.debug("Plugin Azure: No hints present and doesn't appear to be on Azure.")
+      logger.trace("Plugin Azure: No hints present and doesn't appear to be on Azure.")
       false
     end
   end
@@ -48,7 +48,7 @@ Ohai.plugin(:Azure) do
   # http://blog.mszcool.com/index.php/2015/04/detecting-if-a-virtual-machine-runs-in-microsoft-azure-linux-windows-to-protect-your-software-when-distributed-via-the-azure-marketplace/
   def has_waagent?
     if File.exist?("/usr/sbin/waagent") || Dir.exist?('C:\WindowsAzure')
-      Ohai::Log.debug("Plugin Azure: Found waagent used by Azure.")
+      logger.trace("Plugin Azure: Found waagent used by Azure.")
       true
     end
   end
@@ -58,7 +58,7 @@ Ohai.plugin(:Azure) do
     if File.exist?("/var/lib/dhcp/dhclient.eth0.leases")
       File.open("/var/lib/dhcp/dhclient.eth0.leases").each do |line|
         if line =~ /unknown-245/
-          Ohai::Log.debug("Plugin Azure: Found unknown-245 DHCP option used by Azure.")
+          logger.trace("Plugin Azure: Found unknown-245 DHCP option used by Azure.")
           has_245 = true
           break
         end

data/lib/ohai/plugins/bsd/virtualization.rb

@@ -34,7 +34,7 @@ Ohai.plugin(:Virtualization) do
       virtualization[:system] = "jail"
       virtualization[:role] = "guest"
       virtualization[:systems][:jail] = "guest"
-      Ohai::Log.debug("Plugin Virtualization: Guest running in FreeBSD jail detected")
+      logger.trace("Plugin Virtualization: Guest running in FreeBSD jail detected")
     end
 
     # run jls to get a list of running jails
@@ -45,7 +45,7 @@ Ohai.plugin(:Virtualization) do
       virtualization[:system] = "jail"
       virtualization[:role] = "host"
       virtualization[:systems][:jail] = "host"
-      Ohai::Log.debug("Plugin Virtualization: Host running FreeBSD jails detected")
+      logger.trace("Plugin Virtualization: Host running FreeBSD jails detected")
     end
 
     # detect from modules
@@ -56,12 +56,12 @@ Ohai.plugin(:Virtualization) do
         virtualization[:system] = "vbox"
         virtualization[:role] = "host"
         virtualization[:systems][:vbox] = "host"
-        Ohai::Log.debug("Plugin Virtualization: Guest running on VirtualBox detected")
+        logger.trace("Plugin Virtualization: Guest running on VirtualBox detected")
       when /vboxguest/
         virtualization[:system] = "vbox"
         virtualization[:role] = "guest"
         virtualization[:systems][:vbox] = "guest"
-        Ohai::Log.debug("Plugin Virtualization: Host running VirtualBox detected")
+        logger.trace("Plugin Virtualization: Host running VirtualBox detected")
       end
     end
 
@@ -70,7 +70,7 @@ Ohai.plugin(:Virtualization) do
       virtualization[:system] = "bhyve"
       virtualization[:role] = "host"
       virtualization[:systems][:bhyve] = "host"
-      Ohai::Log.debug("Plugin Virtualization: Host running bhyve detected")
+      logger.trace("Plugin Virtualization: Host running bhyve detected")
     end
 
     # Detect KVM/QEMU paravirt guests from cpu, report as KVM
@@ -80,7 +80,7 @@ Ohai.plugin(:Virtualization) do
       virtualization[:system] = "kvm"
       virtualization[:role] = "guest"
       virtualization[:systems][:kvm] = "guest"
-      Ohai::Log.debug("Plugin Virtualization: Guest running on KVM detected")
+      logger.trace("Plugin Virtualization: Guest running on KVM detected")
     end
 
     # gather hypervisor of guests from sysctl kern.vm_guest
@@ -92,22 +92,22 @@ Ohai.plugin(:Virtualization) do
       virtualization[:system] = "vmware"
       virtualization[:role] = "guest"
       virtualization[:systems][:vmware] = "guest"
-      Ohai::Log.debug("Plugin Virtualization: Guest running on VMware detected")
+      logger.trace("Plugin Virtualization: Guest running on VMware detected")
     when /hv/
       virtualization[:system] = "hyperv"
       virtualization[:role] = "guest"
       virtualization[:systems][:hyperv] = "guest"
-      Ohai::Log.debug("Plugin Virtualization: Guest running on Hyper-V detected")
+      logger.trace("Plugin Virtualization: Guest running on Hyper-V detected")
     when /xen/
       virtualization[:system] = "xen"
       virtualization[:role] = "guest"
       virtualization[:systems][:xen] = "guest"
-      Ohai::Log.debug("Plugin Virtualization: Guest running on Xen detected")
+      logger.trace("Plugin Virtualization: Guest running on Xen detected")
     when /bhyve/
       virtualization[:system] = "bhyve"
       virtualization[:role] = "guest"
       virtualization[:systems][:bhyve] = "guest"
-      Ohai::Log.debug("Plugin Virtualization: Guest running on bhyve detected")
+      logger.trace("Plugin Virtualization: Guest running on bhyve detected")
     end
 
     # parse dmidecode to discover various virtualization guests
@@ -117,7 +117,7 @@ Ohai.plugin(:Virtualization) do
         virtualization[:system] = guest
         virtualization[:role] = "guest"
         virtualization[:systems][guest.to_sym] = "guest"
-        Ohai::Log.debug("Plugin Virtualization: Guest running on #{guest} detected")
+        logger.trace("Plugin Virtualization: Guest running on #{guest} detected")
       end
     end
   end

data/lib/ohai/plugins/c.rb

@@ -25,24 +25,24 @@ Ohai.plugin(:C) do
     if so.exitstatus == 0
       yield(so)
     else
-      Ohai::Log.debug("Plugin C: '#{cmd}' failed. Skipping data.")
+      logger.trace("Plugin C: '#{cmd}' failed. Skipping data.")
     end
   rescue Ohai::Exceptions::Exec
-    Ohai::Log.debug("Plugin C: '#{cmd}' binary could not be found. Skipping data.")
+    logger.trace("Plugin C: '#{cmd}' binary could not be found. Skipping data.")
   end
 
   def xcode_installed?
-    Ohai::Log.debug("Plugin C: Checking for Xcode Command Line Tools.")
+    logger.trace("Plugin C: Checking for Xcode Command Line Tools.")
     so = shell_out("/usr/bin/xcode-select -p")
     if so.exitstatus == 0
-      Ohai::Log.debug("Plugin C: Xcode Command Line Tools found.")
+      logger.trace("Plugin C: Xcode Command Line Tools found.")
       return true
     else
-      Ohai::Log.debug("Plugin C: Xcode Command Line Tools not found.")
+      logger.trace("Plugin C: Xcode Command Line Tools not found.")
       return false
     end
   rescue Ohai::Exceptions::Exec
-    Ohai::Log.debug("Plugin C: xcode-select binary could not be found. Skipping data.")
+    logger.trace("Plugin C: xcode-select binary could not be found. Skipping data.")
   end
 
   def collect_gcc
@@ -60,7 +60,7 @@ Ohai.plugin(:C) do
     # COLLECT_GCC=gcc
     # COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/5/lto-wrapper
     # Target: x86_64-linux-gnu
-    # Configured with: ../src/configure -v --with-pkgversion='Ubuntu 5.4.0-6ubuntu1~16.04.4' --with-bugurl=file:///usr/share/doc/gcc-5/README.Bugs --enable-languages=c,ada,c++,java,go,d,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-5 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-libmpx --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-5-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-5-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-5-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-objc-gc --enable-multiarch --disable-werror --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --enable-multilib --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
+    # Configured with: ../src/configure -v --with-pkgversion='Ubuntu 5.4.0-6ubuntu1~16.04.4' --with-bugurl=file:///usr/share/doc/gcc-5/README.Bugs --enable-languages=c,ada,c++,java,go,d,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-5 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-trace --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-libmpx --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-5-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-5-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-5-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-objc-gc --enable-multiarch --disable-werror --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --enable-multilib --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
     # Thread model: posix
     # gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.4)
     gcc = Mash.new
@@ -134,7 +134,7 @@ Ohai.plugin(:C) do
       end
     end
   rescue Ohai::Exceptions::Exec
-    Ohai::Log.debug("Plugin C: 'xlc' binary could not be found. Skipping data.")
+    logger.trace("Plugin C: 'xlc' binary could not be found. Skipping data.")
   end
 
   def collect_sunpro

data/lib/ohai/plugins/chef.rb

@@ -23,10 +23,11 @@ Ohai.plugin(:Chef) do
     begin
       require "chef/version"
     rescue Gem::LoadError
+      logger.trace("Plugin Chef: Unable to load the chef gem to determine the version")
       # this catches when you've done a major version bump of ohai, but
       # your chef gem is incompatible, so we can't load it in the same VM
       # (affects mostly internal testing)
-      next
+      next # avoids us writing an empty mash
     end
 
     chef_packages Mash.new unless chef_packages

data/lib/ohai/plugins/cloud.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 Ohai.plugin(:Cloud) do
-  provides "cloud_v2"
   provides "cloud"
 
   depends "ec2"
@@ -332,8 +331,6 @@ Ohai.plugin(:Cloud) do
     get_digital_ocean_values if on_digital_ocean?
     get_softlayer_values if on_softlayer?
 
-    # set node[:cloud] and node[:cloud_v2] hash here
-    cloud_v2 @cloud_attr_obj.cloud_mash
     cloud @cloud_attr_obj.cloud_mash
   end
 end

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

@@ -1,7 +1,7 @@
 #
 # Author:: Nathan L Smith (<nlloyds@gmail.com>)
 # Author:: Tim Smith (<tsmith@chef.io>)
-# Copyright:: Copyright (c) 2013-2018 Chef Software, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,7 +22,7 @@ Ohai.plugin(:CPU) do
 
   collect_data(:darwin) do
     cpu Mash.new
-    shell_out("sysctl hw machdep").stdout.lines.each do |line|
+    shell_out("sysctl -a").stdout.lines.each do |line|
       case line
       when /^hw.packages: (.*)$/
         cpu[:real] = Regexp.last_match[1].to_i

data/lib/ohai/plugins/darwin/filesystem.rb

@@ -20,7 +20,6 @@
 
 Ohai.plugin(:Filesystem) do
   provides "filesystem"
-  provides "filesystem2"
 
   def generate_device_view(fs)
     view = {}
@@ -104,6 +103,5 @@ Ohai.plugin(:Filesystem) do
     fs_data["by_pair"] = by_pair
 
     filesystem fs_data
-    filesystem2 fs_data
   end
 end

data/lib/ohai/plugins/darwin/hardware.rb

@@ -23,18 +23,24 @@ Ohai.plugin(:Hardware) do
     sp_cmd = "system_profiler #{datatype} -xml"
     # Hardware queries
     sp_std = shell_out(sp_cmd)
-    sp_hash = Plist.parse_xml(sp_std.stdout)
+    Plist.parse_xml(sp_std.stdout)
   end
 
   collect_data(:darwin) do
     unless hardware
       hardware Mash.new
     else
-      Ohai::Log.debug("Plugin Hardware: namespace already exists")
+      logger.trace("Plugin Hardware: namespace already exists")
       next
     end
 
-    require "plist"
+    begin
+      require "plist"
+    rescue LoadError => e
+      # In case the plist gem isn't present, skip this plugin.
+      logger.trace("Plugin Hardware: Can't load gem: #{e}. Cannot continue.")
+      next
+    end
 
     hw_hash = system_profiler("SPHardwareDataType")
     hw_hash[0]["_items"][0].delete("_name")

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

@@ -74,8 +74,8 @@ Ohai.plugin(:Network) do
     return ifname unless ifaces[ifname].nil?
     # oh well, time to go hunting!
     return ifname.chop if ifname =~ /\*$/
-    ifaces.keys.each do |ifc|
-      ifaces[ifc][:addresses].keys.each do |addr|
+    ifaces.each_key do |ifc|
+      ifaces[ifc][:addresses].each_key do |addr|
         return ifc if addr.eql? mac
       end
     end

data/lib/ohai/plugins/darwin/system_profiler.rb

@@ -20,12 +20,13 @@ Ohai.plugin(:SystemProfile) do
   provides "system_profile"
 
   collect_data(:darwin) do
-    require "plist"
+    begin
+      require "plist"
 
-    system_profile Array.new
-    items = Array.new
-    detail_level = {
-      "mini" => %w{
+      system_profile Array.new
+      items = Array.new
+      detail_level = {
+        "mini" => %w{
 SPParallelATAData
 SPAudioData
 SPBluetoothData
@@ -51,22 +52,21 @@ SPThunderboltData
 SPUSBData
 SPWWANData
 SPAirPortData},
-      "full" => [
-                 "SPHardwareDataType",
-                ],
-    }
+        "full" => [
+                   "SPHardwareDataType",
+                  ],
+      }
 
-    detail_level.each do |level, data_types|
-      so = shell_out("system_profiler -xml -detailLevel #{level} #{data_types.join(' ')}")
-      Plist.parse_xml(so.stdout).each do |e|
-        # delete some bogus timing data and then keep the rest
-        e.delete("_SPCompletionInterval")
-        e.delete("_SPResponseTime")
-        e.delete("_SPCommandLineArguments")
-        items << e
+      detail_level.each do |level, data_types|
+        so = shell_out("system_profiler -xml -detailLevel #{level} #{data_types.join(' ')}")
+        Plist.parse_xml(so.stdout).each do |e|
+          items << e
+        end
       end
-    end
 
-    system_profile ( items.sort_by { |h| h["_dataType"] } ) # rubocop: disable Lint/ParenthesesAsGroupedExpression
+      system_profile ( items.sort_by { |h| h["_dataType"] } ) # rubocop: disable Lint/ParenthesesAsGroupedExpression
+    rescue LoadError => e
+      logger.trace("Can't load gem: #{e})")
+    end
   end
 end

data/lib/ohai/plugins/darwin/virtualization.rb

@@ -38,10 +38,20 @@ Ohai.plugin(:Virtualization) do
     ::File.exist?("/Applications/VMware\ Fusion.app/")
   end
 
+  def docker_exists?
+    which("docker")
+  end
+
   collect_data(:darwin) do
     virtualization Mash.new unless virtualization
     virtualization[:systems] = Mash.new unless virtualization[:systems]
 
+    if docker_exists?
+      virtualization[:system] = "docker"
+      virtualization[:role] = "host"
+      virtualization[:systems][:docker] = "host"
+    end
+
     if vboxmanage_exists?
       virtualization[:system] = "vbox"
       virtualization[:role] = "host"

data/lib/ohai/plugins/digital_ocean.rb

@@ -31,13 +31,13 @@ Ohai.plugin(:DigitalOcean) do
     begin
       # detect a vendor of "DigitalOcean"
       if dmi[:bios][:all_records][0][:Vendor] == "DigitalOcean"
-        Ohai::Log.debug("Plugin DigitalOcean: has_do_dmi? == true")
+        logger.trace("Plugin DigitalOcean: has_do_dmi? == true")
         return true
       end
     rescue NoMethodError
       # dmi[:bios][:all_records][0][:Vendor] may not exist
     end
-    Ohai::Log.debug("Plugin DigitalOcean: has_do_dmi? == false")
+    logger.trace("Plugin DigitalOcean: has_do_dmi? == false")
     false
   end
 
@@ -49,14 +49,14 @@ Ohai.plugin(:DigitalOcean) do
 
   collect_data do
     if looks_like_digital_ocean?
-      Ohai::Log.debug("Plugin Digitalocean: looks_like_digital_ocean? == true")
+      logger.trace("Plugin Digitalocean: looks_like_digital_ocean? == true")
       digital_ocean Mash.new
       fetch_metadata.each do |k, v|
         next if k == "vendor_data" # this may have sensitive data we shouldn't store
         digital_ocean[k] = v
       end
     else
-      Ohai::Log.debug("Plugin Digitalocean: No hints present for and doesn't look like digitalocean")
+      logger.trace("Plugin Digitalocean: No hints present for and doesn't look like digitalocean")
       false
     end
   end

data/lib/ohai/plugins/dmi.rb

@@ -60,22 +60,23 @@ Ohai.plugin(:DMI) do
         next if blank_line.match(line)
         line = line.encode(line.encoding, :universal_newline => true)
 
-        if dmidecode_version = dmidecode_version_line.match(line)
+        if ( dmidecode_version = dmidecode_version_line.match(line) )
           dmi[:dmidecode_version] = dmidecode_version[1]
 
-        elsif smbios_version = smbios_version_line.match(line)
+        elsif ( smbios_version = smbios_version_line.match(line) )
           dmi[:smbios_version] = smbios_version[1]
 
-        elsif structures = structures_line.match(line)
+        elsif ( structures = structures_line.match(line) )
           dmi[:structures] = Mash.new
           dmi[:structures][:count] = structures[1]
           dmi[:structures][:size] = structures[2]
 
-        elsif table_location = table_location_line.match(line)
+        elsif ( table_location = table_location_line.match(line) )
           dmi[:table_location] = table_location[1]
 
         elsif ( handle = handle_line.match(line) )
-          unless Ohai::Common::DMI.whitelisted_ids.include?(handle[2].to_i)
+          # Don't overcapture for now (OHAI-260)
+          unless Ohai::Common::DMI::ID_TO_CAPTURE.include?(handle[2].to_i)
             dmi_record = nil
             next
           end
@@ -90,28 +91,28 @@ Ohai.plugin(:DMI) do
           dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:size] = handle[2]
           field = nil
 
-        elsif type = type_line.match(line)
+        elsif ( type = type_line.match(line) )
           if dmi_record .nil?
-            Ohai::Log.debug("Plugin DMI: unexpected data line found before header; discarding:\n#{line}")
+            logger.trace("Plugin DMI: unexpected data line found before header; discarding:\n#{line}")
             next
           end
           dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:application_identifier] = type[1]
 
-        elsif data = data_line.match(line)
+        elsif ( data = data_line.match(line) )
           if dmi_record .nil?
-            Ohai::Log.debug("Plugin DMI: unexpected data line found before header; discarding:\n#{line}")
+            logger.trace("Plugin DMI: 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 extended_data = extended_data_line.match(line)
+        elsif ( extended_data = extended_data_line.match(line) )
           if dmi_record .nil?
-            Ohai::Log.debug("Plugin DMI: unexpected extended data line found before header; discarding:\n#{line}")
+            logger.trace("Plugin DMI: unexpected extended data line found before header; discarding:\n#{line}")
             next
           end
           if field .nil?
-            Ohai::Log.debug("Plugin DMI: unexpected extended data line found outside data section; discarding:\n#{line}")
+            logger.trace("Plugin DMI: unexpected extended data line found outside data section; discarding:\n#{line}")
             next
           end
           # overwrite "raw" value with a new Mash
@@ -119,14 +120,14 @@ Ohai.plugin(:DMI) do
           dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field][extended_data[1]] = nil
 
         else
-          Ohai::Log.debug("Plugin DMI: unrecognized output line; discarding:\n#{line}")
+          logger.trace("Plugin DMI: unrecognized output line; discarding:\n#{line}")
 
         end
       end
 
       Ohai::Common::DMI.convenience_keys(dmi)
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Plugin DMI: Could not shell_out "dmidecode". Skipping data')
+      logger.trace('Plugin DMI: Could not shell_out "dmidecode". Skipping data')
     end
   end
 end