ohai 16.10.6 → 17.9.0

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

@@ -80,7 +80,7 @@ Ohai.plugin(:Network) do
       line.strip!
       logger.trace("Plugin Network: Parsing #{line}")
       if /\\/.match?(line)
-        parts = line.split('\\')
+        parts = line.split("\\")
         route_dest = parts.shift.strip
         route_endings = parts
       elsif line =~ /^([^\s]+)\s(.*)$/
@@ -141,13 +141,13 @@ Ohai.plugin(:Network) do
 
   # using a temporary var to hold routes and their interface name
   def parse_routes(family, iface)
-    iface.collect do |i, iv|
+    iface.filter_map do |i, iv|
       next unless iv[:routes]
 
-      iv[:routes].collect do |r|
+      iv[:routes].filter_map do |r|
         r.merge(dev: i) if r[:family] == family[:name]
-      end.compact # @todo: when we drop ruby 2.6 this should be a filter_map
-    end.compact.flatten # @todo: when we drop ruby 2.6 this should be a filter_map
+      end
+    end.flatten
   end
 
   # determine layer 1 details for the interface using ethtool
@@ -273,6 +273,30 @@ Ohai.plugin(:Network) do
     iface
   end
 
+  # determine offload features for the interface using ethtool
+  def ethernet_offload_parameters(iface)
+    return iface unless ethtool_binary_path
+
+    iface.each_key do |tmp_int|
+      next unless iface[tmp_int][:encapsulation] == "Ethernet"
+
+      so = shell_out("#{ethtool_binary_path} -k #{tmp_int}")
+      Ohai::Log.debug("Plugin Network: Parsing ethtool output: #{so.stdout}")
+      iface[tmp_int]["offload_params"] = {}
+      so.stdout.lines.each do |line|
+        next if line.start_with?("Features for")
+        next if line.strip.nil?
+
+        key, val = line.split(/:\s+/)
+        if val
+          offload_key = key.downcase.strip.tr(" ", "_").to_s
+          iface[tmp_int]["offload_params"][offload_key] = val.downcase.gsub(/\[.*\]/, "").strip.to_s
+        end
+      end
+    end
+    iface
+  end
+
   # determine pause parameters for the interface using ethtool
   def ethernet_pause_parameters(iface)
     return iface unless ethtool_binary_path
@@ -793,6 +817,7 @@ Ohai.plugin(:Network) do
     iface = ethernet_ring_parameters(iface)
     iface = ethernet_channel_parameters(iface)
     iface = ethernet_coalesce_parameters(iface)
+    iface = ethernet_offload_parameters(iface)
     iface = ethernet_driver_info(iface)
     iface = ethernet_pause_parameters(iface)
     counters[:network][:interfaces] = net_counters

data/lib/ohai/plugins/linux/os_release.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+#
+# Author:: Lance Albertson (lance@osuosl.org>)
+# Copyright:: Copyright (c) 2021 Oregon State University
+# 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(:OsRelease) do
+  provides "os_release"
+
+  collect_data(:linux) do
+    os_release Mash.new unless os_release
+
+    # https://www.freedesktop.org/software/systemd/man/os-release.html
+    if file_exist?("/etc/os-release")
+      file_read("/etc/os-release").each_line do |line|
+        key, value = line.split("=")
+        if key == "ID_LIKE"
+          os_release[key.downcase] = value.chomp.gsub(/\A"|"\Z/, "").split(" ") if value
+        else
+          os_release[key.downcase] = value.chomp.gsub(/\A"|"\Z/, "") if value
+        end
+      end
+    end
+  end
+end

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

@@ -54,7 +54,7 @@ Ohai.plugin(:Platform) do
   end
 
   #
-  # Cached /etc/os-release info Hash.  Also has logic for Cisco Nexus
+  # Cached /etc/os-release info Hash. Also has logic for Cisco Nexus
   # switches that pulls the chained CISCO_RELEASE_INFO file into the Hash (other
   # distros can also reuse this method safely).
   #
