facter 4.0.34 → 4.0.35

data/lib/facter/facts/windows/interfaces.rb

@@ -6,7 +6,7 @@ module Facts
       FACT_NAME = 'interfaces'
 
       def call_the_resolver
-        fact_value = Facter::Resolvers::Networking.resolve(:interfaces)
+        fact_value = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
 
         Facter::ResolvedFact.new(FACT_NAME, fact_value ? fact_value.keys.join(',') : nil, :legacy)
       end

data/lib/facter/facts/windows/ipaddress6_interfaces.rb

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("ipaddress6_#{interface_name}", info[:ip6], :legacy) if info[:ip6]
         end

data/lib/facter/facts/windows/ipaddress_interfaces.rb

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("ipaddress_#{interface_name}", info[:ip], :legacy) if info[:ip]
         end

data/lib/facter/facts/windows/macaddress_interfaces.rb

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("macaddress_#{interface_name}", info[:mac], :legacy) if info[:mac]
         end

data/lib/facter/facts/windows/mtu_interfaces.rb

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("mtu_#{interface_name}", info[:mtu], :legacy) if info[:mtu]
         end

data/lib/facter/facts/windows/netmask6_interfaces.rb

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("netmask6_#{interface_name}", info[:netmask6], :legacy) if info[:netmask6]
         end

data/lib/facter/facts/windows/netmask_interfaces.rb

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("netmask_#{interface_name}", info[:netmask], :legacy) if info[:netmask]
         end

data/lib/facter/facts/windows/network6_interfaces.rb

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("network6_#{interface_name}", info[:network6], :legacy) if info[:network6]
         end

data/lib/facter/facts/windows/network_interfaces.rb

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("network_#{interface_name}", info[:network], :legacy) if info[:network]
         end

data/lib/facter/facts/windows/networking/dhcp.rb

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'networking.dhcp'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:dhcp)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:dhcp)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/windows/networking/domain.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'domain'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:domain)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:domain)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/windows/networking/fqdn.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'fqdn'
 
         def call_the_resolver
-          domain = Facter::Resolvers::Networking.resolve(:domain)
+          domain = Facter::Resolvers::Windows::Networking.resolve(:domain)
           hostname = Facter::Resolvers::Hostname.resolve(:hostname)
           return Facter::ResolvedFact.new(FACT_NAME, nil) if !hostname || hostname.empty?
 

data/lib/facter/facts/windows/networking/interfaces.rb

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'networking.interfaces'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:interfaces)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/windows/networking/ip.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'ipaddress'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:ip)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:ip)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/windows/networking/ip6.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'ipaddress6'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:ip6)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:ip6)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/windows/networking/mac.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'macaddress'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:mac)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:mac)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/windows/networking/mtu.rb

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'networking.mtu'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:mtu)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:mtu)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/windows/networking/netmask.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'netmask'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:netmask)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:netmask)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/windows/networking/netmask6.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'netmask6'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:netmask6)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:netmask6)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/windows/networking/network.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'network'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:network)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:network)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/windows/networking/network6.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'network6'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:network6)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:network6)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/windows/networking/primary.rb

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'networking.primary'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:primary_interface)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:primary_interface)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/windows/networking/scope6.rb

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'networking.scope6'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:scope6)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:scope6)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/windows/scope6_interfaces.rb

@@ -9,7 +9,7 @@ module Facts
       def call_the_resolver
         arr = []
         result = {}
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
         interfaces&.each { |interface_name, info| result["scope6_#{interface_name}"] = info[:scope6] if info[:scope6] }
 
         result.each { |fact, value| arr << Facter::ResolvedFact.new(fact, value, :legacy) }

data/lib/facter/framework/cli/cli.rb

@@ -138,14 +138,26 @@ module Facter
 
     desc '--list-block-groups', 'List block groups', hide: true
     map ['--list-block-groups'] => :list_block_groups
-    def list_block_groups(*_args)
-      puts Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
+    def list_block_groups(*args)
+      options = @options.map { |(k, v)| [k.to_sym, v] }.to_h
+      Facter::Options.init_from_cli(options, args)
+
+      block_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
+      block_groups.gsub!(/:\s*\n/, "\n")
+
+      puts block_groups
     end
 
     desc '--list-cache-groups', 'List cache groups', hide: true
     map ['--list-cache-groups'] => :list_cache_groups
