ohai 6.24.2 → 7.0.0.rc.0

data/lib/ohai/plugins/virtualization.rb

@@ -16,71 +16,75 @@
 # limitations under the License.
 #
 
-provides "virtualization"
+Ohai.plugin(:VirtualizationInfo) do
+  %w{ uri capabilities nodeinfo domains networks storage }.each do |info|
+    provides "virtualization/#{info}"
+  end
 
-require_plugin "#{os}::virtualization"
+  collect_data do
+    unless virtualization.nil? || !(virtualization[:role].eql?("host"))
+      begin
+        require 'libvirt'
+        require 'hpricot'
 
-unless virtualization.nil? || !(virtualization[:role].eql?("host"))
-  begin
-    require 'libvirt'
-    require 'hpricot'
+        emu = (virtualization[:system].eql?('kvm') ? 'qemu' : virtualization[:system])
+        virtualization[:libvirt_version] = Libvirt::version(emu)[0].to_s
 
-    emu = (virtualization[:system].eql?('kvm') ? 'qemu' : virtualization[:system])
-    virtualization[:libvirt_version] = Libvirt::version(emu)[0].to_s
+        virtconn = Libvirt::open_read_only("#{emu}:///system")
 
-    virtconn = Libvirt::open_read_only("#{emu}:///system")
+        virtualization[:uri] = virtconn.uri
+        virtualization[:capabilities] = Mash.new
+        virtualization[:capabilities][:xml_desc] = (virtconn.capabilities.split("\n").collect {|line| line.strip}).join
+        #xdoc = Hpricot virtualization[:capabilities][:xml_desc]
+        
+        virtualization[:nodeinfo] = Mash.new
+        ni = virtconn.node_get_info
+        ['cores','cpus','memory','mhz','model','nodes','sockets','threads'].each {|a| virtualization[:nodeinfo][a] = ni.send(a)}
 
-    virtualization[:uri] = virtconn.uri
-    virtualization[:capabilities] = Mash.new
-    virtualization[:capabilities][:xml_desc] = (virtconn.capabilities.split("\n").collect {|line| line.strip}).join
-    #xdoc = Hpricot virtualization[:capabilities][:xml_desc]
-  
-    virtualization[:nodeinfo] = Mash.new
-    ni = virtconn.node_get_info
-    ['cores','cpus','memory','mhz','model','nodes','sockets','threads'].each {|a| virtualization[:nodeinfo][a] = ni.send(a)}
+        virtualization[:domains] = Mash.new
+        virtconn.list_domains.each do |d|
+          dv = virtconn.lookup_domain_by_id d
+          virtualization[:domains][dv.name] = Mash.new
+          virtualization[:domains][dv.name][:id] = d
+          virtualization[:domains][dv.name][:xml_desc] = (dv.xml_desc.split("\n").collect {|line| line.strip}).join
+          ['os_type','uuid'].each {|a| virtualization[:domains][dv.name][a] = dv.send(a)}
+          ['cpu_time','max_mem','memory','nr_virt_cpu','state'].each {|a| virtualization[:domains][dv.name][a] = dv.info.send(a)}
+          #xdoc = Hpricot virtualization[:domains][dv.name][:xml_desc]
+          
+        end
 
-    virtualization[:domains] = Mash.new
-    virtconn.list_domains.each do |d|
-      dv = virtconn.lookup_domain_by_id d
-      virtualization[:domains][dv.name] = Mash.new
-      virtualization[:domains][dv.name][:id] = d
-      virtualization[:domains][dv.name][:xml_desc] = (dv.xml_desc.split("\n").collect {|line| line.strip}).join
-      ['os_type','uuid'].each {|a| virtualization[:domains][dv.name][a] = dv.send(a)}
-      ['cpu_time','max_mem','memory','nr_virt_cpu','state'].each {|a| virtualization[:domains][dv.name][a] = dv.info.send(a)}
-      #xdoc = Hpricot virtualization[:domains][dv.name][:xml_desc]
-    
-    end
+        virtualization[:networks] = Mash.new
+        virtconn.list_networks.each do |n|
+          nv = virtconn.lookup_network_by_name n
+          virtualization[:networks][n] = Mash.new
+          virtualization[:networks][n][:xml_desc] = (nv.xml_desc.split("\n").collect {|line| line.strip}).join
+          ['bridge_name','uuid'].each {|a| virtualization[:networks][n][a] = nv.send(a)}
+          #xdoc = Hpricot virtualization[:networks][n][:xml_desc]
+          
+        end
 
