facter 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5eeb6c68641c9730832a6e41af6bd0bf5367f1953cd737122356a1ddb9a1265
-  data.tar.gz: 3ead9f3065982b9eb476844a21901d5fd1fa8bc1f165b3118490054b004352df
+  metadata.gz: a6ca2540a7ccad083604f2a0a1142cd0e870714dae635dc2fd8d60baa1b1bcbf
+  data.tar.gz: 25cec4e7c98a145d3950dd8c345ae04ee2bdc1b04ae78b08acb1674678c24d64
 SHA512:
-  metadata.gz: 6c10f947a77e46942b5b062b2f3e1ded108b15f9f3a48202e75681be8590400644f42f6d3f3496061741ed81e8fca9ae314098257f1036d6ac09fee694e9a366
-  data.tar.gz: 39b85182513dd1a2b8737785cf5b56f946df171c62462bd39cb32008d52ba7cf2c23d27e91e55998e4b037734838f3eba061d3b96d41c11b2cffe1714d1de838
+  metadata.gz: e43bf9233eca175b442b0cbda693efcae3f3b0f1e370b9b9ef5bca1c81a9450e4bfc3000d957463cbf49900abc6bf9769ba9664cc6750c17f58ad8abd4cf9730
+  data.tar.gz: 47c5a45dd7dfc505cda3d71634258ed7c7ca13e24ee6858219d89480f9b260e278cd8b602a59501a24ec61a7fcb62f1b929330cc5c4b54d34b13718b818280d5

data/lib/facter/facts/aix/processors/cores.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    module Processors
+      class Cores
+        FACT_NAME = 'processors.cores'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Aix::Processors.resolve(:cores_per_socket)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/aix/processors/threads.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    module Processors
+      class Threads
+        FACT_NAME = 'processors.threads'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Aix::Processors.resolve(:threads_per_core)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/linux/processors/cores.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Linux
+    module Processors
+      class Cores
+        FACT_NAME = 'processors.cores'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Linux::Lscpu.resolve(:cores_per_socket)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/linux/processors/threads.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Linux
+    module Processors
+      class Threads
+        FACT_NAME = 'processors.threads'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Linux::Lscpu.resolve(:threads_per_core)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/macosx/os/macosx/version.rb

@@ -10,14 +10,22 @@ module Facts
 
           def call_the_resolver
             fact_value = Facter::Resolvers::SwVers.resolve(:productversion)
-            versions = fact_value.split('.')
-            ver = { 'full' => fact_value, 'major' => "#{versions[0]}.#{versions[1]}", 'minor' => versions[-1] }
+            ver = version_hash(fact_value)
 
             [Facter::ResolvedFact.new(FACT_NAME, ver),
              Facter::ResolvedFact.new(ALIASES[0], fact_value, :legacy),
              Facter::ResolvedFact.new(ALIASES[1], ver['major'], :legacy),
              Facter::ResolvedFact.new(ALIASES[2], ver['minor'], :legacy)]
           end
+
+          def version_hash(fact_value)
+            versions = fact_value.split('.')
+            if versions[0] == '10'
+              { 'full' => fact_value, 'major' => "#{versions[0]}.#{versions[1]}", 'minor' => versions[-1] }
+            else
+              { 'full' => fact_value, 'major' => versions[0], 'minor' => "#{versions[1]}.#{versions[-1]}" }
+            end
+          end
         end
       end
     end

data/lib/facter/facts/macosx/processors/cores.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Macosx
+    module Processors
+      class Cores
+        FACT_NAME = 'processors.cores'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Macosx::Processors.resolve(:cores_per_socket)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/macosx/processors/threads.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Macosx
+    module Processors
+      class Threads
+        FACT_NAME = 'processors.threads'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Macosx::Processors.resolve(:threads_per_core)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/solaris/processors/cores.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Processors
+      class Cores
+        FACT_NAME = 'processors.cores'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Solaris::Processors.resolve(:cores_per_socket)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/solaris/processors/threads.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Processors
+      class Threads
+        FACT_NAME = 'processors.threads'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Solaris::Processors.resolve(:threads_per_core)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/windows/processors/cores.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    module Processors
+      class Cores
+        FACT_NAME = 'processors.cores'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Processors.resolve(:cores_per_socket)
+
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/windows/processors/threads.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    module Processors
+      class Threads
+        FACT_NAME = 'processors.threads'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Processors.resolve(:threads_per_core)
+
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/framework/core/fact_loaders/fact_loader.rb

@@ -18,8 +18,8 @@ module Facter
       @external_fact_loader ||= ExternalFactLoader.new
     end
 
