ohai 18.1.0 → 19.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d6704f249d63eb6abebd08dd48e408fee70bd50d5ca2304471bdcc53b80941c
-  data.tar.gz: f761a02520c31d96e8a8bab3853f5a432d0fb9460b2901dd1a0abe4efdcdcc6b
+  metadata.gz: 6339d53754721217929ead82d4a232ace638f648d5e7ba2469221dfd22da54a0
+  data.tar.gz: 28eda66502f23a2bacf4c96407fb89193023fe76cd5f30f0ab839096def6e044
 SHA512:
-  metadata.gz: a58f353ea899d897e4fc3cd8aa5dabe9737b8002ceda5483482ac7fceded93d40ef5581ca4e403edaa049e6f43587932945e8f1f125cb88162e31ae424a80865
-  data.tar.gz: a58f4b0a239f206e2194abacbdbf137931057980745f0b5b9eee528ff314c21a042ae1b88a0325b12a68fc928c77817778d53d89e952bbd9d88410df35a93865
+  metadata.gz: c33166e19c09e55f3b28d9ee437a350666b7241b949e0b45bc1e4cc27118bc86130f2c6520c7a136de879d3e72fde0254cadbe3d562646abc7298cbb8b437731
+  data.tar.gz: ffd0515bda588dee888dcd1deed4a8d1275b35ddbb55d7b8913b5e87203781628820f0417df55847da3e27a2cec85b2df2e7a2cb7dcb632b9f1181d2f0575e03

data/Gemfile

@@ -1,23 +1,23 @@
 # frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gemspec
 
-# pull these gems from main of chef/chef so that we're testing against what we will release
+# pull these gems from main of chef/chef so that we"re testing against what we will release
+gem "appbundler"
 gem "chef-config", git: "https://github.com/chef/chef", branch: "main", glob: "chef-config/chef-config.gemspec"
 gem "chef-utils", git: "https://github.com/chef/chef", branch: "main", glob: "chef-utils/chef-utils.gemspec"
-
+gem "ffi", "~> 1.17", force_ruby_platform: true
 # NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local
 group :development do
-  gem "chefstyle", "2.2.2"
+  gem "cookstyle", ">= 7.32.8"
   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.16.0"
-  gem "rubocop-rspec"
 end
 
 group :debug do

data/lib/ohai/application.rb

@@ -49,7 +49,7 @@ class Ohai::Application
     short: "-l LEVEL",
     long: "--log_level LEVEL",
     description: "Set the log level (debug, info, warn, error, fatal)",
-    proc: lambda { |l| l.to_sym }
+    proc: lambda(&:to_sym)
 
   option :log_location,
     short: "-L LOGLOCATION",

data/lib/ohai/dsl/plugin/versionvii.rb

@@ -149,11 +149,11 @@ module Ohai
         end
 
         def provides(*paths)
-          logger.warn("[UNSUPPORTED OPERATION] \'provides\' is no longer supported in a \'collect_data\' context. Please specify \'provides\' before collecting plugin data. Ignoring command \'provides #{paths.join(", ")}")
+          logger.warn("[UNSUPPORTED OPERATION] 'provides' is no longer supported in a 'collect_data' context. Please specify 'provides' before collecting plugin data. Ignoring command 'provides #{paths.join(", ")}")
         end
 
         def require_plugin(*args)
-          logger.warn("[UNSUPPORTED OPERATION] \'require_plugin\' is no longer supported. Please use \'depends\' instead.\nIgnoring plugin(s) #{args.join(", ")}")
+          logger.warn("[UNSUPPORTED OPERATION] 'require_plugin' is no longer supported. Please use 'depends' instead.\nIgnoring plugin(s) #{args.join(", ")}")
         end
 
         def configuration(option, *options)

