ohai 16.10.6 → 17.9.0

data/lib/ohai/plugins/cpu.rb

@@ -9,6 +9,7 @@
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
 # Author:: Isa Farnik (<isa@chef.io>)
 # Author:: Doug MacEachern <dougm@vmware.com>
+# Author:: Lance Albertson <lance@osuosl.org>
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
@@ -46,13 +47,213 @@ Ohai.plugin(:CPU) do
     cpuinfo
   end
 
-  collect_data(:linux) do
+  # Convert a string that looks like range of CPUs to an array
+  # Given the following range: 1-7
+  # Convert it into an array: [1, 2, 3, 4, 5, 6, 7]
+  def range_str_to_a(range)
+    range.split(",").each_with_object([]) do |cpu, arr|
+      if /\d+-\d+/.match?(cpu.to_s)
+        arr << Range.new(*cpu.split("-").map(&:to_i)).to_a
+      else
+        arr << cpu.to_i
+      end
+    end.flatten
+  end
+
+  def parse_lscpu(cpu_info)
+    lscpu_info = Mash.new
+    begin
+      so = shell_out("lscpu")
+      cpu_cores = shell_out("lscpu -p=CPU,CORE,SOCKET")
+      if so.exitstatus == 0 && cpu_cores.exitstatus == 0
+        lscpu_info[:numa_node_cpus] = Mash.new
+        lscpu_info[:vulnerability] = Mash.new
+        so.stdout.each_line do |line|
+          case line
+          when /^Architecture:\s+(.+)/
+            lscpu_info[:architecture] = $1.to_s
+          when /^CPU op-mode\(s\):\s+(.+)/
+            lscpu_info[:cpu_opmodes] = $1.split(", ")
+          when /^Byte Order:\s+(.+)/
+            lscpu_info[:byte_order] = $1.downcase
+          when /^Address sizes:\s+(.+)/
+            lscpu_info[:address_sizes] = $1.split(", ")
+          when /^CPU\(s\):\s+(.+)/
+            lscpu_info[:cpus] = $1.to_i
+          when /^On-line CPU\(s\) list:\s+(.+)/
+            cpu_range = range_str_to_a($1)
+            if cpu_range == [0]
+              lscpu_info[:cpus_online] = 0
+            else
+              lscpu_info[:cpus_online] = cpu_range.length
+            end
+          when /^Off-line CPU\(s\) list:\s+(.+)/
+            cpu_range = range_str_to_a($1)
+            if cpu_range == [0]
+              lscpu_info[:cpus_offline] = 0
+            else
+              lscpu_info[:cpus_offline] = cpu_range.length
+            end
+          when /^Thread\(s\) per core:\s+(.+)/ # http://rubular.com/r/lOw2pRrw1q
+            lscpu_info[:threads_per_core] = $1.to_i
+          when /^Core\(s\) per socket:\s+(.+)/ # http://rubular.com/r/lOw2pRrw1q
+            lscpu_info[:cores_per_socket] = $1.to_i
+          when /^Socket\(s\):\s+(.+)/ # http://rubular.com/r/DIzmPtJFvK
+            lscpu_info[:sockets] = $1.to_i
+          when /^Socket\(s\) per book:\s+(.+)/
+            lscpu_info[:sockets_per_book] = $1.to_i
+          when /^Book\(s\) per drawer:\s+(.+)/
+            lscpu_info[:books_per_drawer] = $1.to_i
+          when /^Drawer\(s\):\s+(.+)/
+            lscpu_info[:drawers] = $1.to_i
+          when /^NUMA node\(s\):\s+(.+)/
+            lscpu_info[:numa_nodes] = $1.to_i
+          when /^Vendor ID:\s+(.+)/
+            lscpu_info[:vendor_id] = $1
+          when /^Machine type:\s+(.+)/
+            lscpu_info[:machine_type] = $1
+          when /^CPU family:\s+(.+)/
+            lscpu_info[:family] = $1
+          when /^Model:\s+(.+)/
+            lscpu_info[:model] = $1
+          when /^Model name:\s+(.+)/
+            lscpu_info[:model_name] = $1
+          when /^Stepping:\s+(.+)/
+            lscpu_info[:stepping] = $1
+          when /^CPU MHz:\s+(.+)/
+            lscpu_info[:mhz] = $1
+          when /^CPU static MHz:\s+(.+)/
+            lscpu_info[:mhz] = $1
+          when /^CPU max MHz:\s+(.+)/
+            lscpu_info[:mhz_max] = $1
+          when /^CPU min MHz:\s+(.+)/
+            lscpu_info[:mhz_min] = $1
+          when /^CPU dynamic MHz:\s+(.+)/
+            lscpu_info[:mhz_dynamic] = $1
+          when /^BogoMIPS:\s+(.+)/
+            lscpu_info[:bogomips] = $1
+          when /^Virtualization:\s+(.+)/
+            lscpu_info[:virtualization] = $1
+          when /^Virtualization type:\s+(.+)/
+            lscpu_info[:virtualization_type] = $1
+          when /^Hypervisor vendor:\s+(.+)/
+            lscpu_info[:hypervisor_vendor] = $1
+          when /^Dispatching mode:\s+(.+)/
+            lscpu_info[:dispatching_mode] = $1
+          when /^L1d cache:\s+(.+)/
+            lscpu_info[:l1d_cache] = $1
+          when /^L1i cache:\s+(.+)/
+            lscpu_info[:l1i_cache] = $1
+          when /^L2 cache:\s+(.+)/
+            lscpu_info[:l2_cache] = $1
+          when /^L2d cache:\s+(.+)/
+            lscpu_info[:l2d_cache] = $1
+          when /^L2i cache:\s+(.+)/
+            lscpu_info[:l2i_cache] = $1
+          when /^L3 cache:\s+(.+)/
+            lscpu_info[:l3_cache] = $1
+          when /^L4 cache:\s+(.+)/
+            lscpu_info[:l4_cache] = $1
+          when /^NUMA node(\d+) CPU\(s\):\s+(.+)/
+            numa_node = $1
+            cpus = $2
+            lscpu_info[:numa_node_cpus][numa_node] = range_str_to_a(cpus)
+          when /^Vulnerability (.+?):\s+(.+)/ # https://rubular.com/r/aKtSD1ypUlKbGm
+            name = $1.strip.downcase.tr(" ", "_")
+            description = $2.strip
+            lscpu_info[:vulnerability][name] = Mash.new
+            lscpu_info[:vulnerability][name] = description
+          when /^Flags:\s+(.+)/
+            lscpu_info[:flags] = $1.split(" ").sort
+            # flags are "features" on aarch64 and s390x so add it for backwards computability
+            lscpu_info[:features] = lscpu_info[:flags] if lscpu_info[:architecture].match?(/aarch64|s390x/)
+          end
+        end
+
+        case lscpu_info[:architecture]
+        when "s390x"
+          # Add data from /proc/cpuinfo that isn't available from lscpu
+          lscpu_info[:bogomips_per_cpu] = cpu_info[:bogomips_per_cpu]
+          lscpu_info[:version] = cpu_info["0"][:version]
+          lscpu_info[:identification] = cpu_info["0"][:identification]
+          lscpu_info[:machine] = cpu_info["0"][:machine]
+          lscpu_total = lscpu_info[:sockets_per_book] * lscpu_info[:cores_per_socket] * lscpu_info[:threads_per_core] * lscpu_info[:books_per_drawer] * lscpu_info[:drawers]
+          lscpu_real = lscpu_info[:sockets_per_book]
+          lscpu_cores = lscpu_info[:sockets_per_book] * lscpu_info[:cores_per_socket] * lscpu_info[:books_per_drawer] * lscpu_info[:drawers]
+        when "ppc64le"
+          # Add data from /proc/cpuinfo that isn't available from lscpu
+          lscpu_info[:timebase] = cpu_info[:timebase]
+          lscpu_info[:platform] = cpu_info[:platform]
+          lscpu_info[:machine_model] = cpu_info[:machine_model]
+          lscpu_info[:machine] = cpu_info[:machine]
+          lscpu_info[:firmware] = cpu_info[:firmware] if cpu_info[:firmware]
+          lscpu_info[:mmu] = cpu_info[:mmu] if cpu_info[:mmu]
+          lscpu_info[:mhz] = cpu_info["0"][:mhz]
+          lscpu_total = lscpu_info[:sockets] * lscpu_info[:cores_per_socket] * lscpu_info[:threads_per_core]
+          lscpu_real = lscpu_info[:sockets]
+          lscpu_cores = lscpu_info[:sockets] * lscpu_info[:cores_per_socket]
+        else
+          lscpu_total = lscpu_info[:sockets] * lscpu_info[:cores_per_socket] * lscpu_info[:threads_per_core]
+          lscpu_real = lscpu_info[:sockets]
+          lscpu_cores = lscpu_info[:sockets] * lscpu_info[:cores_per_socket]
+        end
+
+        # Enumerate cpus and fill out data to provide backwards compatibility data
+        cpu_cores.stdout.each_line do |line|
+          current_cpu = nil
+          current_core = nil
+          current_socket = nil
+
+          case line
+          # skip comments
+          when /^#/
+            next
+          # Parse data from "lscpu -p=CPU,CORE,SOCKET"
+          when /(\d+),(\d+),(\d+)/
+            current_cpu = $1
+            current_core = $2
+            current_socket = $3
+          end
+          lscpu_info[current_cpu] = Mash.new
+          lscpu_info[current_cpu][:vendor_id] = lscpu_info[:vendor_id] if lscpu_info[:vendor_id]
+          lscpu_info[current_cpu][:family] = lscpu_info[:family] if lscpu_info[:family]
+          lscpu_info[current_cpu][:model] = lscpu_info[:model] if lscpu_info[:model]
+          lscpu_info[current_cpu][:model_name] = lscpu_info[:model_name] if lscpu_info[:model_name]
+          lscpu_info[current_cpu][:stepping] = lscpu_info[:stepping] if lscpu_info[:stepping]
+          lscpu_info[current_cpu][:mhz] = lscpu_info[:mhz] if lscpu_info[:mhz]
+          lscpu_info[current_cpu][:bogomips] = lscpu_info[:bogomips] if lscpu_info[:bogomips]
+          # Per cpu cache_size is only really available from /proc/cpuinfo on x86
+          lscpu_info[current_cpu][:cache_size] = cpu_info[current_cpu][:cache_size] if cpu_info[current_cpu] && cpu_info[current_cpu][:cache_size]
+          lscpu_info[current_cpu][:physical_id] = current_socket
+          lscpu_info[current_cpu][:core_id] = current_core
+          lscpu_info[current_cpu][:cores] = lscpu_info[:cores_per_socket].to_s
+          lscpu_info[current_cpu][:flags] = lscpu_info[:flags] if lscpu_info[:flags]
+          lscpu_info[current_cpu][:features] = lscpu_info[:flags] if lscpu_info[:architecture].match?(/aarch64|s390x/)
+          if lscpu_info[:architecture] == "s390x"
+            lscpu_info[current_cpu][:version] = cpu_info[current_cpu][:version] if cpu_info[current_cpu][:version]
+            lscpu_info[current_cpu][:identification] = cpu_info[current_cpu][:identification] if cpu_info[current_cpu][:identification]
+            lscpu_info[current_cpu][:machine] = cpu_info[current_cpu][:machine] if cpu_info[current_cpu][:machine]
+          end
+        end
+        lscpu_info[:total] = lscpu_total
+        lscpu_info[:real] = lscpu_real
+        lscpu_info[:cores] = lscpu_cores
+      else
+        logger.trace("Plugin CPU: Error executing lscpu. CPU data may not be available.")
+      end
+    rescue Ohai::Exceptions::Exec # util-linux isn't installed most likely
+      logger.trace("Plugin CPU: Error executing lscpu. util-linux may not be installed.")
+    end
+    lscpu_info
+  end
+
+  def parse_cpuinfo
     cpuinfo = Mash.new
     real_cpu = Mash.new
     cpu_number = 0
     current_cpu = nil
 
