ohai 15.12.0 → 16.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cc502163cd1c79f43b4b934c425a00b2b00c2626cefb82882659fa4756dd82f
-  data.tar.gz: 2eadca5148f5f1c0706157f3b2c7c2cfe6606c304f249815c418aba69ca87c53
+  metadata.gz: 474ba3761494212a1559a82eb0fea84b9ec142762b53cdb4625a6b0d3bf1a9e8
+  data.tar.gz: a809312e61ca2626c073c64e95043c053c6a49bb524e758a6d219345377aadbb
 SHA512:
-  metadata.gz: d3e0b6ae3e18c740ca5e30db4d4db8200c1cae7b742bd5cdda9541c05cc30e8d0570250b86b51dc5397cd8cc383d63d82240ffb5bb069ce9457b536a6c87dfed
-  data.tar.gz: 3925101539b829009b8215eddaccb20d6b88c791ee69224cddd7d4c824bc5939dab97352e97184183d8f1561b3a14108187370e37ac006869cbc8cceae7ce4f2
+  metadata.gz: e12e1ef3e93b78b95c6482cc5d9a4a192cd1759b4021ae2a9a11422f0ea50adaea2f739c6baccaa87dd61d3b97c7ced7204944452a5d97eee0c386d52b9ef60c
+  data.tar.gz: 8cdb5bbcc612d1f4c19b4193f385a62769c0e3d06e4e1eb3aa6f7d8cc4a9acfcb23d3f175faf7c4f6e7e684cbf47af582afef5df54596e62489edb27453991e1

data/Gemfile

@@ -2,8 +2,9 @@ source "https://rubygems.org"
 
 gemspec
 
+# NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local
 group :development do
-  gem "chefstyle", "~> 1.0"
+  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
   gem "rake", ">= 10.1.0"
   gem "rspec-core", "~> 3.0"
   gem "rspec-expectations", "~> 3.0"
@@ -12,10 +13,6 @@ group :development do
   gem "ipaddr_extensions"
 end
 
-group :ci do
-  gem "rspec_junit_formatter"
-end
-
 group :docs do
   gem "yard"
   gem "redcarpet"
@@ -25,6 +22,6 @@ end
 group :debug do
   gem "pry"
   gem "pry-byebug"
-  gem "pry-stack_explorer", "~> 0.4.0" # pin until we drop ruby < 2.6
+  gem "pry-stack_explorer"
   gem "rb-readline"
 end

data/lib/ohai/common/dmi.rb

@@ -111,6 +111,15 @@ module Ohai
         id
       end
 
+      SKIPPED_CONVENIENCE_KEYS = %w{
+        application_identifier
+        caption
+        creation_class_name
+        size
+        system_creation_class_name
+        record_id
+      }.freeze
+
       # create simplified convenience access keys for each record type
       # for single occurrences of one type, copy to top level all fields and values
       # for multiple occurrences of same type, copy to top level all fields and values that are common to all records
@@ -122,13 +131,12 @@ module Ohai
 
           records[:all_records].each do |record|
             record.each do |field, value|
-              next if value.is_a?(Mash)
-              next if field.to_s == "application_identifier"
-              next if field.to_s == "size"
-              next if field.to_s == "record_id"
+              next unless value.is_a?(String)
 
               translated = field.downcase.gsub(/[^a-z0-9]/, "_")
-              value      = value.strip
+              next if SKIPPED_CONVENIENCE_KEYS.include?(translated.to_s)
+
+              value = value.strip
               if in_common.key?(translated)
                 in_common[translated] = nil unless in_common[translated] == value
               else

data/lib/ohai/mixin/azure_metadata.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Tim Smith (<tsmith@chef.io>)
-# Copyright:: Copyright 2017 Chef Software, Inc.
+# Copyright:: 2017-2020 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,30 +19,86 @@ require "net/http" unless defined?(Net::HTTP)
 
 module Ohai
   module Mixin
+    #
+    # This code parses the Azure Instance Metadata API to provide details
+    # of the running instance.
+    #
+    # The code probes the instance metadata endpoint for
+    # available versions, determines the most advanced version known to
+    # work and executes the metadata retrieval using that version.
+    #
+    # If no compatible version is found, an empty hash is returned.
+    #
     module AzureMetadata
 
       AZURE_METADATA_ADDR ||= "169.254.169.254".freeze
-      AZURE_METADATA_URL ||= "/metadata/instance?api-version=2017-08-01".freeze
 
