ohai 6.24.2 → 7.0.0.rc.0

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

@@ -16,98 +16,100 @@
 # limitations under the License.
 #
 
-def get_redhatish_platform(contents)
-  contents[/^Red Hat/i] ? "redhat" : contents[/(\w+)/i, 1].downcase
-end
+Ohai.plugin(:Platform) do
+  provides "platform", "platform_version", "platform_family"
+  depends "lsb"
 
-def get_redhatish_version(contents)
-  contents[/Rawhide/i] ? contents[/((\d+) \(Rawhide\))/i, 1].downcase : contents[/release ([\d\.]+)/, 1]
-end
+  def get_redhatish_platform(contents)
+    contents[/^Red Hat/i] ? "redhat" : contents[/(\w+)/i, 1].downcase
+  end
 
-provides "platform", "platform_version", "platform_family"
+  def get_redhatish_version(contents)
+    contents[/Rawhide/i] ? contents[/((\d+) \(Rawhide\))/i, 1].downcase : contents[/release ([\d\.]+)/, 1]
+  end
 
-require_plugin 'linux::lsb'
+  collect_data(:linux) do
+    # platform [ and platform_version ? ] should be lower case to avoid dealing with RedHat/Redhat/redhat matching 
+    if File.exists?("/etc/oracle-release")
+      contents = File.read("/etc/oracle-release").chomp
+      platform "oracle"
+      platform_version get_redhatish_version(contents)
+    elsif File.exists?("/etc/enterprise-release")
+      contents = File.read("/etc/enterprise-release").chomp
+      platform "oracle"
+      platform_version get_redhatish_version(contents)
+    elsif File.exists?("/etc/debian_version")
+      # Ubuntu and Debian both have /etc/debian_version
+      # Ubuntu should always have a working lsb, debian does not by default
+      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.exists?("/usr/bin/raspi-config")
+          platform "raspbian"
+        else
+          platform "debian"
+        end
+        platform_version File.read("/etc/debian_version").chomp
+      end
+    elsif File.exists?("/etc/redhat-release")
+      contents = File.read("/etc/redhat-release").chomp
+      platform get_redhatish_platform(contents)
+      platform_version get_redhatish_version(contents)
+    elsif File.exists?("/etc/system-release")
+      contents = File.read("/etc/system-release").chomp
+      platform get_redhatish_platform(contents)
+      platform_version get_redhatish_version(contents)
+    elsif File.exists?('/etc/gentoo-release')
+      platform "gentoo"
+      platform_version File.read('/etc/gentoo-release').scan(/(\d+|\.+)/).join
+    elsif File.exists?('/etc/SuSE-release')
+      platform "suse"
+      suse_release = File.read("/etc/SuSE-release")
+      platform_version suse_release.scan(/VERSION = (\d+)\nPATCHLEVEL = (\d+)/).flatten.join(".")
+      platform_version suse_release.scan(/VERSION = ([\d\.]{2,})/).flatten.join(".") if platform_version == ""
+    elsif File.exists?('/etc/slackware-version')
+      platform "slackware"
+      platform_version File.read("/etc/slackware-version").scan(/(\d+|\.+)/).join
+    elsif File.exists?('/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
+    elsif lsb[:id] =~ /RedHat/i
+      platform "redhat"
+      platform_version lsb[:release]
+    elsif lsb[:id] =~ /Amazon/i
+      platform "amazon"
+      platform_version lsb[:release]
+    elsif lsb[:id] =~ /ScientificSL/i
+      platform "scientific"
+      platform_version lsb[:release]
+    elsif lsb[:id] =~ /XenServer/i
+      platform "xenserver"
+      platform_version lsb[:release]
+    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]
+    end
 
-# platform [ and platform_version ? ] should be lower case to avoid dealing with RedHat/Redhat/redhat matching 
-if File.exists?("/etc/oracle-release")
-  contents = File.read("/etc/oracle-release").chomp
-  platform "oracle"
-  platform_version get_redhatish_version(contents)
-elsif File.exists?("/etc/enterprise-release")
-  contents = File.read("/etc/enterprise-release").chomp
-  platform "oracle"
-  platform_version get_redhatish_version(contents)
-elsif File.exists?("/etc/debian_version")
-  # Ubuntu and Debian both have /etc/debian_version
-  # Ubuntu should always have a working lsb, debian does not by default
-  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.exists?("/usr/bin/raspi-config")
-      platform "raspbian"
-    else
-      platform "debian"
+    case platform
+    when /debian/, /ubuntu/, /linuxmint/, /raspbian/
+      platform_family "debian"
+    when /fedora/
+      platform_family "fedora"
+    when /oracle/, /centos/, /redhat/, /scientific/, /enterpriseenterprise/, /amazon/, /xenserver/, /cloudlinux/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID"
+      platform_family "rhel"
+    when /suse/
+      platform_family "suse"
+    when /gentoo/
+      platform_family "gentoo"
+    when /slackware/
+      platform_family "slackware"
+    when /arch/ 
+      platform_family "arch" 
     end