data/lib/ohai/loader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Claire McQuin (<claire@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -97,10 +98,10 @@ module Ohai
     # @return [Object] class object for the ohai plugin defined in the file
     def load_plugin_class(plugin_path)
       # Read the contents of the plugin to understand if it's a V6 or V7 plugin.
-      contents = ""
+      contents = nil
       begin
         logger.trace("Loading plugin at #{plugin_path}")
-        contents << IO.read(plugin_path)
+        contents = File.read(plugin_path)
       rescue IOError, Errno::ENOENT
         logger.warn("Unable to open or read plugin at #{plugin_path}")
         return nil
@@ -110,9 +111,9 @@ module Ohai
       if contents.include?("Ohai.plugin")
         load_v7_plugin_class(contents, plugin_path)
       else
-        raise Exceptions::IllegalPluginDefinition, "[DEPRECATION] Plugin at #{plugin_path}"\
-        " is a version 6 plugin. Version 6 plugins are no longer supported by Ohai. This"\
-        " plugin will need to be updated to the v7 Ohai plugin format. See"\
+        raise Exceptions::IllegalPluginDefinition, "[DEPRECATION] Plugin at #{plugin_path}" \
+        " is a version 6 plugin. Version 6 plugins are no longer supported by Ohai. This" \
+        " plugin will need to be updated to the v7 Ohai plugin format. See" \
         " https://docs.chef.io/ohai_custom.html for v7 syntax."
       end
     end
@@ -151,7 +152,7 @@ module Ohai
     rescue Ohai::Exceptions::IllegalPluginDefinition => e
       logger.warn("Plugin Definition Error: <#{plugin_path}>: #{e.message}")
     rescue NoMethodError => e
-      logger.warn("Plugin Method Error: <#{plugin_path}>: unsupported operation \'#{e.name}\'")
+      logger.warn("Plugin Method Error: <#{plugin_path}>: unsupported operation '#{e.name}'")
     rescue SyntaxError => e
       # split on occurrences of
       #    <env>: syntax error,

data/lib/ohai/mixin/alibaba_metadata.rb

@@ -18,6 +18,9 @@
 
 require "net/http" unless defined?(Net::HTTP)
 
+require_relative "../mixin/json_helper"
+include Ohai::Mixin::JsonHelper
+
 module Ohai
   module Mixin
     #
@@ -38,36 +41,30 @@ module Ohai
         conn.get("/2016-01-01/#{uri}", { "User-Agent" => "chef-ohai/#{Ohai::VERSION}" })
       end
 
-      def fetch_metadata(id = "")
+      def fetch_metadata(id = "", is_directory = true)
         response = http_get(id)
-        return nil unless response.code == "200"
+        if response.code == "200"
 
-        if json?(response.body)
-          data = String(response.body)
-          parser = FFI_Yajl::Parser.new
-          parser.parse(data)
-        elsif response.body.include?("\n")
-          temp = {}
-          response.body.split("\n").each do |sub_attr|
-            temp[sanitize_key(sub_attr)] = fetch_metadata("#{id}/#{sub_attr}")
+          if !is_directory
+            json_data = parse_json(response.body)
+            if json_data.nil?
+              response.body
+            else
+              json_data
+            end
+          elsif is_directory
+            temp = {}
+            response.body.split("\n").each do |sub_attr|
+              if "#{id}/#{sub_attr}" != "/user-data"
+                uri = id == "" ? "#{id}#{sub_attr}/" : "#{id}#{sub_attr}"
+                temp[sanitize_key(sub_attr).gsub(/_$/, "")] = fetch_metadata(uri, has_trailing_slash?(uri))
+              end
+            end
+            temp
           end
-          temp
         else
-          response.body
-        end
-      end
-
-      # @param [String] data that might be JSON
-      #
-      # @return [Boolean] is the data JSON or not?
-      def json?(data)
-        data = String(data)
-        parser = FFI_Yajl::Parser.new
-        begin
-          parser.parse(data)
-          true
-        rescue FFI_Yajl::ParseError
-          false
+          logger.warn("Mixin AlibabaMetadata: Received response code #{response.code} requesting metadata for id='#{id}'")
+          nil
         end
       end
 
@@ -75,7 +72,7 @@ module Ohai
       #
       # @return [Boolean] is there a trailing /?
       def has_trailing_slash?(data)
-        !!( data =~ %r{/$} )
+        !!(data =~ %r{/$})
       end
 
       def sanitize_key(key)

data/lib/ohai/mixin/azure_metadata.rb

@@ -18,6 +18,9 @@
 
 require "net/http" unless defined?(Net::HTTP)
 
+require_relative "../mixin/json_helper"
+include Ohai::Mixin::JsonHelper
+
 module Ohai
   module Mixin
     #
@@ -38,7 +41,8 @@ module Ohai
       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
+                                       2021-02-01 2021-03-01 2021-05-01 2021-10-01 2021-11-01
+                                       2021-11-15 2021-12-13 2023-07-01 }.freeze
 
       def best_api_version
         @api_version ||= begin