@@ -112,16 +112,17 @@ Ohai.plugin(:Platform) do
     # ohai uses. If you're adding a new platform here and you want to change the name
     # you'll want to add it here and then add a spec for the platform_id_remap method
     {
-      "rhel" => "redhat",
+      "alinux" => "alibabalinux",
       "amzn" => "amazon",
+      "archarm" => "arch",
+      "cumulus-linux" => "cumulus",
       "ol" => "oracle",
-      "sles" => "suse",
-      "sles_sap" => "suse",
       "opensuse-leap" => "opensuseleap",
+      "rhel" => "redhat",
+      "sles_sap" => "suse",
+      "sles" => "suse",
       "xenenterprise" => "xenserver",
-      "cumulus-linux" => "cumulus",
-      "archarm" => "arch",
-    }[id] || id
+    }[id.downcase] || id.downcase
   end
 
   #
@@ -133,22 +134,24 @@ Ohai.plugin(:Platform) do
   #
   def platform_family_from_platform(plat)
     case plat
-    when /debian/, /ubuntu/, /linuxmint/, /raspbian/, /cumulus/, /kali/, /pop/
+    when /ubuntu/, /debian/, /linuxmint/, /raspbian/, /cumulus/, /kali/, /pop/
       # apt-get+dpkg almost certainly goes here
       "debian"
-    when /oracle/, /centos/, /redhat/, /almalinux/, /scientific/, /enterpriseenterprise/, /xcp/, /xenserver/, /cloudlinux/, /ibm_powerkvm/, /parallels/, /nexus_centos/, /clearos/, /bigip/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID"
+    when /centos/, /redhat/, /oracle/, /almalinux/, /rocky/, /scientific/, /enterpriseenterprise/, /xenserver/, /xcp-ng/, /cloudlinux/, /alibabalinux/, /sangoma/, /clearos/, /parallels/, /ibm_powerkvm/, /nexus_centos/, /bigip/, /virtuozzo/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID"
       # NOTE: "rhel" should be reserved exclusively for recompiled rhel versions that are nearly perfectly compatible down to the platform_version.
       # The operating systems that are "rhel" should all be as compatible as rhel7 = centos7 = oracle7 = scientific7 (98%-ish core RPM version compatibility
       # and the version numbers MUST track the upstream). The appropriate EPEL version repo should work nearly perfectly.  Some variation like the
-      # oracle kernel version differences and tuning and extra packages are clearly acceptable.  Almost certainly some distros above (xenserver?)
-      # should not be in this list.  Please use fedora, below, instead.  Also note that this is the only platform_family with this strict of a rule,
+      # oracle kernel version differences and tuning and extra packages are clearly acceptable. Almost certainly some distros above (xenserver?)
+      # should not be in this list. Please use fedora, below, instead. Also note that this is the only platform_family with this strict of a rule,
       # see the example of the debian platform family for how the rest of the platform_family designations should be used.
+      #
+      # TODO: when XCP-NG 7.4 support ends we can remove the xcp-ng match. 7.5+ reports as xenenterprise which we remap to xenserver
       "rhel"
     when /amazon/
       "amazon"
-    when /suse/, /sles/, /opensuse/, /opensuseleap/, /sled/
+    when /suse/, /sles/, /opensuseleap/, /opensuse/, /sled/
       "suse"
-    when /fedora/, /pidora/, /arista_eos/
+    when /fedora/, /arista_eos/
       # In the broadest sense:  RPM-based, fedora-derived distributions which are not strictly re-compiled RHEL (if it uses RPMs, and smells more like redhat and less like
       # SuSE it probably goes here).
       "fedora"
@@ -156,9 +159,7 @@ Ohai.plugin(:Platform) do
       "wrlinux"
     when /gentoo/
       "gentoo"
-    when /slackware/
-      "slackware"
-    when /arch/, /manjaro/, /antergos/
+    when /arch/, /manjaro/
       "arch"
     when /exherbo/
       "exherbo"
@@ -168,6 +169,8 @@ Ohai.plugin(:Platform) do
       "clearlinux"
     when /mangeia/
       "mandriva"
+    when /slackware/
+      "slackware"
     end
   end
 
@@ -270,9 +273,6 @@ Ohai.plugin(:Platform) do
     elsif /XenServer/i.match?(lsb[:id])
       platform "xenserver"
       platform_version lsb[:release]
-    elsif /XCP/i.match?(lsb[:id])
-      platform "xcp"
-      platform_version lsb[:release]
     elsif lsb[:id] # LSB can provide odd data that changes between releases, so we currently fall back on it rather than dealing with its subtleties
       platform lsb[:id].downcase
       platform_version lsb[:release]

data/lib/ohai/plugins/linux/tc.rb

