facter 4.0.35 → 4.0.36

data/lib/facter/resolvers/memory_resolver.rb

@@ -27,7 +27,7 @@ module Facter
           def read_system(output)
             @fact_list[:total] = kilobytes_to_bytes(output.match(/MemTotal:\s+(\d+)\s/)[1])
             @fact_list[:memfree] = kilobytes_to_bytes(output.match(/MemFree:\s+(\d+)\s/)[1])
-            @fact_list[:used_bytes] = compute_used(@fact_list[:total], @fact_list[:memfree])
+            @fact_list[:used_bytes] = compute_used(@fact_list[:total], reclaimable_memory(output))
             @fact_list[:capacity] = compute_capacity(@fact_list[:used_bytes], @fact_list[:total])
           end
 
@@ -45,6 +45,13 @@ module Facter
             quantity.to_i * 1024
           end
 
+          def reclaimable_memory(output)
+            buffers = kilobytes_to_bytes(output.match(/Buffers:\s+(\d+)\s/)[1])
+            cached = kilobytes_to_bytes(output.match(/Cached:\s+(\d+)\s/)[1])
+            s_reclaimable = kilobytes_to_bytes(output.match(/SReclaimable:\s+(\d+)\s/)[1])
+            @fact_list[:memfree] + buffers + cached + s_reclaimable
+          end
+
           def compute_capacity(used, total)
             format('%<computed_capacity>.2f', computed_capacity: (used / total.to_f * 100)) + '%'
           end

data/lib/facter/resolvers/processors_resolver.rb

@@ -7,10 +7,12 @@ module Facter
         @log = Facter::Log.new(self)
         @semaphore = Mutex.new
         @fact_list ||= {}
+        MHZ_TO_HZ = 1_000_000
         class << self
           # :count
           # :models
           # :physical_count
+          # :speed
 
           private
 
@@ -38,6 +40,7 @@ module Facter
               count_processors(tokens)
               construct_models_list(tokens)
               count_physical_processors(tokens)
+              build_speed(tokens)
             end
           end
 
@@ -46,7 +49,9 @@ module Facter
           end
 
           def construct_models_list(tokens)
-            @fact_list[:models] << tokens.last.strip if tokens.first.strip == 'model name'
+            return unless tokens.first.strip == 'model name' || tokens.first.strip == 'cpu'
+
+            @fact_list[:models] << tokens.last.strip
           end
 
           def count_physical_processors(tokens)
@@ -54,7 +59,24 @@ module Facter
           end
 
           def physical_devices_count
-            Dir.entries('/sys/devices/system/cpu').count { |dir| dir =~ /cpu[0-9]+$/ }
+            Dir.entries('/sys/devices/system/cpu')
+               .select { |dir| dir =~ /cpu[0-9]+$/ }
+               .count { |dir| File.exist?("/sys/devices/system/cpu/#{dir}/topology/physical_package_id") }
+          end
+
+          def build_speed(tokens)
+            build_speed_for_power_pc(tokens) if tokens.first.strip == 'clock'
+            build_speed_for_x86(tokens) if tokens.first.strip == 'cpu MHz'
+          end
+
+          def build_speed_for_power_pc(tokens)
+            speed = tokens.last.strip.match(/^(\d+).*MHz/)[1]
+            @fact_list[:speed] = speed.to_i * MHZ_TO_HZ
+          end
+
+          def build_speed_for_x86(tokens)
+            speed = tokens.last.strip.match(/^(\d+).*/)[1]
+            @fact_list[:speed] = speed.to_i * MHZ_TO_HZ
           end
         end
       end

