ohai 0.6.10 → 0.6.12.rc.1

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

@@ -40,7 +40,7 @@ popen4("df -P") do |pid, stdin, stdout, stderr|
 end
 
 # Grab mount information from /bin/mount
-popen4("mount -l") do |pid, stdin, stdout, stderr|
+popen4("mount") do |pid, stdin, stdout, stderr|
   stdin.close
   stdout.each do |line|
     if line =~ /^(.+?) on (.+?) type (.+?) \((.+?)\)$/
@@ -53,27 +53,53 @@ popen4("mount -l") do |pid, stdin, stdout, stderr|
   end
 end
 
-# Grab UUID from /dev/disk/by-uuid/*
-popen4("ls -l /dev/disk/by-uuid/* | awk '{print $11, $9}'") do |pid, stdin, stdout, stderr|
+# Gather more filesystem types via libuuid, even devices that's aren't mounted
+popen4("blkid -s TYPE") do |pid, stdin, stdout, stderr|
   stdin.close
   stdout.each do |line|
-    if line =~ /^[.\/]+\/([a-z]+\d) \/.\/(.)$/
-      filesystem = "/dev/" + $1
+    if line =~ /^(\S+): TYPE="(\S+)"/
+      filesystem = $1
+      fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
+      fs[filesystem][:fs_type] = $2
+    end
+  end
+end
+
+# Gather device UUIDs via libuuid
+popen4("blkid -s UUID") do |pid, stdin, stdout, stderr|
+  stdin.close
+  stdout.each do |line|
+    if line =~ /^(\S+): UUID="(\S+)"/
+      filesystem = $1
       fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
       fs[filesystem][:uuid] = $2
     end
   end
 end
 
+# Gather device labels via libuuid
+popen4("blkid -s LABEL") do |pid, stdin, stdout, stderr|
+  stdin.close
+  stdout.each do |line|
+    if line =~ /^(\S+): LABEL="(\S+)"/
+      filesystem = $1
+      fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
+      fs[filesystem][:label] = $2
+    end
+  end
+end
+
 # Grab any missing mount information from /proc/mounts
-File.open('/proc/mounts').read_nonblock(4096).each_line do |line|
-  if line =~ /^(\S+) (\S+) (\S+) (\S+) \S+ \S+$/
-    filesystem = $1
-    next if fs.has_key?(filesystem)
-    fs[filesystem] = Mash.new
-    fs[filesystem][:mount] = $2
-    fs[filesystem][:fs_type] = $3
-    fs[filesystem][:mount_options] = $4.split(",")
+if File.exists?('/proc/mounts')
+  File.open('/proc/mounts').read_nonblock(4096).each_line do |line|
+    if line =~ /^(\S+) (\S+) (\S+) (\S+) \S+ \S+$/
+      filesystem = $1
+      next if fs.has_key?(filesystem)
+      fs[filesystem] = Mash.new
+      fs[filesystem][:mount] = $2
+      fs[filesystem][:fs_type] = $3
+      fs[filesystem][:mount_options] = $4.split(",")
+    end
   end
 end
 

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

@@ -16,12 +16,13 @@
 # limitations under the License.
 #
 
+require 'ipaddr'
 provides "network", "counters/network"
 
 begin
   route_result = from("route -n \| grep -m 1 ^0.0.0.0").split(/[ \t]+/)
   if route_result.last =~ /(venet\d+)/
-    network[:default_interface] = from("ip addr show dev #{$1} | grep -v 127.0.0.1 | grep -m 1 inet").split(/[ \t]+/).last
+    network[:default_interface] = from("ip addr show dev #{$1} | grep -v 127.0.0. | grep -m 1 inet").split(/[ \t]+/).last
     network[:default_gateway] = route_result[1]
   else
     network[:default_gateway], network[:default_interface] = route_result.values_at(1,7)
@@ -31,95 +32,218 @@ rescue Ohai::Exceptions::Exec
 end
 
 def encaps_lookup(encap)
