ohai 18.0.14 → 18.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3f13e229791bcb56c90dfc30f3fa5fea108b9d185c1c0492a5198c2e6bae93b
-  data.tar.gz: 60134dedd0d7da72c1932dc987b143303d9f832bf123380ab22db9462e6799b2
+  metadata.gz: 6d6704f249d63eb6abebd08dd48e408fee70bd50d5ca2304471bdcc53b80941c
+  data.tar.gz: f761a02520c31d96e8a8bab3853f5a432d0fb9460b2901dd1a0abe4efdcdcc6b
 SHA512:
-  metadata.gz: 735fb50fdd3ee96a1325eaae9847d0f998b72b50116963d829bd7b350d5b6af4e76089083612c7a66f7ec7e80a374e45b25b711b38e6ff5c0435f9ac66ae39ec
-  data.tar.gz: ed81c806e9d91688e5c7aa5a4246aea55e62a8dbca35e3c89698795c29f45083572bafdf62382abcce201c53b736a1f11b2fcd17e4ff5aa61a114707fc2f1b11
+  metadata.gz: a58f353ea899d897e4fc3cd8aa5dabe9737b8002ceda5483482ac7fceded93d40ef5581ca4e403edaa049e6f43587932945e8f1f125cb88162e31ae424a80865
+  data.tar.gz: a58f4b0a239f206e2194abacbdbf137931057980745f0b5b9eee528ff314c21a042ae1b88a0325b12a68fc928c77817778d53d89e952bbd9d88410df35a93865

data/Gemfile

@@ -16,7 +16,7 @@ group :development do
   gem "rspec-core", "~> 3.0"
   gem "rspec-expectations", "~> 3.0"
   gem "rspec-mocks", "~> 3.0"
-  gem "rubocop-performance", "1.13.3"
+  gem "rubocop-performance", "1.16.0"
   gem "rubocop-rspec"
 end
 

data/lib/ohai/common/dmi.rb

@@ -25,57 +25,59 @@ module Ohai
       # all-lowercase, all non-alphanumeric converted to '_'
       # 128-255 are 'oem_data_[id]'
       # Everything else is 'unknown'
-      ID_TO_DESCRIPTION = {
-        0 => "bios",
-        1 => "system",
-        2 => "base_board",
-        3 => "chassis",
-        4 => "processor",
-        5 => "memory_controller",
-        6 => "memory_module",
-        7 => "cache",
-        8 => "port_connector",
-        9 => "system_slots",
-        10 => "on_board_devices",
-        11 => "oem_strings",
-        12 => "system_configuration_options",
-        13 => "bios_language",
-        14 => "group_associations",
-        15 => "system_event_log",
-        16 => "physical_memory_array",
-        17 => "memory_device",
-        18 => "32_bit_memory_error",
-        19 => "memory_array_mapped_address",
-        20 => "memory_device_mapped_address",
-        21 => "built_in_pointing_device",
-        22 => "portable_battery",
-        23 => "system_reset",
-        24 => "hardware_security",
-        25 => "system_power_controls",
-        26 => "voltage_probe",
-        27 => "cooling_device",
-        28 => "temperature_probe",
-        29 => "electrical_current_probe",
-        30 => "out_of_band_remote_access",
-        31 => "boot_integrity_services",
-        32 => "system_boot",
-        33 => "64_bit_memory_error",
-        34 => "management_device",
-        35 => "management_device_component",
-        36 => "management_device_threshold_data",
-        37 => "memory_channel",
-        38 => "ipmi_device",
-        39 => "power_supply",
-        40 => "additional_information",
-        41 => "onboard_devices_extended_information",
-        42 => "management_controller_host_interfaces",
-        126 => "disabled_entries",
-        127 => "end_of_table_marker",
-      }.freeze
+      unless defined?(ID_TO_DESCRIPTION)
+        ID_TO_DESCRIPTION = {
+          0 => "bios",
+          1 => "system",
+          2 => "base_board",
+          3 => "chassis",
+          4 => "processor",
+          5 => "memory_controller",
+          6 => "memory_module",
+          7 => "cache",
+          8 => "port_connector",
+          9 => "system_slots",
+          10 => "on_board_devices",
+          11 => "oem_strings",
+          12 => "system_configuration_options",
+          13 => "bios_language",
+          14 => "group_associations",
+          15 => "system_event_log",
+          16 => "physical_memory_array",
+          17 => "memory_device",
+          18 => "32_bit_memory_error",
+          19 => "memory_array_mapped_address",
+          20 => "memory_device_mapped_address",
+          21 => "built_in_pointing_device",
+          22 => "portable_battery",
+          23 => "system_reset",
+          24 => "hardware_security",
+          25 => "system_power_controls",
+          26 => "voltage_probe",
+          27 => "cooling_device",
+          28 => "temperature_probe",
+          29 => "electrical_current_probe",
+          30 => "out_of_band_remote_access",
+          31 => "boot_integrity_services",
+          32 => "system_boot",
+          33 => "64_bit_memory_error",
+          34 => "management_device",
+          35 => "management_device_component",
+          36 => "management_device_threshold_data",
+          37 => "memory_channel",
+          38 => "ipmi_device",
+          39 => "power_supply",
+          40 => "additional_information",
+          41 => "onboard_devices_extended_information",
+          42 => "management_controller_host_interfaces",
+          126 => "disabled_entries",
+          127 => "end_of_table_marker",
+        }.freeze
+      end
 
       # list of IDs to collect from config or default to a sane list that prunes
       # away some of the less useful IDs
