ohai 13.1.0 → 13.2.0

data/lib/ohai/plugins/ec2.rb

@@ -43,10 +43,10 @@ Ohai.plugin(:EC2) do
     # detect a version of '4.2.amazon'
     if get_attribute(:dmi, :bios, :all_records, 0, :Version) =~ /amazon/
       Ohai::Log.debug("Plugin EC2: has_ec2_dmi? == true")
-      return true
+      true
     else
       Ohai::Log.debug("Plugin EC2: has_ec2_dmi? == false")
-      return false
+      false
     end
   end
 
@@ -60,7 +60,7 @@ Ohai.plugin(:EC2) do
       end
     end
     Ohai::Log.debug("Plugin EC2: has_ec2_xen_uuid? == false")
-    return false
+    false
   end
 
   # looks for the Amazon.com Organization in Windows Kernel data
@@ -69,10 +69,10 @@ Ohai.plugin(:EC2) do
     # detect an Organization of 'Amazon.com'
     if get_attribute(:kernel, :os_info, :organization) =~ /Amazon/
       Ohai::Log.debug("Plugin EC2: has_amazon_org? == true")
-      return true
+      true
     else
       Ohai::Log.debug("Plugin EC2: has_amazon_org? == false")
-      return false
+      false
     end
   end
 

data/lib/ohai/plugins/elixir.rb

@@ -30,7 +30,7 @@ Ohai.plugin(:Elixir) do
         languages[:elixir] = elixir
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Elixir plugin: Could not shell_out "elixir -v". Skipping plugin')
+      Ohai::Log.debug('Plugin Elixir: Could not shell_out "elixir -v". Skipping plugin')
     end
   end
 end

data/lib/ohai/plugins/erlang.rb

@@ -34,7 +34,7 @@ Ohai.plugin(:Erlang) do
         erlang[:nif_version] = output[2]
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Erlang plugin: Could not shell_out "erl -eval \'erlang:display(erlang:system_info(otp_release)), erlang:display(erlang:system_info(version)), erlang:display(erlang:system_info(nif_version)), halt().\'  -noshell". Skipping data')
+      Ohai::Log.debug('Plugin Erlang: Could not shell_out "erl -eval \'erlang:display(erlang:system_info(otp_release)), erlang:display(erlang:system_info(version)), erlang:display(erlang:system_info(nif_version)), halt().\'  -noshell". Skipping data')
     end
 
     begin
@@ -51,7 +51,7 @@ Ohai.plugin(:Erlang) do
         end
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Erlang plugin: Could not shell_out "erl +V". Skipping data')
+      Ohai::Log.debug('Plugin Erlang: Could not shell_out "erl +V". Skipping data')
     end
 
     languages[:erlang] = erlang unless erlang.empty?

data/lib/ohai/plugins/eucalyptus.rb

@@ -62,7 +62,7 @@ Ohai.plugin(:Eucalyptus) do
     if looks_like_euca?
       Ohai::Log.debug("Plugin Eucalyptus: looks_like_euca? == true")
       eucalyptus Mash.new
-      self.fetch_metadata.each do |k, v|
+      fetch_metadata.each do |k, v|
         # Eucalyptus 3.4+ supports IAM roles and Instance Profiles much like AWS
         # https://www.eucalyptus.com/blog/2013/10/15/iam-roles-and-instance-profiles-eucalyptus-34
         #
@@ -73,7 +73,7 @@ Ohai.plugin(:Eucalyptus) do
         next if k == "iam" && !hint?("iam")
         eucalyptus[k] = v
       end
-      eucalyptus[:userdata] = self.fetch_userdata
+      eucalyptus[:userdata] = fetch_userdata
     else
       Ohai::Log.debug("Plugin Eucalyptus: looks_like_euca? == false")
       false

data/lib/ohai/plugins/go.rb

@@ -28,7 +28,7 @@ Ohai.plugin(:Go) do
         languages[:go] = go
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Go plugin: Could not shell_out "go version". Skipping plugin')
+      Ohai::Log.debug('Plugin Go: Could not shell_out "go version". Skipping plugin')
     end
   end
 end

data/lib/ohai/plugins/hostname.rb

@@ -47,14 +47,12 @@ Ohai.plugin(:Hostname) do
   # forward and reverse lookup to canonicalize FQDN (hostname -f equivalent)
   # this is ipv6-safe, works on ruby 1.8.7+
   def resolve_fqdn
-    begin
-      hostname = from_cmd("hostname")
-      addrinfo = Socket.getaddrinfo(hostname, nil).first
-      iaddr = IPAddr.new(addrinfo[3])
-      Socket.gethostbyaddr(iaddr.hton)[0]
-    rescue
-      nil
-    end
+    hostname = from_cmd("hostname")
+    addrinfo = Socket.getaddrinfo(hostname, nil).first
+    iaddr = IPAddr.new(addrinfo[3])
+    Socket.gethostbyaddr(iaddr.hton)[0]
+  rescue
+    nil
   end
 
   def collect_domain
