ohai 14.15.0 → 15.0.35

data/lib/ohai/plugins/elixir.rb

@@ -18,19 +18,19 @@ Ohai.plugin(:Elixir) do
   depends "languages"
 
   collect_data do
-    begin
-      so = shell_out("elixir -v")
-      # Sample output:
-      # Erlang/OTP 18 [erts-7.3] [source] [64-bit] [smp:8:8] [async-threads:10] [hipe] [kernel-poll:false] [dtrace]
-      #
-      # Elixir 1.2.4
-      if so.exitstatus == 0 && so.stdout =~ /^Elixir (\S*)/
-        elixir = Mash.new
-        elixir[:version] = $1
-        languages[:elixir] = elixir
-      end
-    rescue Ohai::Exceptions::Exec
-      logger.trace('Plugin Elixir: Could not shell_out "elixir -v". Skipping plugin')
+
+    so = shell_out("elixir -v")
+    # Sample output:
+    # Erlang/OTP 18 [erts-7.3] [source] [64-bit] [smp:8:8] [async-threads:10] [hipe] [kernel-poll:false] [dtrace]
+    #
+    # Elixir 1.2.4
+    if so.exitstatus == 0 && so.stdout =~ /^Elixir (\S*)/
+      elixir = Mash.new
+      elixir[:version] = $1
+      languages[:elixir] = elixir
     end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Elixir: Could not shell_out "elixir -v". Skipping plugin')
+
   end
 end

data/lib/ohai/plugins/filesystem.rb

@@ -250,16 +250,16 @@ Ohai.plugin(:Filesystem) do
       # we have to non-block read dev files. Ew.
       f = File.open("/proc/mounts")
       loop do
-        begin
-          data = f.read_nonblock(4096)
-          mounts << data
-        # We should just catch EOFError, but the kernel had a period of
-        # bugginess with reading virtual files, so we're being extra
-        # cautious here, catching all exceptions, and then we'll read
-        # whatever data we might have
-        rescue Exception
-          break
-        end
+
+        data = f.read_nonblock(4096)
+        mounts << data
+      # We should just catch EOFError, but the kernel had a period of
+      # bugginess with reading virtual files, so we're being extra
+      # cautious here, catching all exceptions, and then we'll read
+      # whatever data we might have
+      rescue Exception
+        break
+
       end
       f.close
       mounts.each_line do |line|

data/lib/ohai/plugins/gce.rb

@@ -23,13 +23,43 @@ Ohai.plugin(:GCE) do
 
   provides "gce"
 
-  # Checks for gce metadata server
-  #
-  # === Return
-  # true:: If gce metadata server found
-  # false:: Otherwise
-  def has_gce_metadata?
-    can_socket_connect?(Ohai::Mixin::GCEMetadata::GCE_METADATA_ADDR, 80)
+  # look for GCE string in dmi vendor bios data within the sys tree.
+  # this works even if the system lacks dmidecode use by the Dmi plugin
+  # @return [Boolean] do we have Google Compute Engine DMI data?
+  def has_gce_dmi?
+    if file_val_if_exists("/sys/class/dmi/id/product_name") =~ /Google Compute Engine/
+      logger.trace("Plugin GCE: has_gce_dmi? == true")
+      true
+    else
+      logger.trace("Plugin GCE: has_gce_dmi? == false")
+      false
+    end
+  end
+
+  # return the contents of a file if the file exists
+  # @param path[String] abs path to the file
+  # @return [String] contents of the file if it exists
+  def file_val_if_exists(path)
+    if ::File.exist?(path)
+      ::File.read(path)
+    end
+  end
+
+  # looks at the Manufacturer and Model WMI values to see if they starts with Google.
+  # @return [Boolean] Are the manufacturer and model Google?
+  def has_gce_system_info?
+    if RUBY_PLATFORM =~ /mswin|mingw32|windows/
+      require "wmi-lite/wmi"
+      wmi = WmiLite::Wmi.new
+      computer_system = wmi.first_of("Win32_ComputerSystem")
+      if computer_system["Manufacturer"] =~ /^Google/ && computer_system["Model"] =~ /^Google/
+        logger.trace("Plugin GCE: has_gce_system_info? == true")
+        return true
+      end
+    else
+      logger.trace("Plugin GCE: has_gce_system_info? == false")
+      false
+    end
   end
 
   # Identifies gce