-  return "Loopback" if encap.eql?("Local Loopback")
+  return "Loopback" if encap.eql?("Local Loopback") || encap.eql?("loopback")
   return "PPP" if encap.eql?("Point-to-Point Protocol")
   return "SLIP" if encap.eql?("Serial Line IP")
   return "VJSLIP" if encap.eql?("VJ Serial Line IP")
   return "IPIP" if encap.eql?("IPIP Tunnel")
   return "6to4" if encap.eql?("IPv6-in-IPv4")
+  return "Ethernet" if encap.eql?("ether")
   encap
 end
 
 iface = Mash.new
 net_counters = Mash.new
-popen4("ifconfig -a") do |pid, stdin, stdout, stderr|
-  stdin.close
-  cint = nil
-  stdout.each do |line|
-    tmp_addr = nil
-    if line =~ /^([0-9a-zA-Z\.\:\-_]+)\s+/
-      cint = $1
-      iface[cint] = Mash.new
-      if cint =~ /^(\w+)(\d+.*)/
-        iface[cint][:type] = $1
-        iface[cint][:number] = $2
+
+if File.exist?("/sbin/ip")
+
+  begin
+    route_result = from("ip route show exact 0.0.0.0/0").chomp.split(/[ \t]+/)
+
+    if route_result[4] =~ /(venet\d+)/
+      network[:default_interface] = from("ip addr show dev #{$1} | grep -v 127.0.0.1 | grep -m 1 inet").split(/[ \t]+/).last
+      network[:default_gateway] = route_result[1]
+    else
+      network[:default_gateway], network[:default_interface] = route_result.values_at(2,4)
+    end
+  rescue Ohai::Exceptions::Exec
+    Ohai::Log.debug("Unable to determine default interface")
+  end
+
+  popen4("ip addr") do |pid, stdin, stdout, stderr|
+    stdin.close
+    cint = nil
+    stdout.each do |line|
+      if line =~ /^(\d+): ([0-9a-zA-Z\.\-_]+):\s/
+        cint = $2
+        iface[cint] = Mash.new
+        if cint =~ /^(\w+)(\d+.*)/
+          iface[cint][:type] = $1
+          iface[cint][:number] = $2
+        end
+
+        if line =~ /mtu (\d+)/
+          iface[cint][:mtu] = $1
+        end
+
+        flags = line.scan(/(UP|BROADCAST|DEBUG|LOOPBACK|POINTTOPOINT|NOTRAILERS|LOWER_UP|NOARP|PROMISC|ALLMULTI|SLAVE|MASTER|MULTICAST|DYNAMIC)/)
+        if flags.length > 1
+          iface[cint][:flags] = flags.flatten.uniq
+        end
+      end
+      if line =~ /link\/(\w+) ([\da-f\:]+) /
+        iface[cint][:encapsulation] = encaps_lookup($1)
+        unless $2 == "00:00:00:00:00:00"
+          iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+          iface[cint][:addresses][$2.upcase] = { "family" => "lladdr" }
+        end
+      end
+      if line =~ /inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\/(\d{1,2})/
+        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        tmp_addr = $1
+        iface[cint][:addresses][tmp_addr] = { "family" => "inet" }
+        iface[cint][:addresses][tmp_addr][:netmask] = IPAddr.new("255.255.255.255").mask($2.to_i).to_s
+
+        if line =~ /brd (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
+          iface[cint][:addresses][tmp_addr][:broadcast] = $1
+        end
+      end
+      if line =~ /inet6 ([a-f0-9\:]+)\/(\d+) scope (\w+)/
+        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        tmp_addr = $1
+        iface[cint][:addresses][tmp_addr] = { "family" => "inet6", "prefixlen" => $2, "scope" => ($3.eql?("host") ? "Node" : $3.capitalize) }
       end
     end
-    if line =~ /Link encap:(Local Loopback)/ || line =~ /Link encap:(.+?)\s/
-      iface[cint][:encapsulation] = encaps_lookup($1)
-    end
-    if line =~ /HWaddr (.+?)\s/
-      iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-      iface[cint][:addresses][$1] = { "family" => "lladdr" }
-    end
-    if line =~ /inet addr:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
-      iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-      iface[cint][:addresses][$1] = { "family" => "inet" }
-      tmp_addr = $1
-    end
-    if line =~ /inet6 addr: ([a-f0-9\:]+)\/(\d+) Scope:(\w+)/
-      iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-      iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $2, "scope" => ($3.eql?("Host") ? "Node" : $3) }
-    end
-    if line =~ /Bcast:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
-      iface[cint][:addresses][tmp_addr]["broadcast"] = $1
-    end
-    if line =~ /Mask:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
-      iface[cint][:addresses][tmp_addr]["netmask"] = $1
-    end
-    flags = line.scan(/(UP|BROADCAST|DEBUG|LOOPBACK|POINTTOPOINT|NOTRAILERS|RUNNING|NOARP|PROMISC|ALLMULTI|SLAVE|MASTER|MULTICAST|DYNAMIC)\s/)
-    if flags.length > 1
-      iface[cint][:flags] = flags.flatten
-    end
-    if line =~ /MTU:(\d+)/
-      iface[cint][:mtu] = $1
-    end
-    if line =~ /P-t-P:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
-      iface[cint][:peer] = $1
-    end
-    if line =~ /RX packets:(\d+) errors:(\d+) dropped:(\d+) overruns:(\d+) frame:(\d+)/
-      net_counters[cint] = Mash.new unless net_counters[cint]
-      net_counters[cint][:rx] = { "packets" => $1, "errors" => $2, "drop" => $3, "overrun" => $4, "frame" => $5 }
-    end
-    if line =~ /TX packets:(\d+) errors:(\d+) dropped:(\d+) overruns:(\d+) carrier:(\d+)/
-      net_counters[cint][:tx] = { "packets" => $1, "errors" => $2, "drop" => $3, "overrun" => $4, "carrier" => $5 }
-    end
-    if line =~ /collisions:(\d+)/
-      net_counters[cint][:tx]["collisions"] = $1
-    end
-    if line =~ /txqueuelen:(\d+)/
-      net_counters[cint][:tx]["queuelen"] = $1
+  end
+
+  popen4("ip link -s") do |pid, stdin, stdout, stderr|
+    stdin.close
+    tmp_int = nil
+    on_rx = true
+    stdout.each do |line|
+      if line =~ /^(\d+): ([0-9a-zA-Z\.\-_]+):\s/
+        tmp_int = $2
+        net_counters[tmp_int] = Mash.new unless net_counters[tmp_int]
+      end
+
+      if line =~ /(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
+        int = on_rx ? :rx : :tx
+        net_counters[tmp_int][int] = Mash.new unless net_counters[tmp_int][int]
+        net_counters[tmp_int][int][:bytes] = $1
+        net_counters[tmp_int][int][:packets] = $2
+        net_counters[tmp_int][int][:errors] = $3
+        net_counters[tmp_int][int][:drop] = $4
+        if(int == :rx)
+          net_counters[tmp_int][int][:overrun] = $5
+        else
+          net_counters[tmp_int][int][:carrier] = $5
+          net_counters[tmp_int][int][:collisions] = $6
+        end
+
+        on_rx = !on_rx
+      end
+
+      if line =~ /qlen (\d+)/
+        net_counters[tmp_int][:tx] = Mash.new unless net_counters[tmp_int][:tx]
+        net_counters[tmp_int][:tx][:queuelen] = $1
+      end
+       
     end
-    if line =~ /RX bytes:(\d+) \((\d+?\.\d+ .+?)\)/
-      net_counters[cint][:rx]["bytes"] = $1
+  end
+
+  popen4("ip neighbor show") do |pid, stdin, stdout, stderr|
+    stdin.close
+    stdout.each do |line|
+      if line =~ /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) dev ([0-9a-zA-Z\.\:\-]+) lladdr ([a-fA-F0-9\:]+)/
+        next unless iface[$2]
+        iface[$2][:arp] = Mash.new unless iface[$2][:arp]
+        iface[$2][:arp][$1] = $3.downcase
+      end
     end