-    def load(options)
-      @internal_facts = load_internal_facts(options)
+    def load(user_query, options)
+      @internal_facts = load_internal_facts(user_query, options)
       @custom_facts = load_custom_facts(options)
       @external_facts = load_external_facts(options)
 
@@ -28,10 +28,10 @@ module Facter
       @facts = @internal_facts + @external_facts + @custom_facts
     end
 
-    def load_internal_facts(options)
+    def load_internal_facts(user_query, options)
       @log.debug('Loading internal facts')
       internal_facts = []
-      if options[:user_query] || options[:show_legacy]
+      if user_query || options[:show_legacy]
         # if we have a user query, then we must search in core facts and legacy facts
         @log.debug('Loading all internal facts')
         internal_facts = @internal_loader.facts

data/lib/facter/framework/core/fact_manager.rb

@@ -16,7 +16,7 @@ module Facter
       @options[:user_query] = user_query
       cache_manager = Facter::CacheManager.new
 
-      searched_facts = QueryParser.parse(user_query, @fact_loader.load(@options))
+      searched_facts = QueryParser.parse(user_query, @fact_loader.load(user_query, @options))
 
       searched_facts, cached_facts = cache_manager.resolve_facts(searched_facts)
       internal_facts = @internal_fact_mgr.resolve_facts(searched_facts)
@@ -45,11 +45,11 @@ module Facter
 
       @cache_manager = Facter::CacheManager.new
 
-      custom_facts = custom_fact_by_filename || []
-      core_and_external_facts = core_or_external_fact || []
+      custom_facts = custom_fact_by_filename(user_query) || []
+      core_and_external_facts = core_or_external_fact(user_query) || []
       resolved_facts = core_and_external_facts + custom_facts
 
-      resolved_facts = all_custom_facts if resolved_facts.empty?
+      resolved_facts = all_custom_facts(user_query) if resolved_facts.empty?
 
       @cache_manager.cache_facts(resolved_facts)
 
@@ -65,7 +65,7 @@ module Facter
     private
 
     def core_fact(user_query, options)
-      loaded_facts_hash = @fact_loader.load_internal_facts(options)
+      loaded_facts_hash = @fact_loader.load_internal_facts(user_query, options)
 
       searched_facts = QueryParser.parse(user_query, loaded_facts_hash)
       searched_facts, cached_facts = @cache_manager.resolve_facts(searched_facts)
@@ -78,14 +78,13 @@ module Facter
       resolved_facts
     end
 
-    def custom_fact_by_filename
-      user_query = @options[:user_query]
+    def custom_fact_by_filename(user_query)
       @log.debug("Searching fact: #{user_query} in file: #{user_query}.rb")
 
       custom_fact = @fact_loader.load_custom_fact(@options, user_query)
       return unless custom_fact.any?
 
-      searched_facts = parse_user_query(custom_fact, @options)
+      searched_facts = parse_user_query(custom_fact, user_query)
       searched_facts, cached_facts = @cache_manager.resolve_facts(searched_facts)
 
       resolved_facts = @external_fact_mgr.resolve_facts(searched_facts)
@@ -93,13 +92,12 @@ module Facter
       resolved_facts if resolved_facts.any?
     end
 
-    def core_or_external_fact
-      user_query = @options[:user_query]
+    def core_or_external_fact(user_query)
       @log.debug("Searching fact: #{user_query} in core facts and external facts")
 
       core_facts = core_fact([user_query], @options)
       external_facts = @fact_loader.load_external_facts(@options)
-      searched_facts = parse_user_query(external_facts, @options)
+      searched_facts = parse_user_query(external_facts, user_query)
       searched_facts, cached_facts = @cache_manager.resolve_facts(searched_facts)
 
       resolved_facts = @external_fact_mgr.resolve_facts(searched_facts)
@@ -109,20 +107,19 @@ module Facter
       resolved_facts unless resolved_facts.map(&:value).compact.empty?
     end
 
-    def all_custom_facts
-      user_query = @options[:user_query]
+    def all_custom_facts(user_query)
       @log.debug("Searching fact: #{user_query} in all custom facts")
 
       custom_facts = @fact_loader.load_custom_facts(@options)
-      searched_facts = parse_user_query(custom_facts, @options)
+      searched_facts = parse_user_query(custom_facts, user_query)
       searched_facts, cached_facts = @cache_manager.resolve_facts(searched_facts)
 
       resolved_facts = @external_fact_mgr.resolve_facts(searched_facts)
       resolved_facts.concat(cached_facts)
     end
 