-    virtualization[:networks] = Mash.new
-    virtconn.list_networks.each do |n|
-      nv = virtconn.lookup_network_by_name n
-      virtualization[:networks][n] = Mash.new
-      virtualization[:networks][n][:xml_desc] = (nv.xml_desc.split("\n").collect {|line| line.strip}).join
-      ['bridge_name','uuid'].each {|a| virtualization[:networks][n][a] = nv.send(a)}
-      #xdoc = Hpricot virtualization[:networks][n][:xml_desc]
-    
-    end
+        virtualization[:storage] = Mash.new
+        virtconn.list_storage_pools.each do |pool|
+          sp = virtconn.lookup_storage_pool_by_name pool
+          virtualization[:storage][pool] = Mash.new
+          virtualization[:storage][pool][:xml_desc] = (sp.xml_desc.split("\n").collect {|line| line.strip}).join
+          ['autostart','uuid'].each {|a| virtualization[:storage][pool][a] = sp.send(a)}
+          ['allocation','available','capacity','state'].each {|a| virtualization[:storage][pool][a] = sp.info.send(a)}
+          #xdoc = Hpricot virtualization[:storage][pool][:xml_desc]
 
-    virtualization[:storage] = Mash.new
-    virtconn.list_storage_pools.each do |pool|
-      sp = virtconn.lookup_storage_pool_by_name pool
-      virtualization[:storage][pool] = Mash.new
-      virtualization[:storage][pool][:xml_desc] = (sp.xml_desc.split("\n").collect {|line| line.strip}).join
-      ['autostart','uuid'].each {|a| virtualization[:storage][pool][a] = sp.send(a)}
-      ['allocation','available','capacity','state'].each {|a| virtualization[:storage][pool][a] = sp.info.send(a)}
-      #xdoc = Hpricot virtualization[:storage][pool][:xml_desc]
+          virtualization[:storage][pool][:volumes] = Mash.new
+          sp.list_volumes.each do |v|
+            virtualization[:storage][pool][:volumes][v] = Mash.new
+            sv = sp.lookup_volume_by_name v
+            ['key','name','path'].each {|a| virtualization[:storage][pool][:volumes][v][a] = sv.send(a)}
+            ['allocation','capacity','type'].each {|a| virtualization[:storage][pool][:volumes][v][a] = sv.info.send(a)}
+          end
+        end
 
-      virtualization[:storage][pool][:volumes] = Mash.new
-      sp.list_volumes.each do |v|
-        virtualization[:storage][pool][:volumes][v] = Mash.new
-        sv = sp.lookup_volume_by_name v
-        ['key','name','path'].each {|a| virtualization[:storage][pool][:volumes][v][a] = sv.send(a)}
-        ['allocation','capacity','type'].each {|a| virtualization[:storage][pool][:volumes][v][a] = sv.info.send(a)}
+        virtconn.close
+      rescue LoadError => e
+        Ohai::Log.debug("Can't load gem: #{e}.  virtualization plugin is disabled.")
       end
     end
-
-    virtconn.close
-  rescue LoadError => e
-    Ohai::Log.debug("Can't load gem: #{e}.  virtualization plugin is disabled.")
   end
 end

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

@@ -16,49 +16,53 @@
 # limitations under the License.
 #
 
-require 'ruby-wmi'
+Ohai.plugin(:CPU) do
+  provides "cpu"
 
-provides "cpu"
+  collect_data(:windows) do
+    require 'ruby-wmi'
 
-cpuinfo = Mash.new
-cpu_number = 0
-index = 0
+    cpuinfo = Mash.new
+    cpu_number = 0
+    index = 0
 
-WMI::Win32_Processor.find(:all).each do |processor|
-  #
-  # 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"]
-  # when we don't see numberofcores property
-  #
+    WMI::Win32_Processor.find(:all).each do |processor|
+      #
+      # 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"]
+      # when we don't see numberofcores property
+      #
 
