facter 4.0.33 → 4.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32bb403fb4187d3a595b0b8aa4ed12ba472b1efc6d785cf2d371fc1488afd2d7
-  data.tar.gz: b8b159eedc00a4c17e2121e73f38bb76d383b298746731104511a36955ba382d
+  metadata.gz: f04518bbd83ad1cf3fb6d5d026e1258cf46a374d7535f28066bcab0939e18360
+  data.tar.gz: c7ee4b28049507ce0035377863eca35faf2c5aed82bda495fbc8b8174aa7a3db
 SHA512:
-  metadata.gz: 3a0f55015be59493c79b53f054e609a336d6e64385547534ffe62084b060d1b70da511f0a4d74179717bf8fe11287ed972586fb159c20a33d4832ba01f287ffc
-  data.tar.gz: 1814bfa9210ec33c2ddeafad6d123a4f2c7377c792cd4a494de5d467f606b46943f2a294c6abc4f1e1700a87edaeeffe3e1de0712782a46ada76ae289367e17f
+  metadata.gz: a369de0d02f412b1d385d5f52a7e4d458e076dc765eab53e2bb4fc0866eb56e7e8f28f0664a55eb7f3abe0e6cb23cc830df38d8b3b0862f33ac90e9648386f17
+  data.tar.gz: 905d45c95b4e2802e3fd4e990d75b6afb8d7ce641783283543c11d624ce3764576c5d39ac1d5550e68dd6c43385eca996f0251b2826ef3153e65b937903c9683

data/lib/facter/facts/bsd/load_averages.rb

@@ -6,7 +6,7 @@ module Facts
       FACT_NAME = 'load_averages'
 
       def call_the_resolver
-        fact_value = Facter::Resolvers::Bsd::LoadAverages.resolve(:load_averages)
+        fact_value = Facter::Resolvers::LoadAverages.resolve(:load_averages)
         Facter::ResolvedFact.new(FACT_NAME, fact_value)
       end
     end

data/lib/facter/facts/freebsd/dmi/bios/release_date.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Dmi
+      module Bios
+        class ReleaseDate
+          FACT_NAME = 'dmi.bios.release_date'
+          ALIASES = 'bios_release_date'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::DmiBios.resolve(:bios_date)
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/dmi/bios/vendor.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Dmi
+      module Bios
+        class Vendor
+          FACT_NAME = 'dmi.bios.vendor'
+          ALIASES = 'bios_vendor'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::DmiBios.resolve(:bios_vendor)
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/dmi/bios/version.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Dmi
+      module Bios
+        class Version
+          FACT_NAME = 'dmi.bios.version'
+          ALIASES = 'bios_version'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::DmiBios.resolve(:bios_version)
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/dmi/manufacturer.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Dmi
+      class Manufacturer
+        FACT_NAME = 'dmi.manufacturer'
+        ALIASES = 'manufacturer'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Freebsd::DmiBios.resolve(:sys_vendor)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/dmi/product/name.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Dmi
+      module Product
+        class Name
+          FACT_NAME = 'dmi.product.name'
+          ALIASES = 'productname'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::DmiBios.resolve(:product_name)
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/dmi/product/serial_number.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Dmi
+      module Product
+        class SerialNumber
+          FACT_NAME = 'dmi.product.serial_number'
+          ALIASES = 'serialnumber'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::DmiBios.resolve(:product_serial)
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/dmi/product/uuid.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Dmi
+      module Product
+        class Uuid
+          FACT_NAME = 'dmi.product.uuid'
+          ALIASES = 'uuid'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::DmiBios.resolve(:product_uuid)
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/memory/swap/available.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Memory
+      module Swap
+        class Available
+          FACT_NAME = 'memory.swap.available'
+          ALIASES = 'swapfree'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::SwapMemory.resolve(:available_bytes)
+            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/memory/swap/available_bytes.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Memory
+      module Swap
+        class AvailableBytes
+          FACT_NAME = 'memory.swap.available_bytes'
+          ALIASES = 'swapfree_mb'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::SwapMemory.resolve(:available_bytes)
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
+             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/memory/swap/capacity.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Memory
+      module Swap
+        class Capacity
+          FACT_NAME = 'memory.swap.capacity'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::SwapMemory.resolve(:capacity)
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/memory/swap/encrypted.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Memory
+      module Swap
+        class Encrypted
+          FACT_NAME = 'memory.swap.encrypted'
+          ALIASES = 'swapencrypted'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::SwapMemory.resolve(:encrypted)
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/memory/swap/total.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Memory
+      module Swap
+        class Total
+          FACT_NAME = 'memory.swap.total'
+          ALIASES = 'swapsize'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::SwapMemory.resolve(:total_bytes)
+            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/memory/swap/total_bytes.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Memory
+      module Swap
+        class TotalBytes
+          FACT_NAME = 'memory.swap.total_bytes'
+          ALIASES = 'swapsize_mb'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::SwapMemory.resolve(:total_bytes)
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
+             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/memory/swap/used.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Memory
+      module Swap
+        class Used
+          FACT_NAME = 'memory.swap.used'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::SwapMemory.resolve(:used_bytes)
+            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/memory/swap/used_bytes.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Memory
+      module Swap
+        class UsedBytes
+          FACT_NAME = 'memory.swap.used_bytes'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::SwapMemory.resolve(:used_bytes)
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/memory/system/available.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Memory
+      module System
+        class Available
+          FACT_NAME = 'memory.system.available'
+          ALIASES = 'memoryfree'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::SystemMemory.resolve(:available_bytes)
+            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/memory/system/available_bytes.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Memory
+      module System
+        class AvailableBytes
+          FACT_NAME = 'memory.system.available_bytes'
+          ALIASES = 'memoryfree_mb'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::SystemMemory.resolve(:available_bytes)
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
+             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/memory/system/capacity.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Memory
+      module System
+        class Capacity
+          FACT_NAME = 'memory.system.capacity'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::SystemMemory.resolve(:capacity)
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/memory/system/total.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Memory
+      module System
+        class Total
+          FACT_NAME = 'memory.system.total'
+          ALIASES = 'memorysize'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::SystemMemory.resolve(:total_bytes)
+            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/memory/system/total_bytes.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Memory
+      module System
+        class TotalBytes
+          FACT_NAME = 'memory.system.total_bytes'
+          ALIASES = 'memorysize_mb'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::SystemMemory.resolve(:total_bytes)
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
+             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/memory/system/used.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Memory
+      module System
+        class Used
+          FACT_NAME = 'memory.system.used'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::SystemMemory.resolve(:used_bytes)
+            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/memory/system/used_bytes.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Memory
+      module System
+        class UsedBytes
+          FACT_NAME = 'memory.system.used_bytes'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Freebsd::SystemMemory.resolve(:used_bytes)
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/solaris/load_averages.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    class LoadAverages
+      FACT_NAME = 'load_averages'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::LoadAverages.resolve(:load_averages)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/facter/framework/detector/os_detector.rb