-    def parse_user_query(loaded_facts, options)
-      user_query = Array(options[:user_query])
+    def parse_user_query(loaded_facts, user_query)
+      user_query = Array(user_query)
       QueryParser.parse(user_query, loaded_facts)
     end
 

data/lib/facter/models/fact_collection.rb

@@ -22,19 +22,18 @@ module Facter
     end
 
     def dig_fact(user_query)
-      split_user_query = Facter::Utils.split_user_query(user_query)
-      fact = dig(user_query) || dig(*split_user_query)
-    rescue TypeError
-      # An incorrect user query (e.g. mountpoints./.available.asd) can cause
-      # Facter to call dig on a string, which raises a type error.
-      # If this happens, we assume the query is wrong and silently continue.
-    ensure
-      @log.debug("Fact \"#{user_query}\" does not exist") unless fact
-      fact
+      value(user_query)
+    rescue KeyError
+      nil
     end
 
     def value(user_query)
-      dig_fact(user_query)
+      fetch(user_query) do
+        split_user_query = Facter::Utils.split_user_query(user_query)
+        split_user_query.reduce(self) do |memo, key|
+          memo.fetch(key) { memo.fetch(key.to_s) } if memo.is_a?(Hash) || memo.is_a?(Array)
+        end
+      end
     end
 
     def bury(*args)

data/lib/facter/resolvers/aix/processors.rb

@@ -16,6 +16,8 @@ module Facter
           def query_pddv(fact_name)
             @fact_list[:models] = []
             @fact_list[:logical_count] = 0
+            @fact_list[:cores_per_socket] = 0
+            @fact_list[:threads_per_core] = 0
 
             odmquery = Facter::Util::Aix::ODMQuery.new
             odmquery.equals('class', 'processor')
@@ -59,6 +61,8 @@ module Facter
             threads = smt_enabled ? smt_threads : 1
 
             @fact_list[:logical_count] += threads
+            @fact_list[:cores_per_socket] += 1
+            @fact_list[:threads_per_core] = threads
             @fact_list[:models].concat([type] * threads)
           end
 

data/lib/facter/resolvers/macosx/processor.rb

@@ -9,12 +9,17 @@ module Facter
         ITEMS = { logical_count: 'hw.logicalcpu_max',
                   physical_count: 'hw.physicalcpu_max',
                   brand: 'machdep.cpu.brand_string',
-                  speed: 'hw.cpufrequency_max' }.freeze
+                  speed: 'hw.cpufrequency_max',
+                  cores_per_socket: 'machdep.cpu.core_count',
+                  threads_per_core: 'machdep.cpu.thread_count' }.freeze
+
         class << self
           # :logicalcount
           # :models
           # :physicalcount
           # :speed
+          # :cores_per_socket
+          # :threads_per_core
 
           private
 
@@ -33,6 +38,8 @@ module Facter
             build_physical_count(processors_data[1])
             build_models(processors_data[2])
             build_speed(processors_data[3])
+            build_cores_per_socket(processors_data[4])
+            build_threads_per_core(processors_data[5], processors_data[4])
           end
 
           def build_logical_count(count)
@@ -51,6 +58,14 @@ module Facter
           def build_speed(value)
             @fact_list[:speed] = value.split(': ')[1].to_i
           end
+
+          def build_cores_per_socket(count)
+            @fact_list[:cores_per_socket] = count.split(': ')[1].to_i
+          end
+
+          def build_threads_per_core(number_of_threads, number_of_cores)
+            @fact_list[:threads_per_core] = number_of_threads.split(': ')[1].to_i / number_of_cores.split(': ')[1].to_i
+          end
         end
       end
     end

data/lib/facter/resolvers/networking.rb

@@ -63,7 +63,8 @@ module Facter
         end
 
         def extract_mac(raw_data, parsed_interface_data)
-          mac = raw_data.match(/(?:ether|lladdr)\s+(\w?\w:\w?\w:\w?\w:\w?\w:\w?\w:\w?\w)/)&.captures&.first
+          mac = raw_data.match(/(?:ether|lladdr)\s+((?:\w?\w:){5}\w?\w)|(?:infiniband)\s+((?:\w?\w:){19}\w?\w)/)
+                       &.captures&.compact&.first
           parsed_interface_data[:mac] = mac unless mac.nil?
         end
 

