ohai 18.2.7 → 18.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d4124cfc978827ab3b466501f06996a182e94c217c9e5bbb0edf77103cb8f1c
-  data.tar.gz: 3ae478f5e047780d6d9dff9859e84a94bd776ef6e0de2b190b1b647ef1d7421b
+  metadata.gz: 2515a27290598e44011ae442133a18dc222aeaaccd9367348f4a67bd8637bfb6
+  data.tar.gz: 1e0840e13deb1a03933b63af3f1a88656105066471716ee16524bce0250c5f68
 SHA512:
-  metadata.gz: cb4420bce8dd0ce5226b75fcedc44ecd8341e8a2597e57e755c3b472879eb9428cf5eca8aca09c57f7f5f57d7ff26bbc195fb816433612a41c118afd5ee97db2
-  data.tar.gz: 33b15548b40a5f556aa76db1da0b40ad89ee9e9d122dccbc6b1f133a9ce1c2d2ddd758a00345d50ff4e1a8e08221c13c58dbee20e868cd2ef3f2293ea4dd8c10
+  metadata.gz: 3472f06319f20ebf31efff7206ad669e57d62fb9f005c0b53ec7fdf6767b3c5973cf20f7c17e2e6b7426238ebb63bd859774a676b76c6b03b24a2f761e39befd
+  data.tar.gz: 96dcec05db20accc6f05ba7404b7eb4c85da0454b597b44ee8630a6b763554353c8fb1e37cdc357f069f889ae6c9a521e14e3067b250436be0250511af186efb

data/lib/ohai/mixin/oci_metadata.rb

@@ -28,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.match?(/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)
@@ -51,7 +84,7 @@ module Ohai
           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/plugins/oci.rb

@@ -44,24 +44,22 @@ Ohai.plugin(:Oci) do
   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
+    asset_tag = chassis_asset_tag
+    return false if asset_tag.nil? || asset_tag.empty?
+
+    if /OracleCloud.com/.match?(asset_tag)
+      logger.trace("Plugin oci: Found OracleCloud.com chassis_asset_tag used by oci.")
+      true
+    else
+      false
     end
-    has_oci_chassis_asset_tag
   end
 
   def parse_metadata
-    return nil unless can_socket_connect?(Ohai::Mixin::OCIMetadata::OCI_METADATA_ADDR, 80)
+    return unless can_socket_connect?(Ohai::Mixin::OCIMetadata::OCI_METADATA_ADDR, 80)
 
     instance_data = fetch_metadata("instance")
-    return nil if instance_data.nil?
+    return if instance_data.nil?
 
     metadata = Mash.new
     metadata["compute"] = Mash.new
@@ -80,12 +78,14 @@ Ohai.plugin(:Oci) do
       end
     end
 
-    volume_attachments_data = fetch_metadata("volumeAttachments")
+    volume_attachments_data = fetch_metadata("allVolumeAttachments")
 
     unless volume_attachments_data.nil?
       metadata["volumes"] = Mash.new
-      volume_attachments_data.each do |k, v|
-        metadata["volumes"][k] = v
+      volume_attachments_data.each do |v|
+        if v.is_a?(Hash) && v["id"]
+          metadata["volumes"][v["id"]] = v
+        end
       end
     end
 

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

@@ -41,7 +41,7 @@ Ohai.plugin(:Network) do
       # If we are running on windows nano or another operating system from the future
       # that does not populate the deprecated win32_* WMI classes, then we should
       # grab data from the newer MSFT_* classes
-      return msft_adapter_data if data[:addresses].count == 0
+      return msft_adapter_data if data[:addresses].none?
 
       data[:adapters] = wmi.instances_of("Win32_NetworkAdapter")
       data

data/lib/ohai/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 18.2.7
+  version: 18.2.8
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-07-29 00:00:00.000000000 Z
+date: 2025-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config