@@ -44,7 +44,11 @@ class OsDetector
     hierarchy = @os_hierarchy.construct_hierarchy(identifier)
     if hierarchy.empty?
       @log.debug("Could not detect hierarchy using os identifier: #{identifier} , trying with family")
-      hierarchy = @os_hierarchy.construct_hierarchy(detect_family)
+
+      detect_family.to_s.split.each do |family|
+        hierarchy = @os_hierarchy.construct_hierarchy(family)
+        return hierarchy unless hierarchy.empty?
+      end
     end
 
     if hierarchy.empty?

data/lib/facter/os_hierarchy.json

@@ -12,7 +12,9 @@
         "Rhel": [
           "Fedora",
           "Amzn",
-          "Centos"
+          "Centos",
+          "Ol",
+          "Scientific"
         ]
       },
       {

data/lib/facter/resolvers/bsd/ffi/ffi_helper.rb

@@ -9,19 +9,9 @@ module Facter
         extend FFI::Library
 
         ffi_lib 'c'
-        attach_function :getloadavg, %i[pointer int], :int
         attach_function :sysctl, %i[pointer uint pointer pointer pointer size_t], :int
       end
 
-      def self.read_load_averages
-        raw_loadavg = FFI::MemoryPointer.new(:double, 3)
-
-        res = Libc.getloadavg(raw_loadavg, 3)
-        return unless res == 3
-
-        raw_loadavg.read_array_of_double(res)
-      end
-
       def self.sysctl(type, oids)
         name = FFI::MemoryPointer.new(:uint, oids.size)
         name.write_array_of_uint(oids)

data/lib/facter/resolvers/freebsd/dmi_resolver.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Freebsd
+      class DmiBios < BaseResolver
+        @semaphore = Mutex.new
+        @fact_list ||= {}
+
+        class << self
+          #:model
+
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_facts(fact_name) }
+          end
+
+          def read_facts(fact_name)
+            require_relative 'ffi/ffi_helper'
+
+            @fact_list[:bios_date]    = Facter::Freebsd::FfiHelper.kenv(:get, 'smbios.bios.reldate')
+            @fact_list[:bios_vendor]  = Facter::Freebsd::FfiHelper.kenv(:get, 'smbios.bios.vendor')
+            @fact_list[:bios_version] = Facter::Freebsd::FfiHelper.kenv(:get, 'smbios.bios.version')
+
+            @fact_list[:product_name]   = Facter::Freebsd::FfiHelper.kenv(:get, 'smbios.system.product')
+            @fact_list[:product_serial] = Facter::Freebsd::FfiHelper.kenv(:get, 'smbios.system.serial')
+            @fact_list[:product_uuid]   = Facter::Freebsd::FfiHelper.kenv(:get, 'smbios.system.uuid')
+
+            @fact_list[:sys_vendor] = Facter::Freebsd::FfiHelper.kenv(:get, 'smbios.system.maker')
+
+            @fact_list[fact_name]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/freebsd/ffi/ffi_helper.rb