-  number_of_cores = nil
-  begin
-    number_of_cores = processor.numberofcores
-    cpu_number += number_of_cores
-  rescue NoMethodError => e
-    Ohai::Log.info("Can not find numberofcores property on Win32_Processor. Consider applying this patch: http://support.microsoft.com/kb/932370")
-  end
+      number_of_cores = nil
+      begin
+        number_of_cores = processor.numberofcores
+        cpu_number += number_of_cores
+      rescue NoMethodError => e
+        Ohai::Log.info("Can not find numberofcores property on Win32_Processor. Consider applying this patch: http://support.microsoft.com/kb/932370")
+      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
-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
+    end
 
-cpu cpuinfo
-cpu[:total] = (cpu_number == 0) ? nil : cpu_number
-cpu[:real] = index
+    cpu cpuinfo
+    cpu[:total] = (cpu_number == 0) ? nil : cpu_number
+    cpu[:real] = index
+  end
+end

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

@@ -16,29 +16,35 @@
 # limitations under the License.
 #
 
-require 'ruby-wmi'
+Ohai.plugin(:Filesystem) do
+  provides "filesystem"
 
-fs = Mash.new
-ld_info = Mash.new
+  collect_data(:windows) do
+    require 'ruby-wmi'
 
-# Grab filesystem data from WMI
-# Note: we should really be parsing Win32_Volume and Win32_Mapped drive
-disks = WMI::Win32_LogicalDisk.find(:all)
-disks.each do |disk|
-    filesystem = disk.DeviceID
-    fs[filesystem] = Mash.new
-    ld_info[filesystem] = Mash.new
-    disk.properties_.each do |p|
-      ld_info[filesystem][p.name.wmi_underscore.to_sym] = disk.send(p.name)
+    fs = Mash.new
+    ld_info = Mash.new
+
+    # Grab filesystem data from WMI
+    # Note: we should really be parsing Win32_Volume and Win32_Mapped drive
+    disks = WMI::Win32_LogicalDisk.find(:all)
+    disks.each do |disk|
+      filesystem = disk.DeviceID
+      fs[filesystem] = Mash.new
+      ld_info[filesystem] = Mash.new
+      disk.properties_.each do |p|
+        ld_info[filesystem][p.name.wmi_underscore.to_sym] = disk.send(p.name)
+      end
+      fs[filesystem][:kb_size] = ld_info[filesystem][:size].to_i / 1000
+      fs[filesystem][:kb_available] = ld_info[filesystem][:free_space].to_i / 1000
+      fs[filesystem][:kb_used] = fs[filesystem][:kb_size].to_i - fs[filesystem][:kb_available].to_i
+      fs[filesystem][:percent_used]  = (fs[filesystem][:kb_size].to_i != 0 ? fs[filesystem][:kb_used].to_i * 100 / fs[filesystem][:kb_size].to_i : 0)
+      fs[filesystem][:mount] = ld_info[filesystem][:name]
+      fs[filesystem][:fs_type] = ld_info[filesystem][:file_system].downcase unless ld_info[filesystem][:file_system] == nil
+      fs[filesystem][:volume_name] = ld_info[filesystem][:volume_name]
     end
-    fs[filesystem][:kb_size] = ld_info[filesystem][:size].to_i / 1000
-    fs[filesystem][:kb_available] = ld_info[filesystem][:free_space].to_i / 1000
-    fs[filesystem][:kb_used] = fs[filesystem][:kb_size].to_i - fs[filesystem][:kb_available].to_i
-    fs[filesystem][:percent_used]  = (fs[filesystem][:kb_size].to_i != 0 ? fs[filesystem][:kb_used].to_i * 100 / fs[filesystem][:kb_size].to_i : 0)
-    fs[filesystem][:mount] = ld_info[filesystem][:name]
-    fs[filesystem][:fs_type] = ld_info[filesystem][:file_system].downcase unless ld_info[filesystem][:file_system] == nil
-    fs[filesystem][:volume_name] = ld_info[filesystem][:volume_name]
-end
 
-# Set the filesystem data
-filesystem fs
+    # Set the filesystem data
+    filesystem fs
+  end
+end

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

@@ -16,98 +16,107 @@
 # limitations under the License.
 #
 
-provides "network"
+Ohai.plugin(:Network) do
+  provides "network", "network/interfaces"
+  provides "counters/network", "counters/network/interfaces"
 