@@ -38,7 +68,11 @@ Ohai.plugin(:GCE) do
   # true:: If gce can be identified
   # false:: Otherwise
   def looks_like_gce?
-    hint?("gce") || has_gce_metadata?
+    return true if hint?("gce")
+
+    if has_gce_dmi? || has_gce_system_info?
+      return true if can_socket_connect?(Ohai::Mixin::GCEMetadata::GCE_METADATA_ADDR, 80)
+    end
   end
 
   collect_data do

data/lib/ohai/plugins/go.rb

@@ -18,17 +18,17 @@ Ohai.plugin(:Go) do
   depends "languages"
 
   collect_data do
-    begin
-      so = shell_out("go version")
-      # Sample output:
-      # go version go1.6.1 darwin/amd64
-      if so.exitstatus == 0 && so.stdout =~ /go(\S+)/
-        go = Mash.new
-        go[:version] = $1
-        languages[:go] = go
-      end
-    rescue Ohai::Exceptions::Exec
-      logger.trace('Plugin Go: Could not shell_out "go version". Skipping plugin')
+
+    so = shell_out("go version")
+    # Sample output:
+    # go version go1.6.1 darwin/amd64
+    if so.exitstatus == 0 && so.stdout =~ /go(\S+)/
+      go = Mash.new
+      go[:version] = $1
+      languages[:go] = go
     end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Go: Could not shell_out "go version". Skipping plugin')
+
   end
 end

data/lib/ohai/plugins/groovy.rb

@@ -21,18 +21,18 @@ Ohai.plugin(:Groovy) do
   depends "languages"
 
   collect_data do
-    begin
-      so = shell_out("groovy -v")
-      # Sample output:
-      # Groovy Version: 2.4.6 JVM: 1.8.0_60 Vendor: Oracle Corporation OS: Mac OS X
-      if so.exitstatus == 0 && so.stdout =~ /Groovy Version: (\S+).*JVM: (\S+)/
-        groovy = Mash.new
-        groovy[:version] = $1
-        groovy[:jvm] = $2
-        languages[:groovy] = groovy
-      end
-    rescue Ohai::Exceptions::Exec
-      logger.trace('Plugin Groovy: Could not shell_out "groovy -v". Skipping plugin')
+
+    so = shell_out("groovy -v")
+    # Sample output:
+    # Groovy Version: 2.4.6 JVM: 1.8.0_60 Vendor: Oracle Corporation OS: Mac OS X
+    if so.exitstatus == 0 && so.stdout =~ /Groovy Version: (\S+).*JVM: (\S+)/
+      groovy = Mash.new
+      groovy[:version] = $1
+      groovy[:jvm] = $2
+      languages[:groovy] = groovy
     end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Groovy: Could not shell_out "groovy -v". Skipping plugin')
+
   end
 end

data/lib/ohai/plugins/hostname.rb

@@ -74,7 +74,7 @@ Ohai.plugin(:Hostname) do
     end
   end
 
-  collect_data(:hpux, :default) do
+  collect_data(:default) do
     machinename from_cmd("hostname")
     fqdn resolve_fqdn
     collect_hostname
@@ -175,7 +175,14 @@ Ohai.plugin(:Hostname) do
     else
       # host is not in dns. optionally use:
       # C:\WINDOWS\system32\drivers\etc\hosts
-      fqdn Socket.gethostbyaddr(info.last).first
+      info[3..info.length].reverse_each do |addr|
+        hostent = Socket.gethostbyaddr(addr)
+        if hostent.first =~ /.+?\.(.*)/
+          fqdn hostent.first
+          break
+        end
+      end
+      fqdn info.first unless fqdn
     end
     domain collect_domain
   end

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

@@ -1,6 +1,6 @@
 #
 # Author:: Matt Wrock (<matt@mattwrock.com>)
-# Copyright:: Copyright (c) 2016 Chef Software, Inc.
+# Copyright:: Copyright (c) 2016-2018 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,18 +28,11 @@ Ohai.plugin(:Fips) do
   collect_data(:linux) do
     fips Mash.new
 
-    # Check for new fips_mode method added in Ruby 2.5. After we drop support
-    # for Ruby 2.4, clean up everything after this and collapse the FIPS plugins.
     require "openssl"
     if defined?(OpenSSL.fips_mode) && OpenSSL.fips_mode && !$FIPS_TEST_MODE
       fips["kernel"] = { "enabled" => true }
     else
