ohai 14.15.0 → 15.0.35

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

@@ -19,9 +19,6 @@
 Ohai.plugin(:SystemdPaths) do
   provides "systemd_paths"
 
-  require "ohai/util/file_helper"
-  include Ohai::Util::FileHelper
-
   collect_data(:linux) do
     systemd_path_path = which("systemd-path")
     if systemd_path_path

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

@@ -17,9 +17,10 @@
 #
 
 Ohai.plugin(:Virtualization) do
+  provides "virtualization"
+  depends "dmi"
   require "ohai/mixin/dmi_decode"
   include Ohai::Mixin::DmiDecode
-  provides "virtualization"
 
   def lxc_version_exists?
     which("lxc-version") || which("lxc-start")
@@ -129,25 +130,14 @@ Ohai.plugin(:Virtualization) do
       virtualization[:systems][:openvz] = "guest"
     end
 
-    # Detect Parallels virtual machine from pci devices
-    if File.exist?("/proc/bus/pci/devices")
-      if File.read("/proc/bus/pci/devices") =~ /1ab84000/
-        logger.trace("Plugin Virtualization: /proc/bus/pci/devices contains '1ab84000' pci device. Detecting as parallels guest")
-        virtualization[:system] = "parallels"
-        virtualization[:role] = "guest"
-        virtualization[:systems][:parallels] = "guest"
-      end
-    end
-
-    # parse dmidecode to discover various virtualization guests
-    if File.exist?("/usr/sbin/dmidecode")
-      guest = guest_from_dmi(shell_out("dmidecode").stdout)
-      if guest
-        logger.trace("Plugin Virtualization: dmidecode contains string indicating #{guest} guest")
-        virtualization[:system] = guest
-        virtualization[:role] = "guest"
-        virtualization[:systems][guest.to_sym] = "guest"
-      end
+    # parse dmi to discover various virtualization guests
+    logger.trace("Looking up #{get_attribute(:dmi, :system, :manufacturer)}, #{get_attribute(:dmi, :system, :product)} #{get_attribute(:dmi, :system, :version)}")
+    guest = guest_from_dmi_data(get_attribute(:dmi, :system, :manufacturer), get_attribute(:dmi, :system, :product), get_attribute(:dmi, :system, :version))
+    if guest
+      logger.trace("Plugin Virtualization: DMI data indicates #{guest} guest")
+      virtualization[:system] = guest
+      virtualization[:role] = "guest"
+      virtualization[:systems][guest.to_sym] = "guest"
     end
 
     # Detect Hyper-V guest and the hostname of the host

data/lib/ohai/plugins/lua.rb

@@ -21,19 +21,19 @@ Ohai.plugin(:Lua) do
   depends "languages"
 
   collect_data do
-    begin
-      so = shell_out("lua -v")
-      # Sample output:
-      # Lua 5.2.4  Copyright (C) 1994-2015 Lua.org, PUC-Rio
-      if so.exitstatus == 0
-        lua = Mash.new
-        # at some point in lua's history they went from outputting the version
-        # on stderr to doing it on stdout. This handles old / new versions
-        lua[:version] = so.stdout.empty? ? so.stderr.split[1] : so.stdout.split[1]
-        languages[:lua] = lua if lua[:version]
-      end
-    rescue Ohai::Exceptions::Exec
-      logger.trace('Plugin Lua: Could not shell_out "lua -v". Skipping plugin')
+
+    so = shell_out("lua -v")
+    # Sample output:
+    # Lua 5.2.4  Copyright (C) 1994-2015 Lua.org, PUC-Rio
+    if so.exitstatus == 0
+      lua = Mash.new
+      # at some point in lua's history they went from outputting the version
+      # on stderr to doing it on stdout. This handles old / new versions
+      lua[:version] = so.stdout.empty? ? so.stderr.split[1] : so.stdout.split[1]
+      languages[:lua] = lua if lua[:version]
     end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Lua: Could not shell_out "lua -v". Skipping plugin')
+
   end
 end