-      # fetch the meta content with a timeout and the required header
+      # 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
+
+      def best_api_version
+        @api_version ||= begin
+          logger.trace("Mixin AzureMetadata: Fetching http://#{AZURE_METADATA_ADDR}/metadata/instance to determine the latest supported metadata release")
+          response = http_get("/metadata/instance")
+          if response.code == "404"
+            logger.trace("Mixin AzureMetadata: Received HTTP 404 from metadata server while determining API version, assuming #{AZURE_SUPPORTED_VERSIONS.last}")
+            return AZURE_SUPPORTED_VERSIONS.last
+          elsif response.code != "400" # 400 is actually what we want
+            raise "Mixin AzureMetadata: Unable to determine Azure metadata version (returned #{response.code} response)"
+          end
+
+          # azure returns a list of the 3 latest versions it supports
+          versions = parse_json(response.body).fetch("newest-versions", [])
+          versions.sort!
+
+          until versions.empty? || AZURE_SUPPORTED_VERSIONS.include?(versions.last)
+            pv = versions.pop
+            logger.trace("Mixin AzureMetadata: Azure metadata version #{pv} is not present in the versions provided by the Azure Instance Metadata service")
+          end
+
+          if versions.empty?
+            logger.debug "Mixin AzureMetadata: The short list of supported versions provided by Azure Instance Metadata service doesn't match any known versions to Ohai. Using the latest supported release known to Ohai instead: #{AZURE_SUPPORTED_VERSIONS.last}"
+            return AZURE_SUPPORTED_VERSIONS.last
+          end
+
+          logger.trace("Mixin AzureMetadata: Latest supported Azure metadata version: #{versions.last}")
+          versions.last
+        end
+      end
+
+      # fetch the meta content with a timeout and the required header and a read timeout of 6s
+      #
+      # @param [String] the relative uri to fetch from the Azure Metadata Service URL
+      #
+      # @return [Net::HTTP]
       def http_get(uri)
         conn = Net::HTTP.start(AZURE_METADATA_ADDR)
         conn.read_timeout = 6
         conn.get(uri, { "Metadata" => "true" })
       end
 
-      def fetch_metadata
-        logger.trace("Mixin AzureMetadata: Fetching metadata from host #{AZURE_METADATA_ADDR} at #{AZURE_METADATA_URL}")
-        response = http_get(AZURE_METADATA_URL)
+      # parse JSON data from a String to a Hash
+      #
+      # @param [String] response_body json as string to parse
+      #
+      # @return [Hash]
+      def parse_json(response_body)
+        data = String(response_body)
+        parser = FFI_Yajl::Parser.new
+        parser.parse(data)
+      rescue FFI_Yajl::ParseError
+        logger.warn("Mixin AzureMetadata: Metadata response is NOT valid JSON")
+        nil
+      end
+
+      def fetch_metadata(api_version = nil)
+        metadata_url = "/metadata/instance?api-version=#{best_api_version}"
+        logger.trace("Mixin AzureMetadata: Fetching metadata from host #{AZURE_METADATA_ADDR} at #{metadata_url}")
+        response = http_get(metadata_url)
         if response.code == "200"
-          begin
-            data = StringIO.new(response.body)
-            parser = FFI_Yajl::Parser.new
-            parser.parse(data)
-          rescue FFI_Yajl::ParseError
-            logger.warn("Mixin AzureMetadata: Metadata response is NOT valid JSON")
-            nil
-          end
+          parse_json(response.body)
         else
           logger.warn("Mixin AzureMetadata: Received response code #{response.code} requesting metadata")
           nil

data/lib/ohai/mixin/ec2_metadata.rb

@@ -160,7 +160,7 @@ module Ohai
             if key[-1..-1] != "/"
               retr_meta = metadata_get("#{id}#{key}", api_version)
               data = retr_meta ? retr_meta : ""
-              json = StringIO.new(data)
+              json = String(data)
               parser = FFI_Yajl::Parser.new
               metadata[metadata_key(key)] = parser.parse(json)
             elsif not key.eql?("/")

data/lib/ohai/mixin/gce_metadata.rb

@@ -39,7 +39,7 @@ module Ohai
         return nil unless response.code == "200"
 
         if json?(response.body)
-          data = StringIO.new(response.body)
+          data = String(response.body)
           parser = FFI_Yajl::Parser.new
           parser.parse(data)
         elsif has_trailing_slash?(id) || (id == "")