-      ID_TO_CAPTURE = [ 0, 1, 2, 3, 4, 6, 11 ].freeze
+      ID_TO_CAPTURE = [ 0, 1, 2, 3, 4, 6, 11 ].freeze unless defined?(ID_TO_CAPTURE)
 
       # the allowlisted DMI IDs. This is combination of the defaults + any additional
       # IDs defined in the :additional_dmi_ids config
@@ -116,14 +118,16 @@ module Ohai
         id
       end
 
-      SKIPPED_CONVENIENCE_KEYS = %w{
-        application_identifier
-        caption
-        creation_class_name
-        size
-        system_creation_class_name
-        record_id
-      }.freeze
+      unless defined?(SKIPPED_CONVENIENCE_KEYS)
+        SKIPPED_CONVENIENCE_KEYS = %w{
+          application_identifier
+          caption
+          creation_class_name
+          size
+          system_creation_class_name
+          record_id
+        }.freeze
+      end
 
       # create simplified convenience access keys for each record type
       # for single occurrences of one type, copy to top level all fields and values

data/lib/ohai/mixin/dmi_decode.rb

@@ -27,7 +27,7 @@ module ::Ohai::Mixin::DmiDecode
     when /VMware/
       return "vmware"
     when /Microsoft/
-      return "hyperv" if /Virtual Machine/.match?(product)
+      return "hyperv" if product.include?("Virtual Machine")
     when /Amazon EC2/
       return "amazonec2"
     when /QEMU/

data/lib/ohai/mixin/network_helper.rb

@@ -23,10 +23,12 @@ require "socket" unless defined?(Socket)
 module Ohai
   module Mixin
     module NetworkHelper
-      FAMILIES = {
-        "inet" => "default",
-        "inet6" => "default_inet6",
-      }.freeze
+      unless defined?(FAMILIES)
+        FAMILIES = {
+          "inet" => "default",
+          "inet6" => "default_inet6",
+        }.freeze
+      end
 
       def hex_to_dec_netmask(netmask)
         # example 'ffff0000' -> '255.255.0.0'

data/lib/ohai/mixin/oci_metadata.rb

@@ -0,0 +1,69 @@
+# 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.
+
+require "net/http" unless defined?(Net::HTTP)
+
+module Ohai
+  module Mixin
+    module OCIMetadata
+      OCI_METADATA_ADDR = "169.254.169.254"
+      OCI_METADATA_URL = "/opc/v2"
+      CHASSIS_ASSET_TAG_FILE = "/sys/devices/virtual/dmi/id/chassis_asset_tag"
+
+      # fetch the meta content with a timeout and the required header
+      def http_get(uri)
+        conn = Net::HTTP.start(OCI_METADATA_ADDR)
+        conn.read_timeout = 6
+        conn.get(
+          uri,
+          {
+            "Authorization" => "Bearer Oracle",
+            "User-Agent" => "chef-ohai/#{Ohai::VERSION}",
+          }
+        )
+      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)
+        else
+          logger.warn("Mixin OciMetadata: Received response code #{response.code} requesting metadata")
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/ohai/plugins/alibaba.rb