@@ -149,8 +147,7 @@ Ohai.plugin(:Hostname) do
         fqdn ourfqdn
       end
     rescue
-      Ohai::Log.debug(
-        "Plugin Hostname: hostname --fqdn returned an error, probably no domain set")
+      Ohai::Log.debug("Plugin Hostname: hostname --fqdn returned an error, probably no domain set")
     end
     domain collect_domain
   end

data/lib/ohai/plugins/ip_scopes.rb

@@ -24,6 +24,8 @@ Ohai.plugin(:IpScopes) do
     begin
       require "ipaddr_extensions"
 
+      Ohai::Log.warn("The IpScopes Ohai plugin has been deprecated and will be removed from Ohai 14 (April 2018).")
+
       network["interfaces"].keys.sort.each do |if_name|
         next if network["interfaces"][if_name]["addresses"].nil?
 

data/lib/ohai/plugins/java.rb

@@ -21,30 +21,28 @@ Ohai.plugin(:Java) do
   depends "languages"
 
   def get_java_info
-    begin
-      so = shell_out("java -mx64m -version")
-      # Sample output:
-      # java version "1.8.0_60"
-      # Java(TM) SE Runtime Environment (build 1.8.0_60-b27)
-      # Java HotSpot(TM) 64-Bit Server VM (build 25.60-b23, mixed mode)
-      if so.exitstatus == 0
-        java = Mash.new
-        so.stderr.split(/\r?\n/).each do |line|
-          case line
-          when /(?:java|openjdk) version \"([0-9\.\_]+)\"/
-            java[:version] = $1
-          when /^(.+Runtime Environment.*) \((build)\s*(.+)\)$/
-            java[:runtime] = { "name" => $1, "build" => $3 }
-          when /^(.+ (Client|Server) VM) \(build\s*(.+)\)$/
-            java[:hotspot] = { "name" => $1, "build" => $3 }
-          end
+    so = shell_out("java -mx64m -version")
+    # Sample output:
+    # java version "1.8.0_60"
+    # Java(TM) SE Runtime Environment (build 1.8.0_60-b27)
+    # Java HotSpot(TM) 64-Bit Server VM (build 25.60-b23, mixed mode)
+    if so.exitstatus == 0
+      java = Mash.new
+      so.stderr.split(/\r?\n/).each do |line|
+        case line
+        when /(?:java|openjdk) version \"([0-9\.\_]+)\"/
+          java[:version] = $1
+        when /^(.+Runtime Environment.*) \((build)\s*(.+)\)$/
+          java[:runtime] = { "name" => $1, "build" => $3 }
+        when /^(.+ (Client|Server) VM) \(build\s*(.+)\)$/
+          java[:hotspot] = { "name" => $1, "build" => $3 }
         end
-
-        languages[:java] = java unless java.empty?
       end
-    rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Java plugin: Could not shell_out "java -mx64m -version". Skipping plugin')
+
+      languages[:java] = java unless java.empty?
     end
+  rescue Ohai::Exceptions::Exec
+    Ohai::Log.debug('Plugin Java: Could not shell_out "java -mx64m -version". Skipping plugin')
   end
 
   # On Mac OS X, the development tools include "stubs" for JVM executables that

data/lib/ohai/plugins/kernel.rb

@@ -67,7 +67,7 @@ Ohai.plugin(:Kernel) do
     return "WIN98" if sys_type.to_s.eql?("17")
     return "WINNT" if sys_type.to_s.eql?("18")
     return "WINCE" if sys_type.to_s.eql?("19")
-    return nil
+    nil
   end
 
   collect_data(:default) do

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

@@ -59,6 +59,10 @@ Ohai.plugin(:CPU) do
         cpuinfo[current_cpu]["cache_size"] = $1
       when /flags\s+:\s(.+)/
         cpuinfo[current_cpu]["flags"] = $1.split(" ")
+      when /BogoMIPS\s+:\s(.+)/
+        cpuinfo[current_cpu]["bogomips"] = $1
+      when /Features\s+:\s(.+)/
+        cpuinfo[current_cpu]["features"] = $1.split(" ")
       when /bogomips per cpu:\s(.+)/
         cpuinfo["bogomips_per_cpu"] = $1
       when /features\s+:\s(.+)/

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

@@ -30,8 +30,9 @@ Ohai.plugin(:Filesystem) do
     name
   end
 