-      begin
-        enabled = File.read("/proc/sys/crypto/fips_enabled").chomp
-        fips["kernel"] = { "enabled" => enabled == "0" ? false : true }
-      rescue Errno::ENOENT
-        fips["kernel"] = { "enabled" => false }
-      end
+      fips["kernel"] = { "enabled" => false }
     end
   end
 end

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

@@ -23,6 +23,7 @@ Ohai.plugin(:Memory) do
     memory Mash.new
     memory[:swap] = Mash.new
     memory[:hugepages] = Mash.new
+    memory[:directmap] = Mash.new
 
     File.open("/proc/meminfo").each do |line|
       case line
@@ -94,6 +95,10 @@ Ohai.plugin(:Memory) do
         memory[:hugepages][:surplus] = $1.to_s
       when /^Hugepagesize:\s+(\d+) (.+)$/
         memory[:hugepage_size] = "#{$1}#{$2}"
+      when /^Hugetlb:\s+(\d+) (.+)$/
+        memory[:hugetlb] = "#{$1}#{$2}"
+      when /^DirectMap([0-9]+[a-zA-Z]):\s+(\d+) (.+)$/
+        memory[:directmap][$1.to_sym] = "#{$2}#{$3}"
       end
     end
   end

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

@@ -491,7 +491,7 @@ Ohai.plugin(:Network) do
     # Match the lead line for an interface from iproute2
     # 3: eth0.11@eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP
     # The '@eth0:' portion doesn't exist on primary interfaces and thus is optional in the regex
-    IPROUTE_INT_REGEX = /^(\d+): ([0-9a-zA-Z@:\.\-_]*?)(@[0-9a-zA-Z]+|):\s/ unless defined? IPROUTE_INT_REGEX
+    IPROUTE_INT_REGEX = /^(\d+): ([0-9a-zA-Z@:\.\-_]*?)(@[0-9a-zA-Z]+|):\s/.freeze unless defined? IPROUTE_INT_REGEX
 
     if which("ip")
       # families to get default routes from

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

@@ -20,16 +20,39 @@ Ohai.plugin(:Platform) do
   provides "platform", "platform_version", "platform_family"
   depends "lsb"
 
+  # the platform mappings between the 'ID' field in /etc/os-release and the value
+  # ohai uses. If you're adding a new platform here and you want to change the name
+  # you'll want to add it here and then add a spec for the platform_id_remap method
+  unless defined?(PLATFORM_MAPPINGS)
+    PLATFORM_MAPPINGS = {
+      "rhel" => "redhat",
+      "amzn" => "amazon",
+      "ol" => "oracle",
+      "sles" => "suse",
+      "sles_sap" => "suse",
+      "opensuse-leap" => "opensuseleap",
+      "xenenterprise" => "xenserver",
+      "cumulus-linux" => "cumulus",
+    }.freeze
+  end
+
+  # @deprecated
   def get_redhatish_platform(contents)
     contents[/^Red Hat/i] ? "redhat" : contents[/(\w+)/i, 1].downcase
   end
 
   # Amazon Linux AMI release 2013.09
   # Amazon Linux 2
+  # Amazon Linux 2 (Karoo)
   # Fedora release 28 (Twenty Eight)
   # CentOS release 5.8 (Final)
   # CentOS release 6.7 (Final)
   # Red Hat Enterprise Linux Server release 7.5 (Maipo)
+  #
+  # @param contents [String] the contents of /etc/redhat-release
+  #
+  # @returns [String] the version string
+  #
   def get_redhatish_version(contents)
     contents[/Rawhide/i] ? contents[/((\d+) \(Rawhide\))/i, 1].downcase : contents[/(release)? ([\d\.]+)/, 2]
   end
@@ -78,22 +101,11 @@ Ohai.plugin(:Platform) do
     File.exist?("/etc/os-release") && os_release_info["CISCO_RELEASE_INFO"]
   end
 
-  #
-  # Determines the platform version for Cumulus Linux systems
-  #
-  # @returns [String] cumulus Linux version from /etc/cumulus/etc.replace/os-release
-  #
-  def cumulus_version
-    release_contents = File.read("/etc/cumulus/etc.replace/os-release")
-    release_contents.match(/VERSION_ID=(.*)/)[1]
-  rescue NoMethodError, Errno::ENOENT, Errno::EACCES # rescue regex failure, file missing, or permission denied
-    logger.warn("Detected Cumulus Linux, but /etc/cumulus/etc/replace/os-release could not be parsed to determine platform_version")
-    nil
-  end
-
   #
   # Determines the platform version for F5 Big-IP systems
   #