-require 'ruby-wmi'
+  def windows_encaps_lookup(encap)
+    return "Ethernet" if encap.eql?("Ethernet 802.3")
+    encap
+  end
 
-def encaps_lookup(encap)
-  return "Ethernet" if encap.eql?("Ethernet 802.3")
-  encap
-end
+  collect_data(:windows) do
+    require 'ruby-wmi'
 
-iface = Mash.new
-iface_config = Mash.new
-iface_instance = Mash.new
+    iface = Mash.new
+    iface_config = Mash.new
+    iface_instance = Mash.new
+    network Mash.new unless network
+    network[:interfaces] = Mash.new unless network[:interfaces]
+    counters Mash.new unless counters
+    counters[:network] = Mash.new unless counters[:network]
 
-# http://msdn.microsoft.com/en-us/library/windows/desktop/aa394217%28v=vs.85%29.aspx
-adapters = WMI::Win32_NetworkAdapterConfiguration.find(:all)
-adapters.each do |adapter|
-    i = adapter.Index
-    iface_config[i] = Mash.new
-    adapter.properties_.each do |p|
-      iface_config[i][p.name.wmi_underscore.to_sym] = adapter.invoke(p.name)
+    # http://msdn.microsoft.com/en-us/library/windows/desktop/aa394217%28v=vs.85%29.aspx
+    adapters = WMI::Win32_NetworkAdapterConfiguration.find(:all)
+    adapters.each do |adapter|
+      i = adapter.Index
+      iface_config[i] = Mash.new
+      adapter.properties_.each do |p|
+        iface_config[i][p.name.wmi_underscore.to_sym] = adapter.invoke(p.name)
+      end
     end
-end
 
-# http://msdn.microsoft.com/en-us/library/windows/desktop/aa394216(v=vs.85).aspx
-adapters = WMI::Win32_NetworkAdapter.find(:all)
-adapters.each do |adapter|
-    i = adapter.Index
-    iface_instance[i] = Mash.new
-     adapter.properties_.each do |p|
-      iface_instance[i][p.name.wmi_underscore.to_sym] = adapter.invoke(p.name)
+    # http://msdn.microsoft.com/en-us/library/windows/desktop/aa394216(v=vs.85).aspx
+    adapters = WMI::Win32_NetworkAdapter.find(:all)
+    adapters.each do |adapter|
+      i = adapter.Index
+      iface_instance[i] = Mash.new
+      adapter.properties_.each do |p|
+        iface_instance[i][p.name.wmi_underscore.to_sym] = adapter.invoke(p.name)
+      end
     end
-end
 
-iface_instance.keys.each do |i|
-  if iface_config[i][:ip_enabled] and iface_instance[i][:net_connection_id]
-    cint = sprintf("0x%x", iface_instance[i][:interface_index] ? iface_instance[i][:interface_index] : iface_instance[i][:index] ).downcase
-    iface[cint] = Mash.new
-    iface[cint][:configuration] = iface_config[i]
-    iface[cint][:instance] = iface_instance[i]
+    iface_instance.keys.each do |i|
+      if iface_config[i][:ip_enabled] and iface_instance[i][:net_connection_id]
+        cint = sprintf("0x%x", iface_instance[i][:interface_index] ? iface_instance[i][:interface_index] : iface_instance[i][:index] ).downcase
+        iface[cint] = Mash.new
+        iface[cint][:configuration] = iface_config[i]
+        iface[cint][:instance] = iface_instance[i]
 
