ohai 8.10.0 → 8.11.1

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

@@ -22,9 +22,9 @@ Ohai.plugin(:Virtualization) do
   provides "virtualization"
 
   def collect_solaris_guestid
-    command = '/usr/sbin/zoneadm list -p'
+    command = "/usr/sbin/zoneadm list -p"
     so = shell_out(command)
-    so.stdout.split(':').first
+    so.stdout.split(":").first
   end
 
   collect_data(:solaris2) do
@@ -41,7 +41,7 @@ Ohai.plugin(:Virtualization) do
     end
 
     # http://www.dmo.ca/blog/detecting-virtualization-on-linux
-    smbios_path= Ohai.abs_path( "/usr/sbin/smbios" )
+    smbios_path = Ohai.abs_path( "/usr/sbin/smbios" )
     if File.exists?(smbios_path)
       so = shell_out(smbios_path)
       case so.stdout
@@ -60,32 +60,32 @@ Ohai.plugin(:Virtualization) do
       end
     end
 
-    if File.executable?('/usr/sbin/zoneadm')
+    if File.executable?("/usr/sbin/zoneadm")
       zones = Mash.new
       so = shell_out("zoneadm list -pc")
       so.stdout.lines do |line|
         info = line.chomp.split(/:/)
         zones[info[1]] = {
-          'id' => info[0],
-          'state' => info[2],
-          'root' => info[3],
-          'uuid' => info[4],
-          'brand' => info[5],
-          'ip' => info[6],
+          "id" => info[0],
+          "state" => info[2],
+          "root" => info[3],
+          "uuid" => info[4],
+          "brand" => info[5],
+          "ip" => info[6],
         }
       end
 
-      if (zones.length == 1)
+      if zones.length == 1
         first_zone = zones.keys[0]
-        unless( first_zone == 'global')
-          virtualization[:system] = 'zone'
-          virtualization[:role] = 'guest'
-          virtualization[:guest_uuid] = zones[first_zone]['uuid']
+        unless( first_zone == "global")
+          virtualization[:system] = "zone"
+          virtualization[:role] = "guest"
+          virtualization[:guest_uuid] = zones[first_zone]["uuid"]
           virtualization[:guest_id] = collect_solaris_guestid
         end
-      elsif (zones.length > 1)
-        virtualization[:system] = 'zone'
-        virtualization[:role] = 'host'
+      elsif zones.length > 1
+        virtualization[:system] = "zone"
+        virtualization[:role] = "host"
         virtualization[:guests] = zones
       end
     end

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

@@ -39,7 +39,7 @@ Ohai.plugin(:Zpools) do
     end
 
     # Grab individual health for devices in the zpools
-    for pool in pools.keys
+    pools.keys.each do |pool|
       pools[pool][:devices] = Mash.new
       # Run "zpool status" as non-root user (adm) so that
       # the command won't try to open() each device which can

data/lib/ohai/plugins/ssh_host_key.rb

@@ -28,8 +28,8 @@ Ohai.plugin(:SSHHostKey) do
       [ "rsa", nil ]
     when /^ecdsa/
       [ "ecdsa", content[0] ]
-    when 'ssh-ed25519'
-      [ 'ed25519', nil ]
+    when "ssh-ed25519"
+      [ "ed25519", nil ]
     else
       [ nil, nil ]
     end

data/lib/ohai/plugins/uptime.rb

@@ -24,7 +24,7 @@
 # limitations under the License.
 #
 
-require 'ohai/mixin/seconds_to_human'
+require "ohai/mixin/seconds_to_human"
 
 Ohai.plugin(:Uptime) do
   provides "uptime", "uptime_seconds"
@@ -43,7 +43,7 @@ Ohai.plugin(:Uptime) do
   end
 
   collect_data(:hpux, :default) do
-    require 'sigar'
+    require "sigar"
 
     sigar = Sigar.new
     uptime = sigar.uptime.uptime
@@ -94,11 +94,10 @@ Ohai.plugin(:Uptime) do
   end
 
   collect_data(:windows) do
-    require 'wmi-lite/wmi'
+    require "wmi-lite/wmi"
     wmi = WmiLite::Wmi.new
-    uptime_seconds wmi.first_of('Win32_PerfFormattedData_PerfOS_System')['systemuptime'].to_i
+    uptime_seconds wmi.first_of("Win32_PerfFormattedData_PerfOS_System")["systemuptime"].to_i
     uptime seconds_to_human(uptime_seconds)
   end
 
 end
-

data/lib/ohai/plugins/virtualbox.rb

@@ -17,10 +17,10 @@
 #
 
 Ohai.plugin(:Virtualbox) do
-  provides 'virtualbox'
+  provides "virtualbox"
 
   collect_data do
-    so = shell_out('VBoxControl guestproperty enumerate')
+    so = shell_out("VBoxControl guestproperty enumerate")
     if so.exitstatus == 0
       virtualbox Mash.new
       virtualbox[:host] = Mash.new

data/lib/ohai/plugins/virtualization.rb

