ohai 16.7.18 → 16.10.7

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

@@ -19,7 +19,6 @@
 # limitations under the License.
 
 Ohai.plugin(:Lspci) do
-  depends "platform"
   provides "pci"
   optional true
 

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

@@ -154,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"
 
@@ -273,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
@@ -385,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
@@ -466,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",
@@ -696,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
@@ -770,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

@@ -136,7 +136,7 @@ Ohai.plugin(:Platform) do
     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
@@ -287,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/netbsd/platform.rb

@@ -21,8 +21,8 @@ Ohai.plugin(:Platform) do
   provides "platform", "platform_version", "platform_family"
 
   collect_data(:netbsd) do
-    platform shell_out("uname -s").stdout.split($/)[0].downcase
-    platform_version shell_out("uname -r").stdout.split($/)[0]
+    platform shell_out("uname -s").stdout.strip.downcase
+    platform_version shell_out("uname -r").stdout.strip
     platform_family "netbsd"
   end
 end

data/lib/ohai/plugins/network.rb

@@ -39,7 +39,7 @@ Ohai.plugin(:NetworkAddresses) do
       next if iface_v.nil? || !iface_v.key?("addresses")
 
       iface_v["addresses"].each do |addr, addr_v|
-        next if addr_v.nil? || (not addr_v.key? "family") || addr_v["family"] != family
+        next if addr_v.nil? || (!addr_v.key? "family") || addr_v["family"] != family
 
         ipaddresses << {
           ipaddress: addr_v["prefixlen"] ? IPAddress("#{addr}/#{addr_v["prefixlen"]}") : IPAddress("#{addr}/#{addr_v["netmask"]}"),

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

@@ -21,8 +21,8 @@ Ohai.plugin(:Platform) do
   provides "platform", "platform_version", "platform_family"
 
   collect_data(:openbsd) do
-    platform shell_out("uname -s").stdout.split($/)[0].downcase
-    platform_version shell_out("uname -r").stdout.split($/)[0]
+    platform shell_out("uname -s").stdout.strip.downcase
+    platform_version shell_out("uname -r").stdout.strip
     platform_family "openbsd"
   end
 end

data/lib/ohai/plugins/os.rb

@@ -35,7 +35,7 @@ Ohai.plugin(:OS) do
 
     # This is __DragonFly_version / __FreeBSD_version. See sys/param.h or
     # http://www.freebsd.org/doc/en/books/porters-handbook/freebsd-versions.html.
-    os_version shell_out("sysctl -n kern.osreldate").stdout.split($/)[0]
+    os_version shell_out("sysctl -n kern.osreldate").stdout.strip
   end
 
   collect_data(:target) do

data/lib/ohai/plugins/packages.rb

@@ -164,7 +164,7 @@ Ohai.plugin(:Packages) do
     # Output format is
     # name version
     so.stdout.lines do |pkg|
-      name, version = pkg.split(" ")
+      name, version = pkg.split
       packages[name] = { "version" => version }
     end
   end

data/lib/ohai/plugins/passwd.rb

@@ -91,7 +91,7 @@ Ohai.plugin(:Passwd) do
           if info.keys.any? { |x| x.match?("Win32_UserAccount") }
             mi["type"] = :user
           else
-            # Note: the type here is actually Win32_SystemAccount, because,
+            # NOTE: the type here is actually Win32_SystemAccount, because,
             # that's what groups are in the Windows universe.
             mi["type"] = :group
           end

data/lib/ohai/plugins/rackspace.rb

@@ -161,10 +161,10 @@ Ohai.plugin(:Rackspace) do
       get_global_ipv6_address(:public_ipv6, :eth0)
       unless rackspace[:public_ip].nil?
         rackspace[:public_hostname] = begin
-                                        Resolv.getname(rackspace[:public_ip])
-        rescue Resolv::ResolvError, Resolv::ResolvTimeout
-          rackspace[:public_ip]
-                                      end
+          Resolv.getname(rackspace[:public_ip])
+                                      rescue Resolv::ResolvError, Resolv::ResolvTimeout
+                                        rackspace[:public_ip]
+        end
       end
       rackspace[:local_ipv4] = rackspace[:private_ip]
       get_global_ipv6_address(:local_ipv6, :eth1)

data/lib/ohai/plugins/scaleway.rb

@@ -44,7 +44,7 @@ Ohai.plugin(:Scaleway) do
     false
   end
 
-  collect_data do
+  collect_data(:linux) do
     if looks_like_scaleway?
       logger.trace("Plugin Scaleway: looks_like_scaleway? == true")
       scaleway Mash.new

data/lib/ohai/plugins/scsi.rb

@@ -18,7 +18,6 @@
 #
 
 Ohai.plugin(:Lsscsi) do
-  depends "platform"
   provides "scsi"
   optional true
 

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

@@ -127,7 +127,7 @@ Ohai.plugin(:Network) do
       end
       if line =~ /\s+inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) netmask (([0-9a-f]){1,8}) broadcast (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
         iface[cint][:addresses] ||= Mash.new
-        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => hex_to_dec_netmask($2) , "broadcast" => $4 }
+        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => hex_to_dec_netmask($2), "broadcast" => $4 }
       end
       if line =~ %r{\s+inet6 ([a-f0-9\:]+)(\s*|(\%[a-z0-9]+)\s*)/(\d+)\s*$}
         iface[cint][:addresses] ||= Mash.new