-    file_open("/proc/cpuinfo").each do |line|
+    file_open("/proc/cpuinfo").each_line do |line|
       case line
       when /processor\s+:\s(.+)/
         cpuinfo[$1] = Mash.new
@@ -68,7 +269,11 @@ Ohai.plugin(:CPU) do
       when /cpu family\s+:\s(.+)/
         cpuinfo[current_cpu]["family"] = $1
       when /model\s+:\s(.+)/
-        cpuinfo[current_cpu]["model"] = $1
+        model = $1
+        cpuinfo[current_cpu]["model"] = model
+        # ppc has "model" at the end of /proc/cpuinfo. In addition it should always include a include a dash or "IBM".
+        # So let's put this in cpu/model on ppc
+        cpuinfo["machine_model"] = model if model.match?(/-|IBM/)
       when /stepping\s+:\s(.+)/
         cpuinfo[current_cpu]["stepping"] = $1
       when /physical id\s+:\s(.+)/
@@ -94,6 +299,24 @@ Ohai.plugin(:CPU) do
         cpuinfo["bogomips_per_cpu"] = $1
       when /features\s+:\s(.+)/
         cpuinfo["features"] = $1.split
+      # ppc64le
+      when /revision\s+:\s(.+)/
+        cpuinfo[current_cpu]["model"] = $1
+      when /cpu\s+:\s(.+)/
+        cpuinfo[current_cpu]["model_name"] = $1
+      when /clock\s+:\s(.+)/
+        cpuinfo[current_cpu]["mhz"] = $1
+      when /timebase\s+:\s(.+)/
+        cpuinfo["timebase"] = $1
+      when /platform\s+:\s(.+)/
+        cpuinfo["platform"] = $1
+      when /machine\s+:\s(.+)/
+        cpuinfo["machine"] = $1
+      when /firmware\s+:\s(.+)/
+        cpuinfo["firmware"] = $1
+      when /MMU\s+:\s(.+)/
+        cpuinfo["mmu"] = $1
+      # s390x
       when /processor\s(\d):\s(.+)/
         current_cpu = $1
         cpu_number += 1