data/lib/ohai/plugins/mono.rb

@@ -21,30 +21,30 @@ Ohai.plugin(:Mono) do
   depends "languages"
 
   collect_data do
-    begin
-      so = shell_out("mono -V")
-      # Sample output:
-      # Mono JIT compiler version 4.2.3 (Stable 4.2.3.4/832de4b Wed Mar 30 13:57:48 PDT 2016)
-      # Copyright (C) 2002-2014 Novell, Inc, Xamarin Inc and Contributors. www.mono-project.com
-      # 	TLS:           normal
-      # 	SIGSEGV:       altstack
-      # 	Notification:  kqueue
-      # 	Architecture:  amd64
-      # 	Disabled:      none
-      # 	Misc:          softtrace
-      # 	LLVM:          supported, not enabled.
-      # 	GC:            sgen
-      if so.exitstatus == 0
-        mono = Mash.new
-        output = so.stdout.split
-        mono[:version] = output[4] unless output[4].nil?
-        if output.length >= 12
-          mono[:builddate] = "%s %s %s %s %s %s" % [output[7], output[8], output[9], output[10], output[11], output[12].delete!(")")]
-        end
-        languages[:mono] = mono unless mono.empty?
+
+    so = shell_out("mono -V")
+    # Sample output:
+    # Mono JIT compiler version 4.2.3 (Stable 4.2.3.4/832de4b Wed Mar 30 13:57:48 PDT 2016)
+    # Copyright (C) 2002-2014 Novell, Inc, Xamarin Inc and Contributors. www.mono-project.com
+    # 	TLS:           normal
+    # 	SIGSEGV:       altstack
+    # 	Notification:  kqueue
+    # 	Architecture:  amd64
+    # 	Disabled:      none
+    # 	Misc:          softtrace
+    # 	LLVM:          supported, not enabled.
+    # 	GC:            sgen
+    if so.exitstatus == 0
+      mono = Mash.new
+      output = so.stdout.split
+      mono[:version] = output[4] unless output[4].nil?
+      if output.length >= 12
+        mono[:builddate] = "%s %s %s %s %s %s" % [output[7], output[8], output[9], output[10], output[11], output[12].delete!(")")]
       end
-    rescue Ohai::Exceptions::Exec
-      logger.trace('Plugin Mono: Could not shell_out "mono -V". Skipping plugin')
+      languages[:mono] = mono unless mono.empty?
     end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Mono: Could not shell_out "mono -V". Skipping plugin')
+
   end
 end

data/lib/ohai/plugins/nodejs.rb

@@ -21,20 +21,20 @@ Ohai.plugin(:Nodejs) do
   depends "languages"
 
   collect_data do
-    begin
-      so = shell_out("node -v")
-      # Sample output:
-      # v5.10.1
-      if so.exitstatus == 0
-        nodejs = Mash.new
-        output = so.stdout.split
-        if output.length >= 1
-          nodejs[:version] = output[0][1..output[0].length]
-        end
-        languages[:nodejs] = nodejs if nodejs[:version]
+
+    so = shell_out("node -v")
+    # Sample output:
+    # v5.10.1
+    if so.exitstatus == 0
+      nodejs = Mash.new
+      output = so.stdout.split
+      if output.length >= 1
+        nodejs[:version] = output[0][1..output[0].length]
       end
-    rescue Ohai::Exceptions::Exec
-      logger.trace('Plugin Nodejs: Could not shell_out "node -v". Skipping plugin')
+      languages[:nodejs] = nodejs if nodejs[:version]
     end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Nodejs: Could not shell_out "node -v". Skipping plugin')
+
   end
 end

data/lib/ohai/plugins/openstack.rb

@@ -69,7 +69,7 @@ Ohai.plugin(:Openstack) do
       # fetch the metadata if we can do a simple socket connect first
       if can_socket_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80, timeout)
         fetch_metadata.each do |k, v|
-          openstack[k] = v
+          openstack[k] = v unless v.empty?
         end
         logger.trace("Plugin Openstack: Successfully fetched Openstack metadata from the metadata endpoint")
       else