-    platform_version File.read("/etc/debian_version").chomp
   end
-elsif File.exists?("/etc/redhat-release")
-  contents = File.read("/etc/redhat-release").chomp
-  platform get_redhatish_platform(contents)
-  platform_version get_redhatish_version(contents)
-elsif File.exists?("/etc/system-release")
-  contents = File.read("/etc/system-release").chomp
-  platform get_redhatish_platform(contents)
-  platform_version get_redhatish_version(contents)
-elsif File.exists?('/etc/gentoo-release')
-  platform "gentoo"
-  platform_version File.read('/etc/gentoo-release').scan(/(\d+|\.+)/).join
-elsif File.exists?('/etc/SuSE-release')
-  platform "suse"
-  suse_release = File.read("/etc/SuSE-release")
-  platform_version suse_release.scan(/VERSION = (\d+)\nPATCHLEVEL = (\d+)/).flatten.join(".")
-  platform_version suse_release.scan(/VERSION = ([\d\.]{2,})/).flatten.join(".") if platform_version == ""
-elsif File.exists?('/etc/slackware-version')
-  platform "slackware"
-  platform_version File.read("/etc/slackware-version").scan(/(\d+|\.+)/).join
-elsif File.exists?('/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
-elsif lsb[:id] =~ /RedHat/i
-  platform "redhat"
-  platform_version lsb[:release]
-elsif lsb[:id] =~ /Amazon/i
-  platform "amazon"
-  platform_version lsb[:release]
-elsif lsb[:id] =~ /ScientificSL/i
-  platform "scientific"
-  platform_version lsb[:release]
-elsif lsb[:id] =~ /XenServer/i
-  platform "xenserver"
-  platform_version lsb[:release]
-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]
-end
-
-
-case platform
-  when /debian/, /ubuntu/, /linuxmint/, /raspbian/
-    platform_family "debian"
-  when /fedora/
-    platform_family "fedora"
-  when /oracle/, /centos/, /redhat/, /scientific/, /enterpriseenterprise/, /amazon/, /xenserver/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID"
-    platform_family "rhel"
-  when /suse/
-    platform_family "suse"
-  when /gentoo/
-    platform_family "gentoo"
-  when /slackware/
-    platform_family "slackware"
-  when /arch/ 
-    platform_family "arch" 
 end

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

@@ -16,110 +16,115 @@
 # limitations under the License.
 #
 
-provides "virtualization"
+Ohai.plugin(:Virtualization) do
+  provides "virtualization"
 
-virtualization Mash.new
+  collect_data(:linux) do
+    virtualization Mash.new
 
-# if it is possible to detect paravirt vs hardware virt, it should be put in
-# virtualization[:mechanism]
+    # if it is possible to detect paravirt vs hardware virt, it should be put in
+    # virtualization[:mechanism]
 
-## Xen
-# /proc/xen is an empty dir for EL6 + Linode Guests
-if File.exists?("/proc/xen")
-  virtualization[:system] = "xen"
-  # Assume guest
-  virtualization[:role] = "guest"
+    ## Xen
+    # /proc/xen is an empty dir for EL6 + Linode Guests
+    if File.exists?("/proc/xen")
+      virtualization[:system] = "xen"
+      # Assume guest
+      virtualization[:role] = "guest"
 
-  # This file should exist on most Xen systems, normally empty for guests
-  if File.exists?("/proc/xen/capabilities")
-    if File.read("/proc/xen/capabilities") =~ /control_d/i
-      virtualization[:role] = "host"
+      # This file should exist on most Xen systems, normally empty for guests
+      if File.exists?("/proc/xen/capabilities")
+        if File.read("/proc/xen/capabilities") =~ /control_d/i
+          virtualization[:role] = "host"
+        end
+      end
     end
