ohai 17.7.8 → 18.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9624a58f805a1092cf71a19d5cc1501104c297df8b5f5cb9dafc8f288a77a62b
-  data.tar.gz: fa2839c8ca0d39f53629fc186b77addb1ef02e8783dba59a10f94d94406388ce
+  metadata.gz: e3f13e229791bcb56c90dfc30f3fa5fea108b9d185c1c0492a5198c2e6bae93b
+  data.tar.gz: 60134dedd0d7da72c1932dc987b143303d9f832bf123380ab22db9462e6799b2
 SHA512:
-  metadata.gz: 4252161549ecd67b7bfd91c7b01673071b54d76179472ac2824965281147a5b40b14b2cc120fc8d2d1a41bc1956041c1c39bf820f3d538f2ee85b61771d11c66
-  data.tar.gz: 3f1be719448a8c6cb39be6b5cb2f1c9017e05abd223d3b2bc23aedb4891a8663e259f6a3f2828a8a7e5809f52dde821fcefaeeb534af80cc4729ba19bcc63514
+  metadata.gz: 735fb50fdd3ee96a1325eaae9847d0f998b72b50116963d829bd7b350d5b6af4e76089083612c7a66f7ec7e80a374e45b25b711b38e6ff5c0435f9ac66ae39ec
+  data.tar.gz: ed81c806e9d91688e5c7aa5a4246aea55e62a8dbca35e3c89698795c29f45083572bafdf62382abcce201c53b736a1f11b2fcd17e4ff5aa61a114707fc2f1b11

data/Gemfile

@@ -9,14 +9,14 @@ gem "chef-utils", git: "https://github.com/chef/chef", branch: "main", glob: "ch
 
 # NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local
 group :development do
-  gem "chefstyle", "2.1.2"
+  gem "chefstyle", "2.2.2"
   gem "ipaddr_extensions"
   gem "rake", ">= 10.1.0"
   gem "rspec-collection_matchers", "~> 1.0"
   gem "rspec-core", "~> 3.0"
   gem "rspec-expectations", "~> 3.0"
   gem "rspec-mocks", "~> 3.0"
-  gem "rubocop-performance", "1.11.5"
+  gem "rubocop-performance", "1.13.3"
   gem "rubocop-rspec"
 end
 

data/lib/ohai/mixin/azure_metadata.rb

@@ -35,9 +35,10 @@ module Ohai
       AZURE_METADATA_ADDR ||= "169.254.169.254"
 
       # it's important that the newer versions are at the end of this array so we can skip sorting it
-      AZURE_SUPPORTED_VERSIONS ||= %w{ 2017-04-02 2017-08-01 2017-12-01 2018-02-01 2018-04-02
-                                       2018-10-01 2019-02-01 2019-03-11 2019-04-30 2019-06-01
-                                       2019-06-04 2019-08-01 2019-08-15 2019-11-01 }.freeze
+      AZURE_SUPPORTED_VERSIONS ||= %w{ 2018-10-01 2019-02-01 2019-03-11 2019-04-30 2019-06-01
+                                       2019-06-04 2019-08-01 2019-08-15 2019-11-01 2020-06-01
+                                       2020-07-15 2020-09-01 2020-10-01 2020-12-01 2021-01-01
+                                       2021-02-01 2021-03-01 2021-05-01 2021-10-01 }.freeze
 
       def best_api_version
         @api_version ||= begin

data/lib/ohai/mixin/os.rb

@@ -110,7 +110,7 @@ module Ohai
           "dragonflybsd"
         when /solaris2/
           "solaris2"
-        when /mswin|mingw32|windows/
+        when /mswin|mingw|windows/
           # After long discussion in IRC the "powers that be" have come to a consensus
           # that no Windows platform exists that was not based on the
           # Windows_NT kernel, so we herby decree that "windows" will refer to all

data/lib/ohai/plugins/azure.rb

@@ -73,9 +73,11 @@ Ohai.plugin(:Azure) do
   end
 
   def tcp_ip_dhcp_domain
-    return unless RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
+    return unless RUBY_PLATFORM.match?(/mswin|mingw|windows/)
 
-    require "win32/registry" unless defined?(Win32::Registry)
+    if ChefUtils.windows?
+      require "win32/registry" unless defined?(Win32::Registry)
+    end
 
     begin
       key = Win32::Registry::HKEY_LOCAL_MACHINE.open("SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters")

data/lib/ohai/plugins/chef.rb

@@ -33,7 +33,7 @@ Ohai.plugin(:Chef) do
     begin
       require "chef/version"
       require "chef-config/config" unless defined?(ChefConfig::Config)
-    rescue Gem::LoadError
+    rescue 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

data/lib/ohai/plugins/ec2.rb

@@ -81,7 +81,7 @@ Ohai.plugin(:EC2) do
   # linux hosts
   # @return [Boolean] do we have a Xen Identifying Number or not?
   def has_ec2_identifying_number?