@@ -0,0 +1,61 @@
+#
+# Author:: Matthew Massey <matthewmassey@fb.com>
+# Copyright:: Copyright (c) 2021 Facebook
+# 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(:Tc) do
+  provides "tc"
+  optional true
+
+  collect_data(:linux) do
+    tc_path = which("tc")
+    if tc_path
+      cmd = "#{tc_path} qdisc show"
+      tc_output = shell_out(cmd)
+
+      tc_data = Mash.new
+      tc_data[:qdisc] = Mash.new
+
+      tc_output.stdout.split("\n").each do |line|
+        line = line.strip
+        if /dev (\w+)/ =~ line
+          dev = $1
+          tc_data[:qdisc][dev] ||= Mash.new
+        else
+          next
+        end
+        if /qdisc (\w+)/ =~ line
+          qdisc = $1
+          tc_data[:qdisc][dev][:qdiscs] ||= []
+          tc_data[:qdisc][dev][:qdiscs] << Mash.new
+          qdisc_idx = tc_data[:qdisc][dev][:qdiscs].length - 1
+          tc_data[:qdisc][dev][:qdiscs][qdisc_idx] ||= Mash.new
+          tc_data[:qdisc][dev][:qdiscs][qdisc_idx][:type] = qdisc
+          tc_data[:qdisc][dev][:qdiscs][qdisc_idx][:parms] ||= Mash.new
+        else
+          next
+        end
+        if qdisc == "fq" && /buckets (\d+)/ =~ line
+          buckets = $1.to_i
+          tc_data[:qdisc][dev][:qdiscs][qdisc_idx][:parms][:buckets] = buckets
+        end
+      end
+      tc tc_data
+    else
+      logger.trace("Plugin Tc: Could not find tc. Skipping plugin.")
+    end
+  end
+end

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

@@ -20,6 +20,7 @@
 Ohai.plugin(:Virtualization) do
   provides "virtualization"
   depends "dmi"
+  depends "cpu"
   require_relative "../../mixin/dmi_decode"
   include Ohai::Mixin::DmiDecode
 
@@ -35,6 +36,10 @@ Ohai.plugin(:Virtualization) do
     which("docker")
   end
 
+  def podman_exists?
+    which("podman")
+  end
+
   collect_data(:linux) do
     virtualization Mash.new unless virtualization
     virtualization[:systems] ||= Mash.new
@@ -46,6 +51,13 @@ Ohai.plugin(:Virtualization) do
       virtualization[:systems][:docker] = "host"
     end
 
+    # Podman hosts
+    if podman_exists?
+      virtualization[:system] = "podman"
+      virtualization[:role] = "host"
+      virtualization[:systems][:podman] = "host"
+    end
+
     # Xen Notes:
     # - /proc/xen is an empty dir for EL6 + Linode Guests + Paravirt EC2 instances
     # - cpuid of guests, if we could get it, would also be a clue
@@ -115,6 +127,14 @@ Ohai.plugin(:Virtualization) do
         virtualization[:role] = "host"
         virtualization[:systems][:kvm] = "host"
       end
+    elsif get_attribute(:cpu, :hypervisor_vendor)
+      if get_attribute(:cpu, :hypervisor_vendor) == "KVM"
+        virtualization[:system] = "kvm"
+        if /(para|full)/.match?(get_attribute(:cpu, :virtualization_type))
+          virtualization[:role] = "guest"
+          virtualization[:systems][:kvm] = "guest"
+        end
+      end
     end
 
     # parse dmi to discover various virtualization guests
@@ -188,7 +208,7 @@ Ohai.plugin(:Virtualization) do
     # <index #>:<subsystem>:/
     #
     # Full notes, https://tickets.opscode.com/browse/OHAI-551
-    # Kernel docs, https://www.kernel.org/doc/Documentation/cgroups
+    # Kernel docs, https://web.archive.org/web/20100514070914/http://www.kernel.org/doc/Documentation/cgroups/
     if file_exist?("/proc/self/cgroup")
       cgroup_content = file_read("/proc/self/cgroup")
       # These two REs catch many different examples. Here's a specific one
@@ -210,6 +230,20 @@ Ohai.plugin(:Virtualization) do
         virtualization[:system] = "nspawn"
         virtualization[:role] = "guest"
         virtualization[:systems][:nspawn] = "guest"
