facter 4.0.26 → 4.0.28
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/actions/presuite.rb +1 -12
- data/.github/workflows/acceptance_tests.yml +4 -4
- data/.github/workflows/checks.yaml +9 -3
- data/.github/workflows/coverage.yaml +1 -1
- data/.github/workflows/unit_tests.yaml +2 -2
- data/.rubocop.yml +5 -0
- data/.rubocop_todo.yml +6 -4
- data/CHANGELOG.md +22 -0
- data/Rakefile +2 -1
- data/VERSION +1 -1
- data/acceptance/.beaker.yml +15 -0
- data/acceptance/.gitignore +12 -0
- data/acceptance/Gemfile +24 -0
- data/acceptance/Rakefile +2 -0
- data/acceptance/bin/ci-bootstrap-from-artifacts.sh +55 -0
- data/acceptance/config/aio/options.rb +6 -0
- data/acceptance/config/git/options.rb +3 -0
- data/acceptance/config/nodes/aix-53-power.yaml +7 -0
- data/acceptance/config/nodes/aix-61-power.yaml +7 -0
- data/acceptance/config/nodes/aix-71-power.yaml +7 -0
- data/acceptance/config/nodes/huaweios-6-powerpc.yaml +7 -0
- data/acceptance/config/nodes/solaris-10-sparc.yaml +9 -0
- data/acceptance/config/nodes/solaris-11-sparc.yaml +9 -0
- data/acceptance/lib/facter/acceptance/base_fact_utils.rb +565 -0
- data/acceptance/lib/facter/acceptance/user_fact_utils.rb +132 -0
- data/acceptance/lib/helper.rb +3 -0
- data/acceptance/lib/puppet/acceptance/common_utils.rb +10 -0
- data/acceptance/lib/puppet/acceptance/git_utils.rb +19 -0
- data/acceptance/lib/puppet/acceptance/install_utils.rb +58 -0
- data/acceptance/setup/aio/pre-suite/001_run_with_facter_ng.rb +75 -0
- data/acceptance/tests/custom_facts/cached_custom_fact.rb +82 -0
- data/acceptance/tests/custom_facts/conflicts_with_builtin_fact.rb +106 -0
- data/acceptance/tests/custom_facts/custom_fact_with_10001_weight_overrides_external_fact.rb +30 -0
- data/acceptance/tests/custom_facts/expand_command.rb +30 -0
- data/acceptance/tests/custom_facts/having_multiple_facts_in_one_file.rb +40 -0
- data/acceptance/tests/custom_facts/not_expand_command.rb +30 -0
- data/acceptance/tests/custom_facts/using_win32ole_should_not_hang.rb +33 -0
- data/acceptance/tests/custom_facts/weighted_cached_custom_facts.rb +94 -0
- data/acceptance/tests/custom_facts/windows_not_expand_command.rb +30 -0
- data/acceptance/tests/external_facts/env_var_overrides_external_fact.rb +46 -0
- data/acceptance/tests/external_facts/external_dir_overrides_default_external_fact.rb +34 -0
- data/acceptance/tests/external_facts/external_fact_overrides_custom_fact.rb +29 -0
- data/acceptance/tests/external_facts/external_fact_overrides_custom_fact_with_10000_weight_or_less.rb +30 -0
- data/acceptance/tests/external_facts/external_fact_overrides_custom_fact_with_confine.rb +35 -0
- data/acceptance/tests/external_facts/external_fact_stderr_messages_output_to_stderr.rb +49 -0
- data/acceptance/tests/external_facts/external_facts_only_run_once.rb +43 -0
- data/acceptance/tests/external_facts/fact_directory_precedence.rb +109 -0
- data/acceptance/tests/external_facts/handle_same_filename_in_different_dirs.rb +59 -0
- data/acceptance/tests/external_facts/non_root_users_default_external_fact_directory.rb +142 -0
- data/acceptance/tests/external_facts/root_uses_default_external_fact_dir.rb +34 -0
- data/acceptance/tests/external_facts/structured_executable_facts.rb +139 -0
- data/acceptance/tests/facter_returns_success_on_non_existent_fact.rb +9 -0
- data/acceptance/tests/facts/dmi.rb +51 -0
- data/acceptance/tests/facts/facterversion.rb +11 -0
- data/acceptance/tests/facts/identity.rb +52 -0
- data/acceptance/tests/facts/mountpoints_fact.rb +12 -0
- data/acceptance/tests/facts/networking_facts.rb +93 -0
- data/acceptance/tests/facts/nim_type.rb +12 -0
- data/acceptance/tests/facts/non_root_users_without_errors.rb +32 -0
- data/acceptance/tests/facts/operatingsystem_detection_after_clear_on_ubuntu.rb +26 -0
- data/acceptance/tests/facts/os_processors_and_kernel.rb +20 -0
- data/acceptance/tests/facts/osx_numeric_hostname.rb +23 -0
- data/acceptance/tests/facts/partitions.rb +37 -0
- data/acceptance/tests/facts/productname.rb +15 -0
- data/acceptance/tests/facts/ruby.rb +59 -0
- data/acceptance/tests/facts/ssh_key.rb +59 -0
- data/acceptance/tests/facts/validate_file_system_size_bytes.rb +37 -0
- data/acceptance/tests/facts/verify_tmpfs_file_system.rb +54 -0
- data/acceptance/tests/facts/windows_os.rb +64 -0
- data/acceptance/tests/load_libfacter.rb +66 -0
- data/acceptance/tests/no_errors_on_stderr.rb +10 -0
- data/acceptance/tests/options/color.rb +16 -0
- data/acceptance/tests/options/config.rb +27 -0
- data/acceptance/tests/options/config_file/blocklist.rb +35 -0
- data/acceptance/tests/options/config_file/blocklist_from_puppet_facts.rb +40 -0
- data/acceptance/tests/options/config_file/custom_dir_overridden_by_cli_custom_dir.rb +56 -0
- data/acceptance/tests/options/config_file/custom_facts.rb +42 -0
- data/acceptance/tests/options/config_file/custom_facts_list.rb +56 -0
- data/acceptance/tests/options/config_file/debug.rb +34 -0
- data/acceptance/tests/options/config_file/debug_override_config_file.rb +34 -0
- data/acceptance/tests/options/config_file/default_file_location.rb +37 -0
- data/acceptance/tests/options/config_file/external_dir_conflicts_with_cli_no_external_facts.rb +37 -0
- data/acceptance/tests/options/config_file/external_dir_overridden_by_cli_external_dir.rb +40 -0
- data/acceptance/tests/options/config_file/external_facts.rb +37 -0
- data/acceptance/tests/options/config_file/external_facts_list.rb +43 -0
- data/acceptance/tests/options/config_file/load_from_ruby.rb +73 -0
- data/acceptance/tests/options/config_file/log_level.rb +35 -0
- data/acceptance/tests/options/config_file/no_custom_facts_and_custom_dir.rb +43 -0
- data/acceptance/tests/options/config_file/no_custom_facts_and_facterlib.rb +43 -0
- data/acceptance/tests/options/config_file/no_custom_facts_and_load_path.rb +49 -0
- data/acceptance/tests/options/config_file/no_external_facts.rb +38 -0
- data/acceptance/tests/options/config_file/no_external_facts_and_external_dir.rb +34 -0
- data/acceptance/tests/options/config_file/no_ruby_disables_custom_facts.rb +52 -0
- data/acceptance/tests/options/config_file/no_ruby_disables_ruby_facts.rb +34 -0
- data/acceptance/tests/options/config_file/trace.rb +48 -0
- data/acceptance/tests/options/config_file/ttls_cached_external_execution_resolver_with_json_output.rb +92 -0
- data/acceptance/tests/options/config_file/ttls_cached_external_execution_resolver_with_text_output.rb +74 -0
- data/acceptance/tests/options/config_file/ttls_cached_external_execution_resolver_with_yaml_output.rb +88 -0
- data/acceptance/tests/options/config_file/ttls_cached_external_json_resolver.rb +79 -0
- data/acceptance/tests/options/config_file/ttls_cached_external_text_resolver.rb +78 -0
- data/acceptance/tests/options/config_file/ttls_cached_external_yaml_resolver.rb +78 -0
- data/acceptance/tests/options/config_file/ttls_cached_facts_clear_by_empty_ttls_cache_list.rb +71 -0
- data/acceptance/tests/options/config_file/ttls_cached_facts_creates_json_cache_file.rb +48 -0
- data/acceptance/tests/options/config_file/ttls_cached_facts_expire_facts_do_not_read_the_old_cached_value.rb +58 -0
- data/acceptance/tests/options/config_file/ttls_cached_facts_expire_facts_refresh_the_cached_value.rb +61 -0
- data/acceptance/tests/options/config_file/ttls_cached_facts_read_from_the_cached_value.rb +57 -0
- data/acceptance/tests/options/config_file/ttls_cached_facts_that_are_corrupt_are_refreshed.rb +53 -0
- data/acceptance/tests/options/config_file/ttls_cached_facts_that_are_empty_return_an_empty_value.rb +53 -0
- data/acceptance/tests/options/config_file/ttls_puppet_facts_creates_json_for_cached_facts.rb +45 -0
- data/acceptance/tests/options/config_file/ttls_puppet_facts_honors_cached_facts.rb +54 -0
- data/acceptance/tests/options/config_file/verbose.rb +34 -0
- data/acceptance/tests/options/custom_facts.rb +34 -0
- data/acceptance/tests/options/custom_facts_facterlib.rb +33 -0
- data/acceptance/tests/options/custom_facts_list.rb +48 -0
- data/acceptance/tests/options/custom_facts_load_path.rb +42 -0
- data/acceptance/tests/options/debug.rb +12 -0
- data/acceptance/tests/options/external_facts.rb +28 -0
- data/acceptance/tests/options/external_facts_list.rb +35 -0
- data/acceptance/tests/options/help.rb +13 -0
- data/acceptance/tests/options/json.rb +43 -0
- data/acceptance/tests/options/list_block_groups.rb +15 -0
- data/acceptance/tests/options/list_block_groups_facter_4.rb +15 -0
- data/acceptance/tests/options/list_cache_groups.rb +65 -0
- data/acceptance/tests/options/log_level.rb +13 -0
- data/acceptance/tests/options/no_block.rb +34 -0
- data/acceptance/tests/options/no_cache_should_not_cache_facts.rb +43 -0
- data/acceptance/tests/options/no_cache_should_not_load_cached_facts.rb +58 -0
- data/acceptance/tests/options/no_cache_should_not_refresh_cached_facts.rb +63 -0
- data/acceptance/tests/options/no_color.rb +16 -0
- data/acceptance/tests/options/no_custom_facts.rb +34 -0
- data/acceptance/tests/options/no_custom_facts_and_custom_dir.rb +19 -0
- data/acceptance/tests/options/no_custom_facts_and_facterlib.rb +34 -0
- data/acceptance/tests/options/no_custom_facts_and_load_path.rb +43 -0
- data/acceptance/tests/options/no_external_facts.rb +28 -0
- data/acceptance/tests/options/no_external_facts_and_external_dir.rb +19 -0
- data/acceptance/tests/options/no_ruby.rb +44 -0
- data/acceptance/tests/options/puppet_facts.rb +37 -0
- data/acceptance/tests/options/show_legacy.rb +18 -0
- data/acceptance/tests/options/strict.rb +11 -0
- data/acceptance/tests/options/trace.rb +36 -0
- data/acceptance/tests/options/verbose.rb +12 -0
- data/acceptance/tests/options/version.rb +12 -0
- data/acceptance/tests/options/yaml.rb +43 -0
- data/acceptance/tests/ticket_1123_facter_with_invalid_locale.rb +23 -0
- data/acceptance/tests/ticket_1238_hostname_fqdn.rb +57 -0
- data/lib/custom_facts/core/execution/base.rb +18 -18
- data/lib/custom_facts/util/collection.rb +2 -7
- data/lib/custom_facts/util/config.rb +1 -1
- data/lib/custom_facts/util/directory_loader.rb +51 -24
- data/lib/custom_facts/util/fact.rb +10 -1
- data/lib/custom_facts/util/resolution.rb +1 -1
- data/lib/facts/aix/aio_agent_version.rb +14 -0
- data/lib/facts/bsd/processors/count.rb +17 -0
- data/lib/facts/bsd/processors/models.rb +23 -0
- data/lib/facts/bsd/processors/speed.rb +17 -0
- data/lib/facts/freebsd/disks.rb +15 -0
- data/lib/facts/freebsd/partitions.rb +15 -0
- data/lib/facts/freebsd/processors/count.rb +17 -0
- data/lib/facts/freebsd/processors/models.rb +23 -0
- data/lib/facts/freebsd/processors/speed.rb +17 -0
- data/lib/facts/linux/aio_agent_version.rb +14 -0
- data/lib/facts/linux/ec2_metadata.rb +47 -0
- data/lib/facts/linux/ec2_userdata.rb +47 -0
- data/lib/facts/linux/is_virtual.rb +2 -5
- data/lib/facts/linux/virtual.rb +1 -5
- data/lib/facts/macosx/aio_agent_version.rb +14 -0
- data/lib/facts/macosx/interfaces.rb +2 -2
- data/lib/facts/macosx/networking/dhcp.rb +17 -0
- data/lib/facts/macosx/networking/interfaces.rb +21 -0
- data/lib/facts/macosx/networking/ip.rb +4 -1
- data/lib/facts/macosx/networking/ip6.rb +21 -0
- data/lib/facts/macosx/networking/mac.rb +4 -1
- data/lib/facts/macosx/networking/mtu.rb +20 -0
- data/lib/facts/macosx/networking/netmask.rb +21 -0
- data/lib/facts/macosx/networking/netmask6.rb +21 -0
- data/lib/facts/macosx/networking/network.rb +21 -0
- data/lib/facts/macosx/networking/network6.rb +21 -0
- data/lib/facts/macosx/networking/primary.rb +17 -0
- data/lib/facts/macosx/networking/scope6.rb +20 -0
- data/lib/facts/solaris/aio_agent_version.rb +14 -0
- data/lib/facts/windows/aio_agent_version.rb +14 -0
- data/lib/facts/windows/ec2_metadata.rb +23 -0
- data/lib/facts/windows/ec2_userdata.rb +23 -0
- data/lib/facts_utils/hypervisors.rb +10 -0
- data/lib/framework/core/cache_manager.rb +42 -18
- data/lib/framework/core/fact/external/external_fact_manager.rb +3 -2
- data/lib/framework/core/fact_loaders/external_fact_loader.rb +3 -2
- data/lib/framework/formatters/legacy_fact_formatter.rb +6 -5
- data/lib/framework/parsers/query_parser.rb +14 -2
- data/lib/models/loaded_fact.rb +3 -1
- data/lib/models/resolved_fact.rb +1 -1
- data/lib/models/searched_fact.rb +1 -0
- data/lib/resolvers/{agent_resolver.rb → aio_agent_version.rb} +4 -3
- data/lib/resolvers/bsd/ffi/ffi_helper.rb +31 -0
- data/lib/resolvers/bsd/processors.rb +47 -0
- data/lib/resolvers/ec2.rb +77 -0
- data/lib/resolvers/freebsd/ffi/ffi_helper.rb +42 -0
- data/lib/resolvers/freebsd/geom_resolver.rb +109 -0
- data/lib/resolvers/freebsd/processors.rb +44 -0
- data/lib/resolvers/macosx/networking.rb +110 -0
- data/lib/resolvers/networking_linux_resolver.rb +8 -30
- data/lib/resolvers/utils/networking.rb +70 -0
- data/lib/resolvers/windows/aio_agent_version.rb +56 -0
- metadata +175 -5
- data/lib/resolvers/macosx/ipaddress_resolver.rb +0 -52
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Facts
|
|
4
|
+
module Bsd
|
|
5
|
+
module Processors
|
|
6
|
+
class Speed
|
|
7
|
+
FACT_NAME = 'processors.speed'
|
|
8
|
+
|
|
9
|
+
def call_the_resolver
|
|
10
|
+
fact_value = Facter::Resolvers::Bsd::Processors.resolve(:speed)
|
|
11
|
+
speed = Facter::FactsUtils::UnitConverter.hertz_to_human_readable(fact_value)
|
|
12
|
+
Facter::ResolvedFact.new(FACT_NAME, speed)
|
|
13
|
+
end
|
|
14
|
+
end
|
|
15
|
+
end
|
|
16
|
+
end
|
|
17
|
+
end
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Facts
|
|
4
|
+
module Freebsd
|
|
5
|
+
class Disks
|
|
6
|
+
FACT_NAME = 'disks'
|
|
7
|
+
|
|
8
|
+
def call_the_resolver
|
|
9
|
+
disks = Facter::Resolvers::Freebsd::Geom.resolve(:disks)
|
|
10
|
+
|
|
11
|
+
Facter::ResolvedFact.new(FACT_NAME, disks)
|
|
12
|
+
end
|
|
13
|
+
end
|
|
14
|
+
end
|
|
15
|
+
end
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Facts
|
|
4
|
+
module Freebsd
|
|
5
|
+
class Partitions
|
|
6
|
+
FACT_NAME = 'partitions'
|
|
7
|
+
|
|
8
|
+
def call_the_resolver
|
|
9
|
+
partitions = Facter::Resolvers::Freebsd::Geom.resolve(:partitions)
|
|
10
|
+
|
|
11
|
+
Facter::ResolvedFact.new(FACT_NAME, partitions)
|
|
12
|
+
end
|
|
13
|
+
end
|
|
14
|
+
end
|
|
15
|
+
end
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Facts
|
|
4
|
+
module Freebsd
|
|
5
|
+
module Processors
|
|
6
|
+
class Count
|
|
7
|
+
FACT_NAME = 'processors.count'
|
|
8
|
+
ALIASES = 'processorcount'
|
|
9
|
+
|
|
10
|
+
def call_the_resolver
|
|
11
|
+
fact_value = Facter::Resolvers::Freebsd::Processors.resolve(:logical_count)
|
|
12
|
+
[Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
|
|
13
|
+
end
|
|
14
|
+
end
|
|
15
|
+
end
|
|
16
|
+
end
|
|
17
|
+
end
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Facts
|
|
4
|
+
module Freebsd
|
|
5
|
+
module Processors
|
|
6
|
+
class Models
|
|
7
|
+
FACT_NAME = 'processors.models'
|
|
8
|
+
ALIASES = 'processor.*'
|
|
9
|
+
|
|
10
|
+
def call_the_resolver
|
|
11
|
+
fact_value = Facter::Resolvers::Freebsd::Processors.resolve(:models)
|
|
12
|
+
return nil unless fact_value
|
|
13
|
+
|
|
14
|
+
facts = [Facter::ResolvedFact.new(FACT_NAME, fact_value)]
|
|
15
|
+
fact_value.each_with_index do |value, index|
|
|
16
|
+
facts.push(Facter::ResolvedFact.new("processor#{index}", value, :legacy))
|
|
17
|
+
end
|
|
18
|
+
facts
|
|
19
|
+
end
|
|
20
|
+
end
|
|
21
|
+
end
|
|
22
|
+
end
|
|
23
|
+
end
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Facts
|
|
4
|
+
module Freebsd
|
|
5
|
+
module Processors
|
|
6
|
+
class Speed
|
|
7
|
+
FACT_NAME = 'processors.speed'
|
|
8
|
+
|
|
9
|
+
def call_the_resolver
|
|
10
|
+
fact_value = Facter::Resolvers::Freebsd::Processors.resolve(:speed)
|
|
11
|
+
speed = Facter::FactsUtils::UnitConverter.hertz_to_human_readable(fact_value)
|
|
12
|
+
Facter::ResolvedFact.new(FACT_NAME, speed)
|
|
13
|
+
end
|
|
14
|
+
end
|
|
15
|
+
end
|
|
16
|
+
end
|
|
17
|
+
end
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Facts
|
|
4
|
+
module Linux
|
|
5
|
+
class AioAgentVersion
|
|
6
|
+
FACT_NAME = 'aio_agent_version'
|
|
7
|
+
|
|
8
|
+
def call_the_resolver
|
|
9
|
+
fact_value = Facter::Resolvers::AioAgentVersion.resolve(:aio_agent_version)
|
|
10
|
+
Facter::ResolvedFact.new(FACT_NAME, fact_value)
|
|
11
|
+
end
|
|
12
|
+
end
|
|
13
|
+
end
|
|
14
|
+
end
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Facts
|
|
4
|
+
module Linux
|
|
5
|
+
class Ec2Metadata
|
|
6
|
+
FACT_NAME = 'ec2_metadata'
|
|
7
|
+
|
|
8
|
+
def call_the_resolver
|
|
9
|
+
return Facter::ResolvedFact.new(FACT_NAME, nil) unless aws?
|
|
10
|
+
|
|
11
|
+
fact_value = Facter::Resolvers::Ec2.resolve(:metadata)
|
|
12
|
+
|
|
13
|
+
Facter::ResolvedFact.new(FACT_NAME, fact_value.empty? ? nil : fact_value)
|
|
14
|
+
end
|
|
15
|
+
|
|
16
|
+
def aws?
|
|
17
|
+
virtual = check_virt_what || check_xen || check_product_name || check_bios_vendor || check_lspci
|
|
18
|
+
|
|
19
|
+
virtual == 'kvm' || virtual =~ /xen/
|
|
20
|
+
end
|
|
21
|
+
|
|
22
|
+
def check_virt_what
|
|
23
|
+
Facter::Resolvers::VirtWhat.resolve(:vm)
|
|
24
|
+
end
|
|
25
|
+
|
|
26
|
+
def check_xen
|
|
27
|
+
Facter::Resolvers::Xen.resolve(:vm)
|
|
28
|
+
end
|
|
29
|
+
|
|
30
|
+
def check_product_name
|
|
31
|
+
product_name = Facter::Resolvers::Linux::DmiBios.resolve(:product_name)
|
|
32
|
+
return unless product_name
|
|
33
|
+
|
|
34
|
+
Facter::FactsUtils::HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
|
|
35
|
+
end
|
|
36
|
+
|
|
37
|
+
def check_bios_vendor
|
|
38
|
+
bios_vendor = Facter::Resolvers::Linux::DmiBios.resolve(:bios_vendor)
|
|
39
|
+
return 'kvm' if bios_vendor&.include?('Amazon EC2')
|
|
40
|
+
end
|
|
41
|
+
|
|
42
|
+
def check_lspci
|
|
43
|
+
Facter::Resolvers::Lspci.resolve(:vm)
|
|
44
|
+
end
|
|
45
|
+
end
|
|
46
|
+
end
|
|
47
|
+
end
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Facts
|
|
4
|
+
module Linux
|
|
5
|
+
class Ec2Userdata
|
|
6
|
+
FACT_NAME = 'ec2_userdata'
|
|
7
|
+
|
|
8
|
+
def call_the_resolver
|
|
9
|
+
return Facter::ResolvedFact.new(FACT_NAME, nil) unless aws?
|
|
10
|
+
|
|
11
|
+
fact_value = Facter::Resolvers::Ec2.resolve(:userdata)
|
|
12
|
+
|
|
13
|
+
Facter::ResolvedFact.new(FACT_NAME, fact_value.empty? ? nil : fact_value)
|
|
14
|
+
end
|
|
15
|
+
|
|
16
|
+
def aws?
|
|
17
|
+
virtual = check_virt_what || check_xen || check_product_name || check_bios_vendor || check_lspci
|
|
18
|
+
|
|
19
|
+
virtual == 'kvm' || virtual =~ /xen/
|
|
20
|
+
end
|
|
21
|
+
|
|
22
|
+
def check_virt_what
|
|
23
|
+
Facter::Resolvers::VirtWhat.resolve(:vm)
|
|
24
|
+
end
|
|
25
|
+
|
|
26
|
+
def check_xen
|
|
27
|
+
Facter::Resolvers::Xen.resolve(:vm)
|
|
28
|
+
end
|
|
29
|
+
|
|
30
|
+
def check_product_name
|
|
31
|
+
product_name = Facter::Resolvers::Linux::DmiBios.resolve(:product_name)
|
|
32
|
+
return unless product_name
|
|
33
|
+
|
|
34
|
+
Facter::FactsUtils::HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
|
|
35
|
+
end
|
|
36
|
+
|
|
37
|
+
def check_bios_vendor
|
|
38
|
+
bios_vendor = Facter::Resolvers::Linux::DmiBios.resolve(:bios_vendor)
|
|
39
|
+
return 'kvm' if bios_vendor&.include?('Amazon EC2')
|
|
40
|
+
end
|
|
41
|
+
|
|
42
|
+
def check_lspci
|
|
43
|
+
Facter::Resolvers::Lspci.resolve(:vm)
|
|
44
|
+
end
|
|
45
|
+
end
|
|
46
|
+
end
|
|
47
|
+
end
|
|
@@ -4,10 +4,7 @@ module Facts
|
|
|
4
4
|
module Linux
|
|
5
5
|
class IsVirtual
|
|
6
6
|
FACT_NAME = 'is_virtual'
|
|
7
|
-
|
|
8
|
-
'KVM' => 'kvm', 'Virtual Machine' => 'hyperv', 'RHEV Hypervisor' => 'rhev',
|
|
9
|
-
'oVirt Node' => 'ovirt', 'HVM domU' => 'xenhvm', 'Bochs' => 'bochs', 'OpenBSD' => 'vmm',
|
|
10
|
-
'BHYVE' => 'bhyve' }.freeze
|
|
7
|
+
|
|
11
8
|
PHYSICAL_HYPERVISORS = %w[physical xen0 vmware_server vmware_workstation openvzhn vserver_host].freeze
|
|
12
9
|
|
|
13
10
|
def call_the_resolver # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
|
|
@@ -52,7 +49,7 @@ module Facts
|
|
|
52
49
|
return 'kvm' if bios_vendor&.include?('Amazon EC2')
|
|
53
50
|
return unless product_name
|
|
54
51
|
|
|
55
|
-
HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
|
|
52
|
+
Facter::FactsUtils::HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
|
|
56
53
|
end
|
|
57
54
|
|
|
58
55
|
def check_lspci
|
data/lib/facts/linux/virtual.rb
CHANGED
|
@@ -4,10 +4,6 @@ module Facts
|
|
|
4
4
|
module Linux
|
|
5
5
|
class Virtual
|
|
6
6
|
FACT_NAME = 'virtual'
|
|
7
|
-
HYPERVISORS_HASH = { 'VMware' => 'vmware', 'VirtualBox' => 'virtualbox', 'Parallels' => 'parallels',
|
|
8
|
-
'KVM' => 'kvm', 'Virtual Machine' => 'hyperv', 'RHEV Hypervisor' => 'rhev',
|
|
9
|
-
'oVirt Node' => 'ovirt', 'HVM domU' => 'xenhvm', 'Bochs' => 'bochs', 'OpenBSD' => 'vmm',
|
|
10
|
-
'BHYVE' => 'bhyve' }.freeze
|
|
11
7
|
|
|
12
8
|
def call_the_resolver # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
|
|
13
9
|
fact_value = check_docker_lxc || check_gce || retrieve_from_virt_what || check_vmware
|
|
@@ -51,7 +47,7 @@ module Facts
|
|
|
51
47
|
return 'kvm' if bios_vendor&.include?('Amazon EC2')
|
|
52
48
|
return unless product_name
|
|
53
49
|
|
|
54
|
-
HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
|
|
50
|
+
Facter::FactsUtils::HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
|
|
55
51
|
end
|
|
56
52
|
|
|
57
53
|
def check_lspci
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Facts
|
|
4
|
+
module Macosx
|
|
5
|
+
class AioAgentVersion
|
|
6
|
+
FACT_NAME = 'aio_agent_version'
|
|
7
|
+
|
|
8
|
+
def call_the_resolver
|
|
9
|
+
fact_value = Facter::Resolvers::AioAgentVersion.resolve(:aio_agent_version)
|
|
10
|
+
Facter::ResolvedFact.new(FACT_NAME, fact_value)
|
|
11
|
+
end
|
|
12
|
+
end
|
|
13
|
+
end
|
|
14
|
+
end
|
|
@@ -6,9 +6,9 @@ module Facts
|
|
|
6
6
|
FACT_NAME = 'interfaces'
|
|
7
7
|
|
|
8
8
|
def call_the_resolver
|
|
9
|
-
fact_value = Facter::Resolvers::Macosx::
|
|
9
|
+
fact_value = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
|
|
10
10
|
|
|
11
|
-
Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
|
|
11
|
+
Facter::ResolvedFact.new(FACT_NAME, fact_value ? fact_value.keys.sort.join(',') : nil, :legacy)
|
|
12
12
|
end
|
|
13
13
|
end
|
|
14
14
|
end
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Facts
|
|
4
|
+
module Macosx
|
|
5
|
+
module Networking
|
|
6
|
+
class Dhcp
|
|
7
|
+
FACT_NAME = 'networking.dhcp'
|
|
8
|
+
|
|
9
|
+
def call_the_resolver
|
|
10
|
+
fact_value = Facter::Resolvers::Macosx::Networking.resolve(:dhcp)
|
|
11
|
+
|
|
12
|
+
Facter::ResolvedFact.new(FACT_NAME, fact_value)
|
|
13
|
+
end
|
|
14
|
+
end
|
|
15
|
+
end
|
|
16
|
+
end
|
|
17
|
+
end
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Facts
|
|
4
|
+
module Macosx
|
|
5
|
+
module Networking
|
|
6
|
+
class Interfaces
|
|
7
|
+
FACT_NAME = 'networking.interfaces'
|
|
8
|
+
|
|
9
|
+
def call_the_resolver
|
|
10
|
+
interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
|
|
11
|
+
dhcp = Facter::Resolvers::Macosx::Networking.resolve(:dhcp)
|
|
12
|
+
primary = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
|
|
13
|
+
|
|
14
|
+
interfaces[primary][:dhcp] = dhcp if interfaces && interfaces[primary]
|
|
15
|
+
|
|
16
|
+
Facter::ResolvedFact.new(FACT_NAME, interfaces)
|
|
17
|
+
end
|
|
18
|
+
end
|
|
19
|
+
end
|
|
20
|
+
end
|
|
21
|
+
end
|
|
@@ -8,7 +8,10 @@ module Facts
|
|
|
8
8
|
ALIASES = 'ipaddress'
|
|
9
9
|
|
|
10
10
|
def call_the_resolver
|
|
11
|
-
|
|
11
|
+
interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
|
|
12
|
+
primary = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
|
|
13
|
+
|
|
14
|
+
fact_value = interfaces.dig(primary, :ip) unless interfaces.nil?
|
|
12
15
|
|
|
13
16
|
[Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
|
|
14
17
|
end
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Facts
|
|
4
|
+
module Macosx
|
|
5
|
+
module Networking
|
|
6
|
+
class Ip6
|
|
7
|
+
FACT_NAME = 'networking.ip6'
|
|
8
|
+
ALIASES = 'ipaddress6'
|
|
9
|
+
|
|
10
|
+
def call_the_resolver
|
|
11
|
+
interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
|
|
12
|
+
primary = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
|
|
13
|
+
|
|
14
|
+
fact_value = interfaces.dig(primary, :ip6) unless interfaces.nil?
|
|
15
|
+
|
|
16
|
+
[Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
|
|
17
|
+
end
|
|
18
|
+
end
|
|
19
|
+
end
|
|
20
|
+
end
|
|
21
|
+
end
|
|
@@ -8,7 +8,10 @@ module Facts
|
|
|
8
8
|
ALIASES = 'macaddress'
|
|
9
9
|
|
|
10
10
|
def call_the_resolver
|
|
11
|
-
|
|
11
|
+
interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
|
|
12
|
+
primary = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
|
|
13
|
+
|
|
14
|
+
fact_value = interfaces.dig(primary, :mac) unless interfaces.nil?
|
|
12
15
|
|
|
13
16
|
[Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
|
|
14
17
|
end
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Facts
|
|
4
|
+
module Macosx
|
|
5
|
+
module Networking
|
|
6
|
+
class Mtu
|
|
7
|
+
FACT_NAME = 'networking.mtu'
|
|
8
|
+
|
|
9
|
+
def call_the_resolver
|
|
10
|
+
interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
|
|
11
|
+
primary = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
|
|
12
|
+
|
|
13
|
+
fact_value = interfaces.dig(primary, :mtu) unless interfaces.nil?
|
|
14
|
+
|
|
15
|
+
Facter::ResolvedFact.new(FACT_NAME, fact_value)
|
|
16
|
+
end
|
|
17
|
+
end
|
|
18
|
+
end
|
|
19
|
+
end
|
|
20
|
+
end
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Facts
|
|
4
|
+
module Macosx
|
|
5
|
+
module Networking
|
|
6
|
+
class Netmask
|
|
7
|
+
FACT_NAME = 'networking.netmask'
|
|
8
|
+
ALIASES = 'netmask'
|
|
9
|
+
|
|
10
|
+
def call_the_resolver
|
|
11
|
+
interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
|
|
12
|
+
primary = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
|
|
13
|
+
|
|
14
|
+
fact_value = interfaces.dig(primary, :netmask) unless interfaces.nil?
|
|
15
|
+
|
|
16
|
+
[Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
|
|
17
|
+
end
|
|
18
|
+
end
|
|
19
|
+
end
|
|
20
|
+
end
|
|
21
|
+
end
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module Facts
|
|
4
|
+
module Macosx
|
|
5
|
+
module Networking
|
|
6
|
+
class Netmask6
|
|
7
|
+
FACT_NAME = 'networking.netmask6'
|
|
8
|
+
ALIASES = 'netmask6'
|
|
9
|
+
|
|
10
|
+
def call_the_resolver
|
|
11
|
+
interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
|
|
12
|
+
primary = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
|
|
13
|
+
|
|
14
|
+
fact_value = interfaces.dig(primary, :netmask6) unless interfaces.nil?
|
|
15
|
+
|
|
16
|
+
[Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
|
|
17
|
+
end
|
|
18
|
+
end
|
|
19
|
+
end
|
|
20
|
+
end
|
|
21
|
+
end
|