@@ -33,7 +33,7 @@ Ohai.plugin(:Alibaba) do
   # this works even if the system lacks dmidecode use by the Dmi plugin
   # @return [Boolean] do we have Alibaba DMI data?
   def has_ali_dmi?
-    if /Alibaba/.match?(file_val_if_exists("/sys/class/dmi/id/sys_vendor"))
+    if file_val_if_exists("/sys/class/dmi/id/sys_vendor").to_s.include?("Alibaba")
       logger.trace("Plugin Alibaba: has_ali_dmi? == true")
       true
     else

data/lib/ohai/plugins/azure.rb

@@ -58,7 +58,7 @@ Ohai.plugin(:Azure) do
     has_245 = false
     if file_exist?("/var/lib/dhcp/dhclient.eth0.leases")
       file_open("/var/lib/dhcp/dhclient.eth0.leases").each do |line|
-        if /unknown-245/.match?(line)
+        if line.include?("unknown-245")
           logger.trace("Plugin Azure: Found unknown-245 DHCP option used by Azure.")
           has_245 = true
           break

data/lib/ohai/plugins/cloud.rb

@@ -28,6 +28,7 @@ Ohai.plugin(:Cloud) do
   depends "azure"
   depends "digital_ocean"
   depends "softlayer"
+  depends "oci"
 
   # Class to help enforce the interface exposed to node[:cloud] (OHAI-542)
   #
@@ -336,6 +337,26 @@ Ohai.plugin(:Cloud) do
     @cloud_attr_obj.provider = "softlayer"
   end
 
+  # ----------------------------------------
+  # OCI
+  # ----------------------------------------
+
+  # Is current Oracle Cloud Infrastructure?
+  #
+  # === Return
+  # true:: If oci Hash is defined
+  # false:: Otherwise
+  def on_oci?
+    oci != nil
+  end
+
+  # Fill cloud hash with OCI values
+  def oci_values
+    oci["metadata"]["network"]["interface"].each { |vnic| @cloud_attr_obj.add_ipv4_addr(vnic["privateIp"], :private) }
+    @cloud_attr_obj.local_hostname = oci["metadata"]["compute"]["hostname"]
+    @cloud_attr_obj.provider = "oci"
+  end
+
   collect_data do
     require "ipaddr" unless defined?(IPAddr)
 
@@ -351,6 +372,7 @@ Ohai.plugin(:Cloud) do
     get_digital_ocean_values if on_digital_ocean?
     get_softlayer_values if on_softlayer?
     get_alibaba_values if on_alibaba?
+    oci_values if on_oci?
 
     cloud @cloud_attr_obj.cloud_mash
   end

data/lib/ohai/plugins/cpu.rb

@@ -193,7 +193,8 @@ Ohai.plugin(:CPU) do
           lscpu_real = lscpu_info[:sockets]
           lscpu_cores = lscpu_info[:sockets] * lscpu_info[:cores_per_socket]
         else
-          lscpu_total = lscpu_info[:sockets] * lscpu_info[:cores_per_socket] * lscpu_info[:threads_per_core]
+          threads_per_core = [lscpu_info[:threads_per_core], 1].max
+          lscpu_total = lscpu_info[:sockets] * lscpu_info[:cores_per_socket] * threads_per_core
           lscpu_real = lscpu_info[:sockets]
           lscpu_cores = lscpu_info[:sockets] * lscpu_info[:cores_per_socket]
         end
@@ -344,15 +345,23 @@ Ohai.plugin(:CPU) do
     cpuinfo
   end
 
+  # Check if the `lscpu` data looks reasonable
+  def valid_lscpu?(lscpu)
+    return false if lscpu.empty?
+    return false if %i{total real cores}.any? { |key| lscpu[key].to_i == 0 }
+
+    true
+  end
+
   collect_data(:linux) do
     cpuinfo = parse_cpuinfo
     lscpu = parse_lscpu(cpuinfo)
 
-    # If we don't have any data from lscpu then get it from /proc/cpuinfo
-    if lscpu.empty?
-      cpu cpuinfo
-    else
+    # If we don't have any sensible data from lscpu then get it from /proc/cpuinfo
+    if valid_lscpu?(lscpu)
       cpu lscpu
+    else
+      cpu cpuinfo
     end
   end
 