+      elsif /container=podman/.match?(file_read("/proc/1/environ"))
+        logger.trace("Plugin Virtualization: /proc/1/environ indicates podman container. Detecting as podman guest")
+        virtualization[:system] = "podman"
+        virtualization[:role] = "guest"
+        virtualization[:systems][:podman] = "guest"
+      # Detect any containers that appear to be using docker such as those running on Github Actions virtual machines
+      # but aren't triggered by the cgroup regex above. It's pretty safe to assume if the cgroup contains containerd,
+      # it's likely using docker.
+      # https://rubular.com/r/qhSmV113cPmEBT
+      elsif %r{^\d+:[^:]*:/[^/]+/(containerd)-?.+$}.match?(cgroup_content)
+        logger.trace("Plugin Virtualization: /proc/self/cgroup indicates docker container. Detecting as docker guest")
+        virtualization[:system] = "docker"
+        virtualization[:role] = "guest"
+        virtualization[:systems][:docker] = "guest"
       elsif lxc_version_exists? && file_read("/proc/self/cgroup") =~ %r{\d:[^:]+:/$}
         # lxc-version shouldn't be installed by default
         # Even so, it is likely we are on an LXC capable host that is not being used as such
@@ -225,7 +259,11 @@ Ohai.plugin(:Virtualization) do
         # If so, we may need to look further for a differentiator (OHAI-573)
         virtualization[:systems][:lxc] = "host"
       end
-    elsif file_exist?("/.dockerenv") || file_exist?("/.dockerinit")
+    end
+
+    # regardless of what we found above, if we're a docker container inside
+    # of the above, lets report as a docker container
+    if file_exist?("/.dockerenv") || file_exist?("/.dockerinit")
       logger.trace("Plugin Virtualization: .dockerenv or .dockerinit exist. Detecting as docker guest")
       virtualization[:system] = "docker"
       virtualization[:role] = "guest"

data/lib/ohai/plugins/network.rb

@@ -82,7 +82,7 @@ Ohai.plugin(:NetworkAddresses) do
       elsif network[gw_attr] &&
           network["interfaces"][network[int_attr]] &&
           network["interfaces"][network[int_attr]]["addresses"]
-        if [ "0.0.0.0", "::", /^fe80:/ ].any? { |pat| pat === network[gw_attr] }
+        if [ "0.0.0.0", "::", /^fe80:/ ].any? { |pat| pat === network[gw_attr] } # rubocop: disable Performance/RedundantEqualityComparisonBlock
           # link level default route
           logger.trace("Plugin Network: link level default #{family} route, picking ip from #{network[gw_attr]}")
           r = gw_if_ips.first

data/lib/ohai/plugins/os.rb

@@ -40,6 +40,12 @@ Ohai.plugin(:OS) do
 
   collect_data(:target) do
     os collect_os
+    os_version "unknown"
+  end
+
+  collect_data(:api) do
+    os collect_os
+    os_version "unknown"
   end
 
   collect_data do

data/lib/ohai/plugins/packages.rb

@@ -106,7 +106,7 @@ Ohai.plugin(:Packages) do
     end
   end
 
-  def collect_programs_from_registry_key(key_path)
+  def collect_programs_from_registry_key(repo, key_path)
     # from http://msdn.microsoft.com/en-us/library/windows/desktop/aa384129(v=vs.85).aspx
     if ::RbConfig::CONFIG["target_cpu"] == "i386"
       reg_type = Win32::Registry::KEY_READ | 0x100
@@ -115,7 +115,7 @@ Ohai.plugin(:Packages) do
     else
       reg_type = Win32::Registry::KEY_READ
     end
-    Win32::Registry::HKEY_LOCAL_MACHINE.open(key_path, reg_type) do |reg|
+    repo.open(key_path, reg_type) do |reg|
       reg.each_key do |key, _wtime|
         pkg = reg.open(key)
         name = pkg["DisplayName"] rescue nil
@@ -133,9 +133,10 @@ Ohai.plugin(:Packages) do
   collect_data(:windows) do
     require "win32/registry" unless defined?(Win32::Registry)
     packages Mash.new