-  end
-end
-
-# Xen Notes:
-# - cpuid of guests, if we could get it, would also be a clue
-# - may be able to determine if under paravirt from /dev/xen/evtchn (See OHAI-253)
-# - EL6 guests carry a 'hypervisor' cpu flag
-# - Additional edge cases likely should not change the above assumptions
-#   but rather be additive - btm
-
-# Detect from kernel module
-if File.exists?("/proc/modules")
-  modules = File.read("/proc/modules")
-  if modules =~ /^kvm/
-    virtualization[:system] = "kvm"
-    virtualization[:role] = "host"
-  elsif modules =~ /^vboxdrv/
-    virtualization[:system] = "vbox"
-    virtualization[:role] = "host"
-  elsif modules =~ /^vboxguest/
-    virtualization[:system] = "vbox"
-    virtualization[:role] = "guest"
-  end
-end
 
-# Detect KVM/QEMU from cpuinfo, report as KVM
-# We could pick KVM from 'Booting paravirtualized kernel on KVM' in dmesg
-# 2.6.27-9-server (intrepid) has this / 2.6.18-6-amd64 (etch) does not
-# It would be great if we could read pv_info in the kernel
-# Wait for reply to: http://article.gmane.org/gmane.comp.emulators.kvm.devel/27885
-if File.exists?("/proc/cpuinfo")
-  if File.read("/proc/cpuinfo") =~ /QEMU Virtual CPU/
-    virtualization[:system] = "kvm"
-    virtualization[:role] = "guest"
-  end
-end
+    # Xen Notes:
+    # - cpuid of guests, if we could get it, would also be a clue
+    # - may be able to determine if under paravirt from /dev/xen/evtchn (See OHAI-253)
+    # - EL6 guests carry a 'hypervisor' cpu flag
+    # - Additional edge cases likely should not change the above assumptions
+    #   but rather be additive - btm
 
-# Detect OpenVZ / Virtuozzo.
-# http://wiki.openvz.org/BC_proc_entries
-if File.exists?("/proc/bc/0")
-  virtualization[:system] = "openvz"
-  virtualization[:role] = "host"
-elsif File.exists?("/proc/vz")
-  virtualization[:system] = "openvz"
-  virtualization[:role] = "guest"
-end
-
-# http://www.dmo.ca/blog/detecting-virtualization-on-linux
-if File.exists?("/usr/sbin/dmidecode")
-  popen4("dmidecode") do |pid, stdin, stdout, stderr|
-    stdin.close
-    dmi_info = stdout.read
-    case dmi_info
-    when /Manufacturer: Microsoft/
-      if dmi_info =~ /Product Name: Virtual Machine/
-        virtualization[:system] = "virtualpc"
+    # Detect from kernel module
+    if File.exists?("/proc/modules")
+      modules = File.read("/proc/modules")
+      if modules =~ /^kvm/
+        virtualization[:system] = "kvm"
+        virtualization[:role] = "host"
+      elsif modules =~ /^vboxdrv/
+        virtualization[:system] = "vbox"
+        virtualization[:role] = "host"
+      elsif modules =~ /^vboxguest/
+        virtualization[:system] = "vbox"
         virtualization[:role] = "guest"
       end
-    when /Manufacturer: VMware/
-      if dmi_info =~ /Product Name: VMware Virtual Platform/
-        virtualization[:system] = "vmware"
-        virtualization[:role] = "guest"
-      end
-    when /Manufacturer: Xen/
-      if dmi_info =~ /Product Name: HVM domU/
-        virtualization[:system] = "xen"
+    end
+
+    # Detect KVM/QEMU from cpuinfo, report as KVM
+    # We could pick KVM from 'Booting paravirtualized kernel on KVM' in dmesg
+    # 2.6.27-9-server (intrepid) has this / 2.6.18-6-amd64 (etch) does not
+    # It would be great if we could read pv_info in the kernel
+    # Wait for reply to: http://article.gmane.org/gmane.comp.emulators.kvm.devel/27885
+    if File.exists?("/proc/cpuinfo")
+      if File.read("/proc/cpuinfo") =~ /QEMU Virtual CPU|Common KVM processor|Common 32-bit KVM processor/
+        virtualization[:system] = "kvm"
         virtualization[:role] = "guest"
       end
-    else
-      nil
     end
 