@@ -57,7 +57,7 @@ module Ohai
       #
       # @return [Boolean] is the data JSON or not?
       def json?(data)
-        data = StringIO.new(data)
+        data = String(data)
         parser = FFI_Yajl::Parser.new
         begin
           parser.parse(data)

data/lib/ohai/plugins/c.rb

@@ -36,10 +36,10 @@ Ohai.plugin(:C) do
     so = shell_out("/usr/bin/xcode-select -p")
     if so.exitstatus == 0
       logger.trace("Plugin C: Xcode Command Line Tools found.")
-      return true
+      true
     else
       logger.trace("Plugin C: Xcode Command Line Tools not found.")
-      return false
+      false
     end
   rescue Ohai::Exceptions::Exec
     logger.trace("Plugin C: xcode-select binary could not be found. Skipping data.")

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

@@ -41,8 +41,8 @@ Ohai.plugin(:Hardware) do
     hardware.merge!(hw_hash[0]["_items"][0])
 
     # ProductName:	Mac OS X
-    # ProductVersion:	10.15.6
-    # BuildVersion:	19G46c
+    # ProductVersion:	10.12.5
+    # BuildVersion:	16F73
     shell_out("sw_vers").stdout.lines.each do |line|
       case line
       when /^ProductName:\s*(.*)$/

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

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) Chef Software, Inc.
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,6 +23,11 @@ Ohai.plugin(:Platform) do
     so = shell_out((Ohai.abs_path( "/usr/bin/sw_vers" )).to_s)
     so.stdout.lines do |line|
       case line
+      when /^ProductName:\s+(.+)$/
+        macname = $1
+        macname.downcase!
+        macname.tr!(" ", "_")
+        platform macname
       when /^ProductVersion:\s+(.+)$/
         platform_version $1
       when /^BuildVersion:\s+(.+)$/
@@ -30,8 +35,6 @@ Ohai.plugin(:Platform) do
       end
     end
 
-    # if we're on darwin assume we're on mac_os_x
-    platform "mac_os_x"
     platform_family "mac_os_x"
   end
 end

data/lib/ohai/plugins/docker.rb

@@ -24,7 +24,7 @@ Ohai.plugin(:Docker) do
   def docker_info_json
     so = shell_out("docker info --format '{{json .}}'")
     if so.exitstatus == 0
-      return JSON.parse(so.stdout)
+      JSON.parse(so.stdout)
     end
   rescue Ohai::Exceptions::Exec
     logger.trace('Plugin Docker: Could not shell_out "docker info --format \'{{json .}}\'". Skipping plugin')

data/lib/ohai/plugins/ec2.rb

@@ -86,7 +86,7 @@ Ohai.plugin(:EC2) do
       wmi = WmiLite::Wmi.new
       if wmi.first_of("Win32_ComputerSystemProduct")["identifyingnumber"] =~ /^ec2/
         logger.trace("Plugin EC2: has_ec2_identifying_number? == true")
-        return true
+        true
       end
     else
       logger.trace("Plugin EC2: has_ec2_identifying_number? == false")

data/lib/ohai/plugins/eucalyptus.rb

@@ -32,9 +32,9 @@ Ohai.plugin(:Eucalyptus) do
   def get_mac_address(addresses)
     detected_addresses = addresses.detect { |address, keypair| keypair == { "family" => "lladdr" } }
     if detected_addresses
-      return detected_addresses.first
+      detected_addresses.first
     else
-      return ""
+      ""
     end
   end
 

data/lib/ohai/plugins/filesystem.rb

@@ -6,7 +6,7 @@
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
 # Author:: Isa Farnik (<isa@chef.io>)
 # Author:: James Gartrell (<jgartrel@gmail.com>)
-# Copyright:: Copyright (c) 2008-2017 Chef Software, Inc.
+# Copyright:: Copyright (c) 2008-2020 Chef Software, Inc.
 # Copyright:: Copyright (c) 2015 Facebook, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -23,6 +23,8 @@
 # limitations under the License.
 #
 
+require "set"
+
 Ohai.plugin(:Filesystem) do
   provides "filesystem"
 
@@ -98,15 +100,6 @@ Ohai.plugin(:Filesystem) do
     view
   end
 
-  def generate_deprecated_view(fs)
-    view = generate_device_view(fs)
-    view.each do |device, entry|
-      view[device][:mount] = entry[:mounts].first
-      view[device].delete(:mounts)
-    end
-    view
-  end
-
   def generate_deprecated_windows_view(fs)
     view = generate_mountpoint_view(fs)
     view.each do |mp, entry|