@@ -515,7 +524,7 @@ Ohai.plugin(:CPU) do
         cpu[index] = Mash.new
         cpu[index][:status] = status
         cpu[index][:location] = location
-        if /Available/.match?(status)
+        if status.include?("Available")
           cpu[:available] += 1
           lsattr = shell_out("lsattr -El #{name}").stdout.lines
           lsattr.each do |attribute|

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

@@ -77,17 +77,14 @@ Ohai.plugin(:Virtualization) do
       virtualization[:systems][:vmware] = "guest"
     end
 
-    if prlctl_exists?
+    if ioreg_exists? && shell_out("ioreg -l").stdout.include?("pci1ab8,4000")
+      virtualization[:system] = "parallels"
+      virtualization[:role] = "guest"
+      virtualization[:systems][:parallels] = "guest"
+    elsif prlctl_exists?
       virtualization[:system] = "parallels"
       virtualization[:role] = "host"
       virtualization[:systems][:parallels] = "host"
-    elsif ioreg_exists?
-      so = shell_out("ioreg -l")
-      if /pci1ab8,4000/.match?(so.stdout)
-        virtualization[:system] = "parallels"
-        virtualization[:role] = "guest"
-        virtualization[:systems][:parallels] = "guest"
-      end
     end
   end
-end
+end

data/lib/ohai/plugins/ec2.rb

@@ -28,10 +28,8 @@
 
 Ohai.plugin(:EC2) do
   require_relative "../mixin/ec2_metadata"
-  require_relative "../mixin/http_helper"
 
   include Ohai::Mixin::Ec2Metadata
-  include Ohai::Mixin::HttpHelper
 
   provides "ec2"
 
@@ -41,7 +39,7 @@ Ohai.plugin(:EC2) do
   # @return [Boolean] do we have Amazon DMI data?
   def has_ec2_amazon_dmi?
     # detect a version of '4.2.amazon'
-    if /Amazon/.match?(file_val_if_exists("/sys/class/dmi/id/bios_vendor"))
+    if file_val_if_exists("/sys/class/dmi/id/bios_vendor").to_s.include?("Amazon")
       logger.trace("Plugin EC2: has_ec2_amazon_dmi? == true")
       true
     else
@@ -56,7 +54,7 @@ Ohai.plugin(:EC2) do
   # @return [Boolean] do we have Amazon DMI data?
   def has_ec2_xen_dmi?
     # detect a version of '4.2.amazon'
-    if /amazon/.match?(file_val_if_exists("/sys/class/dmi/id/bios_version"))
+    if file_val_if_exists("/sys/class/dmi/id/bios_version").to_s.include?("amazon")
       logger.trace("Plugin EC2: has_ec2_xen_dmi? == true")
       true
     else
@@ -106,12 +104,7 @@ Ohai.plugin(:EC2) do
   # a single check that combines all the various detection methods for EC2
   # @return [Boolean] Does the system appear to be on EC2
   def looks_like_ec2?
-    return true if hint?("ec2")
-
-    # Even if it looks like EC2 try to connect first
-    if has_ec2_xen_uuid? || has_ec2_amazon_dmi? || has_ec2_xen_dmi? || has_ec2_identifying_number?
-      return true if can_socket_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80)
-    end
+    hint?("ec2") || has_ec2_xen_uuid? || has_ec2_amazon_dmi? || has_ec2_xen_dmi? || has_ec2_identifying_number?
   end
 
   collect_data do

data/lib/ohai/plugins/fips.rb

@@ -30,6 +30,7 @@ Ohai.plugin(:Fips) do
     fips Mash.new
 
     require "openssl" unless defined?(OpenSSL)
-    fips["kernel"] = { "enabled" => OpenSSL::OPENSSL_FIPS }
+
+    fips["kernel"] = { "enabled" => defined?(OpenSSL.fips_mode) && OpenSSL.fips_mode }
   end
 end

data/lib/ohai/plugins/gce.rb

@@ -28,7 +28,7 @@ Ohai.plugin(:GCE) do
   # this works even if the system lacks dmidecode use by the Dmi plugin
   # @return [Boolean] do we have Google Compute Engine DMI data?
   def has_gce_dmi?
-    if /Google Compute Engine/.match?(file_val_if_exists("/sys/class/dmi/id/product_name"))
+    if file_val_if_exists("/sys/class/dmi/id/product_name").to_s.include?("Google Compute Engine")
       logger.trace("Plugin GCE: has_gce_dmi? == true")
       true
     else

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