+  # @deprecated
+  #
   # @returns [String] bigip Linux version from /etc/f5-release
   #
   def bigip_version
@@ -104,27 +116,32 @@ Ohai.plugin(:Platform) do
     nil
   end
 
+  # our platform names don't match os-release. given a time machine they would but ohai
+  # came before the os-release file. This method remaps the os-release names to
+  # the ohai names
   #
-  # Determines the platform version for Debian based systems
+  # @param id [String] the platform ID from /etc/os-release
   #
-  # @returns [String] version of the platform
+  # @returns [String] the platform name to use in Ohai
   #
-  def debian_platform_version
-    if platform == "cumulus"
-      cumulus_version
-    else # not cumulus
-      File.read("/etc/debian_version").chomp
-    end
+  def platform_id_remap(id)
+    # this catches the centos guest shell in the nexus switch which identifies itself as centos
+    return "nexus_centos" if id == "centos" && os_release_file_is_cisco?
+
+    # remap based on the hash of platforms
+    PLATFORM_MAPPINGS[id] || id
   end
 
   #
   # Determines the platform_family based on the platform
   #
+  # @param plat [String] the platform name
+  #
   # @returns [String] platform_family value
   #
-  def determine_platform_family
-    case platform
-    when /debian/, /ubuntu/, /linuxmint/, /raspbian/, /cumulus/
+  def platform_family_from_platform(plat)
+    case plat
+    when /debian/, /ubuntu/, /linuxmint/, /raspbian/, /cumulus/, /kali/
       # 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"
@@ -162,7 +179,13 @@ Ohai.plugin(:Platform) do
     end
   end
 
-  collect_data(:linux) do
+  # modern linux distros include a /etc/os-release file, which we now rely on for
+  # OS detection. For older distros that do not include that file we fall back to
+  # our pre-Ohai 15 detection logic, which is the method below. No new functionality
+  # should be added to this logic.
+  #
+  # @deprecated
+  def legacy_platform_detection
     # platform [ and platform_version ? ] should be lower case to avoid dealing with RedHat/Redhat/redhat matching
     if File.exist?("/etc/oracle-release")
       contents = File.read("/etc/oracle-release").chomp
@@ -181,18 +204,9 @@ Ohai.plugin(:Platform) do
       if lsb[:id] =~ /Ubuntu/i
         platform "ubuntu"
         platform_version lsb[:release]
-      elsif lsb[:id] =~ /LinuxMint/i
-        platform "linuxmint"
-        platform_version lsb[:release]
       else
-        if File.exist?("/usr/bin/raspi-config")
-          platform "raspbian"
-        elsif Dir.exist?("/etc/cumulus")
-          platform "cumulus"
-        else
-          platform "debian"
-        end
-        platform_version debian_platform_version
+        platform "debian"
+        platform_version File.read("/etc/debian_version").chomp
       end
     elsif File.exist?("/etc/parallels-release")
       contents = File.read("/etc/parallels-release").chomp
@@ -202,14 +216,9 @@ Ohai.plugin(:Platform) do
       platform "arista_eos"
       platform_version File.read("/etc/Eos-release").strip.split[-1]
     elsif File.exist?("/etc/redhat-release")
-      if os_release_file_is_cisco? # Cisco guestshell
-        platform "nexus_centos"
-        platform_version os_release_info["VERSION"]
-      else
-        contents = File.read("/etc/redhat-release").chomp
-        platform get_redhatish_platform(contents)
-        platform_version get_redhatish_version(contents)
-      end
+      contents = File.read("/etc/redhat-release").chomp
+      platform get_redhatish_platform(contents)
+      platform_version get_redhatish_version(contents)
     elsif File.exist?("/etc/system-release")
       contents = File.read("/etc/system-release").chomp
       platform get_redhatish_platform(contents)
@@ -231,7 +240,7 @@ Ohai.plugin(:Platform) do
       end
     elsif os_release_file_is_cisco?
       raise "unknown Cisco /etc/os-release or /etc/cisco-release ID_LIKE field" if