@@ -115,22 +108,6 @@ Ohai.plugin(:Filesystem) do
     view
   end
 
-  def generate_deprecated_solaris_view(fs, old_zfs)
-    view = generate_deprecated_view(fs)
-    old_zfs.each do |fsname, attributes|
-      view[fsname] ||= Mash.new
-      view[fsname][:fs_type] = "zfs"
-      view[fsname][:mount] = attributes[:values][:mountpoint] if attributes[:values].key?("mountpoint")
-      view[fsname][:device] = fsname
-      view[fsname][:zfs_values] = attributes[:values]
-      view[fsname][:zfs_sources] = attributes[:sources]
-      # parents will already be here
-      # but we want to nuke "zfs_properties"
-      view[fsname].delete("zfs_properties")
-    end
-    view
-  end
-
   def parse_common_df(out)
     fs = {}
     out.each_line do |line|
@@ -496,9 +473,8 @@ Ohai.plugin(:Filesystem) do
     fs_data["by_mountpoint"] = by_mountpoint
     fs_data["by_pair"] = by_pair
 
-    # Set the filesystem data - BSD didn't do the conversion when everyone else
-    # did, so 15 will have both be the new API and 16 will drop the old API
-    filesystem generate_deprecated_view(fs)
+    # @todo in Chef 17 the filesystem2 part of this goes away
+    filesystem fs_data
     filesystem2 fs_data
   end
 
@@ -595,7 +571,6 @@ Ohai.plugin(:Filesystem) do
 
     # Grab any zfs data from "zfs get"
     zfs = Mash.new
-    old_zfs = Mash.new
     zfs_get = "zfs get -p -H all"
     run_with_check("zfs") do
       so = shell_out(zfs_get)
@@ -612,13 +587,6 @@ Ohai.plugin(:Filesystem) do
           value: value,
           source: source,
         }
-        # needed for old v1 view
-        old_zfs[filesystem] ||= Mash.new
-        old_zfs[filesystem][:values] ||= Mash.new
-        old_zfs[filesystem][:sources] ||= Mash.new
-        old_zfs[filesystem][:values][property] = value
-        old_zfs[filesystem][:values][property] = value
-        old_zfs[filesystem][:sources][property] = source
       end
     end
 
@@ -652,9 +620,8 @@ Ohai.plugin(:Filesystem) do
     fs_data["by_mountpoint"] = by_mountpoint
     fs_data["by_pair"] = by_pair
 
-    # Set the filesystem data - Solaris didn't do the conversion when everyone
-    # else did, so 15 will have both be the new API and 16 will drop the old API
-    filesystem generate_deprecated_solaris_view(fs, old_zfs)
+    # @todo in Chef 17 the filesystem2 plugin goes away
+    filesystem fs_data
     filesystem2 fs_data
   end
 
@@ -745,9 +712,8 @@ Ohai.plugin(:Filesystem) do
     fs_data["by_mountpoint"] = by_mountpoint
     fs_data["by_pair"] = by_pair
 
-    # Set the filesystem data - AIX didn't do the conversion when everyone
-    # else did, so 15 will have both be the new API and 16 will drop the old API
-    filesystem generate_deprecated_view(fs)
+    # @todo in Chef 17 the filesystem2 plugin goes away here
+    filesystem fs_data
     filesystem2 fs_data
   end
 

data/lib/ohai/plugins/{linux/fips.rb → fips.rb}

@@ -25,7 +25,7 @@
 Ohai.plugin(:Fips) do
   provides "fips"
 
-  collect_data(:linux) do
+  collect_data(:linux, :windows) do
     fips Mash.new
 
     require "openssl" unless defined?(OpenSSL)

data/lib/ohai/plugins/gce.rb

@@ -54,7 +54,7 @@ Ohai.plugin(:GCE) do
       computer_system = wmi.first_of("Win32_ComputerSystem")
       if computer_system["Manufacturer"] =~ /^Google/ && computer_system["Model"] =~ /^Google/
         logger.trace("Plugin GCE: has_gce_system_info? == true")
-        return true
+        true
       end
     else
       logger.trace("Plugin GCE: has_gce_system_info? == false")

data/lib/ohai/plugins/kernel.rb

