facter 4.0.34 → 4.0.35

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

@@ -2,131 +2,133 @@
 
 module Facter
   module Resolvers
-    class Networking < BaseResolver
-      @log = Facter::Log.new(self)
-      @semaphore = Mutex.new
-      @fact_list ||= {}
-      class << self
-        private
-
-        def post_resolve(fact_name)
-          @fact_list.fetch(fact_name) { read_network_information(fact_name) }
-        end
-
-        def read_network_information(fact_name)
-          require 'facter/resolvers/windows/ffi/networking_ffi'
+    module Windows
+      class Networking < BaseResolver
+        @log = Facter::Log.new(self)
+        @semaphore = Mutex.new
+        @fact_list ||= {}
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_network_information(fact_name) }
+          end
 
-          size_ptr = FFI::MemoryPointer.new(NetworkingFFI::BUFFER_LENGTH)
-          adapter_addresses = FFI::MemoryPointer.new(IpAdapterAddressesLh.size, NetworkingFFI::BUFFER_LENGTH)
-          flags = NetworkingFFI::GAA_FLAG_SKIP_ANYCAST |
-                  NetworkingFFI::GAA_FLAG_SKIP_MULTICAST | NetworkingFFI::GAA_FLAG_SKIP_DNS_SERVER
+          def read_network_information(fact_name)
+            require 'facter/resolvers/windows/ffi/networking_ffi'
 
-          return unless (adapter_addresses = get_adapter_addresses(size_ptr, adapter_addresses, flags))
+            size_ptr = FFI::MemoryPointer.new(NetworkingFFI::BUFFER_LENGTH)
+            adapter_addresses = FFI::MemoryPointer.new(IpAdapterAddressesLh.size, NetworkingFFI::BUFFER_LENGTH)
+            flags = NetworkingFFI::GAA_FLAG_SKIP_ANYCAST |
+                    NetworkingFFI::GAA_FLAG_SKIP_MULTICAST | NetworkingFFI::GAA_FLAG_SKIP_DNS_SERVER
 
-          iterate_list(adapter_addresses)
+            return unless (adapter_addresses = get_adapter_addresses(size_ptr, adapter_addresses, flags))
 
-          ::Resolvers::Utils::Networking.expand_main_bindings(@fact_list)
+            iterate_list(adapter_addresses)
 
-          @fact_list[fact_name]
-        end
+            ::Resolvers::Utils::Networking.expand_main_bindings(@fact_list)
 
-        def get_adapter_addresses(size_ptr, adapter_addresses, flags)
-          error = nil
-          3.times do
-            error = NetworkingFFI::GetAdaptersAddresses(NetworkingFFI::AF_UNSPEC, flags,
-                                                        FFI::Pointer::NULL, adapter_addresses, size_ptr)
-            break if error == NetworkingFFI::ERROR_SUCCES
-
-            if error == NetworkingFFI::ERROR_BUFFER_OVERFLOW
-              adapter_addresses = FFI::MemoryPointer.new(IpAdapterAddressesLh.size, NetworkingFFI::BUFFER_LENGTH)
-            else
-              @log.debug 'Unable to retrieve networking facts!'
-              return nil
-            end
+            @fact_list[fact_name]
           end
-          return nil unless error.zero?
 
-          adapter_addresses
-        end
+          def get_adapter_addresses(size_ptr, adapter_addresses, flags)
+            error = nil
+            3.times do
+              error = NetworkingFFI::GetAdaptersAddresses(NetworkingFFI::AF_UNSPEC, flags,
+                                                          FFI::Pointer::NULL, adapter_addresses, size_ptr)
+              break if error == NetworkingFFI::ERROR_SUCCES
+
+              if error == NetworkingFFI::ERROR_BUFFER_OVERFLOW
+                adapter_addresses = FFI::MemoryPointer.new(IpAdapterAddressesLh.size, NetworkingFFI::BUFFER_LENGTH)
+              else
+                @log.debug 'Unable to retrieve networking facts!'
+                return nil
+              end
+            end
+            return nil unless error.zero?
 