@@ -81,26 +85,16 @@ module Ohai
         conn.get(uri, { "Metadata" => "true" })
       end
 
-      # 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)
+      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"
-          parse_json(response.body)
+          json_data = parse_json(response.body)
+          if json_data.nil?
+            logger.warn("Mixin AzureMetadata: Metadata response is NOT valid JSON")
+          end
+          json_data
         else
           logger.warn("Mixin AzureMetadata: Received response code #{response.code} requesting metadata")
           nil

data/lib/ohai/mixin/ec2_metadata.rb

@@ -20,6 +20,9 @@
 
 require "net/http" unless defined?(Net::HTTP)
 
+require_relative "../mixin/json_helper"
+include Ohai::Mixin::JsonHelper
+
 module Ohai
   module Mixin
     ##
@@ -229,9 +232,14 @@ module Ohai
         @fetch_dynamic_data ||= begin
           response = http_client.get("/#{best_api_version}/dynamic/instance-identity/document/", { 'X-aws-ec2-metadata-token': v2_token })
 
-          if json?(response.body) && response.code == "200"
-            FFI_Yajl::Parser.parse(response.body)
+          if response.code == "200"
+            json_data = parse_json(response.body, {})
+            if json_data.nil?
+              logger.warn("Mixin Ec2Metadata: Metadata response is NOT valid JSON")
+            end
+            json_data
           else
+            logger.warn("Mixin Ec2Metadata: Received response code #{response.code} requesting metadata")
             {}
           end
         end
@@ -240,8 +248,14 @@ module Ohai
       private
 
       def expand_path(file_name)
-        path = file_name.gsub(/\=.*$/, "/")
-        # ignore "./" and "../"
+        # First substitution - exactly matches original behavior but safer
+        path = if file_name.include?("=")
+                 file_name[0...file_name.index("=")] + "/"
+               else
+                 file_name.dup
+               end
+
+        # Handle relative path components
         path.gsub(%r{/\.\.?(?:/|$)}, "/")
           .sub(%r{^\.\.?(?:/|$)}, "")
           .sub(/^$/, "/")

data/lib/ohai/mixin/gce_metadata.rb

@@ -17,13 +17,16 @@
 
 require "net/http" unless defined?(Net::HTTP)
 
+require_relative "../mixin/json_helper"
+include Ohai::Mixin::JsonHelper
+
 module Ohai
   module Mixin
     module GCEMetadata
 
       # Trailing dot to host is added to avoid DNS search path
       GCE_METADATA_ADDR ||= "metadata.google.internal."
-      GCE_METADATA_URL ||= "/computeMetadata/v1/?recursive=true"
+      GCE_METADATA_URL ||= "/computeMetadata/v1"
 
       # fetch the meta content with a timeout and the required header
       def http_get(uri)
@@ -36,35 +39,28 @@ module Ohai
       end
 
       def fetch_metadata(id = "")