-    if line =~ /TX bytes:(\d+) \((\d+?\.\d+ .+?)\)/
-      net_counters[cint][:tx]["bytes"] = $1
+  end
+
+else
+
+  begin
+    route_result = from("route -n \| grep -m 1 ^0.0.0.0").split(/[ \t]+/)
+    network[:default_gateway], network[:default_interface] = route_result.values_at(1,7)
+  rescue Ohai::Exceptions::Exec
+    Ohai::Log.debug("Unable to determine default interface")
+  end
+
+  popen4("ifconfig -a") do |pid, stdin, stdout, stderr|
+    stdin.close
+    cint = nil
+    stdout.each do |line|
+      tmp_addr = nil
+      if line =~ /^([0-9a-zA-Z\.\:\-_]+)\s+/
+        cint = $1
+        iface[cint] = Mash.new
+        if cint =~ /^(\w+)(\d+.*)/
+          iface[cint][:type] = $1
+          iface[cint][:number] = $2
+        end
+      end
+      if line =~ /Link encap:(Local Loopback)/ || line =~ /Link encap:(.+?)\s/
+        iface[cint][:encapsulation] = encaps_lookup($1)
+      end
+      if line =~ /HWaddr (.+?)\s/
+        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses][$1] = { "family" => "lladdr" }
+      end
+      if line =~ /inet addr:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
+        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses][$1] = { "family" => "inet" }
+        tmp_addr = $1
+      end
+      if line =~ /inet6 addr: ([a-f0-9\:]+)\/(\d+) Scope:(\w+)/
+        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $2, "scope" => ($3.eql?("Host") ? "Node" : $3) }
+      end
+      if line =~ /Bcast:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
+        iface[cint][:addresses][tmp_addr]["broadcast"] = $1
+      end
+      if line =~ /Mask:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
+        iface[cint][:addresses][tmp_addr]["netmask"] = $1
+      end
+      flags = line.scan(/(UP|BROADCAST|DEBUG|LOOPBACK|POINTTOPOINT|NOTRAILERS|RUNNING|NOARP|PROMISC|ALLMULTI|SLAVE|MASTER|MULTICAST|DYNAMIC)\s/)
+      if flags.length > 1
+        iface[cint][:flags] = flags.flatten
+      end
+      if line =~ /MTU:(\d+)/
+        iface[cint][:mtu] = $1
+      end
+      if line =~ /P-t-P:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
+        iface[cint][:peer] = $1
+      end
+      if line =~ /RX packets:(\d+) errors:(\d+) dropped:(\d+) overruns:(\d+) frame:(\d+)/
+        net_counters[cint] = Mash.new unless net_counters[cint]
+        net_counters[cint][:rx] = { "packets" => $1, "errors" => $2, "drop" => $3, "overrun" => $4, "frame" => $5 }
+      end
+      if line =~ /TX packets:(\d+) errors:(\d+) dropped:(\d+) overruns:(\d+) carrier:(\d+)/
+        net_counters[cint][:tx] = { "packets" => $1, "errors" => $2, "drop" => $3, "overrun" => $4, "carrier" => $5 }
+      end
+      if line =~ /collisions:(\d+)/
+        net_counters[cint][:tx]["collisions"] = $1
+      end
+      if line =~ /txqueuelen:(\d+)/
+        net_counters[cint][:tx]["queuelen"] = $1
+      end
+      if line =~ /RX bytes:(\d+) \((\d+?\.\d+ .+?)\)/
+        net_counters[cint][:rx]["bytes"] = $1
+      end
+      if line =~ /TX bytes:(\d+) \((\d+?\.\d+ .+?)\)/
+        net_counters[cint][:tx]["bytes"] = $1
+      end
     end
   end