@@ -8,10 +8,29 @@ module Facter
       module Libc
         extend FFI::Library
 
+        KENV_GET = 0
+
+        KENV_MVALLEN = 128
+
         ffi_lib 'c'
+        attach_function :kenv, %i[int string pointer int], :int
         attach_function :sysctlbyname, %i[string pointer pointer pointer size_t], :int
       end
 
+      def self.kenv(action, name, value = nil)
+        case action
+        when :get
+          len = Libc::KENV_MVALLEN + 1
+          value = FFI::MemoryPointer.new(:char, len)
+          res = Libc.kenv(Libc::KENV_GET, name, value, len)
+          return nil if res.negative?
+
+          value.read_string(res).chomp("\0")
+        else
+          raise "Action #{action} not supported"
+        end
+      end
+
       def self.sysctl_by_name(type, name)
         oldp = FFI::Pointer::NULL
         oldlenp = FFI::MemoryPointer.new(:size_t)

data/lib/facter/resolvers/freebsd/swap_memory_resolver.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Freebsd
+      class SwapMemory < BaseResolver
+        @semaphore = Mutex.new
+        @fact_list ||= {}
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_swap_memory(fact_name) }
+          end
+
+          def read_swap_memory(fact_name) # rubocop:disable Metrics/AbcSize
+            output = Facter::Core::Execution.execute('swapinfo -k', logger: log)
+            data = output.split("\n")[1..-1].map { |line| line.split(/\s+/) }
+
+            unless data.empty?
+              @fact_list[:total_bytes]     = kilobytes_to_bytes(data.map { |line| line[1].to_i }.inject(:+))
+              @fact_list[:used_bytes]      = kilobytes_to_bytes(data.map { |line| line[2].to_i }.inject(:+))
+              @fact_list[:available_bytes] = kilobytes_to_bytes(data.map { |line| line[3].to_i }.inject(:+))
+              @fact_list[:capacity] = FilesystemHelper.compute_capacity(@fact_list[:used_bytes],
+                                                                        @fact_list[:total_bytes])
+              @fact_list[:encrypted] = data.map { |line| line[0].end_with?('.eli') }.all?
+            end
+
+            @fact_list[fact_name]
+          end
+
+          def kilobytes_to_bytes(quantity)
+            (quantity.to_f * 1024).to_i
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/freebsd/system_memory_resolver.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Freebsd
+      class SystemMemory < BaseResolver
+        @semaphore = Mutex.new
+        @fact_list ||= {}
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { calculate_system_memory(fact_name) }
+          end
+
+          def calculate_system_memory(fact_name)
+            read_total_memory_in_bytes
+            read_available_memory_in_bytes
+
+            @fact_list[:used_bytes] = @fact_list[:total_bytes] - @fact_list[:available_bytes]
+            @fact_list[:capacity] = FilesystemHelper.compute_capacity(@fact_list[:used_bytes], @fact_list[:total_bytes])
+
+            @fact_list[fact_name]
+          end
+
+          def read_available_memory_in_bytes
+            output = Facter::Core::Execution.execute('vmstat -H --libxo json', logger: log)
+            data = JSON.parse(output)
+            @fact_list[:available_bytes] = data['memory']['free-memory'] * 1024
+          end
+
+          def read_total_memory_in_bytes
+            require_relative 'ffi/ffi_helper'
+
+            @fact_list[:total_bytes] = Facter::Freebsd::FfiHelper.sysctl_by_name(:long, 'hw.physmem')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/load_averages.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    class LoadAverages < BaseResolver
+      @semaphore = Mutex.new
+      @fact_list ||= {}
+      class << self
+        private
+
+        def post_resolve(fact_name)
+          @fact_list.fetch(fact_name) { read_load_averages(fact_name) }
+        end
+
+        def read_load_averages(fact_name)
+          require_relative 'utils/ffi/load_averages'
+          @fact_list[:load_averages] = %w[1m 5m 15m].zip(Utils::Ffi::LoadAverages.read_load_averages).to_h
+
+          @fact_list[fact_name]
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/os_release_resolver.rb