-    if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
+    if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
       require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
       wmi = WmiLite::Wmi.new
       if /^ec2/.match?(wmi.first_of("Win32_ComputerSystemProduct")["identifyingnumber"])
@@ -142,8 +142,8 @@ Ohai.plugin(:EC2) do
       ec2[:account_id] = fetch_dynamic_data["accountId"]
       ec2[:availability_zone] = fetch_dynamic_data["availabilityZone"]
       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"
+
+      if ec2[:userdata] && ec2[:userdata].encoding == Encoding::BINARY
         logger.trace("Plugin EC2: Binary UserData Found. Storing in base64")
         ec2[:userdata] = Base64.encode64(ec2[:userdata])
       end

data/lib/ohai/plugins/filesystem.rb

@@ -271,6 +271,30 @@ Ohai.plugin(:Filesystem) do
     fs
   end
 
+  def collect_btrfs_data(entry)
+    btrfs = Mash.new
+    if entry[:fs_type] == "btrfs" && entry["uuid"]
+      uuid = entry["uuid"]
+      alloc = "/sys/fs/btrfs/#{uuid}/allocation"
+      %w{data metadata system}.each do |bg_type|
+        dir = "#{alloc}/#{bg_type}"
+        %w{single dup}.each do |raid|
+          if file_exist?("#{dir}/#{raid}")
+            btrfs["raid"] = raid
+          end
+        end
+        logger.trace("Plugin Filesystem: reading btrfs allocation files at #{dir}")
+        btrfs["allocation"] ||= Mash.new
+        btrfs["allocation"][bg_type] ||= Mash.new
+        %w{total_bytes bytes_used}.each do |field|
+          bytes = file_read("#{dir}/#{field}").chomp.to_i
+          btrfs["allocation"][bg_type][field] = "#{bytes}"
+        end
+      end
+    end
+    btrfs
+  end
+
   collect_data(:linux) do
     fs = Mash.new
 
@@ -394,6 +418,12 @@ Ohai.plugin(:Filesystem) do
       end
     end
 
+    fs.each do |key, entry|
+      if entry[:fs_type] == "btrfs"
+        fs[key][:btrfs] = collect_btrfs_data(entry)
+      end
+    end
+
     by_pair = fs
     by_device = generate_device_view(fs)
     by_mountpoint = generate_mountpoint_view(fs)

data/lib/ohai/plugins/gce.rb

@@ -49,7 +49,7 @@ Ohai.plugin(:GCE) do
   # looks at the Manufacturer and Model WMI values to see if they starts with Google.
   # @return [Boolean] Are the manufacturer and model Google?
   def has_gce_system_info?
-    if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
+    if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
       require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
       wmi = WmiLite::Wmi.new
       computer_system = wmi.first_of("Win32_ComputerSystem")

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

@@ -35,6 +35,8 @@ Ohai.plugin(:Mdadm) do
         device_mash[:size] = Regexp.last_match[1].to_f
       when /State\s+: ([a-z]+)/
         device_mash[:state] = Regexp.last_match[1]
+      when /UUID\s+: ([0-9a-z:]+)/
+        device_mash[:UUID] = Regexp.last_match[1]
       when /Total Devices\s+: ([0-9]+)/
         device_mash[:device_counts][:total] = Regexp.last_match[1].to_i
       when /Raid Devices\s+: ([0-9]+)/

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

@@ -80,9 +80,22 @@ Ohai.plugin(:Network) do
       line.strip!
       logger.trace("Plugin Network: Parsing #{line}")
       if /\\/.match?(line)
+        # If we have multipath routing, then the first part will be a normal
+        # looking route:
+        #   default proto ra metric 1024 <other options>
+        # Each successive part after that is a hop without those options.
+        # So the first thing we do is grab that first part, and split it into
+        # the route destination ("default"), and the route options.
         parts = line.split("\\")
-        route_dest = parts.shift.strip
-        route_endings = parts
+        route_dest, dest_opts = parts.first.split(nil, 2)
+        # Then all the route endings, generally just nexthops.
+        route_endings = parts[1..]
+        if dest_opts && !dest_opts.empty?
+          # Route options like proto, metric, etc. only appear once for each
+          # multipath configuration. Prepend this information to the route
+          # endings so the code below will assign the fields properly.
+          route_endings.map! { |e| e.include?("nexthop") ? "#{dest_opts} #{e}" : e }
+        end
       elsif line =~ /^([^\s]+)\s(.*)$/
         route_dest = $1
         route_endings = [$2]
@@ -90,9 +103,24 @@ Ohai.plugin(:Network) do
         next
       end
       route_endings.each do |route_ending|
+        route_entry = Mash.new(destination: route_dest,
+                               family: family[:name])
+        route_int = nil
         if route_ending =~ /\bdev\s+([^\s]+)\b/
           route_int = $1