-    iface[cint][:counters] = Mash.new
-    iface[cint][:addresses] = Mash.new
-    iface[cint][:configuration][:ip_address].each_index do |i|
-      ip = iface[cint][:configuration][:ip_address][i]
-      _ip = IPAddress("#{ip}/#{iface[cint][:configuration][:ip_subnet][i]}")
-      iface[cint][:addresses][ip] = Mash.new(
-        :prefixlen => _ip.prefix
-      )
-      if _ip.ipv6?
-        # inet6 address
-        iface[cint][:addresses][ip][:family] = "inet6"
-        iface[cint][:addresses][ip][:scope] = "Link" if ip =~ /^fe80/i
-      else
-        # should be an inet4 address
-        iface[cint][:addresses][ip][:netmask] =  _ip.netmask.to_s
-        if iface[cint][:configuration][:ip_use_zero_broadcast]
-          iface[cint][:addresses][ip][:broadcast] = _ip.network.to_s
-        else
-          iface[cint][:addresses][ip][:broadcast] = _ip.broadcast.to_s
+        iface[cint][:counters] = Mash.new
+        iface[cint][:addresses] = Mash.new
+        iface[cint][:configuration][:ip_address].each_index do |i|
+          ip = iface[cint][:configuration][:ip_address][i]
+          _ip = IPAddress("#{ip}/#{iface[cint][:configuration][:ip_subnet][i]}")
+          iface[cint][:addresses][ip] = Mash.new(
+                                                 :prefixlen => _ip.prefix
+                                                 )
+          if _ip.ipv6?
+            # inet6 address
+            iface[cint][:addresses][ip][:family] = "inet6"
+            iface[cint][:addresses][ip][:scope] = "Link" if ip =~ /^fe80/i
+          else
+            # should be an inet4 address
+            iface[cint][:addresses][ip][:netmask] =  _ip.netmask.to_s
+            if iface[cint][:configuration][:ip_use_zero_broadcast]
+              iface[cint][:addresses][ip][:broadcast] = _ip.network.to_s
+            else
+              iface[cint][:addresses][ip][:broadcast] = _ip.broadcast.to_s
+            end
+            iface[cint][:addresses][ip][:family] = "inet"
+          end
+        end
+        # Apparently you can have more than one mac_address? Odd.
+        [iface[cint][:configuration][:mac_address]].flatten.each do |mac_addr|
+          iface[cint][:addresses][mac_addr] = {
+            "family"    => "lladdr"
+          }
+        end
+        iface[cint][:mtu] = iface[cint][:configuration][:mtu]
+        iface[cint][:type] = iface[cint][:instance][:adapter_type]
+        iface[cint][:arp] = {}
+        iface[cint][:encapsulation] = windows_encaps_lookup(iface[cint][:instance][:adapter_type])
+        if iface[cint][:configuration][:default_ip_gateway] != nil and iface[cint][:configuration][:default_ip_gateway].size > 0
+          network[:default_gateway] = iface[cint][:configuration][:default_ip_gateway].first
+          network[:default_interface] = cint
         end
-        iface[cint][:addresses][ip][:family] = "inet"
       end
     end
-    # Apparently you can have more than one mac_address? Odd.
-    [iface[cint][:configuration][:mac_address]].flatten.each do |mac_addr|
-      iface[cint][:addresses][mac_addr] = {
-        "family"    => "lladdr"
-      }
-    end
-    iface[cint][:mtu] = iface[cint][:configuration][:mtu]
-    iface[cint][:type] = iface[cint][:instance][:adapter_type]
-    iface[cint][:arp] = {}
-    iface[cint][:encapsulation] = encaps_lookup(iface[cint][:instance][:adapter_type])
-    if iface[cint][:configuration][:default_ip_gateway] != nil and iface[cint][:configuration][:default_ip_gateway].size > 0
-      network[:default_gateway] = iface[cint][:configuration][:default_ip_gateway].first
-      network[:default_interface] = cint
-    end
-  end
-end
 
-cint=nil
-status, stdout, stderr = run_command(:command => "arp -a")
-if status == 0
-  stdout.split("\n").each do |line|
-    if line =~ /^Interface:\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+[-]+\s+(0x\S+)/
-      cint = $2.downcase
-    end
-    next unless iface[cint]
-    if line =~ /^\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+([a-fA-F0-9\:-]+)/
-      iface[cint][:arp][$1] = $2.gsub("-",":").downcase
+    cint=nil
+    so = shell_out("arp -a")
+    if so.exitstatus == 0
+      so.stdout.lines do |line|
+        if line =~ /^Interface:\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+[-]+\s+(0x\S+)/
+          cint = $2.downcase
+        end
+        next unless iface[cint]
+        if line =~ /^\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+([a-fA-F0-9\:-]+)/
+          iface[cint][:arp][$1] = $2.gsub("-",":").downcase
+        end
+      end
     end
+
+    network["interfaces"] = iface
   end
 end
-
-network["interfaces"] = iface