-        def adapter_down?(adapter)
-          adapter[:OperStatus] != NetworkingFFI::IF_OPER_STATUS_UP ||
-            ![NetworkingFFI::IF_TYPE_ETHERNET_CSMACD, NetworkingFFI::IF_TYPE_IEEE80211].include?(adapter[:IfType])
-        end
+            adapter_addresses
+          end
 
-        def retrieve_dhcp_server(adapter)
-          if !(adapter[:Flags] & NetworkingFFI::IP_ADAPTER_DHCP_ENABLED).zero? &&
-             adapter[:Union][:Struct][:Length] >= IpAdapterAddressesLh.size
-            NetworkUtils.address_to_string(adapter[:Dhcpv4Server])
+          def adapter_down?(adapter)
+            adapter[:OperStatus] != NetworkingFFI::IF_OPER_STATUS_UP ||
+              ![NetworkingFFI::IF_TYPE_ETHERNET_CSMACD, NetworkingFFI::IF_TYPE_IEEE80211].include?(adapter[:IfType])
           end
-        end
 
-        def iterate_list(adapter_addresses)
-          net_interface = {}
-          IpAdapterAddressesLh.read_list(adapter_addresses) do |adapter_address|
-            if adapter_down?(adapter_address)
-              adapter_address = IpAdapterAddressesLh.new(adapter_address[:Next])
-              next
+          def retrieve_dhcp_server(adapter)
+            if !(adapter[:Flags] & NetworkingFFI::IP_ADAPTER_DHCP_ENABLED).zero? &&
+               adapter[:Union][:Struct][:Length] >= IpAdapterAddressesLh.size
+              NetworkUtils.address_to_string(adapter[:Dhcpv4Server])
             end
-            @fact_list[:domain] ||= adapter_address[:DnsSuffix].read_wide_string_without_length
-            name = adapter_address[:FriendlyName].read_wide_string_without_length
-            net_interface[name] = build_interface_info(adapter_address, name)
           end
 
-          @fact_list[:interfaces] = net_interface unless net_interface.empty?
-        end
+          def iterate_list(adapter_addresses)
+            net_interface = {}
+            IpAdapterAddressesLh.read_list(adapter_addresses) do |adapter_address|
+              if adapter_down?(adapter_address)
+                adapter_address = IpAdapterAddressesLh.new(adapter_address[:Next])
+                next
+              end
+              @fact_list[:domain] ||= adapter_address[:DnsSuffix].read_wide_string_without_length
+              name = adapter_address[:FriendlyName].read_wide_string_without_length
+              net_interface[name] = build_interface_info(adapter_address, name)
+            end
 
-        def build_interface_info(adapter_address, name)
-          hash = {}
+            @fact_list[:interfaces] = net_interface unless net_interface.empty?
+          end
 
-          hash[:dhcp] = retrieve_dhcp_server(adapter_address)
-          hash[:mtu] = adapter_address[:Mtu]
+          def build_interface_info(adapter_address, name)
+            hash = {}
 
-          bindings = find_ip_addresses(adapter_address[:FirstUnicastAddress], name)
-          hash[:bindings] = bindings[:ipv4] unless bindings[:ipv4].empty?
-          hash[:bindings6] = bindings[:ipv6] unless bindings[:ipv6].empty?
-          hash[:mac] = NetworkUtils.find_mac_address(adapter_address)
-          hash
-        end
+            hash[:dhcp] = retrieve_dhcp_server(adapter_address)
+            hash[:mtu] = adapter_address[:Mtu]
 
-        def find_ip_addresses(unicast_addresses, name)
-          bindings = {}
-          bindings[:ipv6] = []
-          bindings[:ipv4] = []
+            bindings = find_ip_addresses(adapter_address[:FirstUnicastAddress], name)
+            hash[:bindings] = bindings[:ipv4] unless bindings[:ipv4].empty?
+            hash[:bindings6] = bindings[:ipv6] unless bindings[:ipv6].empty?
+            hash[:mac] = NetworkUtils.find_mac_address(adapter_address)
+            hash
+          end
 