-        os_release_info["ID_LIKE"].nil? || ! os_release_info["ID_LIKE"].include?("wrlinux")
+        os_release_info["ID_LIKE"].nil? || !os_release_info["ID_LIKE"].include?("wrlinux")
 
       case os_release_info["ID"]
       when "nexus"
@@ -242,34 +251,18 @@ Ohai.plugin(:Platform) do
         raise "unknown Cisco /etc/os-release or /etc/cisco-release ID field"
       end
 
-      platform_family "wrlinux"
       platform_version os_release_info["VERSION"]
-    elsif File.exist?("/etc/gentoo-release")
-      platform "gentoo"
-      # the gentoo release version is the base version used to bootstrap
-      # a node and doesn't have a lot of meaning in a rolling release distro
-      # kernel release will be used - ex. 3.18.7-gentoo
-      platform_version shell_out("/bin/uname -r").stdout.strip
     elsif File.exist?("/etc/slackware-version")
       platform "slackware"
       platform_version File.read("/etc/slackware-version").scan(/(\d+|\.+)/).join
-    elsif File.exist?("/etc/arch-release")
-      platform "arch"
-      # no way to determine platform_version in a rolling release distribution
-      # kernel release will be used - ex. 2.6.32-ARCH
-      platform_version shell_out("/bin/uname -r").stdout.strip
     elsif File.exist?("/etc/exherbo-release")
       platform "exherbo"
       # no way to determine platform_version in a rolling release distribution
       # kernel release will be used - ex. 3.13
       platform_version shell_out("/bin/uname -r").stdout.strip
-    elsif File.exist?("/etc/alpine-release")
-      platform "alpine"
-      platform_version File.read("/etc/alpine-release").strip
-    # If /etc/os-release file exists, we take that as source of truth
-    elsif File.exist?("/usr/lib/os-release") && !File.exist?("/etc/os-release")
+    elsif File.exist?("/usr/lib/os-release")
       contents = File.read("/usr/lib/os-release")
-      if /Clear Linux/ =~ contents
+      if /clear-linux-os/ =~ contents # Clear Linux https://clearlinux.org/
         platform "clearlinux"
         platform_version contents[/VERSION_ID=(\d+)/, 1]
       end
@@ -291,27 +284,35 @@ Ohai.plugin(:Platform) do
     elsif lsb[:id] # LSB can provide odd data that changes between releases, so we currently fall back on it rather than dealing with its subtleties
       platform lsb[:id].downcase
       platform_version lsb[:release]
-    # Use os-release (present on all modern linux distros) BUT use old *-release files as fallback.
-    # os-release will only be used if no other *-release file is present.
-    # We have to do this for compatibility reasons, or older OS releases might get different
-    # "platform" or "platform_version" attributes (e.g. SLES12, RHEL7).
-    elsif File.exist?("/etc/os-release")
-      case os_release_info["ID"]
-      when "sles"
-        platform "suse" # SLES is wrong. We call it SUSE
-      when "opensuse-leap"
-        platform "opensuseleap"
-      when "clear-linux-os"
-        platform "clearlinux"
-      else
-        platform os_release_info["ID"]
-      end
-      platform_version os_release_info["VERSION_ID"]
-      # platform_family also does not need to be hardcoded anymore.
-      # This would be the correct way, but we stick with "determine_platform_family" for compatibility reasons.
-      # platform_family os_release_info["ID_LIKE"]
+    end
+  end
+
+  # Grab the version from the VERSION_ID field and use the kernel release if that's not
+  # available. It should be there for everything, but rolling releases like arch / gentoo
+  # where we've traditionally used the kernel as the version
+  # @return String the OS version
+  def determine_os_version
+    # 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)
+    else
+      os_release_info["VERSION_ID"] || shell_out("/bin/uname -r").stdout.strip
+    end
+  end
+
+  collect_data(:linux) do
+    if ::File.exist?("/etc/os-release")
+      logger.trace("Plugin platform: Using /etc/os-release for platform detection")
+
+      # fixup os-release names to ohai platform names
+      platform platform_id_remap(os_release_info["ID"])
+
+      platform_version determine_os_version
+    else # we're on an old Linux distro
+      legacy_platform_detection
     end
 
-    platform_family determine_platform_family if platform_family.nil?
+    # unless we set it in a specific way with the platform logic above set based on platform data
+    platform_family platform_family_from_platform(platform) if platform_family.nil?
   end
 end