facter 4.0.42 → 4.0.48
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/docs/generate.rb +32 -0
- data/lib/docs/template.erb +34 -0
- data/lib/facter.rb +109 -25
- data/lib/facter/config.rb +385 -0
- data/lib/facter/custom_facts/core/aggregate.rb +51 -17
- data/lib/facter/custom_facts/core/execution.rb +54 -38
- data/lib/facter/custom_facts/core/execution/base.rb +33 -33
- data/lib/facter/custom_facts/util/collection.rb +1 -2
- data/lib/facter/custom_facts/util/directory_loader.rb +1 -1
- data/lib/facter/custom_facts/util/fact.rb +38 -3
- data/lib/facter/custom_facts/util/loader.rb +1 -1
- data/lib/facter/custom_facts/util/parser.rb +17 -3
- data/lib/facter/custom_facts/util/resolution.rb +42 -13
- data/lib/facter/facts/aix/disks.rb +1 -1
- data/lib/facter/facts/aix/interfaces.rb +1 -0
- data/lib/facter/facts/aix/memory/swap/available.rb +1 -1
- data/lib/facter/facts/aix/memory/swap/available_bytes.rb +1 -1
- data/lib/facter/facts/aix/memory/swap/total.rb +1 -1
- data/lib/facter/facts/aix/memory/swap/total_bytes.rb +1 -1
- data/lib/facter/facts/aix/memory/swap/used.rb +1 -1
- data/lib/facter/facts/aix/memory/system/available.rb +1 -1
- data/lib/facter/facts/aix/memory/system/available_bytes.rb +1 -1
- data/lib/facter/facts/aix/memory/system/total.rb +1 -1
- data/lib/facter/facts/aix/memory/system/total_bytes.rb +1 -1
- data/lib/facter/facts/aix/memory/system/used.rb +1 -1
- data/lib/facter/facts/aix/processors/speed.rb +1 -1
- data/lib/facter/facts/aix/ssh.rb +1 -1
- data/lib/facter/facts/aix/sshalgorithmkey.rb +1 -1
- data/lib/facter/facts/aix/sshfp_algorithm.rb +1 -1
- data/lib/facter/facts/bsd/processors/speed.rb +1 -1
- data/lib/facter/facts/freebsd/is_virtual.rb +25 -0
- data/lib/facter/facts/freebsd/memory/swap/available.rb +1 -1
- data/lib/facter/facts/freebsd/memory/swap/available_bytes.rb +1 -1
- data/lib/facter/facts/freebsd/memory/swap/total.rb +1 -1
- data/lib/facter/facts/freebsd/memory/swap/total_bytes.rb +1 -1
- data/lib/facter/facts/freebsd/memory/swap/used.rb +1 -1
- data/lib/facter/facts/freebsd/memory/system/available.rb +1 -1
- data/lib/facter/facts/freebsd/memory/system/available_bytes.rb +1 -1
- data/lib/facter/facts/freebsd/memory/system/total.rb +1 -1
- data/lib/facter/facts/freebsd/memory/system/total_bytes.rb +1 -1
- data/lib/facter/facts/freebsd/memory/system/used.rb +1 -1
- data/lib/facter/facts/freebsd/processors/speed.rb +1 -1
- data/lib/facter/facts/freebsd/ssh.rb +1 -1
- data/lib/facter/facts/freebsd/sshalgorithmkey.rb +1 -1
- data/lib/facter/facts/freebsd/sshfp_algorithm.rb +1 -1
- data/lib/facter/facts/freebsd/virtual.rb +22 -0
- data/lib/facter/facts/linux/dhcp_servers.rb +1 -0
- data/lib/facter/facts/linux/disks.rb +1 -1
- data/lib/facter/facts/linux/ec2_metadata.rb +1 -1
- data/lib/facter/facts/linux/ec2_userdata.rb +1 -1
- data/lib/facter/facts/linux/hypervisors/kvm.rb +1 -1
- data/lib/facter/facts/linux/hypervisors/xen.rb +1 -1
- data/lib/facter/facts/linux/interfaces.rb +1 -0
- data/lib/facter/facts/linux/is_virtual.rb +2 -2
- data/lib/facter/facts/linux/memory/swap/available.rb +1 -1
- data/lib/facter/facts/linux/memory/swap/available_bytes.rb +1 -1
- data/lib/facter/facts/linux/memory/swap/total.rb +1 -1
- data/lib/facter/facts/linux/memory/swap/total_bytes.rb +1 -1
- data/lib/facter/facts/linux/memory/swap/used.rb +1 -1
- data/lib/facter/facts/linux/memory/system/available.rb +1 -1
- data/lib/facter/facts/linux/memory/system/available_bytes.rb +1 -1
- data/lib/facter/facts/linux/memory/system/total.rb +1 -1
- data/lib/facter/facts/linux/memory/system/total_bytes.rb +1 -1
- data/lib/facter/facts/linux/memory/system/used.rb +1 -1
- data/lib/facter/facts/linux/os/family.rb +4 -2
- data/lib/facter/facts/linux/processors/speed.rb +1 -1
- data/lib/facter/facts/linux/ssh.rb +1 -1
- data/lib/facter/facts/linux/sshalgorithmkey.rb +1 -1
- data/lib/facter/facts/linux/sshfp_algorithm.rb +1 -1
- data/lib/facter/facts/linux/virtual.rb +1 -1
- data/lib/facter/facts/macosx/dhcp_servers.rb +1 -0
- data/lib/facter/facts/macosx/interfaces.rb +1 -0
- data/lib/facter/facts/macosx/memory/swap/available.rb +1 -1
- data/lib/facter/facts/macosx/memory/swap/available_bytes.rb +1 -1
- data/lib/facter/facts/macosx/memory/swap/total.rb +1 -1
- data/lib/facter/facts/macosx/memory/swap/total_bytes.rb +1 -1
- data/lib/facter/facts/macosx/memory/swap/used.rb +1 -1
- data/lib/facter/facts/macosx/memory/system/available.rb +1 -1
- data/lib/facter/facts/macosx/memory/system/available_bytes.rb +1 -1
- data/lib/facter/facts/macosx/memory/system/total.rb +1 -1
- data/lib/facter/facts/macosx/memory/system/total_bytes.rb +1 -1
- data/lib/facter/facts/macosx/memory/system/used.rb +1 -1
- data/lib/facter/facts/macosx/processors/speed.rb +1 -1
- data/lib/facter/facts/macosx/ssh.rb +1 -1
- data/lib/facter/facts/macosx/sshalgorithmkey.rb +1 -1
- data/lib/facter/facts/macosx/sshfp_algorithm.rb +1 -1
- data/lib/facter/facts/rhel/os/release.rb +1 -1
- data/lib/facter/facts/solaris/dhcp_servers.rb +1 -0
- data/lib/facter/facts/solaris/disks.rb +1 -1
- data/lib/facter/facts/solaris/hypervisors/ldom.rb +3 -0
- data/lib/facter/facts/solaris/interfaces.rb +1 -0
- data/lib/facter/facts/solaris/is_virtual.rb +2 -2
- data/lib/facter/facts/solaris/ldom.rb +34 -4
- data/lib/facter/facts/solaris/memory/swap/available.rb +1 -1
- data/lib/facter/facts/solaris/memory/swap/available_bytes.rb +1 -1
- data/lib/facter/facts/solaris/memory/swap/total.rb +1 -1
- data/lib/facter/facts/solaris/memory/swap/total_bytes.rb +1 -1
- data/lib/facter/facts/solaris/memory/swap/used.rb +1 -1
- data/lib/facter/facts/solaris/memory/system/available.rb +1 -1
- data/lib/facter/facts/solaris/memory/system/available_bytes.rb +1 -1
- data/lib/facter/facts/solaris/memory/system/total.rb +1 -1
- data/lib/facter/facts/solaris/memory/system/total_bytes.rb +1 -1
- data/lib/facter/facts/solaris/memory/system/used.rb +1 -1
- data/lib/facter/facts/solaris/processors/speed.rb +1 -1
- data/lib/facter/facts/solaris/ssh.rb +1 -1
- data/lib/facter/facts/solaris/sshalgorithmkey.rb +1 -1
- data/lib/facter/facts/solaris/sshfp_algorithm.rb +1 -1
- data/lib/facter/facts/solaris/virtual.rb +1 -1
- data/lib/facter/facts/solaris/zones.rb +1 -1
- data/lib/facter/facts/windows/dhcp_servers.rb +1 -0
- data/lib/facter/facts/windows/interfaces.rb +1 -0
- data/lib/facter/facts/windows/memory/system/available.rb +1 -1
- data/lib/facter/facts/windows/memory/system/available_bytes.rb +1 -1
- data/lib/facter/facts/windows/memory/system/total.rb +1 -1
- data/lib/facter/facts/windows/memory/system/total_bytes.rb +1 -1
- data/lib/facter/facts/windows/memory/system/used.rb +1 -1
- data/lib/facter/facts/windows/networking/fqdn.rb +1 -1
- data/lib/facter/facts/windows/os/release.rb +1 -1
- data/lib/facter/framework/benchmarking/timer.rb +4 -2
- data/lib/facter/framework/cli/cli.rb +16 -3
- data/lib/facter/framework/config/fact_groups.rb +10 -8
- data/lib/facter/framework/core/cache_manager.rb +62 -17
- data/lib/facter/framework/core/fact/internal/core_fact.rb +6 -1
- data/lib/facter/framework/core/fact/internal/internal_fact_manager.rb +38 -4
- data/lib/facter/framework/core/fact_augmenter.rb +1 -1
- data/lib/facter/framework/core/fact_loaders/external_fact_loader.rb +4 -2
- data/lib/facter/framework/core/fact_loaders/fact_loader.rb +17 -1
- data/lib/facter/framework/core/fact_manager.rb +15 -3
- data/lib/facter/framework/core/file_loader.rb +6 -2
- data/lib/facter/framework/core/options/config_file_options.rb +16 -5
- data/lib/facter/framework/core/options/option_store.rb +42 -20
- data/lib/facter/framework/detector/os_detector.rb +1 -0
- data/lib/facter/framework/detector/os_hierarchy.rb +5 -9
- data/lib/facter/framework/logging/logger.rb +3 -3
- data/lib/facter/models/fact_collection.rb +11 -1
- data/lib/facter/models/loaded_fact.rb +2 -1
- data/lib/facter/resolvers/aio_agent_version.rb +2 -2
- data/lib/facter/resolvers/aix/{architecture_resolver.rb → architecture.rb} +19 -4
- data/lib/facter/resolvers/aix/disks.rb +6 -5
- data/lib/facter/resolvers/aix/{filesystem_resolver.rb → filesystem.rb} +2 -2
- data/lib/facter/resolvers/aix/{hardware_resolver.rb → hardware.rb} +4 -3
- data/lib/facter/resolvers/aix/{load_averages_resolver.rb → load_averages.rb} +2 -1
- data/lib/facter/resolvers/aix/memory.rb +4 -3
- data/lib/facter/resolvers/aix/mountpoints.rb +6 -5
- data/lib/facter/resolvers/aix/{networking_resolver.rb → networking.rb} +4 -3
- data/lib/facter/resolvers/aix/nim.rb +1 -1
- data/lib/facter/resolvers/aix/os_level.rb +1 -1
- data/lib/facter/resolvers/aix/partitions.rb +7 -6
- data/lib/facter/resolvers/aix/processors.rb +5 -4
- data/lib/facter/resolvers/aix/serialnumber.rb +2 -2
- data/lib/facter/resolvers/{augeas_resolver.rb → augeas.rb} +8 -2
- data/lib/facter/resolvers/base_resolver.rb +14 -4
- data/lib/facter/resolvers/bsd/processors.rb +13 -8
- data/lib/facter/resolvers/cloud.rb +2 -2
- data/lib/facter/resolvers/containers.rb +5 -4
- data/lib/facter/resolvers/debian_version.rb +2 -2
- data/lib/facter/resolvers/{disk_resolver.rb → disk.rb} +17 -6
- data/lib/facter/resolvers/{dmi_resolver.rb → dmi.rb} +5 -4
- data/lib/facter/resolvers/dmi_decode.rb +1 -1
- data/lib/facter/resolvers/ec2.rb +5 -2
- data/lib/facter/resolvers/{eos_release_resolver.rb → eos_release.rb} +2 -2
- data/lib/facter/resolvers/{facterversion_resolver.rb → facterversion.rb} +1 -1
- data/lib/facter/resolvers/{filesystems_resolver.rb → filesystems.rb} +5 -2
- data/lib/facter/resolvers/{fips_enabled_resolver.rb → fips_enabled.rb} +5 -2
- data/lib/facter/resolvers/freebsd/{dmi_resolver.rb → dmi.rb} +1 -1
- data/lib/facter/resolvers/freebsd/{freebsd_version_resolver.rb → freebsd_version.rb} +9 -7
- data/lib/facter/resolvers/freebsd/{geom_resolver.rb → geom.rb} +15 -22
- data/lib/facter/resolvers/freebsd/processors.rb +13 -8
- data/lib/facter/resolvers/freebsd/{swap_memory_resolver.rb → swap_memory.rb} +5 -3
- data/lib/facter/resolvers/freebsd/{system_memory_resolver.rb → system_memory.rb} +4 -2
- data/lib/facter/resolvers/freebsd/virtual.rb +45 -0
- data/lib/facter/resolvers/gce.rb +3 -2
- data/lib/facter/resolvers/hostname.rb +92 -0
- data/lib/facter/resolvers/{identity_resolver.rb → identity.rb} +2 -1
- data/lib/facter/resolvers/linux/docker_uptime.rb +3 -2
- data/lib/facter/resolvers/linux/load_averages.rb +3 -2
- data/lib/facter/resolvers/load_averages.rb +5 -3
- data/lib/facter/resolvers/{lpar_resolver.rb → lpar.rb} +1 -1
- data/lib/facter/resolvers/{lsb_release_resolver.rb → lsb_release.rb} +1 -1
- data/lib/facter/resolvers/lspci.rb +1 -1
- data/lib/facter/resolvers/macosx/{dmi_resolver.rb → dmi.rb} +1 -1
- data/lib/facter/resolvers/macosx/{filesystems_resolver.rb → filesystems.rb} +1 -1
- data/lib/facter/resolvers/macosx/{load_averages_resolver.rb → load_averages.rb} +2 -1
- data/lib/facter/resolvers/macosx/{mountpoints_resolver.rb → mountpoints.rb} +9 -8
- data/lib/facter/resolvers/macosx/{processor_resolver.rb → processor.rb} +2 -1
- data/lib/facter/resolvers/macosx/{swap_memory_resolver.rb → swap_memory.rb} +2 -1
- data/lib/facter/resolvers/macosx/{system_memory_resolver.rb → system_memory.rb} +2 -1
- data/lib/facter/resolvers/macosx/{system_profiler_resolver.rb → system_profiler.rb} +4 -6
- data/lib/facter/resolvers/{memory_resolver.rb → memory.rb} +4 -2
- data/lib/facter/resolvers/mountpoints.rb +90 -0
- data/lib/facter/resolvers/{networking_resolver.rb → networking.rb} +9 -6
- data/lib/facter/resolvers/networking_linux.rb +296 -0
- data/lib/facter/resolvers/open_vz.rb +2 -4
- data/lib/facter/resolvers/{os_release_resolver.rb → os_release.rb} +2 -2
- data/lib/facter/resolvers/partitions.rb +67 -63
- data/lib/facter/resolvers/{path_resolver.rb → path.rb} +1 -1
- data/lib/facter/resolvers/{processors_resolver.rb → processors.rb} +10 -3
- data/lib/facter/resolvers/{redhat_release_resolver.rb → redhat_release.rb} +2 -2
- data/lib/facter/resolvers/{ruby_resolver.rb → ruby.rb} +1 -1
- data/lib/facter/resolvers/{selinux_resolver.rb → selinux.rb} +4 -4
- data/lib/facter/resolvers/solaris/disks.rb +2 -2
- data/lib/facter/resolvers/solaris/dmi.rb +3 -1
- data/lib/facter/resolvers/solaris/dmi_sparc.rb +1 -1
- data/lib/facter/resolvers/solaris/filesystems.rb +1 -1
- data/lib/facter/resolvers/solaris/ipaddress.rb +2 -1
- data/lib/facter/resolvers/solaris/ldom.rb +1 -3
- data/lib/facter/resolvers/solaris/memory.rb +4 -3
- data/lib/facter/resolvers/solaris/mountpoints.rb +61 -0
- data/lib/facter/resolvers/solaris/networking.rb +51 -44
- data/lib/facter/resolvers/solaris/os_release.rb +7 -5
- data/lib/facter/resolvers/solaris/processors.rb +2 -1
- data/lib/facter/resolvers/solaris/zone.rb +1 -1
- data/lib/facter/resolvers/solaris/zone_name.rb +1 -1
- data/lib/facter/resolvers/{ssh_resolver.rb → ssh.rb} +12 -8
- data/lib/facter/resolvers/{suse_release_resolver.rb → suse_release.rb} +2 -2
- data/lib/facter/resolvers/{sw_vers_resolver.rb → sw_vers.rb} +2 -2
- data/lib/facter/resolvers/{timezone_resolver.rb → timezone.rb} +1 -1
- data/lib/facter/resolvers/{uname_resolver.rb → uname.rb} +1 -1
- data/lib/facter/resolvers/{uptime_resolver.rb → uptime.rb} +3 -3
- data/lib/facter/resolvers/virt_what.rb +1 -1
- data/lib/facter/resolvers/vmware.rb +1 -1
- data/lib/facter/resolvers/windows/aio_agent_version.rb +2 -2
- data/lib/facter/resolvers/windows/{dmi_bios_resolver.rb → dmi_bios.rb} +2 -2
- data/lib/facter/resolvers/windows/{dmi_computersystem_resolver.rb → dmi_computersystem.rb} +2 -2
- data/lib/facter/resolvers/windows/{fips_resolver.rb → fips.rb} +2 -1
- data/lib/facter/resolvers/windows/{hardware_architecture_resolver.rb → hardware_architecture.rb} +2 -1
- data/lib/facter/resolvers/windows/{identity_resolver.rb → identity.rb} +2 -1
- data/lib/facter/resolvers/windows/{kernel_resolver.rb → kernel.rb} +3 -1
- data/lib/facter/resolvers/windows/{memory_resolver.rb → memory.rb} +7 -1
- data/lib/facter/resolvers/windows/{netkvm_resolver.rb → netkvm.rb} +2 -1
- data/lib/facter/resolvers/windows/{networking_resolver.rb → networking.rb} +18 -4
- data/lib/facter/resolvers/windows/{processors_resolver.rb → processors.rb} +3 -2
- data/lib/facter/resolvers/windows/{product_release_resolver.rb → product_release.rb} +2 -1
- data/lib/facter/resolvers/windows/ssh.rb +5 -3
- data/lib/facter/resolvers/windows/{system32_resolver.rb → system32.rb} +3 -1
- data/lib/facter/resolvers/windows/{uptime_resolver.rb → uptime.rb} +3 -2
- data/lib/facter/resolvers/windows/{virtualization_resolver.rb → virtualization.rb} +3 -2
- data/lib/facter/resolvers/windows/{win_os_description_resolver.rb → win_os_description.rb} +4 -2
- data/lib/facter/resolvers/{wpar_resolver.rb → wpar.rb} +1 -1
- data/lib/facter/resolvers/xen.rb +2 -2
- data/lib/facter/resolvers/zfs.rb +2 -1
- data/lib/facter/resolvers/zpool.rb +2 -1
- data/lib/facter/util/aix/info_extractor.rb +24 -0
- data/lib/facter/util/aix/odm_query.rb +46 -0
- data/lib/facter/util/api_debugger.rb +33 -29
- data/lib/facter/util/facts/facts_utils.rb +30 -0
- data/lib/facter/util/facts/unit_converter.rb +61 -0
- data/lib/facter/util/facts/uptime_parser.rb +128 -0
- data/lib/facter/util/facts/virtual_detector.rb +90 -0
- data/lib/facter/util/facts/windows_release_finder.rb +55 -0
- data/lib/facter/{resolvers/macosx/utils → util/macosx}/system_profile_executor.rb +1 -1
- data/lib/facter/util/resolvers/aws_token.rb +37 -0
- data/lib/facter/{resolvers/utils → util/resolvers}/ffi/load_averages.rb +2 -2
- data/lib/facter/util/resolvers/filesystem_helper.rb +47 -0
- data/lib/facter/util/resolvers/fingerprint.rb +15 -0
- data/lib/facter/{resolvers/utils → util/resolvers}/http.rb +17 -10
- data/lib/facter/util/resolvers/networking/dhcp.rb +21 -0
- data/lib/facter/util/resolvers/networking/networking.rb +109 -0
- data/lib/facter/util/resolvers/networking/primary_interface.rb +82 -0
- data/lib/facter/util/resolvers/ssh.rb +17 -0
- data/lib/facter/util/resolvers/ssh_helper.rb +31 -0
- data/lib/facter/{resolvers/utils → util/resolvers}/uptime_helper.rb +2 -2
- data/lib/facter/{framework/utils → util}/utils.rb +0 -0
- data/lib/facter/util/windows/win32ole.rb +30 -0
- data/lib/facter/version.rb +1 -1
- metadata +107 -119
- data/lib/facter/fact_groups.conf +0 -308
- data/lib/facter/facts/aix/puppet_version.rb +0 -15
- data/lib/facter/facts/freebsd/puppet_version.rb +0 -15
- data/lib/facter/facts/linux/puppet_version.rb +0 -15
- data/lib/facter/facts/macosx/puppet_version.rb +0 -15
- data/lib/facter/facts/solaris/puppet_version.rb +0 -15
- data/lib/facter/facts/windows/puppet_version.rb +0 -15
- data/lib/facter/facts_utils/facts_utils.rb +0 -12
- data/lib/facter/facts_utils/unit_converter.rb +0 -59
- data/lib/facter/facts_utils/uptime_parser.rb +0 -124
- data/lib/facter/facts_utils/virtual_detector.rb +0 -78
- data/lib/facter/facts_utils/windows_release_finder.rb +0 -51
- data/lib/facter/os_hierarchy.json +0 -36
- data/lib/facter/resolvers/aix/utils/info_extractor.rb +0 -20
- data/lib/facter/resolvers/aix/utils/odm_query.rb +0 -42
- data/lib/facter/resolvers/hostname_resolver.rb +0 -44
- data/lib/facter/resolvers/mountpoints_resolver.rb +0 -59
- data/lib/facter/resolvers/networking_linux_resolver.rb +0 -153
- data/lib/facter/resolvers/puppet_version_resolver.rb +0 -26
- data/lib/facter/resolvers/utils/filesystem_helper.rb +0 -43
- data/lib/facter/resolvers/utils/fingerprint.rb +0 -11
- data/lib/facter/resolvers/utils/networking.rb +0 -86
- data/lib/facter/resolvers/utils/ssh.rb +0 -13
- data/lib/facter/resolvers/utils/ssh_helper.rb +0 -27
- data/lib/facter/resolvers/windows/utils/win32ole.rb +0 -24
@@ -1,17 +1,16 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require 'facter/config'
|
4
|
+
|
3
5
|
module Facter
|
4
6
|
class FactGroups
|
7
|
+
attr_accessor :groups_ttls
|
5
8
|
attr_reader :groups, :block_list, :facts_ttls
|
6
9
|
|
7
|
-
@groups_ttls = []
|
8
|
-
|
9
10
|
STRING_TO_SECONDS = { 'seconds' => 1, 'minutes' => 60, 'hours' => 3600, 'days' => 3600 * 24 }.freeze
|
10
11
|
|
11
|
-
def initialize
|
12
|
-
|
13
|
-
@groups_file_path = group_list_path || default_path
|
14
|
-
@groups ||= File.readable?(@groups_file_path) ? Hocon.load(@groups_file_path) : {}
|
12
|
+
def initialize
|
13
|
+
@groups = Facter::Config::FACT_GROUPS.dup
|
15
14
|
load_groups
|
16
15
|
load_groups_from_options
|
17
16
|
load_facts_ttls
|
@@ -38,7 +37,10 @@ module Facter
|
|
38
37
|
fact = get_fact(fact_name)
|
39
38
|
return fact[:group] if fact
|
40
39
|
|
41
|
-
@groups.detect { |k, v| break k if Array(v).find { |f| fact_name =~ /^#{f}.*/ } }
|
40
|
+
# @groups.detect { |k, v| break k if Array(v).find { |f| fact_name =~ /^#{f}.*/ } }
|
41
|
+
@groups.detect do |k, v|
|
42
|
+
break k if Array(v).find { |f| fact_name.include?('.*') ? fact_name == f : fact_name =~ /^#{f}.*/ }
|
43
|
+
end
|
42
44
|
end
|
43
45
|
|
44
46
|
# Get config ttls for a given group
|
@@ -91,7 +93,7 @@ module Facter
|
|
91
93
|
|
92
94
|
def load_groups
|
93
95
|
config = ConfigReader.init(Options[:config])
|
94
|
-
@block_list = config.block_list ||
|
96
|
+
@block_list = config.block_list || []
|
95
97
|
@groups_ttls = config.ttls || []
|
96
98
|
@groups.merge!(config.fact_groups) if config.fact_groups
|
97
99
|
end
|
@@ -10,7 +10,7 @@ module Facter
|
|
10
10
|
end
|
11
11
|
|
12
12
|
def resolve_facts(searched_facts)
|
13
|
-
return searched_facts, [] if !File.directory?(@cache_dir) || !Options[:cache]
|
13
|
+
return searched_facts, [] if (!File.directory?(@cache_dir) || !Options[:cache]) && Options[:ttls].any?
|
14
14
|
|
15
15
|
facts = []
|
16
16
|
searched_facts.delete_if do |fact|
|
@@ -27,8 +27,9 @@ module Facter
|
|
27
27
|
end
|
28
28
|
|
29
29
|
def cache_facts(resolved_facts)
|
30
|
-
return unless Options[:cache]
|
30
|
+
return unless Options[:cache] && Options[:ttls].any?
|
31
31
|
|
32
|
+
@groups = {}
|
32
33
|
resolved_facts.each do |fact|
|
33
34
|
cache_fact(fact)
|
34
35
|
end
|
@@ -48,8 +49,8 @@ module Facter
|
|
48
49
|
false
|
49
50
|
end
|
50
51
|
|
51
|
-
fact_group = @fact_groups.get_fact_group(fact_name)
|
52
|
-
delete_cache(fact_group) if fact_group && !cached
|
52
|
+
# fact_group = @fact_groups.get_fact_group(fact_name)
|
53
|
+
# delete_cache(fact_group) if fact_group && !cached
|
53
54
|
cached
|
54
55
|
end
|
55
56
|
|
@@ -66,6 +67,8 @@ module Facter
|
|
66
67
|
|
67
68
|
fact = @fact_groups.get_fact(fact_name)
|
68
69
|
|
70
|
+
return if external_fact_in_custom_group?(searched_fact, fact_name, fact)
|
71
|
+
|
69
72
|
return unless fact
|
70
73
|
|
71
74
|
return unless check_ttls?(fact[:group], fact[:ttls])
|
@@ -73,31 +76,70 @@ module Facter
|
|
73
76
|
read_fact(searched_fact, fact[:group])
|
74
77
|
end
|
75
78
|
|
79
|
+
def external_fact_in_custom_group?(searched_fact, fact_name, fact)
|
80
|
+
if searched_fact.type == :file && fact[:group] != fact_name
|
81
|
+
@log.error("Cannot cache '#{fact_name}' fact from '#{fact[:group]}' group. "\
|
82
|
+
'Caching custom group is not supported for external facts.')
|
83
|
+
return true
|
84
|
+
end
|
85
|
+
|
86
|
+
false
|
87
|
+
end
|
88
|
+
|
76
89
|
def read_fact(searched_fact, fact_group)
|
77
|
-
data =
|
90
|
+
data = nil
|
91
|
+
Facter::Framework::Benchmarking::Timer.measure(searched_fact.name, 'cached') do
|
92
|
+
data = read_group_json(fact_group)
|
93
|
+
end
|
78
94
|
return unless data
|
79
95
|
|
96
|
+
unless searched_fact.file
|
97
|
+
return unless valid_format_version?(searched_fact, data, fact_group)
|
98
|
+
|
99
|
+
delete_cache(fact_group) unless data.keys.grep(/#{searched_fact.name}/).any?
|
100
|
+
# data.fetch(searched_fact.name) { delete_cache(fact_group) }
|
101
|
+
end
|
102
|
+
|
80
103
|
@log.debug("loading cached values for #{searched_fact.name} facts")
|
81
104
|
|
82
105
|
create_facts(searched_fact, data)
|
83
106
|
end
|
84
107
|
|
108
|
+
def valid_format_version?(searched_fact, data, fact_group)
|
109
|
+
unless data['cache_format_version'] == 1
|
110
|
+
@log.debug("The fact #{searched_fact.name} could not be read from the cache, \
|
111
|
+
cache_format_version is incorrect!")
|
112
|
+
delete_cache(fact_group)
|
113
|
+
return false
|
114
|
+
end
|
115
|
+
|
116
|
+
true
|
117
|
+
end
|
118
|
+
|
85
119
|
def create_facts(searched_fact, data)
|
86
120
|
if searched_fact.type == :file
|
87
|
-
|
88
|
-
data.each do |fact_name, fact_value|
|
89
|
-
fact = Facter::ResolvedFact.new(fact_name, fact_value, searched_fact.type,
|
90
|
-
searched_fact.user_query, searched_fact.filter_tokens)
|
91
|
-
fact.file = searched_fact.file
|
92
|
-
facts << fact
|
93
|
-
end
|
94
|
-
facts
|
121
|
+
resolve_external_fact(searched_fact, data)
|
95
122
|
else
|
123
|
+
return unless data[searched_fact.name]
|
124
|
+
|
96
125
|
[Facter::ResolvedFact.new(searched_fact.name, data[searched_fact.name], searched_fact.type,
|
97
126
|
searched_fact.user_query, searched_fact.filter_tokens)]
|
98
127
|
end
|
99
128
|
end
|
100
129
|
|
130
|
+
def resolve_external_fact(searched_fact, data)
|
131
|
+
facts = []
|
132
|
+
data.each do |fact_name, fact_value|
|
133
|
+
next if fact_name == 'cache_format_version'
|
134
|
+
|
135
|
+
fact = Facter::ResolvedFact.new(fact_name, fact_value, searched_fact.type,
|
136
|
+
searched_fact.user_query, searched_fact.filter_tokens)
|
137
|
+
fact.file = searched_fact.file
|
138
|
+
facts << fact
|
139
|
+
end
|
140
|
+
facts
|
141
|
+
end
|
142
|
+
|
101
143
|
def cache_fact(fact)
|
102
144
|
fact_name = if fact.file
|
103
145
|
File.basename(fact.file)
|
@@ -107,7 +149,7 @@ module Facter
|
|
107
149
|
|
108
150
|
group_name = @fact_groups.get_fact_group(fact_name)
|
109
151
|
|
110
|
-
return
|
152
|
+
return unless group_name
|
111
153
|
|
112
154
|
return unless fact_cache_enabled?(fact_name)
|
113
155
|
|
@@ -128,6 +170,8 @@ module Facter
|
|
128
170
|
next if File.readable?(cache_file_name)
|
129
171
|
|
130
172
|
@log.debug("caching values for #{group_name} facts")
|
173
|
+
|
174
|
+
data['cache_format_version'] = 1
|
131
175
|
File.write(cache_file_name, JSON.pretty_generate(data))
|
132
176
|
end
|
133
177
|
end
|
@@ -137,9 +181,9 @@ module Facter
|
|
137
181
|
|
138
182
|
cache_file_name = File.join(@cache_dir, group_name)
|
139
183
|
data = nil
|
140
|
-
file = Util::FileHelper.safe_read(cache_file_name)
|
184
|
+
file = Facter::Util::FileHelper.safe_read(cache_file_name)
|
141
185
|
begin
|
142
|
-
data = JSON.parse(file)
|
186
|
+
data = JSON.parse(file) unless file.nil?
|
143
187
|
rescue JSON::ParserError
|
144
188
|
delete_cache(group_name)
|
145
189
|
end
|
@@ -158,12 +202,13 @@ module Facter
|
|
158
202
|
File.delete(cache_file_name)
|
159
203
|
end
|
160
204
|
|
161
|
-
@log.debug("#{group_name} facts cache file expired
|
205
|
+
@log.debug("#{group_name} facts cache file expired, missing or is corrupt")
|
162
206
|
true
|
163
207
|
end
|
164
208
|
|
165
209
|
def delete_cache(group_name)
|
166
210
|
cache_file_name = File.join(@cache_dir, group_name)
|
211
|
+
|
167
212
|
File.delete(cache_file_name) if File.readable?(cache_file_name)
|
168
213
|
end
|
169
214
|
end
|
@@ -11,7 +11,12 @@ module Facter
|
|
11
11
|
|
12
12
|
return unless fact_class
|
13
13
|
|
14
|
-
|
14
|
+
fact_value = nil
|
15
|
+
Facter::Framework::Benchmarking::Timer.measure(@searched_fact.name) do
|
16
|
+
fact_value = fact_class.new.call_the_resolver
|
17
|
+
end
|
18
|
+
|
19
|
+
fact_value
|
15
20
|
end
|
16
21
|
end
|
17
22
|
end
|
@@ -7,7 +7,15 @@ module Facter
|
|
7
7
|
def resolve_facts(searched_facts)
|
8
8
|
internal_searched_facts = filter_internal_facts(searched_facts)
|
9
9
|
|
10
|
-
resolved_facts =
|
10
|
+
resolved_facts = if Options[:sequential]
|
11
|
+
@@log.debug('Resolving facts sequentially')
|
12
|
+
resolve_sequentially(internal_searched_facts)
|
13
|
+
else
|
14
|
+
@@log.debug('Resolving fact in parallel')
|
15
|
+
threads = start_threads(internal_searched_facts)
|
16
|
+
join_threads(threads, internal_searched_facts)
|
17
|
+
end
|
18
|
+
|
11
19
|
nil_resolved_facts = resolve_nil_facts(searched_facts)
|
12
20
|
|
13
21
|
resolved_facts.concat(nil_resolved_facts)
|
@@ -28,7 +36,7 @@ module Facter
|
|
28
36
|
resolved_facts
|
29
37
|
end
|
30
38
|
|
31
|
-
def
|
39
|
+
def resolve_sequentially(searched_facts)
|
32
40
|
resolved_facts = []
|
33
41
|
|
34
42
|
searched_facts
|
@@ -36,8 +44,7 @@ module Facter
|
|
36
44
|
.each do |searched_fact|
|
37
45
|
begin
|
38
46
|
fact = CoreFact.new(searched_fact)
|
39
|
-
fact_value =
|
40
|
-
Facter::Framework::Benchmarking::Timer.measure(searched_fact.name) { fact_value = fact.create }
|
47
|
+
fact_value = fact.create
|
41
48
|
resolved_facts << fact_value unless fact_value.nil?
|
42
49
|
rescue StandardError => e
|
43
50
|
@@log.log_exception(e)
|
@@ -47,5 +54,32 @@ module Facter
|
|
47
54
|
resolved_facts.flatten!
|
48
55
|
FactAugmenter.augment_resolved_facts(searched_facts, resolved_facts)
|
49
56
|
end
|
57
|
+
|
58
|
+
def start_threads(searched_facts)
|
59
|
+
# only resolve a fact once, even if multiple search facts depend on that fact
|
60
|
+
searched_facts
|
61
|
+
.uniq { |searched_fact| searched_fact.fact_class.name }
|
62
|
+
.map do |searched_fact|
|
63
|
+
Thread.new do
|
64
|
+
resolve_fact(searched_fact)
|
65
|
+
end
|
66
|
+
end
|
67
|
+
end
|
68
|
+
|
69
|
+
def join_threads(threads, searched_facts)
|
70
|
+
resolved_facts = threads.map(&:value)
|
71
|
+
resolved_facts.compact!
|
72
|
+
resolved_facts.flatten!
|
73
|
+
|
74
|
+
FactAugmenter.augment_resolved_facts(searched_facts, resolved_facts)
|
75
|
+
end
|
76
|
+
|
77
|
+
def resolve_fact(searched_fact)
|
78
|
+
fact = CoreFact.new(searched_fact)
|
79
|
+
fact.create
|
80
|
+
rescue StandardError => e
|
81
|
+
@@log.log_exception(e)
|
82
|
+
nil
|
83
|
+
end
|
50
84
|
end
|
51
85
|
end
|
@@ -16,7 +16,7 @@ module Facter
|
|
16
16
|
private_class_method def self.get_resolved_facts_for_searched_fact(searched_fact, resolved_facts)
|
17
17
|
if searched_fact.name.include?('.*')
|
18
18
|
resolved_facts
|
19
|
-
.select { |resolved_fact| resolved_fact.name.match(searched_fact.
|
19
|
+
.select { |resolved_fact| resolved_fact.name.match(searched_fact.name) }
|
20
20
|
.reject(&:user_query)
|
21
21
|
.uniq(&:name)
|
22
22
|
else
|
@@ -21,8 +21,9 @@ module Facter
|
|
21
21
|
|
22
22
|
custom_facts_to_load = LegacyFacter.collection.custom_facts
|
23
23
|
|
24
|
-
custom_facts_to_load&.each do |
|
25
|
-
loaded_fact = LoadedFact.new(
|
24
|
+
custom_facts_to_load&.each do |k, v|
|
25
|
+
loaded_fact = LoadedFact.new(k.to_s, nil, :custom)
|
26
|
+
loaded_fact.is_env = v.options[:is_env] if v.options[:is_env]
|
26
27
|
custom_facts << loaded_fact
|
27
28
|
end
|
28
29
|
|
@@ -37,6 +38,7 @@ module Facter
|
|
37
38
|
external_facts_to_load&.each do |k, v|
|
38
39
|
loaded_fact = LoadedFact.new(k.to_s, nil, :external)
|
39
40
|
loaded_fact.file = v.options[:file]
|
41
|
+
loaded_fact.is_env = v.options[:is_env]
|
40
42
|
external_facts << loaded_fact
|
41
43
|
end
|
42
44
|
|
@@ -24,11 +24,27 @@ module Facter
|
|
24
24
|
@internal_facts = load_internal_facts(options)
|
25
25
|
@external_facts = load_external_facts(options)
|
26
26
|
|
27
|
+
filter_env_facts
|
28
|
+
|
27
29
|
@facts = @internal_facts + @external_facts
|
28
30
|
end
|
29
31
|
|
30
32
|
private
|
31
33
|
|
34
|
+
def filter_env_facts
|
35
|
+
env_fact_names = @external_facts.select { |fact| fact.is_env == true }.map(&:name)
|
36
|
+
return unless env_fact_names.any?
|
37
|
+
|
38
|
+
@internal_facts.delete_if do |fact|
|
39
|
+
if env_fact_names.include?(fact.name)
|
40
|
+
@log.debug("Reading #{fact.name} fact from environment variable")
|
41
|
+
true
|
42
|
+
else
|
43
|
+
false
|
44
|
+
end
|
45
|
+
end
|
46
|
+
end
|
47
|
+
|
32
48
|
def load_internal_facts(options)
|
33
49
|
@log.debug('Loading internal facts')
|
34
50
|
internal_facts = []
|
@@ -84,7 +100,7 @@ module Facter
|
|
84
100
|
|
85
101
|
blocked_facts.each do |blocked|
|
86
102
|
facts.each do |fact|
|
87
|
-
next unless fact.name =~ /^#{blocked}
|
103
|
+
next unless fact.name =~ /^#{blocked}\..*|^#{blocked}$/
|
88
104
|
|
89
105
|
if fact.type == :core
|
90
106
|
reject_list_core << fact
|
@@ -17,8 +17,7 @@ module Facter
|
|
17
17
|
end
|
18
18
|
|
19
19
|
def resolve_facts(user_query = [])
|
20
|
-
|
21
|
-
searched_facts = QueryParser.parse(user_query, loaded_facts)
|
20
|
+
searched_facts = parse_user_query(user_query)
|
22
21
|
|
23
22
|
cache_manager = Facter::CacheManager.new
|
24
23
|
searched_facts, cached_facts = cache_manager.resolve_facts(searched_facts)
|
@@ -27,11 +26,12 @@ module Facter
|
|
27
26
|
|
28
27
|
resolved_facts = override_core_facts(internal_facts, external_facts)
|
29
28
|
|
30
|
-
cache_manager.cache_facts(resolved_facts)
|
31
29
|
resolved_facts = resolved_facts.concat(cached_facts)
|
30
|
+
cache_manager.cache_facts(resolved_facts)
|
32
31
|
|
33
32
|
FactFilter.new.filter_facts!(resolved_facts)
|
34
33
|
|
34
|
+
log_resolved_facts(resolved_facts)
|
35
35
|
resolved_facts
|
36
36
|
end
|
37
37
|
|
@@ -47,6 +47,12 @@ module Facter
|
|
47
47
|
|
48
48
|
private
|
49
49
|
|
50
|
+
def parse_user_query(user_query)
|
51
|
+
loaded_facts = @fact_loader.load(Options.get)
|
52
|
+
|
53
|
+
QueryParser.parse(user_query, loaded_facts)
|
54
|
+
end
|
55
|
+
|
50
56
|
def override_core_facts(core_facts, custom_facts)
|
51
57
|
return core_facts unless custom_facts
|
52
58
|
|
@@ -60,5 +66,11 @@ module Facter
|
|
60
66
|
def root_fact_name(fact)
|
61
67
|
fact.name.split('.').first
|
62
68
|
end
|
69
|
+
|
70
|
+
def log_resolved_facts(resolved_facts)
|
71
|
+
resolved_facts.each do |fact|
|
72
|
+
@log.debug("fact \"#{fact.name}\" has resolved to: #{fact.value}") unless fact.value.nil?
|
73
|
+
end
|
74
|
+
end
|
63
75
|
end
|
64
76
|
end
|
@@ -34,7 +34,11 @@ require 'facter/framework/config/fact_groups'
|
|
34
34
|
|
35
35
|
load_dir(['config'])
|
36
36
|
|
37
|
-
load_dir(
|
37
|
+
load_dir(['util'])
|
38
|
+
load_dir(%w[util resolvers])
|
39
|
+
load_dir(%w[util facts])
|
40
|
+
load_dir(%w[util resolvers networking])
|
41
|
+
|
38
42
|
load_dir(['resolvers'])
|
39
43
|
load_dir(['facts_utils'])
|
40
44
|
load_dir(%w[framework core])
|
@@ -47,12 +51,12 @@ load_dir(%w[framework core fact external])
|
|
47
51
|
load_dir(%w[framework formatters])
|
48
52
|
|
49
53
|
os_hierarchy = OsDetector.instance.hierarchy
|
54
|
+
os_hierarchy.each { |operating_system| load_dir(['util', operating_system.downcase, '**']) }
|
50
55
|
os_hierarchy.each { |operating_system| load_dir(['facts', operating_system.downcase, '**']) }
|
51
56
|
os_hierarchy.each { |operating_system| load_dir(['resolvers', operating_system.downcase, '**']) }
|
52
57
|
|
53
58
|
require 'facter/custom_facts/core/legacy_facter'
|
54
59
|
load_dir(%w[framework utils])
|
55
|
-
load_dir(['util'])
|
56
60
|
|
57
61
|
require 'facter/framework/core/fact_augmenter'
|
58
62
|
require 'facter/framework/parsers/query_parser'
|
@@ -19,14 +19,18 @@ module Facter
|
|
19
19
|
private
|
20
20
|
|
21
21
|
def augment_all
|
22
|
-
if Options.cli?
|
23
|
-
|
24
|
-
|
25
|
-
|
22
|
+
augment_cli(Facter::ConfigReader.cli) if Options.cli?
|
23
|
+
augment_globals
|
24
|
+
augment_facts(Facter::ConfigReader.ttls, Facter::ConfigReader.fact_groups)
|
25
|
+
end
|
26
|
+
|
27
|
+
def augment_globals
|
28
|
+
augment_ruby(Facter::ConfigReader.global)
|
29
|
+
|
26
30
|
augment_custom(Facter::ConfigReader.global)
|
27
31
|
augment_external(Facter::ConfigReader.global)
|
28
32
|
augment_show_legacy(Facter::ConfigReader.global)
|
29
|
-
|
33
|
+
augment_sequential(Facter::ConfigReader.global)
|
30
34
|
end
|
31
35
|
|
32
36
|
def augment_config_path(config_path)
|
@@ -68,6 +72,7 @@ module Facter
|
|
68
72
|
|
69
73
|
def augment_ruby(global_conf)
|
70
74
|
return unless global_conf
|
75
|
+
return unless Options.cli?
|
71
76
|
|
72
77
|
@options[:no_ruby] = global_conf['no-ruby'].nil? ? false : global_conf['no-ruby']
|
73
78
|
end
|
@@ -78,6 +83,12 @@ module Facter
|
|
78
83
|
@options[:show_legacy] = global_conf['show-legacy'] unless global_conf['show-legacy'].nil?
|
79
84
|
end
|
80
85
|
|
86
|
+
def augment_sequential(global_conf)
|
87
|
+
return unless global_conf
|
88
|
+
|
89
|
+
@options[:sequential] = global_conf['sequential'] unless global_conf['sequential'].nil?
|
90
|
+
end
|
91
|
+
|
81
92
|
def augment_facts(ttls, groups)
|
82
93
|
fact_groups = Facter::FactGroups.new
|
83
94
|
|