@@ -4,7 +4,7 @@
 # Author:: Bryan McLellan (<btm@loftninjas.org>)
 # Author:: Claire McQuin (<claire@chef.io>)
 # Author:: James Gartrell (<jgartrel@gmail.com>)
-# Copyright:: Copyright (c) Chef Software, Inc.
+# Copyright:: Copyright (c) 2008-2018 Chef Software, Inc.
 # Copyright:: Copyright (c) 2009 Bryan McLellan
 # License:: Apache License, Version 2.0
 #
@@ -137,12 +137,11 @@ Ohai.plugin(:Kernel) do
     end
   end
 
-  # see if a WMI name is in the blocked list so we can avoid writing
-  # out useless data to ohai
-  #
+  # see if a WMI name is blacklisted so we can avoid writing out
+  # useless data to ohai
   # @param [String] name the wmi name to check
-  # @return [Boolean] is the wmi name in the blocked list
-  def blocked_wmi_name?(name)
+  # @return [Boolean] is the wmi name blacklisted
+  def blacklisted_wmi_name?(name)
     [
      "creation_class_name", # this is just the wmi name
      "cs_creation_class_name", # this is just the wmi name
@@ -263,7 +262,7 @@ Ohai.plugin(:Kernel) do
     host = wmi.first_of("Win32_OperatingSystem")
     kernel[:os_info] = Mash.new
     host.wmi_ole_object.properties_.each do |p|
-      next if blocked_wmi_name?(p.name.wmi_underscore)
+      next if blacklisted_wmi_name?(p.name.wmi_underscore)
 
       kernel[:os_info][p.name.wmi_underscore.to_sym] = host[p.name.downcase]
     end
@@ -278,7 +277,7 @@ Ohai.plugin(:Kernel) do
     kernel[:cs_info] = Mash.new
     host = wmi.first_of("Win32_ComputerSystem")
     host.wmi_ole_object.properties_.each do |p|
-      next if blocked_wmi_name?(p.name.wmi_underscore)
+      next if blacklisted_wmi_name?(p.name.wmi_underscore)
 
       kernel[:cs_info][p.name.wmi_underscore.to_sym] = host[p.name.downcase]
     end

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

@@ -0,0 +1,83 @@
+#
+# Author:: Davide Cavalca <dcavalca@fb.com>
+# Copyright:: Copyright (c) 2020 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(:Interrupts) do
+  depends "cpu"
+  provides "interrupts", "interrupts/irq", "interrupts/smp_affinity_by_cpu"
+  optional true
+
+  # Documentation: https://www.kernel.org/doc/Documentation/IRQ-affinity.txt
+  # format: comma-separate list of 32bit bitmask in hex
+  # each bit is a CPU, right to left ordering (i.e. CPU0 is rightmost)
+  def parse_smp_affinity(path, cpus)
+    masks = File.read(path).strip
+    bit_masks = []
+    masks.split(",").each do |mask|
+      bit_masks << mask.rjust(8, "0").to_i(16).to_s(2)
+    end
+    affinity_mask = bit_masks.join
+    affinity_by_cpu = affinity_mask.split("").reverse
+    smp_affinity_by_cpu = Mash.new
+    (0..cpus - 1).each do |cpu|
+      smp_affinity_by_cpu[cpu] = affinity_by_cpu[cpu].to_i == 1
+    end
+    smp_affinity_by_cpu
+  end
+
+  collect_data(:linux) do
+    interrupts Mash.new
+
+    cpus = cpu["total"]
+    interrupts[:smp_affinity_by_cpu] =
+      parse_smp_affinity("/proc/irq/default_smp_affinity", cpus)
+
+    interrupts[:irq] = Mash.new
+    File.open("/proc/interrupts").each do |line|
+      # Documentation: https://www.kernel.org/doc/Documentation/filesystems/proc.txt
+      # format is "{irqn}: {CPUn...} [type] [vector] [device]"
+      irqn, fields = line.split(":", 2)
+      # skip the header
+      next if fields.nil?
+
+      irqn.strip!
+      Ohai::Log.debug("irq: processing #{irqn}")
+
+      interrupts[:irq][irqn] = Mash.new
+      interrupts[:irq][irqn][:events_by_cpu] = Mash.new
+
+      fields = fields.split(nil, cpus + 1)
+      (0..cpus - 1).each do |cpu|
+        interrupts[:irq][irqn][:events_by_cpu][cpu] = fields[cpu].to_i
+      end
+      # Only regular IRQs have extra fields and affinity settings
+      if /^\d+$/.match(irqn)
+        interrupts[:irq][irqn][:type],
+        interrupts[:irq][irqn][:vector],
+        interrupts[:irq][irqn][:device] =
+          fields[cpus].split
+        if File.exist?("/proc/irq/#{irqn}/smp_affinity")
+          interrupts[:irq][irqn][:smp_affinity_by_cpu] =
+            parse_smp_affinity("/proc/irq/#{irqn}/smp_affinity", cpus)
+        end
+      # ERR and MIS do not have any extra fields
+      elsif fields[cpus]
+        interrupts[:irq][irqn][:type] = fields[cpus].strip
+      end
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+#
+# Author:: Jay Vana <jsvana@fb.com>
+# Author:: Davide Cavalca <dcavalca@fb.com>
+# Copyright:: Copyright (c) 2016-2020 Facebook, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+Ohai.plugin(:IPC) do
+  provides "ipc"
+  optional true
+
+  collect_data(:linux) do
+    ipcs_path = which("ipcs")
+    if ipcs_path
+      # NOTE: currently only supports shared memory
+      cmd = "#{ipcs_path} -m"
+      ipcs = shell_out(cmd)
+
+      ipc Mash.new unless ipc
+      ipc["shm"] = Mash.new unless ipc["shm"]
+
+      ipcs.stdout.split("\n").each do |line|
+        next unless line.start_with?("0x")
+
+        parts = line.split
+        segment = {
+          "key" => parts[0],
+          "owner" => parts[2],
+          "perms" => parts[3],
+          "bytes" => parts[4].to_i,
+          "nattch" => parts[5].to_i,
+          "status" => parts[6] ? parts[6] : "",
+        }
+
+        ipc["shm"][parts[1].to_i] = segment
+      end
+    end
+  end
+end

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

@@ -207,6 +207,93 @@ Ohai.plugin(:Network) do
     iface
   end
 
+  # determine channel parameters for the interface using ethtool
+  def ethernet_channel_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} -l #{tmp_int}")
+      logger.trace("Plugin Network: Parsing ethtool output: #{so.stdout}")
+      type = nil
+      iface[tmp_int]["channel_params"] = {}
+      so.stdout.lines.each do |line|
+        next if line.start_with?("Channel parameters for")
+        next if line.strip.nil?
+
+        if line =~ /Pre-set maximums/
+          type = "max"
+          next
+        end
+        if line =~ /Current hardware settings/
+          type = "current"
+          next
+        end
+        key, val = line.split(/:\s+/)
+        if type && val
+          channel_key = "#{type}_#{key.downcase.tr(" ", "_")}"
+          iface[tmp_int]["channel_params"][channel_key] = val.to_i
+        end
+      end
+    end
+    iface
+  end
+
+  # determine coalesce parameters for the interface using ethtool
+  def ethernet_coalesce_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} -c #{tmp_int}")
+      logger.trace("Plugin Network: Parsing ethtool output: #{so.stdout}")
+      iface[tmp_int]["coalesce_params"] = {}
+      so.stdout.lines.each do |line|
+        next if line.start_with?("Coalesce parameters for")
+        next if line.strip.nil?
+
+        if line.start_with?("Adaptive")
+          _, adaptive_rx, _, adaptive_tx = line.split(/:\s+|\s+TX|\n/)
+          iface[tmp_int]["coalesce_params"]["adaptive_rx"] = adaptive_rx
+          iface[tmp_int]["coalesce_params"]["adaptive_tx"] = adaptive_tx
+          next
+        end
+        key, val = line.split(/:\s+/)
+        if val
+          coalesce_key = "#{key.downcase.tr(" ", "_")}"
+          iface[tmp_int]["coalesce_params"][coalesce_key] = val.to_i
+        end
+      end
+    end
+    iface
+  end
+
+  # determine driver info for the interface using ethtool
+  def ethernet_driver_info(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} -i #{tmp_int}")
+      logger.trace("Plugin Network: Parsing ethtool output: #{so.stdout}")
+      iface[tmp_int]["driver_info"] = {}
+      so.stdout.lines.each do |line|
+        next if line.strip.nil?
+
+        key, val = line.split(/:\s+/)
+        if val.nil?
+          val = ""
+        end
+        driver_key = "#{key.downcase.tr(" ", "_")}"
+        iface[tmp_int]["driver_info"][driver_key] = val.chomp
+      end
+    end
+    iface
+  end
+
   # determine link stats, vlans, queue length, and state for an interface using ip
   def link_statistics(iface, net_counters)
     so = shell_out("ip -d -s link")