data/lib/facter/resolvers/solaris/ldom.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Solaris
+      class Ldom < BaseResolver
+        # :chassis_serial
+        # :control_domain
+        # :domain_name
+        # :domain_uuid
+        # :role_control
+        # :role_io
+        # :role_root
+        # :role_service
+        # :role_impl
+
+        @semaphore = Mutex.new
+        @fact_list ||= {}
+
+        VIRTINFO_MAPPING = {
+          chassis_serial: %w[DOMAINCHASSIS serialno],
+          control_domain: %w[DOMAINCONTROL name],
+          domain_name: %w[DOMAINNAME name],
+          domain_uuid: %w[DOMAINUUID uuid],
+          role_control: %w[DOMAINROLE control],
+          role_io: %w[DOMAINROLE io],
+          role_root: %w[DOMAINROLE root],
+          role_service: %w[DOMAINROLE service],
+          role_impl: %w[DOMAINROLE impl]
+        }.freeze
+
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { call_virtinfo(fact_name) }
+          end
+
+          def call_virtinfo(fact_name)
+            # return unless File.executable?('/usr/sbin/virtinfo')
+
+            virtinfo_output = Facter::Core::Execution.execute('/usr/sbin/virtinfo  -a  -p', logger: log)
+            return if virtinfo_output.empty?
+
+            output_hash = parse_output(virtinfo_output)
+            return if output_hash.empty?
+
+            VIRTINFO_MAPPING.each do |key, value|
+              @fact_list[key] = output_hash.dig(*value)&.strip
+            end
+
+            @fact_list[fact_name]
+          end
+
+          def parse_output(output)
+            result = {}
+            output.each_line do |line|
+              next unless line.include? 'DOMAIN'
+
+              x = line.split('|')
+              result[x.shift] = x.map { |f| f.split('=') }.to_h
+            end
+
+            result
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/utils/http.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Utils
+      module Http
+        @log = Facter::Log.new(self)
+
+        class << self
+          CONNECTION_TIMEOUT = 0.6
+          SESSION_TIMEOUT = 5
+
+          # Makes a GET http request and returns it's response.
+          #
+          # Params:
+          # url: String which contains the address to which the request will be made
+          # headers: Hash which contains the headers you need to add to your request.
+          #          Default headers is an empty hash
+          #          Example: { "Accept": 'application/json' }
+          # timeouts: Hash that includes the values for the session and connection timeouts.
+          #          Example: { session: 2.4. connection: 5 }
+          #
+          # Return value:
+          # is a string with the response body if the response code is 200.
+          # If the response code is not 200, an empty string is returned.
+          def get_request(url, headers = {}, timeouts = {})
+            make_request(url, headers, timeouts, 'GET')
+          end
+
+          private
+
+          def make_request(url, headers, timeouts, request_type)
+            require 'net/http'
+
+            uri = URI.parse(url)
+            http = http_obj(uri, timeouts)
+            request = request_obj(headers, uri, request_type)
+
+            # Make the request
+            resp = http.request(request)
+            response_code_valid?(resp.code.to_i) ? resp.body : ''
+          rescue StandardError => e
+            @log.debug("Trying to connect to #{url} but got: #{e.message}")
+            ''
+          end
+
+          def http_obj(parsed_url, timeouts)
+            http = Net::HTTP.new(parsed_url.host)
+            http.read_timeout = timeouts[:session] || SESSION_TIMEOUT
+            http.open_timeout = timeouts[:connection] || CONNECTION_TIMEOUT
+            http
+          end
+
+          def request_obj(headers, parsed_url, request_type)
+            return Net::HTTP::Get.new(parsed_url.request_uri, headers) if request_type == 'GET'
+
+            raise StandardError("Unknown http request type: #{request_type}")
+          end
+
+          def response_code_valid?(http_code)
+            @log.debug("Request failed with error code #{http_code}") unless http_code.equal?(200)
+            http_code.equal?(200)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/xen.rb

@@ -7,6 +7,8 @@ module Facter
       @fact_list ||= {}
 
       XEN_PATH = '/proc/xen/capabilities'
+      XEN_TOOLSTACK = '/usr/lib/xen-common/bin/xen-toolstack'
+      XEN_COMMANDS = ['/usr/sbin/xl', '/usr/sbin/xm'].freeze
 
       class << self
         private
@@ -18,6 +20,7 @@ module Facter
         def detect_xen(fact_name)
           @fact_list[:vm] = detect_xen_type
           @fact_list[:privileged] = privileged?(@fact_list[:vm])
+          @fact_list[:domains] = detect_domains
 
           @fact_list[fact_name]
         end
@@ -33,6 +36,31 @@ module Facter
           content = Util::FileHelper.safe_read(XEN_PATH, nil)
           content&.strip == 'control_d' || xen_type == 'xen0'
         end
+
+        def detect_domains
+          domains = []
+          xen_command = find_command
+          return unless xen_command
+
+          output = Facter::Core::Execution.execute("#{xen_command} list", logger: log)
+          return if output.empty?
+
+          output.each_line do |line|
+            next if line =~ /Domain-0|Name/
+
+            domain = line.match(/^([^\s]*)\s/)
+            domain = domain&.captures&.first
+            domains << domain if domain
+          end
+
+          domains
+        end
+
+        def find_command
+          return XEN_TOOLSTACK if File.exist?(XEN_TOOLSTACK)
+
+          XEN_COMMANDS.each { |command| return command if File.exist?(command) }
+        end
       end
     end
   end