@@ -56,7 +56,7 @@ module Facter
         def process_name
           return unless @fact_list[:name]
 
-          @fact_list[:name] = if @fact_list[:name].downcase.start_with?('red')
+          @fact_list[:name] = if @fact_list[:name].downcase.start_with?('red', 'oracle')
                                 @fact_list[:name].split(' ')[0..1].join
                               else
                                 @fact_list[:name].split(' ')[0].strip

data/lib/facter/resolvers/solaris/ffi/ffi.rb

@@ -20,6 +20,11 @@ module Facter
         INET_ADDRSTRLEN   = 16
         INET6_ADDRSTRLEN  = 46
       end
+
+      BINDINGS_KEY = {
+        FFI::AF_INET => :bindings,
+        FFI::AF_INET6 => :bindings6
+      }.freeze
     end
   end
 end

data/lib/facter/resolvers/solaris/networking_resolver.rb

@@ -12,11 +12,6 @@ module Facter
         @fact_list ||= {}
         @interfaces = {}
 
-        BINDINGS_KEY = {
-          FFI::AF_INET => :bindings,
-          FFI::AF_INET6 => :bindings6
-        }.freeze
-
         class << self
           private
 
@@ -141,7 +136,8 @@ module Facter
           end
 
           def add_dhcp(interface_name)
-            result = Facter::Core::Execution.execute("dhcpinfo -i #{interface_name} ServerID", logger: log)
+            dhcpinfo_command = Facter::Core::Execution.which('dhcpinfo') || '/sbin/dhcpinfo'
+            result = Facter::Core::Execution.execute("#{dhcpinfo_command} -i #{interface_name} ServerID", logger: log)
 
             @interfaces[interface_name][:dhcp] = result.chomp
           end

data/lib/facter/resolvers/utils/ffi/load_averages.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'ffi'
+
+module Facter
+  module Resolvers
+    module Utils
+      module Ffi
+        module LoadAverages
+          extend ::FFI::Library
+          ffi_lib ::FFI::Library::LIBC
+
+          attach_function :getloadavg, %i[pointer int], :int
+
+          def self.read_load_averages
+            raw_loadavg = ::FFI::MemoryPointer.new(:double, 3)
+
+            res = LoadAverages.getloadavg(raw_loadavg, 3)
+            return unless res == 3
+
+            raw_loadavg.read_array_of_double(res)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/windows/ffi/ffi.rb

@@ -30,7 +30,7 @@ module FFI
     def read_wide_string_with_length(char_length)
       # char_length is number of wide chars (typically excluding NULLs), *not* bytes
       str = get_bytes(0, char_length * 2).force_encoding('UTF-16LE')
-      str.encode('UTF-8', str.encoding, {})
+      str.encode('UTF-8', str.encoding)
     end
 
     def read_wide_string_without_length