-    collect_programs_from_registry_key('Software\Microsoft\Windows\CurrentVersion\Uninstall')
-    # on 64 bit systems, 32 bit programs are stored here
-    collect_programs_from_registry_key('Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall')
+    collect_programs_from_registry_key(Win32::Registry::HKEY_LOCAL_MACHINE, 'Software\Microsoft\Windows\CurrentVersion\Uninstall')
+    # on 64 bit systems, 32 bit programs are stored here moved before HKEY_CURRENT_USER otherwise it is not collected (impacts both ohai 16 & 17)
+    collect_programs_from_registry_key(Win32::Registry::HKEY_LOCAL_MACHINE, 'Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall')
+    collect_programs_from_registry_key(Win32::Registry::HKEY_CURRENT_USER, 'Software\Microsoft\Windows\CurrentVersion\Uninstall') rescue nil
   end
 
   collect_data(:aix) do

data/lib/ohai/plugins/rpm.rb

@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+#
+# Author:: Davide Cavalca <dcavalca@fb.com>
+# Copyright:: Copyright (c) 2021 Meta Platforms, Inc. and affiliates.
+# 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(:Rpm) do
+  provides "rpm"
+  optional "true"
+
+  MACROS_MARKER = /========================/.freeze
+
+  DO_NOT_SPLIT = %w{
+    build_arch
+    build_os
+    install_arch
+    install_os
+    archcolor
+    optflags
+  }.freeze
+
+  collect_data(:aix, :darwin, :dragonflybsd, :freebsd, :linux, :netbsd, :openbsd, :solaris2) do
+    rpm_path = which("rpm")
+    if rpm_path
+      rpm_version_out = shell_out("#{rpm_path} --version")
+      rpm_showrc_out = shell_out("#{rpm_path} --showrc")
+
+      rpm Mash.new unless rpm
+      rpm[:macros] ||= Mash.new
+
+      m = rpm_version_out.stdout.match(/\w+ (\d.*)/)
+      if m
+        rpm[:version] = m[1]
+      end
+
+      lines = rpm_showrc_out.stdout.split("\n")
+      # there's a marker to separate the beginning and end of the macros list
+      macros_start_idx = lines.index { |x| x.match(MACROS_MARKER) }
+      macros_end_idx = lines.rindex { |x| x.match(MACROS_MARKER) }
+      section = nil
+      lines[0..macros_start_idx - 1].each do |line|
+        if line.start_with?("ARCHITECTURE AND OS")
+          section = :arch_os
+          rpm[section] ||= Mash.new
+        elsif line.start_with?("RPMRC VALUES")
+          section = :rpmrc
+          rpm[section] ||= Mash.new
+        elsif line.start_with?("Features supported by rpmlib")
+          section = :features
+          rpm[section] ||= Mash.new
+        elsif line.start_with?("Macro path")
+          fields = line.split(":", 2)
+          if fields
+            rpm[:macro_path] = fields[1].strip.split(":")
+          end
+          section = nil
+        elsif %i{arch_os rpmrc}.include?(section)
+          fields = line.split(":")
+          if fields && fields[0] && fields[1]
+            key = fields[0].strip.sub("'s", "es").tr(" ", "_")
+            if DO_NOT_SPLIT.include?(key)
+              values = fields[1].strip
+            else
+              values = fields[1].strip.split(" ")
+            end
+            rpm[section][key] = values
+          end
+        elsif section == :features
+          fields = line.split("=")
+          if fields && fields[0] && fields[1]
+            rpm[section][fields[0].strip] = fields[1].strip
+          end
+        end
+      end
+
+      name = nil
+      value = ""
+      lines[macros_start_idx + 1..macros_end_idx - 1].each do |line|
+        if line.start_with?("-")
+          # new macros are always prefixed by a dash
+          if name
+            # if we had parsed a macro before, store it
+            rpm[:macros][name] = value
+            name = nil
+            value = ""
+          end
+
+          # parse the new macro definition
+          _prefix, name, value = line.split(" ", 3)
+        else
+          # continuations have no prefix and just append to the previous one
+          value += "\n#{line}"
+        end
+      end
+
+      # Once we're done parsing all lines, we might have a parsed definition
+      # we haven't stored - if so, store it.
+      if name
+        rpm[:macros][name] = value
+      end
+    else
+      logger.trace("Plugin RPM: Could not find rpm. Skipping plugin.")
+    end
+  end
+end

data/lib/ohai/plugins/vmware.rb

@@ -45,12 +45,14 @@ Ohai.plugin(:VMware) do
       logger.trace("Plugin VMware: #{vmtools_path} not found")
     else
       vmware Mash.new