-    def list_cache_groups(*_args)
-      puts Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
+    def list_cache_groups(*args)
+      options = @options.map { |(k, v)| [k.to_sym, v] }.to_h
+      Facter::Options.init_from_cli(options, args)
+
+      cache_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
+      cache_groups.gsub!(/:\s*\n/, "\n")
+
+      puts cache_groups
     end
 
     def self.exit_on_failure?

data/lib/facter/framework/config/fact_groups.rb

@@ -13,6 +13,7 @@ module Facter
       @groups_file_path = group_list_path || default_path
       @groups ||= File.readable?(@groups_file_path) ? Hocon.load(@groups_file_path) : {}
       load_groups
+      load_groups_from_options
     end
 
     # Breakes down blocked groups in blocked facts
@@ -42,6 +43,18 @@ module Facter
 
     private
 
+    def load_groups_from_options
+      Options.external_dir.each do |dir|
+        next unless Dir.exist?(dir)
+
+        ext_facts = Dir.entries(dir)
+        ext_facts.reject! { |ef| ef =~ /^(\.|\.\.)$/ }
+        ext_facts.each do |ef|
+          @groups[ef] = nil
+        end
+      end
+    end
+
     def load_groups
       config = ConfigReader.init(Options[:config])
       @block_list = config.block_list || {}

data/lib/facter/os_hierarchy.json

