facter 4.0.30 → 4.0.35

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/templates/man.erb

@@ -0,0 +1,122 @@
+<%# encoding: UTF-8%>
+SYNOPSIS
+--------
+  facter [options] [query] [query] [...]
+
+DESCRIPTION
+-----------
+Collect and display facts about the current system. The library behind Facter is easy to extend, making Facter an easy way to collect information about a system.
+
+If no queries are given, then all facts will be returned.
+
+Many of the command line options can also be set via the HOCON config file. This file can also be used to block or cache certain fact groups.
+
+OPTIONS
+-------
+<% @Facter::Cli.class_options.each do |name, option| -%><% next if option.hide%>
+  * `<%= option.aliases[0] + '`, `' if option.aliases.any? %>--<%= 'no-' if negate_options.include?(name.to_s)%><%= name.to_s.gsub('_','-') %>`:
+
+    <%= option.description %>
+
+<% end -%>
+
+FILES
+-----
+<em>/etc/puppetlabs/facter/facter.conf</em>
+
+A HOCON config file that can be used to specify directories for custom and external facts, set various command line options, and specify facts to block. See example below for details, or visit the GitHub README.
+
+EXAMPLES
+--------
+Display all facts:
+
+```
+$ facter
+disks => {
+  sda => {
+    model => "Virtual disk",
+    size => "8.00 GiB",
+    size_bytes => 8589934592,
+    vendor => "ExampleVendor"
+  }
+}
+dmi => {
+  bios => {
+    release_date => "06/23/2013",
+    vendor => "Example Vendor",
+    version => "6.00"
+  }
+}
+[\.\.\.]
+```
+
+Display a single structured fact:
+
+```
+$ facter processors
+{
+  count => 2,
+  isa => "x86_64",
+  models => [
+    "Intel(R) Xeon(R) CPU E5-2680 v2 @ 2.80GHz",
+    "Intel(R) Xeon(R) CPU E5-2680 v2 @ 2.80GHz"
+  ],
+  physicalcount => 2
+}
+```
+
+Display a single fact nested within a structured fact:
+
+```
+$ facter processors.isa
+x86_64
+```
+
+Display a single legacy fact. Note that non-structured facts existing in previous versions of Facter are still available,
+but are not displayed by default due to redundancy with newer structured facts:
+
+```
+$ facter processorcount
+2
+```
+
+Format facts as JSON:
+
+```
+$ facter \-\-json os.name os.release.major processors.isa
+{
+  "os.name": "Ubuntu",
+  "os.release.major": "14.04",
+  "processors.isa": "x86_64"
+}
+```
+
+An example config file.
+
+```
+# always loaded (CLI and as Ruby module)
+global : {
+    external-dir : "~/external/facts",
+    custom-dir   :  [
+       "~/custom/facts",
+       "~/custom/facts/more-facts"
+    ],
+    no-external-facts : false,
+    no-custom-facts   : false,
+    no-ruby           : false
+}
+# loaded when running from the command line
+cli : {
+    debug     : false,
+    trace     : true,
+    verbose   : false,
+    log-level : "info"
+}
+# always loaded, fact-sepcific configuration
+facts : {
+    # for valid blocklist entries, use --list-block-groups
+    blocklist : [ "file system", "EC2" ],
+    # for valid time-to-live entries, use --list-cache-groups
+    ttls : [ { "timezone" : 30 days } ]
+}
+```

data/lib/facter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Facter
-  VERSION = '4.0.30' 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.30
+  version: 4.0.35
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -208,6 +208,7 @@ files:
 - lib/facter/fact_groups.conf
 - lib/facter/facts/aix/aio_agent_version.rb
 - lib/facter/facts/aix/augeas/version.rb
+- lib/facter/facts/aix/disks.rb
 - lib/facter/facts/aix/facterversion.rb
 - lib/facter/facts/aix/filesystems.rb
 - lib/facter/facts/aix/hypervisors/lpar.rb