@@ -108,40 +331,28 @@ Ohai.plugin(:CPU) do
       end
     end
 
-    cpu cpuinfo
-
-    cpu[:total] = cpu_number
-
     # use data we collected unless cpuinfo is lacking core information
     # which is the case on older linux distros
-    if !real_cpu.empty? && cpu["0"]["cores"]
-      cpu[:real] = real_cpu.keys.length
-      cpu[:cores] = real_cpu.keys.length * cpu["0"]["cores"].to_i
+    if !real_cpu.empty? && cpuinfo["0"]["cores"]
+      logger.trace("Plugin CPU: Error executing lscpu. CPU data may not be available.")
+      cpuinfo[:real] = real_cpu.keys.length
+      cpuinfo[:cores] = real_cpu.keys.length * cpuinfo["0"]["cores"].to_i
     else
-      begin
-        logger.trace("Plugin CPU: Falling back to aggregate data from lscpu as real cpu & core data is missing in /proc/cpuinfo")
-        so = shell_out("lscpu")
-        if so.exitstatus == 0
-          lscpu_data = Mash.new
-          so.stdout.each_line do |line|
-            case line
-            when /^Thread\(s\) per core:\s(.+)/ # http://rubular.com/r/lOw2pRrw1q
-              lscpu_data[:threads] = $1.to_i
-            when /^Core\(s\) per socket:\s(.+)/ # http://rubular.com/r/lOw2pRrw1q
-              lscpu_data[:cores] = $1.to_i
-            when /^Socket\(s\):\s(.+)/ # http://rubular.com/r/DIzmPtJFvK
-              lscpu_data[:sockets] = $1.to_i
-            end
-          end
-          cpu[:total] = lscpu_data[:sockets] * lscpu_data[:cores] * lscpu_data[:threads]
-          cpu[:real] = lscpu_data[:sockets]
-          cpu[:cores] = lscpu_data[:sockets] * lscpu_data[:cores]
-        else
-          logger.trace("Plugin CPU: Error executing lscpu. CPU data may not be available.")
-        end
-      rescue Ohai::Exceptions::Exec # util-linux isn't installed most likely
-        logger.trace("Plugin CPU: Error executing lscpu. util-linux may not be installed.")
-      end
+      logger.trace("Plugin CPU: real cpu & core data is missing in /proc/cpuinfo and lscpu")
+    end
+    cpuinfo[:total] = cpu_number
+    cpuinfo
+  end
+
+  collect_data(:linux) do
+    cpuinfo = parse_cpuinfo
+    lscpu = parse_lscpu(cpuinfo)
+
+    # If we don't have any data from lscpu then get it from /proc/cpuinfo
+    if lscpu.empty?
+      cpu cpuinfo
+    else
+      cpu lscpu
     end
   end
 