-  def parse_line(line, have_lsblk)
-    if have_lsblk
+  def parse_line(line, cmdtype)
+    case cmdtype
+    when "lsblk"
       regex = /NAME="(\S+).*?" UUID="(\S*)" LABEL="(\S*)" FSTYPE="(\S*)"/
       if line =~ regex
         dev = $1
@@ -41,7 +42,7 @@ Ohai.plugin(:Filesystem) do
         fs_type = $4
         return { :dev => dev, :uuid => uuid, :label => label, :fs_type => fs_type }
       end
-    else
+    when "blkid"
       bits = line.split
       dev = bits.shift.split(":")[0]
       f = { :dev => dev }
@@ -54,7 +55,7 @@ Ohai.plugin(:Filesystem) do
       end
       return f
     end
-    return nil
+    nil
   end
 
   def generate_device_view(fs)
@@ -142,36 +143,48 @@ Ohai.plugin(:Filesystem) do
       end
     end
 
-    have_lsblk = File.exist?("/bin/lsblk")
-    if have_lsblk
-      cmd = "lsblk -n -P -o NAME,UUID,LABEL,FSTYPE"
-    else
-      # CentOS5 and other platforms don't have lsblk
-      cmd = "blkid"
+    # We used to try to decide if we wanted to run lsblk or blkid
+    # but they each have a variety of cases were they fail to report
+    # data. For example, there are a variety of cases where lsblk won't
+    # report unmounted filesystems, but blkid will. And vise-versa. Sweet.
+    # So for reliability, we'll run both, if we have them.
+
+    lsblk = which("lsblk")
+    blkid = which("blkid")
+    cmds = []
+    # These should be in order of preference... first writer wins.
+    if lsblk
+      cmds << "#{lsblk} -n -P -o NAME,UUID,LABEL,FSTYPE"
+    end
+    if blkid
+      cmds << blkid
     end
 
-    so = shell_out(cmd)
-    so.stdout.each_line do |line|
-      parsed = parse_line(line, have_lsblk)
-      next if parsed.nil?
-      # lsblk lists each device once, so we need to update all entries
-      # in the hash that are related to this device
-      keys_to_update = []
-      fs.each_key do |key|
-        keys_to_update << key if key.start_with?("#{parsed[:dev]},")
-      end
+    cmds.each do |cmd|
+      cmdtype = File.basename(cmd.split.first)
+      so = shell_out(cmd)
+      so.stdout.each_line do |line|
+        parsed = parse_line(line, cmdtype)
+        next if parsed.nil?
+        # lsblk lists each device once, so we need to update all entries
+        # in the hash that are related to this device
+        keys_to_update = []
+        fs.each_key do |key|
+          keys_to_update << key if key.start_with?("#{parsed[:dev]},")
+        end
 
-      if keys_to_update.empty?
-        key = "#{parsed[:dev]},"
-        fs[key] = Mash.new
-        fs[key][:device] = parsed[:dev]
-        keys_to_update << key
-      end
+        if keys_to_update.empty?
+          key = "#{parsed[:dev]},"
+          fs[key] = Mash.new
+          fs[key][:device] = parsed[:dev]
+          keys_to_update << key
+        end
 
-      keys_to_update.each do |key|
-        [:fs_type, :uuid, :label].each do |subkey|
-          if parsed[subkey] && !parsed[subkey].empty?
-            fs[key][subkey] = parsed[subkey]
+        keys_to_update.each do |key|
+          [:fs_type, :uuid, :label].each do |subkey|
+            if parsed[subkey] && !parsed[subkey].empty?
+              fs[key][subkey] = parsed[subkey]
+            end
           end
         end
       end

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

@@ -54,7 +54,7 @@ Ohai.plugin(:LSB) do
         end
       end
     else
-      Ohai::Log.debug("Skipping LSB, cannot find /etc/lsb-release or /usr/bin/lsb_release")
+      Ohai::Log.debug("Plugin LSB: Skipping LSB, cannot find /etc/lsb-release or /usr/bin/lsb_release")
     end
   end
 end

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

@@ -59,7 +59,15 @@ Ohai.plugin(:Mdadm) do
         if line =~ /(md[0-9]+)/
           device = Regexp.last_match[1]
           pieces = line.split(/\s+/)
-          devices[device] = pieces[4..-1].map { |s| s.match(/(.+)\[\d\]/)[1] }
+          # there are variable numbers of fields until you hit the raid level
+          # everything after that is members...
+          # unless the array is inactive, in which case you don't get a raid
+          # level.
+          members = pieces.drop_while { |x| !x.start_with?("raid", "inactive") }
+          # drop the 'raid' too
+
+          members.shift unless members.empty?
+          devices[device] = members.map { |s| s.match(/(.+)\[\d\]/)[1] }
         end
       end
 

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