data/lib/ohai/plugins/solaris2/virtualization.rb

@@ -69,12 +69,11 @@ Ohai.plugin(:Virtualization) do
 
       if zones.length == 1
         first_zone = zones.keys[0]
+        virtualization[:system] = "zone"
         if first_zone == "global"
-          virtualization[:system] = "zone"
           virtualization[:role] = "host"
           virtualization[:systems][:zone] = "host"
         else
-          virtualization[:system] = "zone"
           virtualization[:role] = "guest"
           virtualization[:systems][:zone] = "guest"
           virtualization[:guest_uuid] = zones[first_zone]["uuid"]

data/lib/ohai/plugins/train.rb

@@ -29,7 +29,6 @@ Ohai.plugin(:Train) do
       if transport_connection.respond_to?(:uri)
         train["scheme"] = URI.parse(transport_connection.uri).scheme
         train["uri"] = transport_connection.uri
-      else
       end
     end
   end

data/lib/ohai/plugins/uptime.rb

@@ -55,7 +55,7 @@ Ohai.plugin(:Uptime) do
   end
 
   collect_data(:linux) do
-    uptime, idletime = file_open("/proc/uptime").gets.split(" ")
+    uptime, idletime = file_open("/proc/uptime").gets.split
     uptime_seconds uptime.to_i
     uptime seconds_to_human(uptime.to_i)
     idletime_seconds idletime.to_i

data/lib/ohai/plugins/virtualbox.rb

@@ -128,7 +128,7 @@ Ohai.plugin(:Virtualbox) do
     logger.trace("Plugin VboxHost: Could not run '#{so_cmd}'. Skipping data")
   end
 
-  collect_data(:default) do
+  collect_data(:windows, :linux, :solaris2, :darwin) do
     case virtualization.dig("systems", "vbox")
     when "guest"
       logger.trace("Plugin Virtualbox: Node detected as vbox guest. Collecting guest data.")

data/lib/ohai/plugins/vmware.rb

@@ -37,8 +37,7 @@ Ohai.plugin(:VMware) do
   depends "virtualization"
 
   def from_cmd(cmd)
-    so = shell_out(cmd)
-    so.stdout.split($/)[0]
+    shell_out(cmd).stdout.strip
   end
 
   def get_vm_attributes(vmtools_path)

data/lib/ohai/plugins/zpools.rb

@@ -46,7 +46,6 @@ Ohai.plugin(:Zpools) do
           pools[$1][:zpool_version] = sanitize_value($8)
         end
       end
-
     rescue Ohai::Exceptions::Exec
       Ohai::Log.debug('Plugin Zpools: Could not shell_out "zpool list -H -o name,size,alloc,free,cap,dedup,health,version". Skipping plugin.')
     end