@@ -669,6 +756,9 @@ Ohai.plugin(:Network) do
 
     iface = ethernet_layer_one(iface)
     iface = ethernet_ring_parameters(iface)
+    iface = ethernet_channel_parameters(iface)
+    iface = ethernet_coalesce_parameters(iface)
+    iface = ethernet_driver_info(iface)
     counters[:network][:interfaces] = net_counters
     network["interfaces"] = iface
   end

data/lib/ohai/plugins/packages.rb

@@ -191,7 +191,7 @@ Ohai.plugin(:Packages) do
     chunked_lines = so.stdout.lines.map(&:strip).chunk do |line|
       !line.empty? || nil
     end
-    chunked_lines.each do |_, lines| # rubocop: disable Performance/HashEachMethods
+    chunked_lines.each do |_, lines| # rubocop: disable Style/HashEachMethods
       package = {}
       lines.each do |line|
         key, value = line.split(":", 2)

data/lib/ohai/plugins/rackspace.rb

@@ -54,7 +54,7 @@ Ohai.plugin(:Rackspace) do
     wmi = WmiLite::Wmi.new
     if wmi.first_of("Win32_ComputerSystem")["PrimaryOwnerName"] == "Rackspace"
       logger.trace("Plugin Rackspace: has_rackspace_manufacturer? == true")