-          IpAdapterUnicastAddressLH.read_list(unicast_addresses) do |unicast|
-            addr = NetworkUtils.address_to_string(unicast[:Address])
-            unless addr
-              unicast = IpAdapterUnicastAddressLH.new(unicast[:Next])
-              next
+          def find_ip_addresses(unicast_addresses, name)
+            bindings = {}
+            bindings[:ipv6] = []
+            bindings[:ipv4] = []
+
+            IpAdapterUnicastAddressLH.read_list(unicast_addresses) do |unicast|
+              addr = NetworkUtils.address_to_string(unicast[:Address])
+              unless addr
+                unicast = IpAdapterUnicastAddressLH.new(unicast[:Next])
+                next
+              end
+
+              sock_addr = SockAddr.new(unicast[:Address][:lpSockaddr])
+              add_ip_data(addr, unicast, sock_addr, bindings)
+              find_primary_interface(sock_addr, name, addr)
             end
-
-            sock_addr = SockAddr.new(unicast[:Address][:lpSockaddr])
-            add_ip_data(addr, unicast, sock_addr, bindings)
-            find_primary_interface(sock_addr, name, addr)
+            bindings
           end
-          bindings
-        end
 
-        def add_ip_data(addr, unicast, sock_addr, bindings)
-          result = find_bindings(sock_addr, unicast, addr)
-          return unless result
+          def add_ip_data(addr, unicast, sock_addr, bindings)
+            result = find_bindings(sock_addr, unicast, addr)
+            return unless result
 
-          bindings[:ipv6] << result if sock_addr[:sa_family] == NetworkingFFI::AF_INET6
-          bindings[:ipv4] << result if sock_addr[:sa_family] == NetworkingFFI::AF_INET
-        end
+            bindings[:ipv6] << result if sock_addr[:sa_family] == NetworkingFFI::AF_INET6
+            bindings[:ipv4] << result if sock_addr[:sa_family] == NetworkingFFI::AF_INET
+          end
 
-        def find_bindings(sock_addr, unicast, addr)
-          return unless [NetworkingFFI::AF_INET, NetworkingFFI::AF_INET6].include?(sock_addr[:sa_family])
+          def find_bindings(sock_addr, unicast, addr)
+            return unless [NetworkingFFI::AF_INET, NetworkingFFI::AF_INET6].include?(sock_addr[:sa_family])
 
-          ::Resolvers::Utils::Networking.build_binding(addr, unicast[:OnLinkPrefixLength])
-        end
+            ::Resolvers::Utils::Networking.build_binding(addr, unicast[:OnLinkPrefixLength])
+          end
 
-        def find_primary_interface(sock_addr, name, addr)
-          if !@fact_list[:primary_interface] &&
-             ([NetworkingFFI::AF_INET, NetworkingFFI::AF_INET6].include?(sock_addr[:sa_family]) &&
-                 !::Resolvers::Utils::Networking.ignored_ip_address(addr))
-            @fact_list[:primary_interface] = name.to_s
+          def find_primary_interface(sock_addr, name, addr)
+            if !@fact_list[:primary_interface] &&
+               ([NetworkingFFI::AF_INET, NetworkingFFI::AF_INET6].include?(sock_addr[:sa_family]) &&
+               !::Resolvers::Utils::Networking.ignored_ip_address(addr))
+              @fact_list[:primary_interface] = name.to_s
+            end
           end
         end
       end