-  end
-end
-
-# Detect Linux-VServer
-if File.exists?("/proc/self/status")
-  proc_self_status = File.read("/proc/self/status")
-  vxid = proc_self_status.match(/^(s_context|VxID): (\d+)$/)
-  if vxid and vxid[2]
-    virtualization[:system] = "linux-vserver"
-    if vxid[2] == "0"
+    # Detect OpenVZ / Virtuozzo.
+    # http://wiki.openvz.org/BC_proc_entries
+    if File.exists?("/proc/bc/0")
+      virtualization[:system] = "openvz"
       virtualization[:role] = "host"
-    else
+    elsif File.exists?("/proc/vz")
+      virtualization[:system] = "openvz"
       virtualization[:role] = "guest"
-     end
+    end
+
+    # http://www.dmo.ca/blog/detecting-virtualization-on-linux
+    if File.exists?("/usr/sbin/dmidecode")
+      so = shell_out("dmidecode")
+      case so.stdout
+      when /Manufacturer: Microsoft/
+        if so.stdout =~ /Product Name: Virtual Machine/
+          virtualization[:system] = "virtualpc"
+          virtualization[:role] = "guest"
+        end
+      when /Manufacturer: VMware/
+        if so.stdout =~ /Product Name: VMware Virtual Platform/
+          virtualization[:system] = "vmware"
+          virtualization[:role] = "guest"
+        end
+      when /Manufacturer: Xen/
+        if so.stdout =~ /Product Name: HVM domU/
+          virtualization[:system] = "xen"
+          virtualization[:role] = "guest"
+        end
+      when /Manufacturer: Oracle Corporation/
+        if so.stdout =~ /Product Name: VirtualBox/
+          virtualization[:system] = "vbox"
+          virtualization[:role] = "guest"
+        end
+      else
+        nil
+      end
+    end
+
+    # Detect Linux-VServer
+    if File.exists?("/proc/self/status")
+      proc_self_status = File.read("/proc/self/status")
+      vxid = proc_self_status.match(/^(s_context|VxID): (\d+)$/)
+      if vxid and vxid[2]
+        virtualization[:system] = "linux-vserver"
+        if vxid[2] == "0"
+          virtualization[:role] = "host"
+        else
+          virtualization[:role] = "guest"
+        end
+      end
+    end
   end
 end

data/lib/ohai/plugins/lua.rb

@@ -16,19 +16,23 @@
 # limitations under the License.
 #
 
-provides "languages/lua"
+Ohai.plugin(:Lua) do
+  provides "languages/lua"
 
-require_plugin "languages"
+  depends "languages"
 
-output = nil
+  collect_data do
+    output = nil
 
-lua = Mash.new
+    lua = Mash.new
 
-status, stdout, stderr = run_command(:no_status_check => true, :command => "lua -v")
-if status == 0
-  output = stderr.split
-  if output.length >= 1
-    lua[:version] = output[1]
+    so = shell_out("lua -v")
+    if so.exitstatus == 0
+      output = so.stderr.split
+      if output.length >= 1
+        lua[:version] = output[1]
+      end
+      languages[:lua] = lua if lua[:version]
+    end
   end
-  languages[:lua] = lua if lua[:version]
 end

data/lib/ohai/plugins/mono.rb

@@ -16,22 +16,26 @@
 # limitations under the License.
 #
 
-provides "languages/mono"
+Ohai.plugin(:Mono) do
+  provides "languages/mono"
 
-require_plugin "languages"
+  depends "languages"
 
-output = nil
+  collect_data do
+    output = nil
 
-mono = Mash.new
+    mono = Mash.new
 
-status, stdout, stderr = run_command(:no_status_check => true, :command => "mono -V")
-if status == 0
-  output = stdout.split
-  if output.length >= 4
-    mono[:version] = output[4]
+    so = shell_out("mono -V")
+    if so.exitstatus == 0
+      output = so.stdout.split
+      if output.length >= 4
+        mono[:version] = output[4]
+      end
+      if output.length >= 11
+        mono[:builddate] = "%s %s %s %s" % [output[6],output[7],output[8],output[11].gsub!(/\)/,'')]
+      end
+      languages[:mono] = mono if mono[:version]
+    end
   end
-  if output.length >= 11
-    mono[:builddate] = "%s %s %s %s" % [output[6],output[7],output[8],output[11].gsub!(/\)/,'')]
-  end
-  languages[:mono] = mono if mono[:version]
 end