data/lib/ohai/plugins/packages.rb

@@ -50,34 +50,7 @@ Ohai.plugin(:Packages) do
 
       pkgs.each do |pkg|
         name, epoch, version, release, installdate, arch = pkg.split
-        if packages[name]
-          # We have more than one package with this exact name!
-          # Create an "versions" array for tracking all versions of packages with this name.
-          # The top-level package information will be the first one returned by rpm -qa,
-          # all versions go in this list, with the same information they'd normally have.
-          if packages[name]["versions"].nil?
-            # add the data of the first package to the list, so that all versions are in the list.
-            packages[name]["versions"] = []
-            packages[name]["versions"] << Mash.new({ "epoch" => packages[name]["epoch"],
-                                                     "version" => packages[name]["version"],
-                                                     "release" => packages[name]["release"],
-                                                     "installdate" => packages[name]["installdate"],
-                                                     "arch" => packages[name]["arch"] })
-          end
-          packages[name]["versions"] << Mash.new({ "epoch" => epoch, "version" => version, "release" => release, "installdate" => installdate, "arch" => arch }) # Add this package version to the list
-          # When this was originally written, it didn't account for multiple versions of the same package
-          # so it just kept clobbering the package data if it encountered multiple versions
-          # of the same package. As a result, the last duplicate returned by rpm -qa was what was present;
-          # here we clobber that data for compatibility. Note that we can't overwrite the entire hash
-          # without losing the versions array.
-          packages[name]["epoch"] = epoch
-          packages[name]["version"] = version
-          packages[name]["release"] = release
-          packages[name]["installdate"] = installdate
-          packages[name]["arch"] = arch
-        else
-          packages[name] = { "epoch" => epoch, "version" => version, "release" => release, "installdate" => installdate, "arch" => arch }
-        end
+        packages[name] = { "epoch" => epoch, "version" => version, "release" => release, "installdate" => installdate, "arch" => arch }
       end
 
     when "arch"

data/lib/ohai/plugins/perl.rb

@@ -21,25 +21,25 @@ Ohai.plugin(:Perl) do
   depends "languages"
 
   collect_data do
-    begin
-      so = shell_out("perl -V:version -V:archname")
-      # Sample output:
-      # version='5.18.2';
-      # archname='darwin-thread-multi-2level';
-      if so.exitstatus == 0
-        perl = Mash.new
-        so.stdout.split(/\r?\n/).each do |line|
-          case line
-          when /^version=\'(.+)\';$/
-            perl[:version] = $1
-          when /^archname=\'(.+)\';$/
-            perl[:archname] = $1
-          end
+
+    so = shell_out("perl -V:version -V:archname")
+    # Sample output:
+    # version='5.18.2';
+    # archname='darwin-thread-multi-2level';
+    if so.exitstatus == 0
+      perl = Mash.new
+      so.stdout.split(/\r?\n/).each do |line|
+        case line
+        when /^version=\'(.+)\';$/
+          perl[:version] = $1
+        when /^archname=\'(.+)\';$/
+          perl[:archname] = $1
         end
-        languages[:perl] = perl unless perl.empty?
       end
-    rescue Ohai::Exceptions::Exec
-      logger.trace('Plugin Perl: Could not shell_out "perl -V:version -V:archname". Skipping plugin')
+      languages[:perl] = perl unless perl.empty?
     end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Perl: Could not shell_out "perl -V:version -V:archname". Skipping plugin')
+
   end
 end

data/lib/ohai/plugins/php.rb

@@ -23,30 +23,30 @@ Ohai.plugin(:PHP) do
   depends "languages"
 
   collect_data do