@@ -288,7 +499,7 @@ Ohai.plugin(:CPU) do
 
     cpu[:total] = shell_out("pmcycles -m").stdout.lines.length
 
-    # The below is only relevent on an LPAR
+    # The below is only relevant on an LPAR
     if shell_out("uname -W").stdout.strip == "0"
 
       # At least one CPU will be available, but we'll wait to increment this later.

data/lib/ohai/plugins/eucalyptus.rb

@@ -29,7 +29,7 @@ Ohai.plugin(:Eucalyptus) do
   provides "eucalyptus"
   depends "network/interfaces"
 
-  MAC_MATCH = /^[dD]0:0[dD]:/.freeze
+  MAC_MATCH = /^[dD]0:0[dD]:/.freeze unless defined?(MAC_MATCH)
 
   # returns the mac address from the collection of all address types
   def get_mac_address(addresses)

data/lib/ohai/plugins/filesystem.rb

@@ -98,14 +98,6 @@ Ohai.plugin(:Filesystem) do
     view
   end
 
-  def generate_deprecated_windows_view(fs)
-    view = generate_mountpoint_view(fs)
-    view.each do |mp, entry|
-      view[mp].delete("devices")
-    end
-    view
-  end
-
   def parse_common_df(out)
     fs = {}
     out.each_line do |line|
