ohai 8.7.0 → 8.8.0

data/lib/ohai/plugins/dragonflybsd/os.rb

@@ -0,0 +1,32 @@
+#
+# Authors:: Adam Jacob (<adam@opscode.com>)
+#           Richard Manyanza (<liseki@nyikacraftsmen.com>)
+# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright (c) 2014 Richard Manyanza.
+# 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/mixin/os'
+
+Ohai.plugin(:OS) do
+  provides "os", "os_version"
+
+  collect_data(:dragonflybsd) do
+    os collect_os
+
+    # This is __DragonFly_version. See sys/param.h
+    os_version shell_out("sysctl -n kern.osreldate").stdout.split($/)[0]
+  end
+end

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

@@ -0,0 +1,29 @@
+#
+# Author:: Bryan McLellan (btm@loftninjas.org)
+# Copyright:: Copyright (c) 2009 Bryan McLellan
+# 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.
+#
+
+Ohai.plugin(:Platform) do
+  provides "platform", "platform_version", "platform_family"
+
+  collect_data(:dragonflybsd) do
+    so = shell_out("uname -s")
+    platform so.stdout.split($/)[0].downcase
+    so = shell_out("uname -r")
+    platform_version so.stdout.split($/)[0]
+    platform_family "dragonflybsd"
+  end
+end

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

@@ -1,5 +1,6 @@
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
+# Author:: Tim Smith (tsmith@chef.io)
 # Copyright:: Copyright (c) 2008 Bryan McLellan
 # License:: Apache License, Version 2.0
 #
@@ -27,21 +28,26 @@ Ohai.plugin(:CPU) do
     cpuinfo["flags"] = []
 
     # /var/run/dmesg.boot
-    # CPU: Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz (3516.61-MHz K8-class CPU)
-    # Origin = "GenuineIntel"  Id = 0x306a9  Family = 6  Model = 3a  Stepping = 9
-    # Features=0x783fbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,MMX,FXSR,SSE,SSE2>
-    # Features2=0x209<SSE3,MON,SSSE3>
-    # AMD Features=0x28100800<SYSCALL,NX,RDTSCP,LM>
-    # AMD Features2=0x1<LAHF>
+    # CPU: Intel(R) Core(TM) i7-4980HQ CPU @ 2.80GHz (2793.59-MHz K8-class CPU)
+    #   Origin="GenuineIntel"  Id=0x40661  Family=0x6  Model=0x46  Stepping=1
+    #   Features=0x783fbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,MMX,FXSR,SSE,SSE2>
+    #   Features2=0x5ed8220b<SSE3,PCLMULQDQ,MON,SSSE3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AESNI,XSAVE,OSXSAVE,AVX,RDRAND>
+    #   AMD Features=0x28100800<SYSCALL,NX,RDTSCP,LM>
+    #   AMD Features2=0x21<LAHF,ABM>
+    #   Structured Extended Features=0x2000<NFPUSG>
+    #   TSC: P-state invariant
 
     File.open("/var/run/dmesg.boot").each do |line|
       case line
       when /CPU:\s+(.+) \(([\d.]+).+\)/
         cpuinfo["model_name"] = $1
         cpuinfo["mhz"] = $2
-      when /Origin = "(.+)"\s+Id = (.+)\s+Stepping = (.+)/
+      when /Origin.*"(.*)".*Family.*0x(\S+).*Model.*0x(\S+).*Stepping.*(\S+)/
         cpuinfo["vendor_id"] = $1
-        cpuinfo["stepping"] = $3
+        # convert from hex value to int, but keep a string to match Linux ohai
+        cpuinfo["family"] = $2.to_i(16).to_s
+        cpuinfo["model"] = $3.to_i(16).to_s
+        cpuinfo["stepping"] = $4
         # These _should_ match /AMD Features2?/ lines as well
       when /Features=.+<(.+)>/
         cpuinfo["flags"].concat($1.downcase.split(','))

data/lib/ohai/plugins/freebsd/os.rb

@@ -26,7 +26,7 @@ Ohai.plugin(:OS) do
   collect_data(:freebsd) do
     os collect_os
 
-    # This is __FreeBSD_version. See sys/param.h or 
+    # This is __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]
   end

data/lib/ohai/plugins/hostname.rb