-    begin
-      so = shell_out("php -v")
-      # Sample output:
-      # PHP 5.5.31 (cli) (built: Feb 20 2016 20:33:10)
-      # Copyright (c) 1997-2015 The PHP Group
-      # Zend Engine v2.5.0, Copyright (c) 1998-2015 Zend Technologies
-      if so.exitstatus == 0
-        php = Mash.new
-        so.stdout.each_line do |line|
-          case line
-          when /^PHP (\S+)(?:.*built: ([^)]+))?/
-            php[:version] = $1
-            php[:builddate] = $2
-          when /Zend Engine v([^\s]+),/
-            php[:zend_engine_version] = $1
-          when /Zend OPcache v([^\s]+),/
-            php[:zend_opcache_version] = $1
-          end
-        end
 
-        languages[:php] = php unless php.empty?
+    so = shell_out("php -v")
+    # Sample output:
+    # PHP 5.5.31 (cli) (built: Feb 20 2016 20:33:10)
+    # Copyright (c) 1997-2015 The PHP Group
+    # Zend Engine v2.5.0, Copyright (c) 1998-2015 Zend Technologies
+    if so.exitstatus == 0
+      php = Mash.new
+      so.stdout.each_line do |line|
+        case line
+        when /^PHP (\S+)(?:.*built: ([^)]+))?/
+          php[:version] = $1
+          php[:builddate] = $2
+        when /Zend Engine v([^\s]+),/
+          php[:zend_engine_version] = $1
+        when /Zend OPcache v([^\s]+),/
+          php[:zend_opcache_version] = $1
+        end
       end
-    rescue Ohai::Exceptions::Exec
-      logger.trace('Plugin Php: Could not shell_out "php -v". Skipping plugin')
+
+      languages[:php] = php unless php.empty?
     end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Php: Could not shell_out "php -v". Skipping plugin')
+
   end
 end

data/lib/ohai/plugins/powershell.rb

@@ -20,39 +20,39 @@ Ohai.plugin(:Powershell) do
   depends "languages"
 
   collect_data(:windows) do
-    begin
-      so = shell_out("powershell.exe -NoLogo -NonInteractive -NoProfile -command $PSVersionTable")
-      # Sample output:
-      #
-      # Name                           Value
-      # ----                           -----
-      # PSVersion                      4.0
-      # WSManStackVersion              3.0
-      # SerializationVersion           1.1.0.1
-      # CLRVersion                     4.0.30319.34014
-      # BuildVersion                   6.3.9600.16394
-      # PSCompatibleVersions           {1.0, 2.0, 3.0, 4.0}
-      # PSRemotingProtocolVersion      2.2
 
-      if so.exitstatus == 0
-        powershell = Mash.new
-        version_info = {}
-        so.stdout.strip.each_line do |line|
-          kv = line.strip.split(/\s+/, 2)
-          version_info[kv[0]] = kv[1] if kv.length == 2
-        end
-        powershell[:version] = version_info["PSVersion"]
-        powershell[:ws_man_stack_version] = version_info["WSManStackVersion"]
-        powershell[:serialization_version] = version_info["SerializationVersion"]
-        powershell[:clr_version] = version_info["CLRVersion"]
-        powershell[:build_version] = version_info["BuildVersion"]
-        powershell[:compatible_versions] = parse_compatible_versions
-        powershell[:remoting_protocol_version] = version_info["PSRemotingProtocolVersion"]
-        languages[:powershell] = powershell unless powershell.empty?
+    so = shell_out("powershell.exe -NoLogo -NonInteractive -NoProfile -command $PSVersionTable")
+    # Sample output:
+    #
+    # Name                           Value
+    # ----                           -----
+    # PSVersion                      4.0
+    # WSManStackVersion              3.0
+    # SerializationVersion           1.1.0.1
+    # CLRVersion                     4.0.30319.34014
+    # BuildVersion                   6.3.9600.16394
+    # PSCompatibleVersions           {1.0, 2.0, 3.0, 4.0}
+    # PSRemotingProtocolVersion      2.2
+
+    if so.exitstatus == 0
+      powershell = Mash.new
+      version_info = {}
+      so.stdout.strip.each_line do |line|
+        kv = line.strip.split(/\s+/, 2)
+        version_info[kv[0]] = kv[1] if kv.length == 2
       end