@@ -466,9 +458,7 @@ Ohai.plugin(:Filesystem) do
     fs_data["by_mountpoint"] = by_mountpoint
     fs_data["by_pair"] = by_pair
 
-    # @todo in Chef 17 the filesystem2 part of this goes away
     filesystem fs_data
-    filesystem2 fs_data
   end
 
   collect_data(:darwin) do
@@ -613,9 +603,7 @@ Ohai.plugin(:Filesystem) do
     fs_data["by_mountpoint"] = by_mountpoint
     fs_data["by_pair"] = by_pair
 
-    # @todo in Chef 17 the filesystem2 plugin goes away
     filesystem fs_data
-    filesystem2 fs_data
   end
 
   collect_data(:aix) do
@@ -705,9 +693,7 @@ Ohai.plugin(:Filesystem) do
     fs_data["by_mountpoint"] = by_mountpoint
     fs_data["by_pair"] = by_pair
 
-    # @todo in Chef 17 the filesystem2 plugin goes away here
     filesystem fs_data
-    filesystem2 fs_data
   end
 
   collect_data(:windows) do
@@ -726,9 +712,10 @@ Ohai.plugin(:Filesystem) do
     fs_data["by_mountpoint"] = by_mountpoint
     fs_data["by_pair"] = by_pair
 