@@ -37,16 +37,12 @@ Ohai.plugin(:Network) do
     File.exist? "/proc/net/if_inet6"
   end
 
-  def iproute2_binary_available?
-    ["/sbin/ip", "/usr/bin/ip", "/bin/ip"].any? { |path| File.exist?(path) }
-  end
-
-  def find_ethtool_binary
-    ["/sbin/ethtool", "/usr/sbin/ethtool"].find { |path| File.exist?(path) }
+  def ethtool_binary_path
+    @ethtool ||= which("ethtool")
   end
 
   def is_openvz?
-    ::File.directory?("/proc/vz")
+    @openvz ||= ::File.directory?("/proc/vz")
   end
 
   def is_openvz_host?
@@ -151,11 +147,11 @@ Ohai.plugin(:Network) do
 
   # determine layer 1 details for the interface using ethtool
   def ethernet_layer_one(iface)
-    return iface unless ethtool_binary = find_ethtool_binary
+    return iface unless ethtool_binary_path
     keys = %w{ Speed Duplex Port Transceiver Auto-negotiation MDI-X }
     iface.each_key do |tmp_int|
       next unless iface[tmp_int][:encapsulation] == "Ethernet"
-      so = shell_out("#{ethtool_binary} #{tmp_int}")
+      so = shell_out("#{ethtool_binary_path} #{tmp_int}")
       so.stdout.lines do |line|
         line.chomp!
         Ohai::Log.debug("Plugin Network: Parsing ethtool output: #{line}")
@@ -175,10 +171,10 @@ Ohai.plugin(:Network) do
 
   # determine ring parameters for the interface using ethtool
   def ethernet_ring_parameters(iface)
-    return iface unless ethtool_binary = find_ethtool_binary
+    return iface unless ethtool_binary_path
     iface.each_key do |tmp_int|
       next unless iface[tmp_int][:encapsulation] == "Ethernet"
-      so = shell_out("#{ethtool_binary} -g #{tmp_int}")
+      so = shell_out("#{ethtool_binary_path} -g #{tmp_int}")
       Ohai::Log.debug("Plugin Network: Parsing ethtool output: #{so.stdout}")
       type = nil
       iface[tmp_int]["ring_params"] = {}
@@ -471,7 +467,7 @@ Ohai.plugin(:Network) do
     # 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
 
-    if iproute2_binary_available?
+    if which("ip")
       # families to get default routes from
       families = [{
                     :name => "inet",

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

@@ -107,7 +107,7 @@ Ohai.plugin(:Platform) do
     case platform
     when /debian/, /ubuntu/, /linuxmint/, /raspbian/, /cumulus/
       "debian"
-    when /oracle/, /centos/, /redhat/, /scientific/, /enterpriseenterprise/, /xenserver/, /cloudlinux/, /ibm_powerkvm/, /parallels/, /nexus_centos/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID"
+    when /oracle/, /centos/, /redhat/, /scientific/, /enterpriseenterprise/, /xenserver/, /cloudlinux/, /ibm_powerkvm/, /parallels/, /nexus_centos/, /clearos/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID"
       "rhel"
     when /amazon/
       "amazon"
@@ -127,6 +127,8 @@ Ohai.plugin(:Platform) do
       "exherbo"
     when /alpine/
       "alpine"
+    when /clearlinux/
+      "clearlinux"
     end
   end
 
@@ -232,6 +234,12 @@ Ohai.plugin(:Platform) do
     elsif File.exist?("/etc/alpine-release")
       platform "alpine"
       platform_version File.read("/etc/alpine-release").strip()
+    elsif File.exist?("/usr/lib/os-release")
+      contents = File.read("/usr/lib/os-release")
+      if /Clear Linux/ =~ contents
+        platform "clearlinux"
+        platform_version contents[/VERSION_ID=(\d+)/, 1]
+      end
     elsif lsb[:id] =~ /RedHat/i
       platform "redhat"
       platform_version lsb[:release]

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

@@ -0,0 +1,39 @@
+#
+# Author:: Davide Cavalca <dcavalca@fb.com>
+# Copyright:: Copyright (c) 2017 Facebook
+# 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.
+#
+
+require "ohai/util/file_helper"
+
+include Ohai::Util::FileHelper
+
+Ohai.plugin(:SystemdPaths) do
+  provides "systemd_paths"
+
+  collect_data(:linux) do
+    systemd_path_path = which("systemd-path")
+    if systemd_path_path
+      systemd_path = shell_out(systemd_path_path)
+
+      systemd_paths Mash.new unless systemd_paths
+
+      systemd_path.stdout.each_line do |line|
+        key, val = line.split(":")
+        systemd_paths[key] = val.strip
+      end
+    end
+  end
+end