data/lib/ohai/util/ip_helper.rb

@@ -33,7 +33,7 @@ module Ohai
           IPV6_LINK_LOCAL_UNICAST_BLOCK.include?(ip) || IPV6_PRIVATE_ADDRESS_BLOCK.include?(ip)
         end
       end
-      alias :unique_local_address? :private_address?
+      alias unique_local_address? private_address?
 
       def public_address?(addr)
         !private_address?(addr)

data/lib/ohai/version.rb

@@ -19,5 +19,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(__dir__)
-  VERSION = "16.7.18"
+  VERSION = "16.10.7"
 end

data/ohai.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |s|
   s.add_dependency "mixlib-log", ">= 2.0.1", "< 4.0"
   s.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
   s.add_dependency "plist", "~> 3.1"
-  s.add_dependency "wmi-lite", "~> 1.0"
   s.add_dependency "train-core"
+  s.add_dependency "wmi-lite", "~> 1.0"
   # Note for ohai developers: If chef-config causes you grief, try:
   #     bundle install --with development
   # this should work as long as chef is a development dependency in Gemfile.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 16.7.18
+  version: 16.10.7
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-07 00:00:00.000000000 Z
+date: 2021-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -181,33 +181,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: wmi-lite
+  name: train-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: train-core
+  name: wmi-lite
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: Ohai profiles your system and emits JSON
 email: adam@chef.io
 executables:
@@ -285,11 +285,11 @@ files:
 - lib/ohai/plugins/gce.rb
 - lib/ohai/plugins/go.rb
 - lib/ohai/plugins/groovy.rb
+- lib/ohai/plugins/grub2.rb
 - lib/ohai/plugins/haskell.rb
 - lib/ohai/plugins/hostname.rb
 - lib/ohai/plugins/init_package.rb
 - lib/ohai/plugins/java.rb
-- lib/ohai/plugins/joyent.rb
 - lib/ohai/plugins/kernel.rb
 - lib/ohai/plugins/keys.rb
 - lib/ohai/plugins/languages.rb
@@ -391,7 +391,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON

data/lib/ohai/plugins/joyent.rb

@@ -1,78 +0,0 @@
-# frozen_string_literal: true
-#
-# Author: sawanoboriyu@higanworks.com
-# Copyright (C) 2014 HiganWorks LLC
-# 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.
-#
-#
-
-# Reference from: sm-summary command
-
-Ohai.plugin(:Joyent) do
-  provides "joyent"
-  provides "virtualization/guest_id"
-  depends "os", "platform", "virtualization"
-
-  def collect_product_file
-    data = file_read("/etc/product") rescue nil
-    if data
-      data.strip.split("\n")
-    else
-      []
-    end
-  end
-
-  def collect_pkgsrc
-    data = file_read("/opt/local/etc/pkg_install.conf") rescue nil
-    if data
-      /PKG_PATH=(.*)/.match(data)[1] rescue nil
-    end
-  end
-
-  def is_smartos?
-    platform == "smartos"
-  end
-
-  collect_data do
-    if is_smartos?
-      joyent Mash.new
-
-      # copy uuid
-      joyent[:sm_uuid] = virtualization[:guest_uuid]
-
-      # get zone id unless globalzone
-      unless joyent[:sm_uuid] == "global"
-        joyent[:sm_id] = virtualization[:guest_id]
-      end
-
-      # retrieve image name and pkgsrc
-      collect_product_file.each do |line|
-        case line
-        when /^Image/
-          sm_image = line.split(" ")
-          joyent[:sm_image_id] = sm_image[1]
-          joyent[:sm_image_ver] = sm_image[2]
-        when /^Base Image/
-          sm_baseimage = line.split(" ")
-          joyent[:sm_baseimage_id] = sm_baseimage[2]
-          joyent[:sm_baseimage_ver] = sm_baseimage[3]
-        end
-      end
-
-      ## retrieve pkgsrc
-      joyent[:sm_pkgsrc] = collect_pkgsrc
-    end
-  end
-end