data/lib/facter/resolvers/processors_lscpu.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Linux
+      class Lscpu < BaseResolver
+        init_resolver
+
+        ITEMS = { threads_per_core: "-e 'Thread(s)'",
+                  cores_per_socket: "-e 'Core(s)'" }.freeze
+
+        class << self
+          #:cores_per_socket
+          #:threads_per_core
+
+          private
+
+          def post_resolve(fact_name, _options)
+            @fact_list.fetch(fact_name) { read_cpuinfo(fact_name) }
+          end
+
+          def read_cpuinfo(fact_name)
+            lscpu_output = Facter::Core::Execution.execute("lscpu | grep #{ITEMS.values.join(' ')}", logger: log)
+            build_fact_list(lscpu_output.split("\n"))
+            @fact_list[fact_name]
+          end
+
+          def build_fact_list(processors_data)
+            build_threads_per_core(processors_data[0])
+            build_cores_per_socket(processors_data[1])
+          end
+
+          def build_threads_per_core(index)
+            @fact_list[:threads_per_core] = index.split(': ')[1].to_i
+          end
+
+          def build_cores_per_socket(index)
+            @fact_list[:cores_per_socket] = index.split(': ')[1].to_i
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -28,6 +28,13 @@ module Facter
             @fact_list[:physical_count] = output.scan(/chip_id .*/).uniq.size
             @fact_list[:speed] = output.scan(/current_clock_Hz .*/).first.gsub(/[a-zA-z\s]+/, '').to_i
             @fact_list[:models] = output.scan(/brand .*/).map { |elem| elem.gsub(/brand(\s+)/, '') }
+            calculate_threads_cores(output)
+          end
+
+          def calculate_threads_cores(output)
+            @fact_list[:core_count] = output.scan(/\score_id .*/).uniq.size
+            @fact_list[:threads_per_core] = @fact_list[:logical_count] / @fact_list[:core_count]
+            @fact_list[:cores_per_socket] = @fact_list[:core_count] / @fact_list[:physical_count]
           end
         end
       end

data/lib/facter/resolvers/windows/processors.rb

@@ -19,14 +19,19 @@ module Facter
 
         def read_fact_from_win32_processor(fact_name)
           win = Facter::Util::Windows::Win32Ole.new
-          proc = win.exec_query('SELECT Name,Architecture,NumberOfLogicalProcessors FROM Win32_Processor')
+          query_string = 'SELECT Name,'\
+          'Architecture,'\
+          'NumberOfLogicalProcessors,'\
+          'NumberOfCores FROM Win32_Processor'
+          proc = win.exec_query(query_string)
           unless proc
             log.debug 'WMI query returned no results'\
             'for Win32_Processor with values Name, Architecture and NumberOfLogicalProcessors.'
             return
           end
           result = iterate_proc(proc)
-          build_fact_list(result)
+          cores_threads = calculate_cores_threads(proc, result)
+          build_fact_list(result, cores_threads)
           @fact_list[fact_name]
         end
 
@@ -40,7 +45,29 @@ module Facter
             isa ||= find_isa(proc.Architecture)
           end
 
-          { models: models, isa: isa, logical_count: logical_count.zero? ? models.count : logical_count }
+          { models: models,
+            isa: isa,
+            logical_count: logical_processors_count(logical_count, models.count) }
+        end
+
+        def calculate_cores_threads(result_proc, data_proc)
+          cores = 0
+          threads_per_core = 0
+          result_proc.each do |proc|
+            cores = proc.NumberOfCores
+            threads_per_core = if check_hyperthreading(data_proc[:logical_count], cores) ||
+                                  cores > data_proc[:logical_count]
+                                 1
+                               else
+                                 data_proc[:logical_count] / (cores * data_proc[:models].size)
+                               end
+          end
+          { cores_per_socket: cores,
+            threads_per_core: threads_per_core }
+        end
+
+        def check_hyperthreading(cores, logical_processors)
+          cores == logical_processors
         end
 
         def find_isa(arch)
@@ -52,11 +79,21 @@ module Facter
           log.debug 'Unable to determine processor type: unknown architecture'
         end
 
-        def build_fact_list(result)
+        def logical_processors_count(logical_count, models_count)
+          if logical_count.zero?
+            models_count
+          else
+            logical_count
+          end
+        end
+
+        def build_fact_list(result, cores_threads)
           @fact_list[:count] = result[:logical_count]
           @fact_list[:isa] = result[:isa]
           @fact_list[:models] = result[:models]
           @fact_list[:physicalcount] = result[:models].size
+          @fact_list[:cores_per_socket] = cores_threads[:cores_per_socket]
+          @fact_list[:threads_per_core] = cores_threads[:threads_per_core]
         end
       end
     end

data/lib/facter/util/linux/socket_parser.rb

@@ -36,7 +36,7 @@ module Facter
           def search_for_mac(ifaddr)
             mac = mac_from_bonded_interface(ifaddr.name)
             mac ||= mac_from(ifaddr)