data/lib/facter/resolvers/zfs.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    class ZFS < BaseResolver
+      @semaphore = Mutex.new
+      @fact_list ||= {}
+      class << self
+        private
+
+        def post_resolve(fact_name)
+          @fact_list.fetch(fact_name) { zfs_fact(fact_name) }
+        end
+
+        def zfs_fact(fact_name)
+          build_zfs_facts
+          @fact_list[fact_name]
+        end
+
+        def build_zfs_facts
+          output = Facter::Core::Execution.execute('zfs upgrade -v', logger: log)
+          features_list = output.scan(/^\s+(\d+)/).flatten
+
+          return if features_list.empty?
+
+          @fact_list[:zfs_featurenumbers] = features_list.join(',')
+          @fact_list[:zfs_version] = features_list.last
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/zpool.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    class Zpool < BaseResolver
+      @semaphore = Mutex.new
+      @fact_list ||= {}
+      class << self
+        private
+
+        def post_resolve(fact_name)
+          @fact_list.fetch(fact_name) { zpool_fact(fact_name) }
+        end
+
+        def zpool_fact(fact_name)
+          build_zpool_facts
+          @fact_list[fact_name]
+        end
+
+        def build_zpool_facts
+          output = Facter::Core::Execution.execute('zpool upgrade -v', logger: log)
+          features_list = output.scan(/^\s+(\d+)/).flatten
+          features_flags = output.scan(/^([a-z0-9_]+)[[:blank:]]*(\(read-only compatible\))?$/).map(&:first)
+
+          return if features_list.empty?
+
+          @fact_list[:zpool_featurenumbers] = features_list.join(',')
+          @fact_list[:zpool_featureflags] = features_flags.join(',')
+          @fact_list[:zpool_version] = features_flags.any? ? '5000' : features_list.last
+        end
+      end
+    end
+  end
+end

data/lib/facter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.34
+  version: 4.0.35
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -285,7 +285,6 @@ files:
 - lib/facter/facts/aix/system_uptime/seconds.rb
 - lib/facter/facts/aix/system_uptime/uptime.rb
 - lib/facter/facts/aix/timezone.rb
-- lib/facter/facts/bsd/bsd_example_fact.rb
 - lib/facter/facts/bsd/kernelmajversion.rb
 - lib/facter/facts/bsd/kernelversion.rb
 - lib/facter/facts/bsd/load_averages.rb
@@ -302,6 +301,7 @@ files:
 - lib/facter/facts/debian/os/distro/id.rb
 - lib/facter/facts/debian/os/distro/release.rb
 - lib/facter/facts/debian/os/release.rb
+- lib/facter/facts/freebsd/augeas/version.rb
 - lib/facter/facts/freebsd/disks.rb
 - lib/facter/facts/freebsd/dmi/bios/release_date.rb
 - lib/facter/facts/freebsd/dmi/bios/vendor.rb
@@ -310,6 +310,14 @@ files:
 - 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/facterversion.rb
+- lib/facter/facts/freebsd/identity/gid.rb
+- lib/facter/facts/freebsd/identity/group.rb
+- lib/facter/facts/freebsd/identity/privileged.rb
+- lib/facter/facts/freebsd/identity/uid.rb
+- lib/facter/facts/freebsd/identity/user.rb
+- lib/facter/facts/freebsd/kernel.rb
+- lib/facter/facts/freebsd/kernelrelease.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
@@ -325,13 +333,51 @@ files:
 - 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/mountpoints.rb
+- lib/facter/facts/freebsd/netmask6_interfaces.rb
+- lib/facter/facts/freebsd/netmask_interfaces.rb
+- lib/facter/facts/freebsd/network6_interfaces.rb
+- lib/facter/facts/freebsd/network_interfaces.rb
+- lib/facter/facts/freebsd/networking/dhcp.rb
+- lib/facter/facts/freebsd/networking/domain.rb
+- lib/facter/facts/freebsd/networking/fqdn.rb
+- lib/facter/facts/freebsd/networking/hostname.rb
+- lib/facter/facts/freebsd/networking/interfaces.rb
+- lib/facter/facts/freebsd/networking/ip.rb
+- lib/facter/facts/freebsd/networking/ip6.rb
+- lib/facter/facts/freebsd/networking/mac.rb
+- lib/facter/facts/freebsd/networking/mtu.rb
+- lib/facter/facts/freebsd/networking/netmask.rb
+- lib/facter/facts/freebsd/networking/netmask6.rb
+- lib/facter/facts/freebsd/networking/network.rb
+- lib/facter/facts/freebsd/networking/network6.rb
+- lib/facter/facts/freebsd/networking/primary.rb
+- lib/facter/facts/freebsd/networking/scope6.rb
+- lib/facter/facts/freebsd/os/architecture.rb
+- lib/facter/facts/freebsd/os/hardware.rb
+- lib/facter/facts/freebsd/os/name.rb
 - lib/facter/facts/freebsd/os/release.rb
 - lib/facter/facts/freebsd/partitions.rb