@@ -79,7 +79,7 @@ Ohai.plugin(:Network) do
     so.stdout.lines do |line|
       line.strip!
       logger.trace("Plugin Network: Parsing #{line}")
-      if /\\/.match?(line)
+      if line.include?("\\")
         # If we have multipath routing, then the first part will be a normal
         # looking route:
         #   default proto ra metric 1024 <other options>
@@ -218,11 +218,11 @@ Ohai.plugin(:Network) do
         next if line.start_with?("Ring parameters for")
         next if line.strip.nil?
 
-        if /Pre-set maximums/.match?(line)
+        if line.include?("Pre-set maximums")
           type = "max"
           next
         end
-        if /Current hardware settings/.match?(line)
+        if line.include?("Current hardware settings")
           type = "current"
           next
         end
@@ -251,11 +251,11 @@ Ohai.plugin(:Network) do
         next if line.start_with?("Channel parameters for")
         next if line.strip.nil?
 
-        if /Pre-set maximums/.match?(line)
+        if line.include?("Pre-set maximums")
           type = "max"
           next
         end
-        if /Current hardware settings/.match?(line)
+        if line.include?("Current hardware settings")
           type = "current"
           next
         end

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

@@ -149,7 +149,8 @@ Ohai.plugin(:Platform) do
       "rhel"
     when /amazon/
       "amazon"
-    when /suse/, /sles/, /opensuseleap/, /opensuse/, /sled/
+    # suse matches opensuse, suse-* opensuse-*, etc. sle[sd\-_] intends to match sles, sled, sle-*, sle_*
+    when /suse/, /sle[sd\-_]/
       "suse"
     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
@@ -257,7 +258,7 @@ Ohai.plugin(:Platform) do
       platform_version shell_out("/bin/uname -r").stdout.strip
     elsif file_exist?("/usr/lib/os-release")
       contents = file_read("/usr/lib/os-release")
-      if /clear-linux-os/.match?(contents) # Clear Linux https://clearlinux.org/
+      if contents.include?("clear-linux-os") # Clear Linux https://clearlinux.org/
         platform "clearlinux"
         platform_version contents[/VERSION_ID=(\d+)/, 1]
       end

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

@@ -118,7 +118,7 @@ Ohai.plugin(:Virtualization) do
     # guests will have the hypervisor cpu feature that hosts don't have
     if file_exist?("/sys/devices/virtual/misc/kvm")
       virtualization[:system] = "kvm"
-      if /hypervisor/.match?(file_read("/proc/cpuinfo"))
+      if file_read("/proc/cpuinfo").include?("hypervisor")
         logger.trace("Plugin Virtualization: /sys/devices/virtual/misc/kvm present and /proc/cpuinfo lists the hypervisor feature. Detecting as kvm guest")
         virtualization[:role] = "guest"
         virtualization[:systems][:kvm] = "guest"
@@ -220,17 +220,17 @@ Ohai.plugin(:Virtualization) do
         virtualization[:system] = $1
         virtualization[:role] = "guest"
         virtualization[:systems][$1.to_sym] = "guest"
-      elsif /container=lxc/.match?(file_read("/proc/1/environ"))
+      elsif file_read("/proc/1/environ").include?("container=lxc")
         logger.trace("Plugin Virtualization: /proc/1/environ indicates lxc container. Detecting as lxc guest")
         virtualization[:system] = "lxc"
         virtualization[:role] = "guest"
         virtualization[:systems][:lxc] = "guest"
-      elsif /container=systemd-nspawn/.match?(file_read("/proc/1/environ"))
+      elsif file_read("/proc/1/environ").include?("container=systemd-nspawn")
         logger.trace("Plugin Virtualization: /proc/1/environ indicates nspawn container. Detecting as nspawn guest")
         virtualization[:system] = "nspawn"
         virtualization[:role] = "guest"
         virtualization[:systems][:nspawn] = "guest"
-      elsif /container=podman/.match?(file_read("/proc/1/environ"))
+      elsif file_read("/proc/1/environ").include?("container=podman")
         logger.trace("Plugin Virtualization: /proc/1/environ indicates podman container. Detecting as podman guest")
         virtualization[:system] = "podman"
         virtualization[:role] = "guest"