-    rescue Ohai::Exceptions::Exec
-      logger.trace('Plugin Powershell: Could not shell_out "powershell.exe -NoLogo -NonInteractive -NoProfile -command $PSVersionTable". Skipping plugin')
+      powershell[:version] = version_info["PSVersion"]
+      powershell[:ws_man_stack_version] = version_info["WSManStackVersion"]
+      powershell[:serialization_version] = version_info["SerializationVersion"]
+      powershell[:clr_version] = version_info["CLRVersion"]
+      powershell[:build_version] = version_info["BuildVersion"]
+      powershell[:compatible_versions] = parse_compatible_versions
+      powershell[:remoting_protocol_version] = version_info["PSRemotingProtocolVersion"]
+      languages[:powershell] = powershell unless powershell.empty?
     end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Powershell: Could not shell_out "powershell.exe -NoLogo -NonInteractive -NoProfile -command $PSVersionTable". Skipping plugin')
+
   end
 
   def version_command

data/lib/ohai/plugins/ps.rb

@@ -23,7 +23,7 @@ Ohai.plugin(:PS) do
   provides "command/ps"
   depends "command"
 
-  collect_data(:aix, :darwin, :hpux, :linux, :solaris2) do
+  collect_data(:aix, :darwin, :linux, :solaris2) do
     command[:ps] = "ps -ef"
   end
 

data/lib/ohai/plugins/python.rb

@@ -22,22 +22,22 @@ Ohai.plugin(:Python) do
   depends "languages"
 
   collect_data do
-    begin
-      so = shell_out("python -c \"import sys; print (sys.version)\"")
-      # Sample output:
-      # 2.7.11 (default, Dec 26 2015, 17:47:53)
-      # [GCC 4.2.1 Compatible Apple LLVM 7.0.2 (clang-700.1.81)]
-      if so.exitstatus == 0
-        python = Mash.new
-        output = so.stdout.split
-        python[:version] = output[0]
-        if output.length >= 6
-          python[:builddate] = "%s %s %s %s" % [output[2], output[3], output[4], output[5].delete!(")")]
-        end
-        languages[:python] = python unless python.empty?
+
+    so = shell_out("python -c \"import sys; print (sys.version)\"")
+    # Sample output:
+    # 2.7.11 (default, Dec 26 2015, 17:47:53)
+    # [GCC 4.2.1 Compatible Apple LLVM 7.0.2 (clang-700.1.81)]
+    if so.exitstatus == 0
+      python = Mash.new
+      output = so.stdout.split
+      python[:version] = output[0]
+      if output.length >= 6
+        python[:builddate] = "%s %s %s %s" % [output[2], output[3], output[4], output[5].delete!(")")]
       end
-    rescue Ohai::Exceptions::Exec
-      logger.trace('Plugin Python: Could not shell_out "python -c "import sys; print (sys.version)"". Skipping plugin')
+      languages[:python] = python unless python.empty?
     end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Python: Could not shell_out "python -c "import sys; print (sys.version)"". Skipping plugin')
+
   end
 end

data/lib/ohai/plugins/rust.rb

@@ -18,17 +18,17 @@ Ohai.plugin(:Rust) do
   depends "languages"
 
   collect_data do
-    begin
-      so = shell_out("rustc --version")
-      # Sample output:
-      # rustc 1.7.0
-      if so.exitstatus == 0
-        rust = Mash.new
-        rust[:version] = so.stdout.split[1]
-        languages[:rust] = rust if rust[:version]
-      end
-    rescue Ohai::Exceptions::Exec
-      logger.trace('Plugin Rust: Could not shell_out "rustc --version". Skipping plugin')
+
+    so = shell_out("rustc --version")
+    # Sample output:
+    # rustc 1.7.0
+    if so.exitstatus == 0
+      rust = Mash.new
+      rust[:version] = so.stdout.split[1]
+      languages[:rust] = rust if rust[:version]
     end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Rust: Could not shell_out "rustc --version". Skipping plugin')
+
   end
 end