-    # Set the filesystem data - Windows didn't do the conversion when everyone
-    # else did, so 15 will have both be the new API and 16 will drop the old API
-    filesystem generate_deprecated_windows_view(fs)
+    # Chef 16 added 'filesystem2'
+    # In Chef 17 we made 'filesystem' and 'filesystem2' match (both new-style)
+    # In Chef 18 we will drop 'filesystem2'
+    filesystem fs_data
     filesystem2 fs_data
   end
 end

data/lib/ohai/plugins/habitat.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+Ohai.plugin(:Habitat) do
+  provides "habitat"
+
+  def habitat_binary
+    @habitat_binary ||= which("hab")
+  end
+
+  def fetch_habitat_version
+    shell_out([habitat_binary, "-V"]).stdout.gsub(/hab\s*/, "").strip
+  rescue Ohai::Exceptions::Exec
+    logger.trace("Plugin Habitat: Unable to determine the installed version of Habitat, skipping collection.")
+  end
+
+  def fetch_habitat_packages
+    shell_out([habitat_binary, "pkg", "list", "--all"]).stdout.split.sort.select { |pkg| pkg.match?(%r{.*/.*/.*/.*}) }
+  rescue Ohai::Exceptions::Exec
+    logger.trace("Plugin Habitat: Unable to determine the installed Habitat packages, skipping collection.")
+  end
+
+  def load_habitat_service_via_cli(status_stdout)
+    # package                           type        desired  state  elapsed (s)  pid   group
+    # core/httpd/2.4.35/20190307151146  standalone  up       up     158169       1410  httpd.default
+    @services = []
+    status_stdout.each_line do |line|
+      fields = line.split(/\s+/)
+      next unless fields[0].match?(%r{.*/.*/.*/.*}) # ignore header line
+
+      service = {}
+      service[:identity] = fields[0]
+      service[:topology] = fields[1]
+      service[:state_desired] = fields[2]
+      service[:state_actual] = fields[2]
+      (@services).push(service)
+    end
+    @services
+  end
+
+  def fetch_habitat_services
+    services_shell_out = shell_out([habitat_binary, "svc", "status"]).stdout
+    load_habitat_service_via_cli(services_shell_out) if services_shell_out
+  rescue Ohai::Exceptions::Exec
+    logger.trace("Plugin Habitat: Unable to determine the installed Habitat services, skipping collection.")
+  end
+
+  collect_data(:default) do
+    if habitat_binary
+      habitat Mash.new
+      habitat["version"] = fetch_habitat_version
+      habitat["packages"] = fetch_habitat_packages
+      habitat["services"] = fetch_habitat_services
+    else
+      logger.trace("Plugin Habitat: Could not find hab binary. Skipping plugin.")
+    end
+  end
+end

data/lib/ohai/plugins/hostname.rb

@@ -26,7 +26,11 @@
 # limitations under the License.
 #
 
+require_relative "../mixin/network_helper"
+
 Ohai.plugin(:Hostname) do
+  include Ohai::Mixin::NetworkHelper
+
   provides "domain", "hostname", "fqdn", "machinename"
 
   # hostname : short hostname
@@ -42,17 +46,8 @@ Ohai.plugin(:Hostname) do
   end
 
   # forward and reverse lookup to canonicalize FQDN (hostname -f equivalent)
-  # this is ipv6-safe, works on ruby 1.8.7+
   def resolve_fqdn
-    require "socket" unless defined?(Socket)
-    require "ipaddr" unless defined?(IPAddr)
-
-    hostname = from_cmd("hostname")
-    addrinfo = Socket.getaddrinfo(hostname, nil).first
-    iaddr = IPAddr.new(addrinfo[3])
-    Socket.gethostbyaddr(iaddr.hton)[0]
-  rescue
-    nil
+    canonicalize_hostname_with_retries(from_cmd("hostname"))
   end
 
   def collect_domain