data/lib/facter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Facter
-  VERSION = '4.0.33' unless defined?(VERSION)
+  VERSION = '4.0.34' unless defined?(VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.33
+  version: 4.0.34
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-05 00:00:00.000000000 Z
+date: 2020-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -303,6 +303,28 @@ files:
 - lib/facter/facts/debian/os/distro/release.rb
 - lib/facter/facts/debian/os/release.rb
 - lib/facter/facts/freebsd/disks.rb
+- lib/facter/facts/freebsd/dmi/bios/release_date.rb
+- lib/facter/facts/freebsd/dmi/bios/vendor.rb
+- lib/facter/facts/freebsd/dmi/bios/version.rb
+- lib/facter/facts/freebsd/dmi/manufacturer.rb
+- lib/facter/facts/freebsd/dmi/product/name.rb
+- lib/facter/facts/freebsd/dmi/product/serial_number.rb
+- lib/facter/facts/freebsd/dmi/product/uuid.rb
+- lib/facter/facts/freebsd/memory/swap/available.rb
+- lib/facter/facts/freebsd/memory/swap/available_bytes.rb
+- lib/facter/facts/freebsd/memory/swap/capacity.rb
+- lib/facter/facts/freebsd/memory/swap/encrypted.rb
+- lib/facter/facts/freebsd/memory/swap/total.rb
+- lib/facter/facts/freebsd/memory/swap/total_bytes.rb
+- lib/facter/facts/freebsd/memory/swap/used.rb
+- lib/facter/facts/freebsd/memory/swap/used_bytes.rb
+- lib/facter/facts/freebsd/memory/system/available.rb
+- lib/facter/facts/freebsd/memory/system/available_bytes.rb
+- lib/facter/facts/freebsd/memory/system/capacity.rb
+- lib/facter/facts/freebsd/memory/system/total.rb
+- lib/facter/facts/freebsd/memory/system/total_bytes.rb
+- lib/facter/facts/freebsd/memory/system/used.rb
+- lib/facter/facts/freebsd/memory/system/used_bytes.rb
 - lib/facter/facts/freebsd/os/release.rb
 - lib/facter/facts/freebsd/partitions.rb
 - lib/facter/facts/freebsd/processors/count.rb
@@ -564,6 +586,7 @@ files:
 - lib/facter/facts/solaris/kernelmajversion.rb
 - lib/facter/facts/solaris/kernelrelease.rb
 - lib/facter/facts/solaris/kernelversion.rb
+- lib/facter/facts/solaris/load_averages.rb
 - lib/facter/facts/solaris/macaddress_interfaces.rb
 - lib/facter/facts/solaris/memory/swap/available.rb
 - lib/facter/facts/solaris/memory/swap/available_bytes.rb
@@ -772,7 +795,6 @@ files:
 - lib/facter/resolvers/augeas_resolver.rb
 - lib/facter/resolvers/base_resolver.rb
 - lib/facter/resolvers/bsd/ffi/ffi_helper.rb
-- lib/facter/resolvers/bsd/load_averages_resolver.rb
 - lib/facter/resolvers/bsd/processors.rb
 - lib/facter/resolvers/containers.rb
 - lib/facter/resolvers/debian_version.rb
@@ -784,13 +806,17 @@ files:
 - lib/facter/resolvers/facterversion_resolver.rb
 - lib/facter/resolvers/filesystems_resolver.rb
 - lib/facter/resolvers/fips_enabled_resolver.rb
+- lib/facter/resolvers/freebsd/dmi_resolver.rb
 - lib/facter/resolvers/freebsd/ffi/ffi_helper.rb
 - lib/facter/resolvers/freebsd/freebsd_version_resolver.rb
 - lib/facter/resolvers/freebsd/geom_resolver.rb
 - lib/facter/resolvers/freebsd/processors.rb
+- lib/facter/resolvers/freebsd/swap_memory_resolver.rb
+- lib/facter/resolvers/freebsd/system_memory_resolver.rb
 - lib/facter/resolvers/hostname_resolver.rb
 - lib/facter/resolvers/identity_resolver.rb
-- lib/facter/resolvers/load_averages_resolver.rb
+- lib/facter/resolvers/linux/load_averages.rb
+- lib/facter/resolvers/load_averages.rb
 - lib/facter/resolvers/lpar_resolver.rb
 - lib/facter/resolvers/lsb_release_resolver.rb
 - lib/facter/resolvers/lspci.rb
@@ -836,6 +862,7 @@ files:
 - lib/facter/resolvers/timezone_resolver.rb
 - lib/facter/resolvers/uname_resolver.rb
 - lib/facter/resolvers/uptime_resolver.rb
+- lib/facter/resolvers/utils/ffi/load_averages.rb
 - lib/facter/resolvers/utils/filesystem_helper.rb
 - lib/facter/resolvers/utils/fingerprint.rb
 - lib/facter/resolvers/utils/networking.rb

data/lib/facter/resolvers/bsd/load_averages_resolver.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Facter
-  module Resolvers
-    module Bsd
-      class LoadAverages < BaseResolver
-        @semaphore = Mutex.new
-        @fact_list ||= {}
-        class << self
-          private
-
-          def post_resolve(fact_name)
-            @fact_list.fetch(fact_name) { read_load_averages(fact_name) }
-          end
-
-          def read_load_averages(fact_name)
-            require_relative 'ffi/ffi_helper'
-            @fact_list[:load_averages] = %w[1m 5m 15m].zip(Facter::Bsd::FfiHelper.read_load_averages).to_h
-
-            @fact_list[fact_name]
-          end
-        end
-      end
-    end
-  end
-end