+      vmware[:host] = Mash.new
+      vmware[:guest] = Mash.new
       begin
         # vmware-toolbox-cmd stat <param> commands
         # Iterate through each parameter supported by the "vwware-toolbox-cmd stat" command, assign value
         # to attribute "vmware[:<parameter>]"
         %w{hosttime speed sessionid balloon swap memlimit memres cpures cpulimit}.each do |param|
-          vmware[param] = from_cmd("#{vmtools_path} stat #{param}")
+          vmware[param] = from_cmd([vmtools_path, "stat", param])
           if /UpdateInfo failed/.match?(vmware[param])
             vmware[param] = nil
           end
@@ -59,8 +61,23 @@ Ohai.plugin(:VMware) do
         # Iterate through each parameter supported by the "vmware-toolbox-cmd status" command, assign value
         # to attribute "vmware[:<parameter>]"
         %w{upgrade timesync}.each do |param|
-          vmware[param] = from_cmd("#{vmtools_path} #{param} status")
+          vmware[param] = from_cmd([vmtools_path, param, "status"])
         end
+        # Distinguish hypervisors by presence of raw session data (vSphere only)
+        raw_session = from_cmd([vmtools_path, "stat", "raw", "json", "session"])
+        if raw_session.empty?
+          vmware[:host] = {
+            type: "vmware_desktop",
+          }
+        else
+          require "json" unless defined?(JSON)
+          session = JSON.parse(raw_session)
+          vmware[:host] = {
+            type: "vmware_vsphere",
+            version: session["version"],
+          }
+        end
+        vmware[:guest][:vmware_tools_version] = from_cmd([vmtools_path, "-v"]).split(" ").first
       rescue
         logger.trace("Plugin VMware: Error while collecting VMware guest attributes")
       end
@@ -71,4 +88,7 @@ Ohai.plugin(:VMware) do
     get_vm_attributes("/usr/bin/vmware-toolbox-cmd") if virtualization[:systems][:vmware]
   end
 
+  collect_data(:windows) do
+    get_vm_attributes("C:/Program Files/VMWare/VMware Tools/VMwareToolboxCmd.exe") if virtualization[:systems][:vmware]
+  end
 end

data/lib/ohai/runner.rb

@@ -61,7 +61,7 @@ module Ohai
         rescue Ohai::Exceptions::Error, SystemExit # SystemExit: abort or exit from plug-in should exit Ohai with failure code
           raise
         rescue Exception => e
-          logger.trace("Plugin #{plugin.name} threw exception #{e.inspect} #{e.backtrace.join("\n")}")
+          logger.warn("Plugin #{plugin.name} threw exception #{e.inspect} #{e.backtrace.join("\n")}")
         end
       end
       logger.trace("Plugin #{plugin.name} took #{"%f" % elapsed.truncate(6)} seconds to run.")

data/lib/ohai/version.rb

@@ -19,5 +19,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(__dir__)
-  VERSION = "16.10.6"
+  VERSION = "17.9.0"
 end

data/ohai.gemspec

@@ -12,24 +12,20 @@ Gem::Specification.new do |s|
   s.email = "adam@chef.io"
   s.homepage = "https://github.com/chef/ohai/"
 
-  s.required_ruby_version = ">= 2.6"
+  s.required_ruby_version = ">= 2.7"
 
-  s.add_dependency "chef-config", ">= 12.8", "< 17"
-  s.add_dependency "chef-utils", ">= 16.0", "< 17"
+  s.add_dependency "chef-config", ">= 14.12", "< 18"
+  s.add_dependency "chef-utils", ">= 16.0", "< 18"
   s.add_dependency "ffi", "~> 1.9"
   s.add_dependency "ffi-yajl", "~> 2.2"
   s.add_dependency "ipaddress"
   s.add_dependency "mixlib-cli", ">= 1.7.0" # 1.7+ needed to support passing multiple options
   s.add_dependency "mixlib-config", ">= 2.0", "< 4.0"
   s.add_dependency "mixlib-log", ">= 2.0.1", "< 4.0"
-  s.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
+  s.add_dependency "mixlib-shellout", "~> 3.2", ">= 3.2.5"
   s.add_dependency "plist", "~> 3.1"
   s.add_dependency "train-core"
   s.add_dependency "wmi-lite", "~> 1.0"
-  # Note for ohai developers: If chef-config causes you grief, try:
-  #     bundle install --with development
-  # this should work as long as chef is a development dependency in Gemfile.
-  #
 
   s.bindir = "bin"
   s.executables = %w{ohai}