@@ -97,7 +97,7 @@ Ohai.plugin(:Hostname) do
     collect_domain
   end
 
-  collect_data(:darwin, :netbsd, :openbsd) do
+  collect_data(:darwin, :netbsd, :openbsd, :dragonflybsd) do
     hostname from_cmd("hostname -s")
     fqdn resolve_fqdn
     machinename from_cmd("hostname")

data/lib/ohai/plugins/kernel.rb

@@ -132,6 +132,18 @@ Ohai.plugin(:Kernel) do
     kernel[:modules] = bsd_modules("/usr/bin/modstat")
   end
 
+  collect_data(:dragonflybsd) do
+    kernel init_kernel
+    kernel[:os] = kernel[:name]
+
+    so = shell_out("uname -i")
+    kernel[:ident] = so.stdout.split($/)[0]
+    so = shell_out("sysctl kern.securelevel")
+    kernel[:securelevel] = so.stdout.split($/).select { |e| e =~ /kern.securelevel: (.+)$/ }
+
+    kernel[:modules] = bsd_modules("/sbin/kldstat")
+  end
+
   collect_data(:solaris2) do
     kernel init_kernel
 

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

@@ -17,8 +17,10 @@
 #
 
 require 'ohai/util/file_helper'
+require 'ohai/mixin/dmi_decode'
 
 include Ohai::Util::FileHelper
+include Ohai::Mixin::DmiDecode
 
 Ohai.plugin(:Virtualization) do
   provides "virtualization"
@@ -114,44 +116,13 @@ Ohai.plugin(:Virtualization) do
       end
     end
 
-    # http://www.dmo.ca/blog/detecting-virtualization-on-linux
+    # parse dmidecode to discover various virtualization guests
     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"
-          virtualization[:systems][:virtualpc] = "guest"
-        end
-      when /Manufacturer: VMware/
-        if so.stdout =~ /Product Name: VMware Virtual Platform/
-          virtualization[:system] = "vmware"
-          virtualization[:role] = "guest"
-          virtualization[:systems][:vmware] = "guest"
-        end
-      when /Manufacturer: Xen/
-        if so.stdout =~ /Product Name: HVM domU/
-          virtualization[:system] = "xen"
-          virtualization[:role] = "guest"
-          virtualization[:systems][:xen] = "guest"
-        end
-      when /Manufacturer: Oracle Corporation/
-        if so.stdout =~ /Product Name: VirtualBox/
-          virtualization[:system] = "vbox"
-          virtualization[:role] = "guest"
-          virtualization[:systems][:vbox] = "guest"
-        end
-      when /Product Name: OpenStack/
-        virtualization[:system] = "openstack"
-        virtualization[:role] = "guest"
-        virtualization[:systems][:openstack] = "guest"
-      when /Manufacturer: QEMU|Product Name: KVM/
-        virtualization[:system] = "kvm"
-        virtualization[:role] = "guest"
-        virtualization[:systems][:kvm] = "guest"
-      else
-        nil
+      guest = determine_guest(shell_out('dmidecode').stdout)
+      if guest
+        virtualization[:system] = guest
+        virtualization[:role] = 'guest'
+        virtualization[:systems][guest.to_sym] = 'guest'
       end
     end
 

data/lib/ohai/plugins/network_listeners.rb

@@ -39,6 +39,11 @@ Ohai.plugin(:NetworkListeners) do
       listeners[port][:address] = addr
       begin
         pid = sigar.proc_port(conn.type, port)
+        # workaround for a failure of proc_state to throw
+        # after the first 0 has been supplied to it
+        #
+        # no longer required when hyperic/sigar#48 is fixed
+        throw ArgumentError.new("No such process") if pid == 0
         listeners[port][:pid] = pid
         listeners[port][:name] = sigar.proc_state(pid).name
       rescue

data/lib/ohai/plugins/ps.rb

@@ -27,8 +27,8 @@ Ohai.plugin(:PS) do
     command[:ps] = 'ps -ef'
   end
 
-  collect_data(:freebsd, :netbsd, :openbsd) do
+  collect_data(:freebsd, :netbsd, :openbsd, :dragonflybsd) do
     # ps -e requires procfs
-    command[:ps] = 'ps -ax'
+    command[:ps] = 'ps -axww'
   end
 end

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

