facter 4.0.43 → 4.0.49
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 +65 -9
- data/lib/facter/config.rb +385 -0
- data/lib/facter/custom_facts/core/aggregate.rb +7 -0
- data/lib/facter/custom_facts/core/execution.rb +28 -4
- 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 +39 -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 +2 -2
- 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/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 +20 -6
- 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} +3 -2
- 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} +6 -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 +13 -12
- data/lib/facter/resolvers/solaris/networking.rb +50 -43
- 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 +106 -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 -62
- data/lib/facter/resolvers/networking_linux_resolver.rb +0 -159
- 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
@@ -8,7 +8,7 @@ module Facts
|
|
8
8
|
|
9
9
|
def call_the_resolver
|
10
10
|
facts = []
|
11
|
-
result = Facter::Resolvers::
|
11
|
+
result = Facter::Resolvers::Ssh.resolve(:ssh)
|
12
12
|
result.each do |ssh|
|
13
13
|
facts << Facter::ResolvedFact.new("sshfp_#{ssh.name.to_sym}",
|
14
14
|
"#{ssh.fingerprint.sha1}\n#{ssh.fingerprint.sha256}", :legacy)
|
@@ -51,7 +51,7 @@ module Facts
|
|
51
51
|
|
52
52
|
return unless product_name
|
53
53
|
|
54
|
-
Facter::
|
54
|
+
Facter::Util::Facts::HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
|
55
55
|
|
56
56
|
nil
|
57
57
|
end
|
@@ -10,7 +10,7 @@ module Facts
|
|
10
10
|
|
11
11
|
def call_the_resolver
|
12
12
|
fact_value = Facter::Resolvers::Memory.resolve(:available_bytes)
|
13
|
-
fact_value = Facter::
|
13
|
+
fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
|
14
14
|
|
15
15
|
[Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
|
16
16
|
end
|
@@ -12,7 +12,7 @@ module Facts
|
|
12
12
|
fact_value = Facter::Resolvers::Memory.resolve(:available_bytes)
|
13
13
|
|
14
14
|
[Facter::ResolvedFact.new(FACT_NAME, fact_value),
|
15
|
-
Facter::ResolvedFact.new(ALIASES, Facter::
|
15
|
+
Facter::ResolvedFact.new(ALIASES, Facter::Util::Facts::UnitConverter.bytes_to_mb(fact_value), :legacy)]
|
16
16
|
end
|
17
17
|
end
|
18
18
|
end
|
@@ -10,7 +10,7 @@ module Facts
|
|
10
10
|
|
11
11
|
def call_the_resolver
|
12
12
|
fact_value = Facter::Resolvers::Memory.resolve(:total_bytes)
|
13
|
-
fact_value = Facter::
|
13
|
+
fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
|
14
14
|
|
15
15
|
[Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
|
16
16
|
end
|
@@ -12,7 +12,7 @@ module Facts
|
|
12
12
|
fact_value = Facter::Resolvers::Memory.resolve(:total_bytes)
|
13
13
|
|
14
14
|
[Facter::ResolvedFact.new(FACT_NAME, fact_value),
|
15
|
-
Facter::ResolvedFact.new(ALIASES, Facter::
|
15
|
+
Facter::ResolvedFact.new(ALIASES, Facter::Util::Facts::UnitConverter.bytes_to_mb(fact_value), :legacy)]
|
16
16
|
end
|
17
17
|
end
|
18
18
|
end
|
@@ -9,7 +9,7 @@ module Facts
|
|
9
9
|
|
10
10
|
def call_the_resolver
|
11
11
|
fact_value = Facter::Resolvers::Memory.resolve(:used_bytes)
|
12
|
-
fact_value = Facter::
|
12
|
+
fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
|
13
13
|
|
14
14
|
Facter::ResolvedFact.new(FACT_NAME, fact_value)
|
15
15
|
end
|
@@ -12,7 +12,7 @@ module Facts
|
|
12
12
|
hostname = Facter::Resolvers::Hostname.resolve(:hostname)
|
13
13
|
return Facter::ResolvedFact.new(FACT_NAME, nil) if !hostname || hostname.empty?
|
14
14
|
|
15
|
-
fact_value = [hostname, domain].compact.join('.')
|
15
|
+
fact_value = domain && !domain.empty? ? [hostname, domain].compact.join('.') : hostname
|
16
16
|
|
17
17
|
[Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
|
18
18
|
end
|
@@ -16,7 +16,7 @@ module Facts
|
|
16
16
|
kernel_version: kernel_resolver(:kernelversion)
|
17
17
|
}
|
18
18
|
|
19
|
-
fact_value = Facter::WindowsReleaseFinder.find_release(input)
|
19
|
+
fact_value = Facter::Util::Facts::WindowsReleaseFinder.find_release(input)
|
20
20
|
arr << Facter::ResolvedFact.new(FACT_NAME, ({ full: fact_value, major: fact_value } if fact_value))
|
21
21
|
ALIASES.each { |aliass| arr << Facter::ResolvedFact.new(aliass, fact_value, :legacy) }
|
22
22
|
arr
|
@@ -7,11 +7,13 @@ module Facter
|
|
7
7
|
module Benchmarking
|
8
8
|
class Timer
|
9
9
|
class << self
|
10
|
-
def measure(fact_name)
|
10
|
+
def measure(fact_name, prefix_message = '')
|
11
11
|
if Options[:timing]
|
12
12
|
time = Benchmark.measure { yield }
|
13
13
|
|
14
|
-
|
14
|
+
log = "fact '#{fact_name}', took: #{time.format('%r')} seconds"
|
15
|
+
prefix_message = "#{prefix_message} " unless prefix_message.empty?
|
16
|
+
puts "#{prefix_message}#{log}"
|
15
17
|
else
|
16
18
|
yield
|
17
19
|
end
|
@@ -79,11 +79,6 @@ module Facter
|
|
79
79
|
type: :boolean,
|
80
80
|
desc: 'Show legacy facts when querying all facts.'
|
81
81
|
|
82
|
-
class_option :puppet,
|
83
|
-
type: :boolean,
|
84
|
-
aliases: '-p',
|
85
|
-
desc: 'Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.'
|
86
|
-
|
87
82
|
class_option :yaml,
|
88
83
|
aliases: '-y',
|
89
84
|
type: :boolean,
|
@@ -98,6 +93,10 @@ module Facter
|
|
98
93
|
aliases: '-t',
|
99
94
|
desc: 'Show how much time it took to resolve each fact'
|
100
95
|
|
96
|
+
class_option :sequential,
|
97
|
+
type: :boolean,
|
98
|
+
desc: 'Resolve facts sequentially'
|
99
|
+
|
101
100
|
desc '--man', 'Display manual.', hide: true
|
102
101
|
map ['--man'] => :man
|
103
102
|
def man(*args)
|
@@ -157,6 +156,20 @@ module Facter
|
|
157
156
|
puts cache_groups
|
158
157
|
end
|
159
158
|
|
159
|
+
desc '--puppet, -p', '(NOT SUPPORTED)Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.'
|
160
|
+
map ['--puppet', '-p'] => :puppet
|
161
|
+
def puppet(*args)
|
162
|
+
log = Log.new(self)
|
163
|
+
log.warn('`facter --puppet` and `facter -p` are no longer supported, use `puppet facts show` instead')
|
164
|
+
log.warn('the output does not contain puppet facts!')
|
165
|
+
|
166
|
+
output, status = Facter.to_user_output(@options, *args)
|
167
|
+
puts output
|
168
|
+
|
169
|
+
status = 1 if Facter::Log.errors?
|
170
|
+
exit status
|
171
|
+
end
|
172
|
+
|
160
173
|
desc 'help', 'Help for all arguments'
|
161
174
|
def help(*args)
|
162
175
|
help_string = +''
|
@@ -171,7 +184,7 @@ module Facter
|
|
171
184
|
def help_header(_args)
|
172
185
|
path = File.join(File.dirname(__FILE__), '../../')
|
173
186
|
|
174
|
-
Util::FileHelper.safe_read("#{path}fixtures/facter_help_header")
|
187
|
+
Facter::Util::FileHelper.safe_read("#{path}fixtures/facter_help_header")
|
175
188
|
end
|
176
189
|
|
177
190
|
IGNORE_OPTIONS = %w[log_level color no_color].freeze
|
@@ -201,6 +214,7 @@ module Facter
|
|
201
214
|
end
|
202
215
|
|
203
216
|
def build_option(name, aliases, description)
|
217
|
+
name = name.tr('_', '-')
|
204
218
|
help_option = +''
|
205
219
|
help_option << aliases.join(',').rjust(10)
|
206
220
|
help_option << ' '
|
@@ -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
|