@@ -24,31 +24,31 @@ Ohai.plugin(:VirtualizationInfo) do
   collect_data do
     unless virtualization.nil? || !(virtualization[:role].eql?("host"))
       begin
-        require 'libvirt'
-        require 'hpricot'
+        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
+        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)}
+        %w{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)}
+          virtualization[:domains][dv.name][:xml_desc] = (dv.xml_desc.split("\n").collect { |line| line.strip }).join
+          %w{os_type uuid}.each { |a| virtualization[:domains][dv.name][a] = dv.send(a) }
+          %w{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
@@ -57,8 +57,8 @@ Ohai.plugin(:VirtualizationInfo) do
         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)}
+          virtualization[:networks][n][:xml_desc] = (nv.xml_desc.split("\n").collect { |line| line.strip }).join
+          %w{bridge_name uuid}.each { |a| virtualization[:networks][n][a] = nv.send(a) }
           #xdoc = Hpricot virtualization[:networks][n][:xml_desc]
 
         end
@@ -67,17 +67,17 @@ Ohai.plugin(:VirtualizationInfo) do
         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)}
+          virtualization[:storage][pool][:xml_desc] = (sp.xml_desc.split("\n").collect { |line| line.strip }).join
+          %w{autostart uuid}.each { |a| virtualization[:storage][pool][a] = sp.send(a) }
+          %w{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)}
+            %w{key name path}.each { |a| virtualization[:storage][pool][:volumes][v][a] = sv.send(a) }
+            %w{allocation capacity type}.each { |a| virtualization[:storage][pool][:volumes][v][a] = sv.info.send(a) }
           end
         end
 

data/lib/ohai/plugins/vmware.rb

@@ -49,7 +49,7 @@ Ohai.plugin(:VMware) do
         # vmware-toolbox-cmd stat <param> commands
         # Iterate through each parameter supported by the "vwware-toolbox-cmd stat" command, assign value
         # to attribute "vmware[:<parameter>]"
-        [ "hosttime", "speed", "sessionid", "balloon", "swap", "memlimit", "memres", "cpures", "cpulimit" ].each do |param|
+        %w{hosttime speed sessionid balloon swap memlimit memres cpures cpulimit}.each do |param|
           vmware[param] = from_cmd("#{vmtools_path} stat #{param}")
           if vmware[param] =~ /UpdateInfo failed/
             vmware[param] = nil
@@ -58,7 +58,7 @@ Ohai.plugin(:VMware) do
         # vmware-toolbox-cmd <param> status commands
         # Iterate through each parameter supported by the "vwware-toolbox-cmd status" command, assign value
         # to attribute "vmware[:<parameter>]"
-        [ "upgrade", "timesync" ].each do |param|
+        %w{upgrade timesync}.each do |param|
           vmware[param] = from_cmd("#{vmtools_path} #{param} status")
         end
       rescue

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

@@ -20,14 +20,14 @@ Ohai.plugin(:CPU) do
   provides "cpu"
 
   collect_data(:windows) do
-    require 'wmi-lite/wmi'
+    require "wmi-lite/wmi"
 
     cpu Mash.new
     cores = 0
     logical_processors = 0
 
     wmi = WmiLite::Wmi.new
-    processors = wmi.instances_of('Win32_Processor')
+    processors = wmi.instances_of("Win32_Processor")
 
     processors.each_with_index do |processor, index|
       current_cpu = index.to_s
@@ -43,23 +43,23 @@ Ohai.plugin(:CPU) do
       #
 
       begin
-        cpu[current_cpu]["cores"] = processor['numberofcores']
-        cores += processor['numberofcores']
+        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
 
-      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
+      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
 

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

@@ -22,23 +22,23 @@ Ohai.plugin(:Drivers) do
   collect_data(:windows) do
     if configuration(:enabled)
 
-      require 'wmi-lite/wmi'
+      require "wmi-lite/wmi"
 
       kext = Mash.new
       pnp_drivers = Mash.new
 
       wmi = WmiLite::Wmi.new
 
-      drivers = wmi.instances_of('Win32_PnPSignedDriver')
+      drivers = wmi.instances_of("Win32_PnPSignedDriver")
       drivers.each do |driver|
-        pnp_drivers[driver['deviceid']] = Mash.new
+        pnp_drivers[driver["deviceid"]] = Mash.new
         driver.wmi_ole_object.properties_.each do |p|
-          pnp_drivers[driver['deviceid']][p.name.wmi_underscore.to_sym] = driver[p.name.downcase]
+          pnp_drivers[driver["deviceid"]][p.name.wmi_underscore.to_sym] = driver[p.name.downcase]
         end
-        if driver['devicename']
-          kext[driver['devicename']] = pnp_drivers[driver['deviceid']]
-          kext[driver['devicename']][:version] = pnp_drivers[driver['deviceid']][:driver_version]
-          kext[driver['devicename']][:date] = pnp_drivers[driver['deviceid']][:driver_date] ? pnp_drivers[driver['deviceid']][:driver_date].to_s[0..7] : nil
+        if driver["devicename"]
+          kext[driver["devicename"]] = pnp_drivers[driver["deviceid"]]
+          kext[driver["devicename"]][:version] = pnp_drivers[driver["deviceid"]][:driver_version]
+          kext[driver["devicename"]][:date] = pnp_drivers[driver["deviceid"]][:driver_date] ? pnp_drivers[driver["deviceid"]][:driver_date].to_s[0..7] : nil
         end
       end
 

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