-        response = http_get("#{GCE_METADATA_URL}/#{id}")
-        return nil unless response.code == "200"
-
-        if json?(response.body)
-          data = String(response.body)
-          parser = FFI_Yajl::Parser.new
-          parser.parse(data)
-        elsif has_trailing_slash?(id) || (id == "")
-          temp = {}
-          response.body.split("\n").each do |sub_attr|
-            temp[sanitize_key(sub_attr)] = fetch_metadata("#{id}#{sub_attr}")
+        url = "#{GCE_METADATA_URL}/#{id}"
+        url = "#{url}?recursive=true" if url.end_with?("/")
+        response = http_get(url)
+        if response.code == "200"
+          json_data = parse_json(response.body)
+          if json_data.nil?
+            logger.warn("Mixin GCEMetadata: Metadata response is NOT valid JSON for id='#{id}'")
+            if has_trailing_slash?(id) || (id == "")
+              temp = {}
+              response.body.split("\n").each do |sub_attr|
+                temp[sanitize_key(sub_attr)] = fetch_metadata("#{id}#{sub_attr}")
+              end
+              temp
+            else
+              response.body
+            end
+          else
+            json_data
           end
-          temp
         else
-          response.body
-        end
-      end
-
-      # @param [String] data that might be JSON
-      #
-      # @return [Boolean] is the data JSON or not?
-      def json?(data)
-        data = String(data)
-        parser = FFI_Yajl::Parser.new
-        begin
-          parser.parse(data)
-          true
-        rescue FFI_Yajl::ParseError
-          false
+          logger.warn("Mixin GCEMetadata: Received response code #{response.code} requesting metadata for id='#{id}'")
+          nil
         end
       end
 

data/lib/ohai/mixin/json_helper.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+#
+# Author:: Renato Covarrubias (<rnt@rnt.cl>)
+# 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.
+
+module Ohai
+  module Mixin
+    module JsonHelper
+      # parse JSON data from a String to a Hash
+      #
+      # @param [String] response_body json as string to parse
+      # @param [Object] return_on_parse_error value to return if parsing fails
+      #
+      # @return [Hash]
+      def parse_json(response_body, return_on_parse_error = nil)
+        data = String(response_body)
+        parser = FFI_Yajl::Parser.new
+        parser.parse(data)
+      rescue FFI_Yajl::ParseError
+        return_on_parse_error
+      end
+    end
+  end
+end

data/lib/ohai/mixin/network_helper.rb

@@ -19,6 +19,7 @@
 #
 
 require "socket" unless defined?(Socket)
+require "resolv" unless defined?(Resolv)
 
 module Ohai
   module Mixin
@@ -37,6 +38,12 @@ module Ohai
         dec
       end
 
+      # Addrinfo#ip*? methods return true on AI_CANONNAME Addrinfo records that match
+      # the ipv* scheme and #ip? always returns true unless a non tcp Addrinfo
+      def ip?(hostname)
+        Resolv::IPv4::Regex.match?(hostname) || Resolv::IPv6::Regex.match?(hostname)
+      end
+
       # This does a forward and reverse lookup on the hostname to return what should be
       # the FQDN for the host determined by name lookup (generally DNS).  If the forward
       # lookup fails this will throw.  If the reverse lookup fails this will return the
@@ -47,7 +54,27 @@ module Ohai
       # server), and the method should return the hostname and not the IP address.
       #
       def canonicalize_hostname(hostname)
-        Addrinfo.getaddrinfo(hostname, nil, nil, nil, nil, Socket::AI_CANONNAME).first.canonname
+        ai = Addrinfo
+          .getaddrinfo(hostname, nil, nil, nil, nil, Socket::AI_CANONNAME)
+          .first
+
+        canonname = ai&.canonname
+        # use canonname if it's an FQDN
+        # This API is preferred as it never gives us an IP address for broken DNS
+        # (see https://github.com/chef/ohai/pull/1705)
+        # However, we have found that Windows hosts that are not joined to a domain
+        # can return a non-qualified hostname).
+        # Use a '.' in the canonname as indicator of FQDN
+        return canonname if canonname.include?(".")
+
+        # If we got a non-qualified name, then we do a standard reverse resolve
+        # which, assuming DNS is working, will work around that windows bug
+        # (and maybe others)
+        canonname = ai&.getnameinfo&.first
+        return canonname unless ip?(canonname)
+
+        # if all else fails, return the name we were given as a safety
+        hostname
       end
 
       def canonicalize_hostname_with_retries(hostname)