@@ -98,58 +93,21 @@ Ohai.plugin(:Hostname) do
   collect_data(:darwin) do
     hostname from_cmd("hostname -s")
     machinename from_cmd("hostname")
-    begin
-      our_fqdn = resolve_fqdn
-      # Sometimes... very rarely, but sometimes, 'hostname --fqdn' falsely
-      # returns a blank string. WTF.
-      if our_fqdn.nil? || our_fqdn.empty?
-        logger.trace("Plugin Hostname: hostname returned an empty string, retrying once.")
-        our_fqdn = resolve_fqdn
-      end
-
-      if our_fqdn.nil? || our_fqdn.empty?
-        logger.trace("Plugin Hostname: hostname returned an empty string twice and will" +
-                        "not be set.")
-      else
-        fqdn our_fqdn
-      end
-    rescue
-      logger.trace(
-        "Plugin Hostname: hostname returned an error, probably no domain set"
-      )
-    end
+    fqdn resolve_fqdn
     domain collect_domain
   end
 
   collect_data(:freebsd) do
     hostname from_cmd("hostname -s")
     machinename from_cmd("hostname")
-    fqdn from_cmd("hostname -f")
+    fqdn resolve_fqdn
     collect_domain
   end
 
   collect_data(:linux) do
     hostname from_cmd("hostname -s")
     machinename from_cmd("hostname")
-    begin
-      our_fqdn = from_cmd("hostname --fqdn")
-      # Sometimes... very rarely, but sometimes, 'hostname --fqdn' falsely
-      # returns a blank string. WTF.
-      if our_fqdn.nil? || our_fqdn.empty?
-        logger.trace("Plugin Hostname: hostname --fqdn returned an empty string, retrying " +
-                        "once.")
-        our_fqdn = from_cmd("hostname --fqdn")
-      end
-
-      if our_fqdn.nil? || our_fqdn.empty?
-        logger.trace("Plugin Hostname: hostname --fqdn returned an empty string twice and " +
-                        "will not be set.")
-      else
-        fqdn our_fqdn
-      end
-    rescue
-      logger.trace("Plugin Hostname: hostname --fqdn returned an error, probably no domain set")
-    end
+    fqdn resolve_fqdn
     domain collect_domain
   end
 
@@ -169,22 +127,7 @@ Ohai.plugin(:Hostname) do
 
     hostname host["dnshostname"].to_s
     machinename host["name"].to_s
-
-    info = Socket.gethostbyname(Socket.gethostname)
-    if /.+?\.(.*)/.match?(info.first)
-      fqdn info.first
-    else
-      # host is not in dns. optionally use:
-      # C:\WINDOWS\system32\drivers\etc\hosts
-      info[3..info.length].reverse_each do |addr|
-        hostent = Socket.gethostbyaddr(addr)
-        if /.+?\.(.*)/.match?(hostent.first)
-          fqdn hostent.first
-          break
-        end
-      end
-      fqdn info.first unless fqdn
-    end
+    fqdn canonicalize_hostname_with_retries(Socket.gethostname)
     domain collect_domain
   end
 end

data/lib/ohai/plugins/linux/livepatch.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+#
+# Author:: Song Liu <song@kernel.org>
+# Copyright:: Copyright (c) 2021 Facebook, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+Ohai.plugin(:Livepatch) do
+  provides "livepatch"
+
+  collect_data(:linux) do
+    if file_exist?("/sys/kernel/livepatch")
+      patches = Mash.new
+      dir_glob("/sys/kernel/livepatch/*").each do |livepatch_dir|
+        dir = File.basename(livepatch_dir)
+        patches[dir] = Mash.new
+        %w{enabled transition}.each do |check|
+          if file_exist?("/sys/kernel/livepatch/#{dir}/#{check}")
+            file_open("/sys/kernel/livepatch/#{dir}/#{check}") { |f| patches[dir][check] = f.read_nonblock(1024).strip }
+          end
+        end
+        livepatch patches
+      end
+    end
+  end
+end