data/lib/ohai/plugins/oci.rb

@@ -0,0 +1,94 @@
+# 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.
+#
+
+Ohai.plugin(:Oci) do
+  require_relative "../mixin/oci_metadata"
+  require_relative "../mixin/http_helper"
+
+  include Ohai::Mixin::OCIMetadata
+  include Ohai::Mixin::HttpHelper
+
+  provides "oci"
+
+  collect_data do
+    oci_metadata_from_hints = hint?("oci")
+    if oci_metadata_from_hints
+      logger.trace("Plugin OCI: oci hint is present. Parsing any hint data.")
+      oci Mash.new
+      oci_metadata_from_hints.each { |k, v| oci[k] = v }
+      oci["metadata"] = parse_metadata
+    elsif oci_chassis_asset_tag?
+      logger.trace("Plugin oci: No hints present, but system appears to be on oci.")
+      oci Mash.new
+      oci["metadata"] = parse_metadata
+    else
+      logger.trace("Plugin oci: No hints present and doesn't appear to be on oci.")
+      false
+    end
+  end
+
+  def oci_chassis_asset_tag?
+    has_oci_chassis_asset_tag = false
+    if file_exist?(Ohai::Mixin::OCIMetadata::CHASSIS_ASSET_TAG_FILE)
+      file_open(Ohai::Mixin::OCIMetadata::CHASSIS_ASSET_TAG_FILE).each do |line|
+        next unless /OracleCloud.com/.match?(line)
+
+        logger.trace("Plugin oci: Found OracleCloud.com chassis_asset_tag used by oci.")
+        has_oci_chassis_asset_tag = true
+        break
+      end
+    end
+    has_oci_chassis_asset_tag
+  end
+
+  def parse_metadata
+    return nil unless can_socket_connect?(Ohai::Mixin::OCIMetadata::OCI_METADATA_ADDR, 80)
+
+    instance_data = fetch_metadata("instance")
+    return nil if instance_data.nil?
+
+    metadata = Mash.new
+    metadata["compute"] = Mash.new
+
+    instance_data.each do |k, v|
+      metadata["compute"][k] = v
+    end
+
+    vnics_data = fetch_metadata("vnics")
+
+    unless vnics_data.nil?
+      metadata["network"] = Mash.new
+      metadata["network"]["interface"] = []
+      vnics_data.each do |v|
+        metadata["network"]["interface"].append(v)
+      end
+    end
+
+    volume_attachments_data = fetch_metadata("volumeAttachments")
+
+    unless volume_attachments_data.nil?
+      metadata["volumes"] = Mash.new
+      volume_attachments_data.each do |k, v|
+        metadata["volumes"][k] = v
+      end
+    end
+
+    metadata
+  end
+end

data/lib/ohai/plugins/rpm.rb

@@ -22,16 +22,18 @@ Ohai.plugin(:Rpm) do
   provides "rpm"
   optional "true"
 
-  MACROS_MARKER = /========================/.freeze
+  MACROS_MARKER = /========================/.freeze unless defined?(MACROS_MARKER)
 
-  DO_NOT_SPLIT = %w{
-    build_arch
-    build_os
-    install_arch
-    install_os
-    archcolor
-    optflags
-  }.freeze
+  unless defined?(DO_NOT_SPLIT)
+    DO_NOT_SPLIT = %w{
+      build_arch
+      build_os
+      install_arch
+      install_os
+      archcolor
+      optflags
+    }.freeze
+  end
 
   collect_data(:aix, :darwin, :dragonflybsd, :freebsd, :linux, :netbsd, :openbsd, :solaris2) do
     rpm_path = which("rpm")

data/lib/ohai/plugins/scaleway.rb

@@ -27,7 +27,7 @@ Ohai.plugin(:Scaleway) do
   # looks for `scaleway` keyword in kernel command line
   # @return [Boolean] do we have the keyword or not?
   def has_scaleway_cmdline?
-    if file_exist?("/proc/cmdline") && /scaleway/.match?(file_read("/proc/cmdline"))
+    if file_exist?("/proc/cmdline") && file_read("/proc/cmdline").include?("scaleway")
       logger.trace("Plugin Scaleway: has_scaleway_cmdline? == true")
       return true
     end

data/lib/ohai/plugins/timezone.rb