+- lib/facter/facts/freebsd/path.rb
 - lib/facter/facts/freebsd/processors/count.rb
+- lib/facter/facts/freebsd/processors/isa.rb
 - lib/facter/facts/freebsd/processors/models.rb
 - lib/facter/facts/freebsd/processors/speed.rb
-- lib/facter/facts/freebsd/solaris_zones/current.rb
-- lib/facter/facts/freebsd/solaris_zones/zone.rb
+- lib/facter/facts/freebsd/puppet_version.rb
+- lib/facter/facts/freebsd/ruby/platform.rb
+- lib/facter/facts/freebsd/ruby/sitedir.rb
+- lib/facter/facts/freebsd/ruby/version.rb
+- lib/facter/facts/freebsd/ssh.rb
+- lib/facter/facts/freebsd/system_uptime/days.rb
+- lib/facter/facts/freebsd/system_uptime/hours.rb
+- lib/facter/facts/freebsd/system_uptime/seconds.rb
+- lib/facter/facts/freebsd/system_uptime/uptime.rb
+- lib/facter/facts/freebsd/timezone.rb
+- lib/facter/facts/freebsd/zfs_featurenumbers.rb
+- lib/facter/facts/freebsd/zfs_version.rb
+- lib/facter/facts/freebsd/zpool_featureflags.rb
+- lib/facter/facts/freebsd/zpool_featurenumbers.rb
+- lib/facter/facts/freebsd/zpool_version.rb
 - lib/facter/facts/linux/aio_agent_version.rb
 - lib/facter/facts/linux/augeas/version.rb
 - lib/facter/facts/linux/dhcp_servers.rb
@@ -571,7 +617,18 @@ files:
 - lib/facter/facts/sles/os/release.rb
 - lib/facter/facts/solaris/aio_agent_version.rb
 - lib/facter/facts/solaris/augeas/version.rb
+- lib/facter/facts/solaris/current_zone.rb
 - lib/facter/facts/solaris/dhcp_servers.rb
+- lib/facter/facts/solaris/disks.rb
+- lib/facter/facts/solaris/dmi/bios/release_date.rb
+- lib/facter/facts/solaris/dmi/bios/vendor.rb
+- lib/facter/facts/solaris/dmi/bios/version.rb
+- lib/facter/facts/solaris/dmi/chassis/asset_tag.rb
+- lib/facter/facts/solaris/dmi/chassis/type.rb
+- lib/facter/facts/solaris/dmi/manufacturer.rb
+- lib/facter/facts/solaris/dmi/product/name.rb
+- lib/facter/facts/solaris/dmi/product/serial_number.rb
+- lib/facter/facts/solaris/dmi/product/uuid.rb
 - lib/facter/facts/solaris/facterversion.rb
 - lib/facter/facts/solaris/filesystems.rb
 - lib/facter/facts/solaris/identity/gid.rb
@@ -637,8 +694,6 @@ files:
 - lib/facter/facts/solaris/ruby/platform.rb
 - lib/facter/facts/solaris/ruby/sitedir.rb
 - lib/facter/facts/solaris/ruby/version.rb
-- lib/facter/facts/solaris/solaris_zones/current.rb
-- lib/facter/facts/solaris/solaris_zones/zone.rb
 - lib/facter/facts/solaris/ssh.rb
 - lib/facter/facts/solaris/system_uptime/days.rb
 - lib/facter/facts/solaris/system_uptime/hours.rb
@@ -647,6 +702,7 @@ files:
 - lib/facter/facts/solaris/timezone.rb
 - lib/facter/facts/solaris/zfs_featurenumbers.rb
 - lib/facter/facts/solaris/zfs_version.rb
+- lib/facter/facts/solaris/zones.rb
 - lib/facter/facts/solaris/zpool_featureflags.rb
 - lib/facter/facts/solaris/zpool_featurenumbers.rb
 - lib/facter/facts/solaris/zpool_version.rb
@@ -815,6 +871,7 @@ files:
 - lib/facter/resolvers/freebsd/system_memory_resolver.rb
 - lib/facter/resolvers/hostname_resolver.rb
 - lib/facter/resolvers/identity_resolver.rb