data/lib/facter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Facter
-  VERSION = '4.0.35' unless defined?(VERSION)
+  VERSION = '4.0.36' unless defined?(VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.35
+  version: 4.0.36
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-19 00:00:00.000000000 Z
+date: 2020-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -279,7 +279,10 @@ files:
 - lib/facter/facts/aix/ruby/sitedir.rb
 - lib/facter/facts/aix/ruby/version.rb
 - lib/facter/facts/aix/scope6_interfaces.rb
+- lib/facter/facts/aix/serialnumber.rb
 - lib/facter/facts/aix/ssh.rb
+- lib/facter/facts/aix/sshalgorithmkey.rb
+- lib/facter/facts/aix/sshfp_algorithm.rb
 - lib/facter/facts/aix/system_uptime/days.rb
 - lib/facter/facts/aix/system_uptime/hours.rb
 - lib/facter/facts/aix/system_uptime/seconds.rb
@@ -368,6 +371,8 @@ files:
 - lib/facter/facts/freebsd/ruby/sitedir.rb
 - lib/facter/facts/freebsd/ruby/version.rb
 - lib/facter/facts/freebsd/ssh.rb
+- lib/facter/facts/freebsd/sshalgorithmkey.rb
+- lib/facter/facts/freebsd/sshfp_algorithm.rb
 - lib/facter/facts/freebsd/system_uptime/days.rb
 - lib/facter/facts/freebsd/system_uptime/hours.rb
 - lib/facter/facts/freebsd/system_uptime/seconds.rb
@@ -385,6 +390,7 @@ files:
 - lib/facter/facts/linux/dmi/bios/release_date.rb
 - lib/facter/facts/linux/dmi/bios/vendor.rb
 - lib/facter/facts/linux/dmi/bios/version.rb
+- lib/facter/facts/linux/dmi/board/asset_tag.rb
 - lib/facter/facts/linux/dmi/board/manufacturer.rb
 - lib/facter/facts/linux/dmi/board/product.rb
 - lib/facter/facts/linux/dmi/board/serial_number.rb
@@ -399,6 +405,7 @@ files:
 - lib/facter/facts/linux/facterversion.rb
 - lib/facter/facts/linux/filesystems.rb
 - lib/facter/facts/linux/fips_enabled.rb
+- lib/facter/facts/linux/gce.rb
 - lib/facter/facts/linux/hypervisors/docker.rb
 - lib/facter/facts/linux/hypervisors/hyper_v.rb
 - lib/facter/facts/linux/hypervisors/kvm.rb
@@ -482,6 +489,7 @@ files:
 - lib/facter/facts/linux/processors/isa.rb
 - lib/facter/facts/linux/processors/models.rb
 - lib/facter/facts/linux/processors/physicalcount.rb
+- lib/facter/facts/linux/processors/speed.rb
 - lib/facter/facts/linux/puppet_version.rb
 - lib/facter/facts/linux/ruby/platform.rb
 - lib/facter/facts/linux/ruby/sitedir.rb
@@ -496,6 +504,7 @@ files:
 - lib/facter/facts/linux/system_uptime/uptime.rb
 - lib/facter/facts/linux/timezone.rb
 - lib/facter/facts/linux/virtual.rb
+- lib/facter/facts/linux/xen.rb
 - lib/facter/facts/macosx/aio_agent_version.rb
 - lib/facter/facts/macosx/augeas/version.rb
 - lib/facter/facts/macosx/dhcp_servers.rb
@@ -631,6 +640,8 @@ files:
 - lib/facter/facts/solaris/dmi/product/uuid.rb
 - lib/facter/facts/solaris/facterversion.rb
 - lib/facter/facts/solaris/filesystems.rb
+- lib/facter/facts/solaris/hypervisors/ldom.rb
+- lib/facter/facts/solaris/hypervisors/zone.rb
 - lib/facter/facts/solaris/identity/gid.rb
 - lib/facter/facts/solaris/identity/group.rb
 - lib/facter/facts/solaris/identity/privileged.rb
@@ -639,10 +650,12 @@ files:
 - lib/facter/facts/solaris/interfaces.rb
 - lib/facter/facts/solaris/ipaddress6_interfaces.rb
 - lib/facter/facts/solaris/ipaddress_interfaces.rb
+- lib/facter/facts/solaris/is_virtual.rb
 - lib/facter/facts/solaris/kernel.rb
 - lib/facter/facts/solaris/kernelmajversion.rb
 - lib/facter/facts/solaris/kernelrelease.rb
 - lib/facter/facts/solaris/kernelversion.rb
+- lib/facter/facts/solaris/ldom.rb
 - lib/facter/facts/solaris/load_averages.rb
 - lib/facter/facts/solaris/macaddress_interfaces.rb
 - lib/facter/facts/solaris/memory/swap/available.rb
@@ -695,11 +708,14 @@ files:
 - lib/facter/facts/solaris/ruby/sitedir.rb
 - lib/facter/facts/solaris/ruby/version.rb
 - lib/facter/facts/solaris/ssh.rb
+- lib/facter/facts/solaris/sshalgorithmkey.rb
+- lib/facter/facts/solaris/sshfp_algorithm.rb
 - lib/facter/facts/solaris/system_uptime/days.rb
 - lib/facter/facts/solaris/system_uptime/hours.rb
 - lib/facter/facts/solaris/system_uptime/seconds.rb
 - lib/facter/facts/solaris/system_uptime/uptime.rb
 - lib/facter/facts/solaris/timezone.rb
+- lib/facter/facts/solaris/virtual.rb
 - lib/facter/facts/solaris/zfs_featurenumbers.rb
 - lib/facter/facts/solaris/zfs_version.rb
 - lib/facter/facts/solaris/zones.rb
@@ -719,6 +735,7 @@ files:
 - lib/facter/facts/windows/ec2_userdata.rb
 - lib/facter/facts/windows/facterversion.rb
 - lib/facter/facts/windows/fips_enabled.rb
+- lib/facter/facts/windows/gce.rb
 - lib/facter/facts/windows/hypervisors/hyperv.rb
 - lib/facter/facts/windows/hypervisors/kvm.rb
 - lib/facter/facts/windows/hypervisors/virtualbox.rb
@@ -783,6 +800,8 @@ files:
 - lib/facter/facts/windows/ruby/version.rb
 - lib/facter/facts/windows/scope6_interfaces.rb
 - lib/facter/facts/windows/ssh.rb
+- lib/facter/facts/windows/sshalgorithmkey.rb
+- lib/facter/facts/windows/sshfp_algorithm.rb
 - lib/facter/facts/windows/system_uptime/days.rb
 - lib/facter/facts/windows/system_uptime/hours.rb
 - lib/facter/facts/windows/system_uptime/seconds.rb
@@ -846,6 +865,7 @@ files:
 - lib/facter/resolvers/aix/os_level_resolver.rb
 - lib/facter/resolvers/aix/partitions.rb
 - lib/facter/resolvers/aix/processors.rb
+- lib/facter/resolvers/aix/serialnumber.rb
 - lib/facter/resolvers/aix/utils/info_extractor.rb
 - lib/facter/resolvers/aix/utils/odm_query.rb
 - lib/facter/resolvers/augeas_resolver.rb
@@ -869,6 +889,7 @@ files:
 - lib/facter/resolvers/freebsd/processors.rb
 - lib/facter/resolvers/freebsd/swap_memory_resolver.rb
 - lib/facter/resolvers/freebsd/system_memory_resolver.rb
+- lib/facter/resolvers/gce.rb
 - lib/facter/resolvers/hostname_resolver.rb
 - lib/facter/resolvers/identity_resolver.rb
 - lib/facter/resolvers/linux/docker_uptime.rb
@@ -908,6 +929,7 @@ files:
 - lib/facter/resolvers/solaris/ffi/structs.rb
 - lib/facter/resolvers/solaris/filesystems.rb
 - lib/facter/resolvers/solaris/ipaddress.rb
+- lib/facter/resolvers/solaris/ldom.rb
 - lib/facter/resolvers/solaris/memory.rb
 - lib/facter/resolvers/solaris/networking.rb
 - lib/facter/resolvers/solaris/os_release.rb
@@ -923,6 +945,7 @@ files:
 - lib/facter/resolvers/utils/ffi/load_averages.rb
 - lib/facter/resolvers/utils/filesystem_helper.rb
 - lib/facter/resolvers/utils/fingerprint.rb
+- lib/facter/resolvers/utils/http.rb
 - lib/facter/resolvers/utils/networking.rb
 - lib/facter/resolvers/utils/ssh.rb
 - lib/facter/resolvers/utils/ssh_helper.rb