ohai 16.6.5 → 16.10.6

data/lib/ohai/plugins/keys.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Cookbook Name:: apache2
 # Recipe:: default

data/lib/ohai/plugins/languages.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/plugins/libvirt.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Benjamin Black (<bb@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -16,11 +17,11 @@
 # limitations under the License.
 #
 
-# Note: This plugin requires libvirt-bin/libvirt-dev as well as the ruby-libvirt
+# NOTE: This plugin requires libvirt-bin/libvirt-dev as well as the ruby-libvirt
 #       gem to be installed before it will properly parse data
 
 Ohai.plugin(:Libvirt) do
-  %w{ uri capabilities nodeinfo domains networks storage }.each do |info|
+  %w{uri capabilities nodeinfo domains networks storage}.each do |info|
     provides "libvirt/#{info}"
     depends "virtualization"
   end
@@ -88,7 +89,7 @@ Ohai.plugin(:Libvirt) do
     storage_data
   end
 
-  collect_data do
+  collect_data(:linux) do
     if virtualization[:role].eql?("host")
       load_libvirt
       begin

data/lib/ohai/plugins/linode.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Aaron Kalin (<akalin@martinisoftware.com>)
 # License:: Apache License, Version 2.0
@@ -17,31 +18,38 @@
 Ohai.plugin(:Linode) do
   provides "linode"
 
-  depends "kernel"
+  depends "domain"
   depends "network/interfaces"
 
-  # Checks for matching linode kernel name
+  # Checks to see if the node is in the members.linode.com domain
   #
-  # Returns true or false
-  def has_linode_kernel?
-    if ( kernel_data = kernel )
-      kernel_data[:release].split("-").last.include?("linode")
-    end
+  # @return [Boolean]
+  #
+  def has_linode_domain?
+    domain&.include?("linode")
+  end
+
+  # Checks for linode mirrors in the apt sources.list file
+  #
+  # @return [Boolean]
+  #
+  def has_linode_apt_repos?
+    file_exist?("/etc/apt/sources.list") && file_read("/etc/apt/sources.list").include?("linode")
   end
 
   # Identifies the linode cloud by preferring the hint, then
   #
-  # Returns true or false
+  # @return [Boolean]
+  #
   def looks_like_linode?
-    hint?("linode") || has_linode_kernel?
+    hint?("linode") || has_linode_domain? || has_linode_apt_repos?
   end
 
-  # Names linode ip address
+  # Alters linode mash with new interface based on name parameter
   #
-  # name - symbol of ohai name (e.g. :public_ip)
-  # eth - Interface name (e.g. :eth0)
+  # @param [Symbol] name Ohai name (e.g. :public_ip)
+  # @param [Symbol] eth Interface name (e.g. :eth0)
   #
-  # Alters linode mash with new interface based on name parameter
   def get_ip_address(name, eth)
     if ( eth_iface = network[:interfaces][eth] )
       eth_iface[:addresses].each do |key, info|
@@ -50,7 +58,7 @@ Ohai.plugin(:Linode) do
     end
   end
 
-  collect_data do
+  collect_data(:linux) do
     # Setup linode mash if it is a linode system
     if looks_like_linode?
       logger.trace("Plugin Linode: looks_like_linode? == true")

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Davide Cavalca (<dcavalca@fb.com>)
 # Copyright:: Copyright (c) 2016 Facebook
@@ -25,8 +26,8 @@ Ohai.plugin(:Hostnamectl) do
     hostnamectl_path = which("hostnamectl")
     if hostnamectl_path
       shell_out(hostnamectl_path).stdout.split("\n").each do |line|
-        key, val = line.split(":")
-        hostnamectl[key.chomp.lstrip.tr(" ", "_").downcase] = val.chomp.lstrip
+        key, val = line.split(": ", 2)
+        hostnamectl[key.chomp.lstrip.tr(" ", "_").downcase] = val
       end
     end
   end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Davide Cavalca <dcavalca@fb.com>
 # Copyright:: Copyright (c) 2020 Facebook

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Jay Vana <jsvana@fb.com>
 # Author:: Davide Cavalca <dcavalca@fb.com>

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -26,34 +27,20 @@ Ohai.plugin(:LSB) do
       # From package redhat-lsb on Fedora/Redhat, lsb-release on Debian/Ubuntu
       shell_out("lsb_release -a").stdout.lines do |line|
         case line
-        when /^Distributor ID:\s+(.+)$/
+        when /^Distributor ID:\s+(.+)/
           lsb[:id] = $1
-        when /^Description:\s+(.+)$/
+        when /^Description:\s+(.+)/
           lsb[:description] = $1
-        when /^Release:\s+(.+)$/
+        when /^Release:\s+(.+)/
           lsb[:release] = $1
-        when /^Codename:\s+(.+)$/
+        when /^Codename:\s+(.+)/
           lsb[:codename] = $1
         else
           lsb[:id] = line
         end
       end
-    elsif file_exist?("/etc/lsb-release")
-      # Old, non-standard Debian support
-      file_open("/etc/lsb-release").each do |line|
-        case line
-        when /^DISTRIB_ID=["']?(.+?)["']?$/
-          lsb[:id] = $1
-        when /^DISTRIB_RELEASE=["']?(.+?)["']?$/
-          lsb[:release] = $1
-        when /^DISTRIB_CODENAME=["']?(.+?)["']?$/
-          lsb[:codename] = $1
-        when /^DISTRIB_DESCRIPTION=["']?(.+?)["']?$/
-          lsb[:description] = $1
-        end
-      end
     else
-      logger.trace("Plugin LSB: Skipping LSB, cannot find /etc/lsb-release or /usr/bin/lsb_release")
+      logger.trace("Plugin LSB: Skipping LSB, cannot find /usr/bin/lsb_release")
     end
   end
 end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Joerg Herzinger <joerg.herzinger@oiml.at>
 # Author:: Phil Dibowitz <phil@ipom.com>
@@ -18,7 +19,6 @@
 # limitations under the License.
 
 Ohai.plugin(:Lspci) do
-  depends "platform"
   provides "pci"
   optional true
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Davide Cavalca (<dcavalca@fb.com>)
 # Copyright:: Copyright (c) 2016 Facebook

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Tim Smith <tsmith@limelight.com>
 # Author:: Phil Dibowitz <phild@ipomc.com>

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -27,77 +28,77 @@ Ohai.plugin(:Memory) do
 
     file_open("/proc/meminfo").each do |line|
       case line
-      when /^MemTotal:\s+(\d+) (.+)$/
+      when /^MemTotal:\s+(\d+) (.+)/
         memory[:total] = "#{$1}#{$2}"
-      when /^MemFree:\s+(\d+) (.+)$/
+      when /^MemFree:\s+(\d+) (.+)/
         memory[:free] = "#{$1}#{$2}"
-      when /^MemAvailable:\s+(\d+) (.+)$/
+      when /^MemAvailable:\s+(\d+) (.+)/
         memory[:available] = "#{$1}#{$2}"
-      when /^Buffers:\s+(\d+) (.+)$/
+      when /^Buffers:\s+(\d+) (.+)/
         memory[:buffers] = "#{$1}#{$2}"
-      when /^Cached:\s+(\d+) (.+)$/
+      when /^Cached:\s+(\d+) (.+)/
         memory[:cached] = "#{$1}#{$2}"
-      when /^Active:\s+(\d+) (.+)$/
+      when /^Active:\s+(\d+) (.+)/
         memory[:active] = "#{$1}#{$2}"
-      when /^Inactive:\s+(\d+) (.+)$/
+      when /^Inactive:\s+(\d+) (.+)/
         memory[:inactive] = "#{$1}#{$2}"
-      when /^HighTotal:\s+(\d+) (.+)$/
+      when /^HighTotal:\s+(\d+) (.+)/
         memory[:high_total] = "#{$1}#{$2}"
-      when /^HighFree:\s+(\d+) (.+)$/
+      when /^HighFree:\s+(\d+) (.+)/
         memory[:high_free] = "#{$1}#{$2}"
-      when /^LowTotal:\s+(\d+) (.+)$/
+      when /^LowTotal:\s+(\d+) (.+)/
         memory[:low_total] = "#{$1}#{$2}"
-      when /^LowFree:\s+(\d+) (.+)$/
+      when /^LowFree:\s+(\d+) (.+)/
         memory[:low_free] = "#{$1}#{$2}"
-      when /^Dirty:\s+(\d+) (.+)$/
+      when /^Dirty:\s+(\d+) (.+)/
         memory[:dirty] = "#{$1}#{$2}"
-      when /^Writeback:\s+(\d+) (.+)$/
+      when /^Writeback:\s+(\d+) (.+)/
         memory[:writeback] = "#{$1}#{$2}"
-      when /^AnonPages:\s+(\d+) (.+)$/
+      when /^AnonPages:\s+(\d+) (.+)/
         memory[:anon_pages] = "#{$1}#{$2}"
-      when /^Mapped:\s+(\d+) (.+)$/
+      when /^Mapped:\s+(\d+) (.+)/
         memory[:mapped] = "#{$1}#{$2}"
-      when /^Slab:\s+(\d+) (.+)$/
+      when /^Slab:\s+(\d+) (.+)/
         memory[:slab] = "#{$1}#{$2}"
-      when /^SReclaimable:\s+(\d+) (.+)$/
+      when /^SReclaimable:\s+(\d+) (.+)/
         memory[:slab_reclaimable] = "#{$1}#{$2}"
-      when /^SUnreclaim:\s+(\d+) (.+)$/
+      when /^SUnreclaim:\s+(\d+) (.+)/
         memory[:slab_unreclaim] = "#{$1}#{$2}"
-      when /^PageTables:\s+(\d+) (.+)$/
+      when /^PageTables:\s+(\d+) (.+)/
         memory[:page_tables] = "#{$1}#{$2}"
-      when /^NFS_Unstable:\s+(\d+) (.+)$/
+      when /^NFS_Unstable:\s+(\d+) (.+)/
         memory[:nfs_unstable] = "#{$1}#{$2}"
-      when /^Bounce:\s+(\d+) (.+)$/
+      when /^Bounce:\s+(\d+) (.+)/
         memory[:bounce] = "#{$1}#{$2}"
-      when /^CommitLimit:\s+(\d+) (.+)$/
+      when /^CommitLimit:\s+(\d+) (.+)/
         memory[:commit_limit] = "#{$1}#{$2}"
-      when /^Committed_AS:\s+(\d+) (.+)$/
+      when /^Committed_AS:\s+(\d+) (.+)/
         memory[:committed_as] = "#{$1}#{$2}"
-      when /^VmallocTotal:\s+(\d+) (.+)$/
+      when /^VmallocTotal:\s+(\d+) (.+)/
         memory[:vmalloc_total] = "#{$1}#{$2}"
-      when /^VmallocUsed:\s+(\d+) (.+)$/
+      when /^VmallocUsed:\s+(\d+) (.+)/
         memory[:vmalloc_used] = "#{$1}#{$2}"
-      when /^VmallocChunk:\s+(\d+) (.+)$/
+      when /^VmallocChunk:\s+(\d+) (.+)/
         memory[:vmalloc_chunk] = "#{$1}#{$2}"
-      when /^SwapCached:\s+(\d+) (.+)$/
+      when /^SwapCached:\s+(\d+) (.+)/
         memory[:swap][:cached] = "#{$1}#{$2}"
-      when /^SwapTotal:\s+(\d+) (.+)$/
+      when /^SwapTotal:\s+(\d+) (.+)/
         memory[:swap][:total] = "#{$1}#{$2}"
-      when /^SwapFree:\s+(\d+) (.+)$/
+      when /^SwapFree:\s+(\d+) (.+)/
         memory[:swap][:free] = "#{$1}#{$2}"
-      when /^HugePages_Total:\s+(\d+)$/
+      when /^HugePages_Total:\s+(\d+)/
         memory[:hugepages][:total] = $1.to_s
-      when /^HugePages_Free:\s+(\d+)$/
+      when /^HugePages_Free:\s+(\d+)/
         memory[:hugepages][:free] = $1.to_s
-      when /^HugePages_Rsvd:\s+(\d+)$/
+      when /^HugePages_Rsvd:\s+(\d+)/
         memory[:hugepages][:reserved] = $1.to_s
-      when /^HugePages_Surp:\s+(\d+)$/
+      when /^HugePages_Surp:\s+(\d+)/
         memory[:hugepages][:surplus] = $1.to_s
-      when /^Hugepagesize:\s+(\d+) (.+)$/
+      when /^Hugepagesize:\s+(\d+) (.+)/
         memory[:hugepage_size] = "#{$1}#{$2}"
-      when /^Hugetlb:\s+(\d+) (.+)$/
+      when /^Hugetlb:\s+(\d+) (.+)/
         memory[:hugetlb] = "#{$1}#{$2}"
-      when /^DirectMap([0-9]+[a-zA-Z]):\s+(\d+) (.+)$/
+      when /^DirectMap([0-9]+[a-zA-Z]):\s+(\d+) (.+)/
         memory[:directmap][$1.to_sym] = "#{$2}#{$3}"
       end
     end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Chris Read <chris.read@gmail.com>
@@ -153,7 +154,7 @@ Ohai.plugin(:Network) do
   def ethernet_layer_one(iface)
     return iface unless ethtool_binary_path
 
-    keys = %w{ Speed Duplex Port Transceiver Auto-negotiation MDI-X }
+    keys = %w{Speed Duplex Port Transceiver Auto-negotiation MDI-X}
     iface.each_key do |tmp_int|
       next unless iface[tmp_int][:encapsulation] == "Ethernet"
 
@@ -272,6 +273,30 @@ Ohai.plugin(:Network) do
     iface
   end
 
+  # determine pause parameters for the interface using ethtool
+  def ethernet_pause_parameters(iface)
+    return iface unless ethtool_binary_path
+
+    iface.each_key do |tmp_int|
+      next unless iface[tmp_int][:encapsulation] == "Ethernet"
+
+      so = shell_out("#{ethtool_binary_path} -a #{tmp_int}")
+      logger.trace("Plugin Network: Parsing ethtool output: #{so.stdout}")
+      iface[tmp_int]["pause_params"] = {}
+      so.stdout.lines.each do |line|
+        next if line.start_with?("Pause parameters for")
+        next if line.strip.nil?
+
+        key, val = line.split(/:\s+/)
+        if val
+          pause_key = "#{key.downcase.tr(" ", "_")}"
+          iface[tmp_int]["pause_params"][pause_key] = val.strip.eql? "on"
+        end
+      end
+    end
+    iface
+  end
+
   # determine driver info for the interface using ethtool
   def ethernet_driver_info(iface)
     return iface unless ethtool_binary_path
@@ -384,7 +409,7 @@ Ohai.plugin(:Network) do
     if line =~ IPROUTE_INT_REGEX
       cint = $2
       iface[cint] = Mash.new
-      if cint =~ /^(\w+)(\d+.*)/
+      if cint =~ /^(\w+?)(\d+.*)/
         iface[cint][:type] = $1
         iface[cint][:number] = $2
       end
@@ -465,7 +490,7 @@ Ohai.plugin(:Network) do
       iface[cint][:addresses] ||= Mash.new
       tmp_addr = $1
       tags = $4 || ""
-      tags = tags.split(" ")
+      tags = tags.split
 
       iface[cint][:addresses][tmp_addr] = {
         "family" => "inet6",
@@ -695,7 +720,7 @@ Ohai.plugin(:Network) do
         if line =~ /^([0-9a-zA-Z@\.\:\-_]+)\s+/
           cint = $1
           iface[cint] = Mash.new
-          if cint =~ /^(\w+)(\d+.*)/
+          if cint =~ /^(\w+?)(\d+.*)/
             iface[cint][:type] = $1
             iface[cint][:number] = $2
           end
@@ -769,6 +794,7 @@ Ohai.plugin(:Network) do
     iface = ethernet_channel_parameters(iface)
     iface = ethernet_coalesce_parameters(iface)
     iface = ethernet_driver_info(iface)
+    iface = ethernet_pause_parameters(iface)
     counters[:network][:interfaces] = net_counters
     network["interfaces"] = iface
   end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -132,10 +133,10 @@ Ohai.plugin(:Platform) do
   #
   def platform_family_from_platform(plat)
     case plat
-    when /debian/, /ubuntu/, /linuxmint/, /raspbian/, /cumulus/, /kali/
+    when /debian/, /ubuntu/, /linuxmint/, /raspbian/, /cumulus/, /kali/, /pop/
       # apt-get+dpkg almost certainly goes here
       "debian"
-    when /oracle/, /centos/, /redhat/, /scientific/, /enterpriseenterprise/, /xcp/, /xenserver/, /cloudlinux/, /ibm_powerkvm/, /parallels/, /nexus_centos/, /clearos/, /bigip/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID"
+    when /oracle/, /centos/, /redhat/, /almalinux/, /scientific/, /enterpriseenterprise/, /xcp/, /xenserver/, /cloudlinux/, /ibm_powerkvm/, /parallels/, /nexus_centos/, /clearos/, /bigip/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID"
       # NOTE: "rhel" should be reserved exclusively for recompiled rhel versions that are nearly perfectly compatible down to the platform_version.
       # The operating systems that are "rhel" should all be as compatible as rhel7 = centos7 = oracle7 = scientific7 (98%-ish core RPM version compatibility
       # and the version numbers MUST track the upstream). The appropriate EPEL version repo should work nearly perfectly.  Some variation like the
@@ -286,6 +287,9 @@ Ohai.plugin(:Platform) do
     # centos only includes the major version in os-release for some reason
     if os_release_info["ID"] == "centos"
       get_redhatish_version(file_read("/etc/redhat-release").chomp)
+    # debian testing and unstable don't have VERSION_ID set
+    elsif os_release_info["ID"] == "debian"
+      os_release_info["VERSION_ID"] || file_read("/etc/debian_version").chomp
     else
       os_release_info["VERSION_ID"] || shell_out("/bin/uname -r").stdout.strip
     end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Davide Cavalca <dcavalca@fb.com>
 # Copyright:: Copyright (c) 2020 Facebook

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Davide Cavalca <dcavalca@fb.com>
 # Copyright:: Copyright (c) 2016 Facebook