@@ -226,6 +227,20 @@ files:
 - lib/facter/facts/aix/kernelversion.rb
 - lib/facter/facts/aix/load_averages.rb
 - lib/facter/facts/aix/macaddress_interfaces.rb
+- lib/facter/facts/aix/memory/swap/available.rb
+- lib/facter/facts/aix/memory/swap/available_bytes.rb
+- lib/facter/facts/aix/memory/swap/capacity.rb
+- lib/facter/facts/aix/memory/swap/total.rb
+- lib/facter/facts/aix/memory/swap/total_bytes.rb
+- lib/facter/facts/aix/memory/swap/used.rb
+- lib/facter/facts/aix/memory/swap/used_bytes.rb
+- lib/facter/facts/aix/memory/system/available.rb
+- lib/facter/facts/aix/memory/system/available_bytes.rb
+- lib/facter/facts/aix/memory/system/capacity.rb
+- lib/facter/facts/aix/memory/system/total.rb
+- lib/facter/facts/aix/memory/system/total_bytes.rb
+- lib/facter/facts/aix/memory/system/used.rb
+- lib/facter/facts/aix/memory/system/used_bytes.rb
 - lib/facter/facts/aix/mountpoints.rb
 - lib/facter/facts/aix/mtu_interfaces.rb
 - lib/facter/facts/aix/netmask6_interfaces.rb
@@ -270,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
@@ -287,14 +301,83 @@ 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
+- 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/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
+- 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/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
@@ -534,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
@@ -549,7 +643,22 @@ 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
+- lib/facter/facts/solaris/memory/swap/capacity.rb
+- lib/facter/facts/solaris/memory/swap/total.rb
+- lib/facter/facts/solaris/memory/swap/total_bytes.rb
+- lib/facter/facts/solaris/memory/swap/used.rb
+- lib/facter/facts/solaris/memory/swap/used_bytes.rb
+- lib/facter/facts/solaris/memory/system/available.rb
+- lib/facter/facts/solaris/memory/system/available_bytes.rb
+- lib/facter/facts/solaris/memory/system/capacity.rb
+- lib/facter/facts/solaris/memory/system/total.rb
+- lib/facter/facts/solaris/memory/system/total_bytes.rb
+- lib/facter/facts/solaris/memory/system/used.rb
+- lib/facter/facts/solaris/memory/system/used_bytes.rb
 - lib/facter/facts/solaris/mountpoints.rb
 - lib/facter/facts/solaris/mtu_interfaces.rb
 - lib/facter/facts/solaris/netmask6_interfaces.rb
@@ -585,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
@@ -595,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
@@ -726,21 +834,23 @@ files:
 - lib/facter/os_hierarchy.json
 - lib/facter/resolvers/aio_agent_version.rb
 - lib/facter/resolvers/aix/architecture_resolver.rb
+- lib/facter/resolvers/aix/disks.rb
 - lib/facter/resolvers/aix/ffi/ffi_helper.rb
 - lib/facter/resolvers/aix/filesystem_resolver.rb
 - lib/facter/resolvers/aix/hardware_resolver.rb
 - lib/facter/resolvers/aix/load_averages_resolver.rb
+- lib/facter/resolvers/aix/memory.rb
 - lib/facter/resolvers/aix/mountpoints.rb
 - lib/facter/resolvers/aix/networking_resolver.rb
 - lib/facter/resolvers/aix/nim.rb
 - lib/facter/resolvers/aix/os_level_resolver.rb
 - lib/facter/resolvers/aix/partitions.rb
 - lib/facter/resolvers/aix/processors.rb
+- lib/facter/resolvers/aix/utils/info_extractor.rb
 - lib/facter/resolvers/aix/utils/odm_query.rb
 - 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
@@ -752,13 +862,18 @@ 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/docker_uptime.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
@@ -766,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
@@ -775,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
@@ -785,29 +900,33 @@ 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/networking_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.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
 - 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
 - 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
@@ -842,6 +961,9 @@ 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
 - lib/facter/version.rb