@@ -63,7 +63,15 @@ Ohai.plugin(:Filesystem) do
 
     # Grab any zfs data from "zfs get"
     zfs = Mash.new
-    so = shell_out("zfs get -p -H all")
+    # ohai.plugin[:filesystem][:zfs_properties] = 'used'
+    # ohai.plugin[:filesystem][:zfs_properties] = ['mountpoint', 'creation', 'available', 'used']
+    zfs_get = "zfs get -p -H "
+    if configuration(:zfs_properties).nil? || configuration(:zfs_properties).empty?
+      zfs_get << "all"
+    else
+      zfs_get << [configuration(:zfs_properties)].join(',')
+    end
+    so = shell_out(zfs_get)
     so.stdout.lines do |line|
       next unless (line =~ /^([^\t]+)\t([^\t]+)\t([^\t]+)\t([^\t]+)$/)
       filesystem = $1

data/lib/ohai/plugins/uptime.rb

@@ -57,7 +57,7 @@ Ohai.plugin(:Uptime) do
     uptime data.last
   end
 
-  collect_data(:freebsd, :netbsd) do
+  collect_data(:freebsd, :netbsd, :dragonflybsd) do
     data = collect_uptime("/sbin/sysctl")
     uptime_seconds data.first
     uptime data.last

data/lib/ohai/plugins/virtualbox.rb

@@ -0,0 +1,44 @@
+#
+# Author:: "Tim Smith" <tsmith@chef.io>
+# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# 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.
+#
+
+Ohai.plugin(:Virtualbox) do
+  provides 'virtualbox'
+
+  collect_data do
+    so = shell_out('VBoxControl guestproperty enumerate')
+    if so.exitstatus == 0
+      virtualbox Mash.new
+      virtualbox[:host] = Mash.new
+      virtualbox[:guest] = Mash.new
+      so.stdout.lines.each do |line|
+        case line
+        when /LanguageID, value: (\S*),/
+          virtualbox[:host][:language] = Regexp.last_match(1)
+        when /VBoxVer, value: (\S*),/
+          virtualbox[:host][:version] = Regexp.last_match(1)
+        when /VBoxRev, value: (\S*),/
+          virtualbox[:host][:revision] = Regexp.last_match(1)
+        when /GuestAdd\/VersionExt, value: (\S*),/
+          virtualbox[:guest][:guest_additions_version] = Regexp.last_match(1)
+        when /GuestAdd\/Revision, value: (\S*),/
+          virtualbox[:guest][:guest_additions_revision] = Regexp.last_match(1)
+        end
+      end
+    end
+  end
+end

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

@@ -22,50 +22,49 @@ Ohai.plugin(:CPU) do
   collect_data(:windows) do
     require 'wmi-lite/wmi'
 
-    cpuinfo = Mash.new
-    cpu_number = 0
-    index = 0
+    cpu Mash.new
+    cores = 0
+    logical_processors = 0
 
     wmi = WmiLite::Wmi.new
     processors = wmi.instances_of('Win32_Processor')
 
-    processors.each do |processor|
+    processors.each_with_index do |processor, index|
+      current_cpu = index.to_s
+      cpu[current_cpu] = Mash.new
       #
-      # On Windows Server 2003 R2 (i.e. 5.2.*), numberofcores property 
+      # On Windows Server 2003 R2 (i.e. 5.2.*), numberofcores property
       # doesn't exist on the Win32_Processor class unless the user has
       # patched their system with:
       # http://support.microsoft.com/kb/932370
-      # 
-      # We're returning nil for cpu["cores"] and cpu["count"]
+      #
+      # We're returning nil for cpu["cores"]
       # when we don't see numberofcores property
       #
 
-      number_of_cores = nil
       begin
-        number_of_cores = processor['numberofcores']
-        cpu_number += number_of_cores
+        cpu[current_cpu]["cores"] = processor['numberofcores']
+        cores += processor['numberofcores']
       rescue NoMethodError => e
         Ohai::Log.info("Can not find numberofcores property on Win32_Processor. Consider applying this patch: http://support.microsoft.com/kb/932370")
+        cpu[current_cpu]["cores"] = nil
       end
 