@@ -21,7 +21,7 @@ Ohai.plugin(:Filesystem) do
 
   collect_data(:windows) do
 
-    require 'wmi-lite/wmi'
+    require "wmi-lite/wmi"
 
     fs = Mash.new
     ld_info = Mash.new
@@ -30,10 +30,10 @@ Ohai.plugin(:Filesystem) do
 
     # Grab filesystem data from WMI
     # Note: we should really be parsing Win32_Volume and Win32_Mapped drive
-    disks = wmi.instances_of('Win32_LogicalDisk')
+    disks = wmi.instances_of("Win32_LogicalDisk")
 
     disks.each do |disk|
-      filesystem = disk['deviceid']
+      filesystem = disk["deviceid"]
       fs[filesystem] = Mash.new
       ld_info[filesystem] = Mash.new
       disk.wmi_ole_object.properties_.each do |p|
@@ -42,7 +42,7 @@ Ohai.plugin(:Filesystem) do
       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][: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]

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

@@ -35,4 +35,4 @@ Ohai.plugin(:Memory) do
     # SwapFree
     memory[:swap][:free] = os["FreeSpaceInPagingFiles"] + "kB"
   end
-end
+end

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

@@ -27,7 +27,7 @@ Ohai.plugin(:Network) do
 
   collect_data(:windows) do
 
-    require 'wmi-lite/wmi'
+    require "wmi-lite/wmi"
 
     iface = Mash.new
     iface_config = Mash.new
@@ -40,11 +40,11 @@ Ohai.plugin(:Network) do
     # http://msdn.microsoft.com/en-us/library/windows/desktop/aa394217%28v=vs.85%29.aspx
     wmi = WmiLite::Wmi.new
 
-    adapters = wmi.instances_of('Win32_NetworkAdapterConfiguration')
+    adapters = wmi.instances_of("Win32_NetworkAdapterConfiguration")
 
     adapters.each do |adapter|
 
-      i = adapter['index']
+      i = adapter["index"]
       iface_config[i] = Mash.new
       adapter.wmi_ole_object.properties_.each do |p|
         iface_config[i][p.name.wmi_underscore.to_sym] = adapter[p.name.downcase]
@@ -53,10 +53,10 @@ Ohai.plugin(:Network) do
 
     # http://msdn.microsoft.com/en-us/library/windows/desktop/aa394216(v=vs.85).aspx
 
-    adapters = wmi.instances_of('Win32_NetworkAdapter')
+    adapters = wmi.instances_of("Win32_NetworkAdapter")
 
     adapters.each do |adapter|
-      i = adapter['index']
+      i = adapter["index"]
       iface_instance[i] = Mash.new
       adapter.wmi_ole_object.properties_.each do |p|
         iface_instance[i][p.name.wmi_underscore.to_sym] = adapter[p.name.downcase]
@@ -76,7 +76,7 @@ Ohai.plugin(:Network) do
           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
+                                                 :prefixlen => _ip.prefix,
                                                  )
           if _ip.ipv6?
             # inet6 address
@@ -84,7 +84,7 @@ Ohai.plugin(:Network) do
             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
+            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
@@ -96,7 +96,7 @@ Ohai.plugin(:Network) do
         # 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"
+            "family" => "lladdr"
           }
         end
         iface[cint][:mtu] = iface[cint][:configuration][:mtu]
@@ -110,7 +110,7 @@ Ohai.plugin(:Network) do
       end
     end
 
-    cint=nil
+    cint = nil
     so = shell_out("arp -a")
     if so.exitstatus == 0
       so.stdout.lines do |line|
@@ -119,7 +119,7 @@ Ohai.plugin(:Network) do
         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
+          iface[cint][:arp][$1] = $2.gsub("-", ":").downcase
         end
       end
     end

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

@@ -27,8 +27,7 @@ Ohai.plugin(:Platform) do
 
   collect_data(:windows) do
     platform os
-    platform_version kernel['release']
+    platform_version kernel["release"]
     platform_family "windows"
   end
 end
-

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

@@ -19,38 +19,38 @@
 #
 
 Ohai.plugin(:Virtualization) do
-  provides 'virtualization'
+  provides "virtualization"
 
   collect_data(:windows) do
-    require 'wmi-lite/wmi'
+    require "wmi-lite/wmi"
 
     virtualization Mash.new unless virtualization
     virtualization[:systems] = Mash.new unless virtualization[:systems]
 
     # Grab BIOS data from WMI to determine vendor information
     wmi = WmiLite::Wmi.new
-    bios = wmi.instances_of('Win32_BIOS')
+    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'
+    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'
+    if bios[0]["serialnumber"] =~ /VMware/
+      virtualization[:system] = "vmware"
+      virtualization[:role] = "guest"
+      virtualization[:systems][:vmware] = "guest"
     end
   end
 end