data/lib/ohai/mixin/oci_metadata.rb

@@ -18,6 +18,9 @@
 
 require "net/http" unless defined?(Net::HTTP)
 
+require_relative "../mixin/json_helper"
+include Ohai::Mixin::JsonHelper
+
 module Ohai
   module Mixin
     module OCIMetadata
@@ -25,6 +28,39 @@ module Ohai
       OCI_METADATA_URL = "/opc/v2"
       CHASSIS_ASSET_TAG_FILE = "/sys/devices/virtual/dmi/id/chassis_asset_tag"
 
+      # Get the chassis asset tag from DMI information
+      # On Linux: reads from sysfs
+      # On Windows: queries WMI Win32_SystemEnclosure
+      def chassis_asset_tag
+        if RUBY_PLATFORM =~ /mswin|mingw|windows/
+          get_chassis_asset_tag_windows
+        else
+          get_chassis_asset_tag_linux
+        end
+      end
+
+      # Read chassis asset tag from Linux sysfs
+      def get_chassis_asset_tag_linux
+        return unless ::File.exist?(CHASSIS_ASSET_TAG_FILE)
+
+        ::File.read(CHASSIS_ASSET_TAG_FILE).strip
+      rescue => e
+        logger.debug("Mixin OciMetadata: Failed to read chassis asset tag from #{CHASSIS_ASSET_TAG_FILE}: #{e}")
+        nil
+      end
+
+      # Read chassis asset tag from Windows WMI
+      def get_chassis_asset_tag_windows
+        require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
+
+        wmi = WmiLite::Wmi.new
+        enclosure = wmi.first_of("Win32_SystemEnclosure")
+        enclosure&.[]("SMBIOSAssetTag")
+      rescue => e
+        logger.debug("Mixin OciMetadata: Failed to read chassis asset tag from WMI: #{e}")
+        nil
+      end
+
       # fetch the meta content with a timeout and the required header
       def http_get(uri)
         conn = Net::HTTP.start(OCI_METADATA_ADDR)
@@ -38,29 +74,17 @@ module Ohai
         )
       end
 
-      # 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 OciMetadata: Metadata response is NOT valid JSON")
-        nil
-      end
-
       # Fetch metadata from api
       def fetch_metadata(metadata = "instance")
         response = http_get("#{OCI_METADATA_URL}/#{metadata}")
-        return nil unless response.code == "200"
-
         if response.code == "200"
-          parse_json(response.body)
+          json_data = parse_json(response.body)
+          if json_data.nil?
+            logger.warn("Mixin OciMetadata: Metadata response is NOT valid JSON")
+          end
+          json_data
         else
-          logger.warn("Mixin OciMetadata: Received response code #{response.code} requesting metadata")
+          logger.debug("Mixin OciMetadata: Received response code #{response.code} requesting #{metadata}")
           nil
         end
       end

data/lib/ohai/mixin/string.rb

@@ -25,7 +25,7 @@ class String
   # ActiveSupport::CoreExtensions::String::Inflections
   # @return [String]
   def wmi_underscore
-    gsub(/::/, "/").gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+    gsub("::", "/").gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
       .gsub(/([a-z\d])([A-Z])/, '\1_\2').tr("-", "_").downcase
   end
 end

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

@@ -26,11 +26,11 @@ Ohai.plugin(:Kernel) do
 
     uname_so = shell_out("uname -rvp").stdout.split
 
-    kernel[:name] =    "aix" # this is here for historical reasons, but it's always aix
+    kernel[:name] = "aix" # this is here for historical reasons, but it's always aix
     kernel[:release] = uname_so[0]
     kernel[:version] = uname_so[1]
     kernel[:machine] = uname_so[2]
-    kernel[:bits] =    shell_out("getconf KERNEL_BITMODE").stdout.strip
+    kernel[:bits] = shell_out("getconf KERNEL_BITMODE").stdout.strip
 
     modules = Mash.new
     so = shell_out("genkex -d")

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