-      current_cpu = index.to_s
-      index += 1
-      cpuinfo[current_cpu] = Mash.new
-      cpuinfo[current_cpu]["vendor_id"] = processor['manufacturer']
-      cpuinfo[current_cpu]["family"] = processor['family'].to_s
-      cpuinfo[current_cpu]["model"] = processor['revision'].to_s
-      cpuinfo[current_cpu]["stepping"] = processor['stepping']
-      cpuinfo[current_cpu]["physical_id"] = processor['deviceid']
-      #cpuinfo[current_cpu]["core_id"] = XXX
-      cpuinfo[current_cpu]["cores"] = number_of_cores
-      cpuinfo[current_cpu]["model_name"] = processor['description']
-      cpuinfo[current_cpu]["mhz"] = processor['maxclockspeed'].to_s
-      cpuinfo[current_cpu]["cache_size"] = "#{processor['l2cachesize']} KB"
-      #cpuinfo[current_cpu]["flags"] = XXX
+      logical_processors += processor['numberoflogicalprocessors']
+      cpu[current_cpu]["vendor_id"] = processor['manufacturer']
+      cpu[current_cpu]["family"] = processor['family'].to_s
+      cpu[current_cpu]["model"] = processor['revision'].to_s
+      cpu[current_cpu]["stepping"] = processor['stepping'].nil? \
+                  ? processor['description'].match(/Stepping\s+(\d+)/)[1] \
+                  : processor['stepping']
+      cpu[current_cpu]["physical_id"] = processor['deviceid']
+      cpu[current_cpu]["model_name"] = processor['description']
+      cpu[current_cpu]["mhz"] = processor['maxclockspeed'].to_s
+      cpu[current_cpu]["cache_size"] = "#{processor['l2cachesize']} KB"
     end
 
-    cpu cpuinfo
-    cpu[:total] = (cpu_number == 0) ? nil : cpu_number
-    cpu[:real] = index
+    cpu[:total] = logical_processors
+    cpu[:cores] = cores
+    cpu[:real] =  processors.length
   end
 end

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

@@ -1,6 +1,8 @@
 #
 # Author:: Pavel Yudin (<pyudin@parallels.com>)
+# Author:: Tim Smith (<tsmith@chef.io>)
 # Copyright:: Copyright (c) 2015 Pavel Yudin
+# Copyright:: Copyright (c) 2015 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,29 +18,39 @@
 # limitations under the License.
 #
 
-require 'ohai/util/file_helper'
-
-include Ohai::Util::FileHelper
-
 Ohai.plugin(:Virtualization) do
-  provides "virtualization"
-
-  def powershell_exists?
-    which('powershell.exe')
-  end
+  provides 'virtualization'
 
   collect_data(:windows) do
+    require 'wmi-lite/wmi'
+
     virtualization Mash.new unless virtualization
     virtualization[:systems] = Mash.new unless virtualization[:systems]
 
-    # Detect Parallels virtual machine from BIOS information
-    if powershell_exists?
-      so = shell_out('powershell.exe "Get-WmiObject -Class Win32_BIOS"')
-      if so.stdout =~ /Parallels Software International Inc./
-        virtualization[:system] = 'parallels'
-        virtualization[:role] = 'guest'
-        virtualization[:systems][:parallels] = 'guest'
-      end
+    # Grab BIOS data from WMI to determine vendor information
+    wmi = WmiLite::Wmi.new
+    bios = wmi.instances_of('Win32_BIOS')
+
+    case bios[0]['manufacturer']
+    when 'innotek GmbH'
+      virtualization[:system] = 'vbox'
+      virtualization[:role] = 'guest'
+      virtualization[:systems][:vbox] = 'guest'
+    when 'Parallels Software International Inc.'
+      virtualization[:system] = 'parallels'
+      virtualization[:role] = 'guest'
+      virtualization[:systems][:parallels] = 'guest'
+    when 'Bochs'
+      virtualization[:system] = "kvm"
+      virtualization[:role] = "guest"
+      virtualization[:systems][:kvm] = "guest"
+    end
+
+    # vmware fusion detection
+    if bios[0]['serialnumber'] =~ /VMware/
+      virtualization[:system] = 'vmware'
+      virtualization[:role] = 'guest'
+      virtualization[:systems][:vmware] = 'guest'
     end
   end
 end