-      return true
+      true
     end
   end
 

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

@@ -0,0 +1,94 @@
+#
+# Author:: Pete Higgins (pete@peterhiggins.org)
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+Ohai.plugin(:DMI) do
+  provides "dmi"
+
+  # Map the linux component types to their rough Windows API equivalents
+  DMI_TO_WIN32OLE ||= {
+    chassis: "SystemEnclosure",
+    processor: "Processor",
+    bios: "Bios",
+    system: "ComputerSystemProduct",
+    base_board: "BaseBoard",
+  }.freeze
+
+  # This regex is in 3 parts for the different supported patterns in camel
+  # case names coming from the Windows API:
+  # * Typical camelcase, eg Depth, PartNumber, NumberOfPowerCords
+  # * Acronyms preceding camelcase, eg SMBIOSAssetTag
+  # * Acronyms that occur at the end of the name, eg SKU, DeviceID
+  #
+  # This cannot handle some property names, eg SMBIOSBIOSVersion.
+  # https://rubular.com/r/FBNtXod4wkZGAG
+  SPLIT_REGEX ||= /[A-Z][a-z0-9]+|[A-Z]{2,}(?=[A-Z][a-z0-9])|[A-Z]{2,}/.freeze
+
+  WINDOWS_TO_UNIX_KEYS ||= [
+    %w{vendor manufacturer},
+    %w{identifying_number serial_number},
+    %w{name family},
+  ].freeze
+
+  collect_data(:windows) do
+    require "ohai/common/dmi"
+    require "wmi-lite/wmi"
+    wmi = WmiLite::Wmi.new
+
+    dmi Mash.new
+
+    # The Windows API returns property names in camel case, eg "SerialNumber",
+    # while `dmi` returns them as space separated strings, eg "Serial Number".
+    # `Ohai::Common::DMI.convenience_keys` expects property names in `dmi`'s
+    # format, so build two parallel hashes with the keys as they come from the
+    # Windows API and in a faked-out `dmi` version. After the call to
+    # `Ohai::Common::DMI.convenience_keys` replace the faked-out `dmi`
+    # collection with the one with the original property names.
+    DMI_TO_WIN32OLE.each do |dmi_key, ole_key|
+      wmi_objects = wmi.instances_of("Win32_#{ole_key}").map(&:wmi_ole_object)
+
+      split_name_properties = []
+      properties = []
+
+      wmi_objects.each do |wmi_object|
+        split_name_properties << Mash.new
+        properties << Mash.new
+
+        wmi_object.properties_.each do |property|
+          property_name = property.name
+          value = wmi_object.invoke(property_name)
+
+          split_name = property_name.scan(SPLIT_REGEX).join(" ")
+          split_name_properties.last[split_name] = value
+          properties.last[property_name] = value
+        end
+      end
+
+      dmi[dmi_key] = Mash.new(all_records: split_name_properties, _all_records: properties)
+    end
+
+    Ohai::Common::DMI.convenience_keys(dmi)
+
+    dmi.each_value do |records|
+      records[:all_records] = records.delete(:_all_records)
+
+      WINDOWS_TO_UNIX_KEYS.each do |windows_key, unix_key|
+        records[unix_key] = records.delete(windows_key) if records.key?(windows_key)
+      end
+    end
+  end
+end