@@ -21,5 +21,25 @@ Ohai.plugin(:Timezone) do
   collect_data(:default) do
     time Mash.new unless time
     time[:timezone] = Time.now.getlocal.zone
+
+    # Windows in German display language outputs LATIN1 bytes for .zone, but marks them as
+    # IBM437, which somehow fails any attempt at conversion to other encodings when
+    # ä is present, as in the timezone name "Mitteleuropäische Zeit" (Central Europe Time)
+    #
+    # Windows-1252 is the legacy encoding for Windows for German that actually
+    # translates (ISO-8859-1 works as well), but going with the more correct
+    # encoding name for Windows' implementation of Latin-1
+    #
+    # References
+    # * [Code Page 437/IBM437](https://en.wikipedia.org/wiki/Code_page_437)
+    # * [ISO/IEC 8859-1](https://en.wikipedia.org/wiki/ISO/IEC_8859-1)
+    # * [Windows-1252](https://en.wikipedia.org/wiki/Windows-1252)
+    if time[:timezone].encoding == Encoding::IBM437
+      # Assume encoding is WINDOWS_1252
+      time[:timezone] = time[:timezone].force_encoding(Encoding::WINDOWS_1252)
+      # Re-encode in UTF_8. Note: If other encodings have problems converting
+      # it might be worth re-encode everything in UTF_8.
+      time[:timezone] = time[:timezone].encode(Encoding::UTF_8)
+    end
   end
 end

data/lib/ohai/plugins/vmware.rb

@@ -53,7 +53,22 @@ Ohai.plugin(:VMware) do
         # 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])
-          if /UpdateInfo failed/.match?(vmware[param])
+          if param == "hosttime" && vmtools_path.include?("Program Files")
+            # popen and %x return stdout encoded as IBM437 in Windows but in a string marked
+            # UTF-8. The string doesn't throw an exception when encoded to "UTF-8" but
+            # displays [?] character in Windows without this.
+            #
+            # .force_encoding(Encoding::ISO_8859_1) causes the character to be dropped
+            # and .force_encoding(Encoding::Windows_1252) displays the „ character in place
+            # of an ä. .force_encoding(Encoding::IBM437) allows for the correct characters
+            # to be displayed.
+            #
+            # Note:
+            # * this is broken for at least Ruby 2.7 through 3.1.3
+            # * confirmed that this is broken on Windows Server 2022
+            vmware[param] = vmware[param].force_encoding(Encoding::IBM437).encode("UTF-8")
+          end
+          if vmware[param].include?("UpdateInfo failed")
             vmware[param] = nil
           end
         end

data/lib/ohai/util/ip_helper.rb

@@ -21,8 +21,8 @@ module Ohai
       require "ipaddress" unless defined?(IPAddress)
 
       # Corresponding to RFC 4192 + RFC 4193
-      IPV6_LINK_LOCAL_UNICAST_BLOCK = IPAddress("fe80::/10")
-      IPV6_PRIVATE_ADDRESS_BLOCK = IPAddress("fc00::/7")
+      IPV6_LINK_LOCAL_UNICAST_BLOCK = IPAddress("fe80::/10") unless defined?(IPV6_LINK_LOCAL_UNICAST_BLOCK)
+      IPV6_PRIVATE_ADDRESS_BLOCK = IPAddress("fc00::/7") unless defined?(IPV6_PRIVATE_ADDRESS_BLOCK)
 
       def private_address?(addr)
         ip = IPAddress(addr)

data/lib/ohai/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 18.0.14
+  version: 18.1.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2023-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -241,6 +241,7 @@ files:
 - lib/ohai/mixin/gce_metadata.rb
 - lib/ohai/mixin/http_helper.rb
 - lib/ohai/mixin/network_helper.rb
+- lib/ohai/mixin/oci_metadata.rb
 - lib/ohai/mixin/os.rb
 - lib/ohai/mixin/scaleway_metadata.rb
 - lib/ohai/mixin/seconds_to_human.rb
@@ -324,6 +325,7 @@ files:
 - lib/ohai/plugins/netbsd/platform.rb
 - lib/ohai/plugins/network.rb
 - lib/ohai/plugins/nodejs.rb
+- lib/ohai/plugins/oci.rb
 - lib/ohai/plugins/ohai.rb
 - lib/ohai/plugins/ohai_time.rb
 - lib/ohai/plugins/openbsd/memory.rb