-            mac if !mac.nil? && mac != '00:00:00:00:00:00' && mac =~ /^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$/
+            mac if !mac.nil? && mac != '00:00:00:00:00:00' && mac =~ /^([0-9A-Fa-f]{2}[:-]){5,19}([0-9A-Fa-f]{2})$/
           end
 
           def mac_from_bonded_interface(interface_name)

data/lib/facter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-14 00:00:00.000000000 Z
+date: 2021-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -260,10 +260,12 @@ files:
 - lib/facter/facts/aix/partitions.rb
 - lib/facter/facts/aix/path.rb
 - lib/facter/facts/aix/processor.rb
+- lib/facter/facts/aix/processors/cores.rb
 - lib/facter/facts/aix/processors/count.rb
 - lib/facter/facts/aix/processors/isa.rb
 - lib/facter/facts/aix/processors/models.rb
 - lib/facter/facts/aix/processors/speed.rb
+- lib/facter/facts/aix/processors/threads.rb
 - lib/facter/facts/aix/ruby/platform.rb
 - lib/facter/facts/aix/ruby/sitedir.rb
 - lib/facter/facts/aix/ruby/version.rb
@@ -489,11 +491,13 @@ files:
 - lib/facter/facts/linux/partitions.rb
 - lib/facter/facts/linux/path.rb
 - lib/facter/facts/linux/processor.rb
+- lib/facter/facts/linux/processors/cores.rb
 - lib/facter/facts/linux/processors/count.rb
 - 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/processors/threads.rb
 - lib/facter/facts/linux/ruby/platform.rb
 - lib/facter/facts/linux/ruby/sitedir.rb
 - lib/facter/facts/linux/ruby/version.rb
@@ -576,11 +580,13 @@ files:
 - lib/facter/facts/macosx/os/name.rb
 - lib/facter/facts/macosx/os/release.rb
 - lib/facter/facts/macosx/path.rb
+- lib/facter/facts/macosx/processors/cores.rb
 - lib/facter/facts/macosx/processors/count.rb
 - lib/facter/facts/macosx/processors/isa.rb
 - lib/facter/facts/macosx/processors/models.rb
 - lib/facter/facts/macosx/processors/physicalcount.rb
 - lib/facter/facts/macosx/processors/speed.rb
+- lib/facter/facts/macosx/processors/threads.rb
 - lib/facter/facts/macosx/ruby/platform.rb
 - lib/facter/facts/macosx/ruby/sitedir.rb
 - lib/facter/facts/macosx/ruby/version.rb
@@ -716,11 +722,13 @@ files:
 - lib/facter/facts/solaris/os/name.rb
 - lib/facter/facts/solaris/os/release.rb
 - lib/facter/facts/solaris/path.rb
+- lib/facter/facts/solaris/processors/cores.rb
 - lib/facter/facts/solaris/processors/count.rb
 - lib/facter/facts/solaris/processors/isa.rb
 - lib/facter/facts/solaris/processors/models.rb
 - lib/facter/facts/solaris/processors/physicalcount.rb
 - lib/facter/facts/solaris/processors/speed.rb
+- lib/facter/facts/solaris/processors/threads.rb
 - lib/facter/facts/solaris/ruby/platform.rb
 - lib/facter/facts/solaris/ruby/sitedir.rb
 - lib/facter/facts/solaris/ruby/version.rb
@@ -810,10 +818,12 @@ files:
 - lib/facter/facts/windows/os/windows/system32.rb
 - lib/facter/facts/windows/path.rb
 - lib/facter/facts/windows/processor.rb
+- lib/facter/facts/windows/processors/cores.rb
 - lib/facter/facts/windows/processors/count.rb
 - lib/facter/facts/windows/processors/isa.rb
 - lib/facter/facts/windows/processors/models.rb
 - lib/facter/facts/windows/processors/physicalcount.rb
+- lib/facter/facts/windows/processors/threads.rb
 - lib/facter/facts/windows/ruby/platform.rb
 - lib/facter/facts/windows/ruby/sitedir.rb
 - lib/facter/facts/windows/ruby/version.rb
@@ -933,6 +943,7 @@ files:
 - lib/facter/resolvers/partitions.rb
 - lib/facter/resolvers/path.rb
 - lib/facter/resolvers/processors.rb
+- lib/facter/resolvers/processors_lscpu.rb
 - lib/facter/resolvers/redhat_release.rb
 - lib/facter/resolvers/release_from_first_line.rb
 - lib/facter/resolvers/ruby.rb