-        else
+        end
+        # does any known interface own the src address?
+        # we try to infer the interface/device from its address if it isn't specified
+        # we want to override the interface set via nexthop but only if possible
+        if line =~ /\bsrc\s+([^\s]+)\b/ && (!route_int || line.include?("nexthop"))
+          # only clobber previously set route_int if we find a match
+          if (match = iface.select { |name, intf| intf.fetch("addresses", {}).any? { |addr, _| addr == $1 } }.keys.first)
+            route_int = match
+            route_entry[:inferred] = true
+          end
+        end
+
+        unless route_int
           logger.trace("Plugin Network: Skipping route entry without a device: '#{line}'")
           next
         end
@@ -103,8 +131,6 @@ Ohai.plugin(:Network) do
           next
         end
 
-        route_entry = Mash.new(destination: route_dest,
-                               family: family[:name])
         %w{via scope metric proto src}.each do |k|
           # http://rubular.com/r/pwTNp65VFf
           route_entry[k] = $1 if route_ending =~ /\b#{k}\s+([^\s]+)/
@@ -350,6 +376,7 @@ Ohai.plugin(:Network) do
     so = shell_out("ip -d -s link")
     tmp_int = nil
     on_rx = true
+    xdp_mode = nil
     so.stdout.lines do |line|
       if line =~ IPROUTE_INT_REGEX
         tmp_int = $2
@@ -425,6 +452,30 @@ Ohai.plugin(:Network) do
       if line =~ /\sstate (\w+)/
         iface[tmp_int]["state"] = $1.downcase
       end
+
+      if line.include?("xdp")
+        mode = line.scan(/\s(xdp|xdpgeneric|xdpoffload|xdpmulti)\s/).flatten[0]
+        # Fetches and sets the mode from the first line.
+        unless mode.nil?
+          iface[tmp_int][:xdp] = {}
+          if mode.eql?("xdp")
+            # In case of xdpdrv, mode is xdp,
+            # to keep it consistent, keeping mode as xdpdrv.
+            mode = "xdpdrv"
+          end
+          xdp_mode = mode
+          iface[tmp_int][:xdp][:attached] = []
+        end
+
+        if line =~ %r{prog/(\w+) id (\d+) tag (\w+)}
+          mode = $1.eql?("xdp") ? xdp_mode : $1
+          iface[tmp_int][:xdp][:attached] << {
+            mode: mode,
+            id: $2,
+            tag: $3,
+          }
+        end
+      end
     end
     iface
   end
@@ -607,10 +658,12 @@ Ohai.plugin(:Network) do
       # sorting the selected routes:
       # - getting default routes first
       # - then sort by metric
+      # - then sort by if the device was inferred or not (preferring explicit to inferred)
       # - then by prefixlen
       [
        r[:destination] == "default" ? 0 : 1,
        r[:metric].nil? ? 0 : r[:metric].to_i,
+       r[:inferred] ? 1 : 0,
        # for some reason IPAddress doesn't accept "::/0", it doesn't like prefix==0
        # just a quick workaround: use 0 if IPAddress fails
        begin

data/lib/ohai/plugins/openstack.rb

@@ -49,7 +49,7 @@ Ohai.plugin(:Openstack) do
   # https://help.dreamhost.com/hc/en-us/articles/228377408-How-to-find-the-default-user-of-an-image
   def openstack_provider
     # dream host doesn't support windows so bail early if we're on windows
-    return "openstack" if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
+    return "openstack" if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
 
     if Etc::Passwd.entries.map(&:name).include?("dhc-user")
       "dreamhost"

data/lib/ohai/plugins/rackspace.rb

@@ -48,7 +48,7 @@ Ohai.plugin(:Rackspace) do
   # true:: If the rackspace cloud can be identified
   # false:: Otherwise
   def has_rackspace_manufacturer?
-    return false unless RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
+    return false unless RUBY_PLATFORM.match?(/mswin|mingw|windows/)
 
     require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
     wmi = WmiLite::Wmi.new

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 = "17.7.8"
+  VERSION = "18.0.14"
 end

data/ohai.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.7"
 
-  s.add_dependency "chef-config", ">= 14.12", "< 18"
-  s.add_dependency "chef-utils", ">= 16.0", "< 18"
+  s.add_dependency "chef-config", ">= 14.12", "< 19"
+  s.add_dependency "chef-utils", ">= 16.0", "< 19"
   s.add_dependency "ffi", "~> 1.9"
   s.add_dependency "ffi-yajl", "~> 2.2"
   s.add_dependency "ipaddress"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 17.7.8
+  version: 18.0.14
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-28 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -19,7 +19,7 @@ dependencies:
         version: '14.12'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '18'
+        version: '19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '14.12'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '18'
+        version: '19'
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '16.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '18'
+        version: '19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '16.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '18'
+        version: '19'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -341,6 +341,7 @@ files:
 - lib/ohai/plugins/python.rb
 - lib/ohai/plugins/rackspace.rb
 - lib/ohai/plugins/root_group.rb
+- lib/ohai/plugins/rpm.rb
 - lib/ohai/plugins/ruby.rb
 - lib/ohai/plugins/rust.rb
 - lib/ohai/plugins/scala.rb