@@ -25,14 +25,11 @@
     ]
   },
   {
-    "Solaris": [
-      {
-        "Bsd": [
-          "Freebsd"
-        ]
-      }
+    "Bsd": [
+      "Freebsd"
     ]
   },
+  "Solaris",
   "Macosx",
   "Windows",
   "Aix"

data/lib/facter/resolvers/base_resolver.rb

@@ -20,7 +20,7 @@ module Facter
           subscribe_to_manager
           post_resolve(fact_name)
         end
-      rescue LoadError => e
+      rescue LoadError, NameError => e
         log.debug("resolving fact #{fact_name}, but #{e}")
         @fact_list[fact_name] = nil
       end

data/lib/facter/resolvers/ec2.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'net/http'
-
 module Facter
   module Resolvers
     class Ec2 < BaseResolver
@@ -52,6 +50,8 @@ module Facter
         end
 
         def get_data_from(url)
+          require 'net/http'
+
           parsed_url = URI.parse(url)
           http = Net::HTTP.new(parsed_url.host)
           http.read_timeout = determine_session_timeout

data/lib/facter/resolvers/filesystems_resolver.rb

@@ -22,7 +22,7 @@ module Facter
             filesystems = []
             output.each do |line|
               tokens = line.split(' ')
-              filesystems << tokens if tokens.size == 1
+              filesystems << tokens if tokens.size == 1 && tokens.first != 'fuseblk'
             end
             @fact_list[:systems] = filesystems.sort.join(',')
             @fact_list[fact_name]

data/lib/facter/resolvers/linux/docker_uptime.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Linux
+      class DockerUptime < BaseResolver
+        @semaphore = Mutex.new
+        @fact_list ||= {}
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { detect_uptime(fact_name) }
+          end
+
+          def detect_uptime(fact_name)
+            days, hours, minutes, seconds = extract_uptime_from_docker
+            total_seconds = convert_to_seconds(days, hours, minutes, seconds)
+            @fact_list = Utils::UptimeHelper.create_uptime_hash(total_seconds)
+
+            @fact_list[fact_name]
+          end
+
+          def extract_uptime_from_docker
+            # time format [dd-][hh:]mm:ss
+            time = Facter::Core::Execution.execute('ps -o etime= -p "1"', logger: log)
+            extracted_time = time.split(/[-:]/)
+
+            reversed_time = extracted_time.reverse
+            seconds = reversed_time[0].to_i
+            minutes = reversed_time[1].to_i
+            hours = reversed_time[2].to_i
+            days = reversed_time[3].to_i
+
+            [days, hours, minutes, seconds]
+          end
+
+          def convert_to_seconds(days, hours, minutes, seconds)
+            days * 24 * 3600 + hours * 3600 + minutes * 60 + seconds
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/linux/load_averages.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Linux
       class LoadAverages < BaseResolver
-        @log = Facter::Log.new(self)
         @semaphore = Mutex.new
         @fact_list ||= {}
         class << self

data/lib/facter/resolvers/load_averages.rb

@@ -14,6 +14,8 @@ module Facter
 
         def read_load_averages(fact_name)
           require_relative 'utils/ffi/load_averages'
+
+          log.debug('loading cpu load averages')
           @fact_list[:load_averages] = %w[1m 5m 15m].zip(Utils::Ffi::LoadAverages.read_load_averages).to_h
 
           @fact_list[fact_name]

data/lib/facter/resolvers/mountpoints_resolver.rb

@@ -2,59 +2,57 @@
 
 module Facter
   module Resolvers
-    module Linux
-      class Mountpoints < BaseResolver
-        include Facter::FilesystemHelper
-        @semaphore = Mutex.new
-        @fact_list ||= {}
-        @log = Facter::Log.new(self)
-        class << self
-          private
-
-          def post_resolve(fact_name)
-            @fact_list.fetch(fact_name) { read_mounts }
-          end
+    class Mountpoints < BaseResolver
+      include Facter::FilesystemHelper
+      @semaphore = Mutex.new
+      @fact_list ||= {}
+      @log = Facter::Log.new(self)
+      class << self
+        private
+
+        def post_resolve(fact_name)
+          @fact_list.fetch(fact_name) { read_mounts }
+        end
 
-          def root_device
-            cmdline = Util::FileHelper.safe_read('/proc/cmdline')
-            match = cmdline.match(/root=([^\s]+)/)
-            match&.captures&.first
-          end
+        def root_device
+          cmdline = Util::FileHelper.safe_read('/proc/cmdline')
+          match = cmdline.match(/root=([^\s]+)/)
+          match&.captures&.first
+        end
 
-          def compute_device(device)
-            # If the "root" device, lookup the actual device from the kernel options
-            # This is done because not all systems symlink /dev/root
-            device = root_device if device == '/dev/root'
-            device
-          end
+        def compute_device(device)
+          # If the "root" device, lookup the actual device from the kernel options
+          # This is done because not all systems symlink /dev/root
+          device = root_device if device == '/dev/root'
+          device
+        end
 
-          def read_mounts # rubocop:disable Metrics/AbcSize
-            mounts = []
-            FilesystemHelper.read_mountpoints.each do |fs|
-              device = compute_device(fs.name)
-              filesystem = fs.mount_type
-              path = fs.mount_point
-              options = fs.options.split(',').map(&:strip)
+        def read_mounts # rubocop:disable Metrics/AbcSize
+          mounts = []
+          FilesystemHelper.read_mountpoints.each do |fs|
+            device = compute_device(fs.name)
+            filesystem = fs.mount_type
+            path = fs.mount_point
+            options = fs.options.split(',').map(&:strip)
 
-              next if path =~ %r{^/(proc|sys)} && filesystem != 'tmpfs' || filesystem == 'autofs'
+            next if path =~ %r{^/(proc|sys)} && filesystem != 'tmpfs' || filesystem == 'autofs'
 
-              stats = FilesystemHelper.read_mountpoint_stats(path)
-              size_bytes = stats.bytes_total.abs
-              available_bytes = stats.bytes_available.abs
+            stats = FilesystemHelper.read_mountpoint_stats(path)
+            size_bytes = stats.bytes_total.abs
+            available_bytes = stats.bytes_available.abs
 
-              used_bytes = stats.bytes_used.abs
-              total_bytes = used_bytes + available_bytes
-              capacity = FilesystemHelper.compute_capacity(used_bytes, total_bytes)
+            used_bytes = stats.bytes_used.abs
+            total_bytes = used_bytes + available_bytes
+            capacity = FilesystemHelper.compute_capacity(used_bytes, total_bytes)
 
-              size = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(size_bytes)
-              available = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(available_bytes)
-              used = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(used_bytes)
+            size = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(size_bytes)
+            available = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(available_bytes)
+            used = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(used_bytes)
 
-              mounts << Hash[FilesystemHelper::MOUNT_KEYS.zip(FilesystemHelper::MOUNT_KEYS
-                .map { |v| binding.local_variable_get(v) })]
-            end
-            @fact_list[:mountpoints] = mounts
+            mounts << Hash[FilesystemHelper::MOUNT_KEYS.zip(FilesystemHelper::MOUNT_KEYS
+              .map { |v| binding.local_variable_get(v) })]
           end
+          @fact_list[:mountpoints] = mounts
         end
       end
     end