data/lib/ohai/plugins/windows/system_enclosure.rb

@@ -18,13 +18,11 @@
 
 Ohai.plugin :SystemEnclosure do
   provides "system_enclosure"
+  depends "dmi"
 
   collect_data(:windows) do
-    require "wmi-lite/wmi"
     system_enclosure Mash.new
-    wmi = WmiLite::Wmi.new
-    wmi_object = wmi.first_of("Win32_SystemEnclosure").wmi_ole_object
-    system_enclosure[:manufacturer] = wmi_object.invoke("manufacturer")
-    system_enclosure[:serialnumber] = wmi_object.invoke("serialnumber")
+    system_enclosure[:manufacturer] = get_attribute(:dmi, :chassis, :manufacturer)
+    system_enclosure[:serialnumber] = get_attribute(:dmi, :chassis, :serial_number)
   end
 end

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "15.12.0".freeze
+  VERSION = "16.0.20".freeze
 end

data/ohai.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency "ipaddress"
   s.add_dependency "wmi-lite", "~> 1.0"
   s.add_dependency "ffi", "~> 1.9"
-  s.add_dependency "chef-config", ">= 12.8", "< 16"
+  s.add_dependency "chef-config", ">= 12.8", "< 17"
   # 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.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 15.12.0
+  version: 16.0.20
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -177,7 +177,7 @@ dependencies:
         version: '12.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '16'
+        version: '17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -187,7 +187,7 @@ dependencies:
         version: '12.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '16'
+        version: '17'
 description: Ohai profiles your system and emits JSON
 email: adam@chef.io
 executables:
@@ -254,6 +254,7 @@ files:
 - lib/ohai/plugins/erlang.rb
 - lib/ohai/plugins/eucalyptus.rb
 - lib/ohai/plugins/filesystem.rb
+- lib/ohai/plugins/fips.rb
 - lib/ohai/plugins/freebsd/memory.rb
 - lib/ohai/plugins/freebsd/network.rb
 - lib/ohai/plugins/freebsd/platform.rb
@@ -271,8 +272,9 @@ files:
 - lib/ohai/plugins/libvirt.rb
 - lib/ohai/plugins/linode.rb
 - lib/ohai/plugins/linux/block_device.rb
-- lib/ohai/plugins/linux/fips.rb
 - lib/ohai/plugins/linux/hostnamectl.rb
+- lib/ohai/plugins/linux/interrupts.rb
+- lib/ohai/plugins/linux/ipc.rb
 - lib/ohai/plugins/linux/lsb.rb
 - lib/ohai/plugins/linux/lspci.rb
 - lib/ohai/plugins/linux/machineid.rb
@@ -327,8 +329,8 @@ files:
 - lib/ohai/plugins/uptime.rb
 - lib/ohai/plugins/virtualbox.rb
 - lib/ohai/plugins/vmware.rb
+- lib/ohai/plugins/windows/dmi.rb
 - lib/ohai/plugins/windows/drivers.rb
-- lib/ohai/plugins/windows/fips.rb
 - lib/ohai/plugins/windows/memory.rb
 - lib/ohai/plugins/windows/network.rb
 - lib/ohai/plugins/windows/platform.rb

data/lib/ohai/plugins/windows/fips.rb

@@ -1,38 +0,0 @@
-#
-# Author:: Matt Wrock (<matt@mattwrock.com>)
-# Copyright:: Copyright (c) 2016-2018 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# After long discussion in IRC the "powers that be" have come to a concensus
-# that there is no other Windows platforms exist that were not based on the
-# Windows_NT kernel, so we herby decree that "windows" will refer to all
-# platforms built upon the Windows_NT kernel and have access to win32 or win64
-# subsystems.
-
-Ohai.plugin(:Fips) do
-  provides "fips"
-
-  collect_data(:windows) do
-    fips Mash.new
-
-    require "openssl" unless defined?(OpenSSL)
-    if defined?(OpenSSL.fips_mode) && OpenSSL.fips_mode && !$FIPS_TEST_MODE
-      fips["kernel"] = { "enabled" => true }
-    else
-      fips["kernel"] = { "enabled" => false }
-    end
-  end
-end