@@ -120,7 +120,7 @@ Ohai.plugin(:Network) do
           interface = $6
           ifaces[interface][:routes] ||= []
           ifaces[interface][:routes] << Mash.new( destination: $1, family: family,
-                                                  via: $2, flags: $3)
+            via: $2, flags: $3)
         end
       end
     end

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

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

data/lib/ohai/plugins/alibaba.rb

@@ -54,7 +54,7 @@ Ohai.plugin(:Alibaba) do
   # a single check that combines all the various detection methods for Alibaba
   # @return [Boolean] Does the system appear to be on Alibaba
   def looks_like_alibaba?
-    return true if hint?("alibaba") || has_ali_dmi?
+    hint?("alibaba") || has_ali_dmi?
   end
 
   collect_data do

data/lib/ohai/plugins/cpu.rb

@@ -63,7 +63,8 @@ Ohai.plugin(:CPU) do
   def parse_lscpu(cpu_info)
     lscpu_info = Mash.new
     begin
-      so = shell_out("lscpu")
+      # Pipe to cat to retain previous output on newer util-linux (see lscpu(1))
+      so = shell_out("lscpu | cat")
       cpu_cores = shell_out("lscpu -p=CPU,CORE,SOCKET")
       if so.exitstatus == 0 && cpu_cores.exitstatus == 0
         lscpu_info[:numa_node_cpus] = Mash.new
@@ -96,10 +97,12 @@ Ohai.plugin(:CPU) do
             end
           when /^Thread\(s\) per core:\s+(.+)/ # http://rubular.com/r/lOw2pRrw1q
             lscpu_info[:threads_per_core] = $1.to_i
-          when /^Core\(s\) per socket:\s+(.+)/ # http://rubular.com/r/lOw2pRrw1q
+          when /^Core\(s\) per (?:socket|cluster):\s+(.+)/ # http://rubular.com/r/lOw2pRrw1q
             lscpu_info[:cores_per_socket] = $1.to_i
           when /^Socket\(s\):\s+(.+)/ # http://rubular.com/r/DIzmPtJFvK
             lscpu_info[:sockets] = $1.to_i
+          when /^Clusters\(s\):\s+(.+)/
+            lscpu_info[:clusters] = $1.to_i
           when /^Socket\(s\) per book:\s+(.+)/
             lscpu_info[:sockets_per_book] = $1.to_i
           when /^Book\(s\) per drawer:\s+(.+)/
@@ -110,6 +113,10 @@ Ohai.plugin(:CPU) do
             lscpu_info[:numa_nodes] = $1.to_i
           when /^Vendor ID:\s+(.+)/
             lscpu_info[:vendor_id] = $1
+          when /^BIOS Vendor ID:\s+(.+)/
+            lscpu_info[:bios_vendor_id] = $1
+          when /^BIOS Model name:\s+(.+)/
+            lscpu_info[:bios_model_name] = $1.strip
           when /^Machine type:\s+(.+)/
             lscpu_info[:machine_type] = $1
           when /^CPU family:\s+(.+)/
@@ -630,6 +637,6 @@ Ohai.plugin(:CPU) do
 
     cpu[:total] = logical_processors
     cpu[:cores] = cores
-    cpu[:real] =  processors.length
+    cpu[:real] = processors.length
   end
 end

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

@@ -18,7 +18,7 @@
 #
 
 Ohai.plugin(:Platform) do
-  provides "platform", "platform_version", "platform_build", "platform_family"
+  provides "platform", "platform_version", "platform_version_extra", "platform_build", "platform_family"
 
   collect_data(:darwin) do
     so = shell_out(Ohai.abs_path( "/usr/bin/sw_vers" ).to_s)
@@ -26,6 +26,8 @@ Ohai.plugin(:Platform) do
       case line
       when /^ProductVersion:\s+(.+)$/
         platform_version $1
+      when /^ProductVersionExtra:\s+(.+)$/
+        platform_version_extra $1
       when /^BuildVersion:\s+(.+)$/
         platform_build $1
       end