+- lib/facter/resolvers/linux/docker_uptime.rb
 - lib/facter/resolvers/linux/load_averages.rb
 - lib/facter/resolvers/load_averages.rb
 - lib/facter/resolvers/lpar_resolver.rb
@@ -824,7 +881,6 @@ files:
 - lib/facter/resolvers/macosx/filesystems_resolver.rb
 - lib/facter/resolvers/macosx/load_averages_resolver.rb
 - lib/facter/resolvers/macosx/mountpoints_resolver.rb
-- lib/facter/resolvers/macosx/networking_resolver.rb
 - lib/facter/resolvers/macosx/processor_resolver.rb
 - lib/facter/resolvers/macosx/swap_memory_resolver.rb
 - lib/facter/resolvers/macosx/system_memory_resolver.rb
@@ -833,6 +889,7 @@ files:
 - lib/facter/resolvers/memory_resolver.rb
 - lib/facter/resolvers/mountpoints_resolver.rb
 - lib/facter/resolvers/networking_linux_resolver.rb
+- lib/facter/resolvers/networking_resolver.rb
 - lib/facter/resolvers/open_vz.rb
 - lib/facter/resolvers/os_level_resolver.rb
 - lib/facter/resolvers/os_release_resolver.rb
@@ -843,19 +900,20 @@ files:
 - lib/facter/resolvers/redhat_release_resolver.rb
 - lib/facter/resolvers/ruby_resolver.rb
 - lib/facter/resolvers/selinux_resolver.rb
+- lib/facter/resolvers/solaris/disks.rb
+- lib/facter/resolvers/solaris/dmi.rb
+- lib/facter/resolvers/solaris/dmi_sparc.rb
 - lib/facter/resolvers/solaris/ffi/ffi.rb
 - lib/facter/resolvers/solaris/ffi/functions.rb
 - lib/facter/resolvers/solaris/ffi/structs.rb
-- lib/facter/resolvers/solaris/filesystems_resolver.rb
-- lib/facter/resolvers/solaris/ipaddress_resolver.rb
+- lib/facter/resolvers/solaris/filesystems.rb
+- lib/facter/resolvers/solaris/ipaddress.rb
 - lib/facter/resolvers/solaris/memory.rb
-- lib/facter/resolvers/solaris/networking_resolver.rb
+- lib/facter/resolvers/solaris/networking.rb
+- lib/facter/resolvers/solaris/os_release.rb
 - lib/facter/resolvers/solaris/processors.rb
-- lib/facter/resolvers/solaris/solaris_os_release_resolver.rb
-- lib/facter/resolvers/solaris/solaris_zone_name.rb
-- lib/facter/resolvers/solaris/zfs_resolver.rb
-- lib/facter/resolvers/solaris/zone_resolver.rb
-- lib/facter/resolvers/solaris/zpool_resolver.rb
+- lib/facter/resolvers/solaris/zone.rb
+- lib/facter/resolvers/solaris/zone_name.rb
 - lib/facter/resolvers/ssh_resolver.rb
 - lib/facter/resolvers/suse_release_resolver.rb
 - lib/facter/resolvers/sw_vers_resolver.rb
@@ -868,6 +926,7 @@ files:
 - lib/facter/resolvers/utils/networking.rb
 - lib/facter/resolvers/utils/ssh.rb
 - lib/facter/resolvers/utils/ssh_helper.rb
+- lib/facter/resolvers/utils/uptime_helper.rb
 - lib/facter/resolvers/virt_what.rb
 - lib/facter/resolvers/vmware.rb
 - lib/facter/resolvers/windows/aio_agent_version.rb
@@ -902,6 +961,8 @@ files:
 - lib/facter/resolvers/windows/win_os_description_resolver.rb
 - lib/facter/resolvers/wpar_resolver.rb
 - lib/facter/resolvers/xen.rb
+- lib/facter/resolvers/zfs.rb
+- lib/facter/resolvers/zpool.rb
 - lib/facter/templates/man.erb
 - lib/facter/util/api_debugger.rb
 - lib/facter/util/file_helper.rb