-end
 
-popen4("arp -an") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    if line =~ /^\S+ \((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) \[(\w+)\] on ([0-9a-zA-Z\.\:\-]+)/
-      next unless iface[$4] # this should never happen
-      iface[$4][:arp] = Mash.new unless iface[$4][:arp]
-      iface[$4][:arp][$1] = $2.downcase
+
+  popen4("arp -an") do |pid, stdin, stdout, stderr|
+    stdin.close
+    stdout.each do |line|
+      if line =~ /^\S+ \((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) \[(\w+)\] on ([0-9a-zA-Z\.\:\-]+)/
+        next unless iface[$4] # this should never happen
+        iface[$4][:arp] = Mash.new unless iface[$4][:arp]
+        iface[$4][:arp][$1] = $2.downcase
+      end
     end
   end
+
 end
 
+
 counters[:network][:interfaces] = net_counters
 
 network["interfaces"] = iface
+

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

@@ -24,19 +24,29 @@ def get_redhatish_version(contents)
   contents[/Rawhide/i] ? contents[/((\d+) \(Rawhide\))/i, 1].downcase : contents[/release ([\d\.]+)/, 1]
 end
 
-provides "platform", "platform_version"
+provides "platform", "platform_version", "platform_family"
 
 require_plugin 'linux::lsb'
-  
-# platform [ and platform_version ? ] should be lower case to avoid dealing with RedHat/Redhat/redhat matching
 
-if lsb[:id] =~ /RedHat/i
+# 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 lsb[:id] =~ /RedHat/i
   platform "redhat"
   platform_version lsb[:release]
 elsif lsb[:id] =~ /Amazon/i
- platform "amazon"
- platform_version lsb[:release]
-elsif lsb[:id]	
+  platform "amazon"
+  platform_version lsb[:release]
+elsif lsb[:id] =~ /ScientificSL/i
+  platform "scientific"
+  platform_version lsb[:release]
+elsif lsb[:id]
   platform lsb[:id].downcase
   platform_version lsb[:release]
 elsif File.exists?("/etc/debian_version")
@@ -52,7 +62,7 @@ elsif File.exists?("/etc/system-release")
   platform_version get_redhatish_version(contents)
 elsif File.exists?('/etc/gentoo-release')
   platform "gentoo"
-  platform_version IO.read('/etc/gentoo-release').scan(/(\d+|\.+)/).join
+  platform_version File.read('/etc/gentoo-release').scan(/(\d+|\.+)/).join
 elsif File.exists?('/etc/SuSE-release')
   platform "suse"
   platform_version File.read("/etc/SuSE-release").scan(/VERSION = (\d+)\nPATCHLEVEL = (\d+)/).flatten.join(".")
@@ -65,3 +75,21 @@ elsif File.exists?('/etc/arch-release')
   # no way to determine platform_version in a rolling release distribution
   # kernel release will be used - ex. 2.6.32-ARCH
 end
+
+
+case platform
+  when /debian/, /ubuntu/, /mint/
+    platform_family "debian"
+  when /fedora/, /amazon/
+    platform_family "fedora"
+  when /oracle/, /centos/, /redhat/, /scientific/, /enterpriseenterprise/
+    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/openbsd/uptime.rb

@@ -18,13 +18,13 @@
 
 provides "uptime", "uptime_seconds"
 
-# kern.boottime: { sec = 1232765114, usec = 823118 } Fri Jan 23 18:45:14 2009
+# kern.boottime=Tue Nov  1 14:45:52 2011
 
 popen4("/sbin/sysctl kern.boottime") do |pid, stdin, stdout, stderr|
   stdin.close
   stdout.each do |line|
-    if line =~ /kern.boottime:\D+(\d+)/
-      uptime_seconds Time.new.to_i - $1.to_i
+    if line =~ /kern.boottime=(.+)/
+      uptime_seconds Time.new.to_i - Time.parse($1).to_i
       uptime self._seconds_to_human(uptime_seconds)
     end
   end