ohai 0.6.12 → 0.6.14.rc.1

data/lib/ohai/config.rb

@@ -21,10 +21,23 @@ require 'mixlib/config'
 module Ohai
   class Config
     extend Mixlib::Config
+    
+    # from chef/config.rb, should maybe be moved to mixlib-config?
+    def self.platform_specific_path(path)
+      if RUBY_PLATFORM =~ /mswin|mingw|windows/
+        # turns /etc/chef/client.rb into C:/chef/client.rb
+        path = File.join(ENV['SYSTEMDRIVE'], path.split('/')[2..-1])
+        # ensure all forward slashes are backslashes
+        path.gsub!(File::SEPARATOR, (File::ALT_SEPARATOR || '\\'))
+      end
+      path
+    end
+    
 
     log_level :info
     log_location STDOUT
     plugin_path [ File.expand_path(File.join(File.dirname(__FILE__), 'plugins'))]
     disabled_plugins []
+    hints_path [ platform_specific_path('/etc/chef/ohai/hints') ]
   end
 end

data/lib/ohai/mixin/command.rb

@@ -128,7 +128,12 @@ module Ohai
       #
       # Thanks Ara!
       def popen4(cmd, args={}, &b)
-
+	
+	## Disable garbage collection to work around possible bug in MRI
+  # Ruby 1.8 suffers from intermittent segfaults believed to be due to GC while IO.select
+  # See OHAI-330 / CHEF-2916 / CHEF-1305
+	GC.disable
+	
         # Waitlast - this is magic.
         #
         # Do we wait for the child process to die before we yield
@@ -334,6 +339,9 @@ module Ohai
         end
       rescue Errno::ENOENT
         raise Ohai::Exceptions::Exec, "command #{cmd} doesn't exist or is not in the PATH"
+      ensure
+	# we disabled GC entering
+	GC.enable
       end
 
       module_function :popen4

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

@@ -71,6 +71,7 @@ def encaps_lookup(ifname)
 end
 
 def scope_lookup(scope)
+  return "Node" if scope.eql?("::1")
   return "Link" if scope.match(/^fe80\:/)
   return "Site" if scope.match(/^fec0\:/)
   "Global"
@@ -114,7 +115,7 @@ popen4("ifconfig -a") do |pid, stdin, stdout, stderr|
         iface[cint][:encapsulation] = encaps_lookup($1)
       end
     end
-    if line =~ /^\s+ether ([0-9a-f\:]+)\s/
+    if line =~ /^\s+ether ([0-9a-f\:]+)/
       iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
       iface[cint][:addresses][$1] = { "family" => "lladdr" }
       iface[cint][:encapsulation] = "Ethernet"
@@ -131,9 +132,9 @@ popen4("ifconfig -a") do |pid, stdin, stdout, stderr|
       iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
       iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => $2.scanf('%2x'*4)*".", "broadcast" => $4 }
     end
-    if line =~ /\s+inet6 ([a-f0-9\:]+)(\s*|(\%[a-z0-9]+)\s*) prefixlen (\d+)\s*$/
+    if line =~ /\s+inet6 ([a-f0-9\:]+)(\s*|(\%[a-z0-9]+)\s*) prefixlen (\d+)\s*/
       iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-      iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $4 , "scope" => "Node" }
+      iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $4 , "scope" => scope_lookup($1) }
     end
     if line =~ /\s+inet6 ([a-f0-9\:]+)(\s*|(\%[a-z0-9]+)\s*) prefixlen (\d+) scopeid 0x([a-f0-9]+)/
       iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
@@ -154,7 +155,7 @@ 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\:]+) on ([a-zA-Z0-9\.\:\-]+) \[(\w+)\]/
+    if line =~ /^\S+ \((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) on ([a-zA-Z0-9\.\:\-]+).*\[(\w+)\]/
       # MAC addr really should be normalized to include all the zeroes.
       next if iface[$3].nil? # this should never happen
       iface[$3][:arp] = Mash.new unless iface[$3][:arp]

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-provides "platform", "platform_version", "platform_build"
+provides "platform", "platform_version", "platform_build", "platform_family"
 
 popen4("/usr/bin/sw_vers") do |pid, stdin, stdout, stderr|
   stdin.close
@@ -33,4 +33,6 @@ popen4("/usr/bin/sw_vers") do |pid, stdin, stdout, stderr|
       platform_build $1
     end
   end
-end
+end
+
+platform_family "mac_os_x"

data/lib/ohai/plugins/ec2.rb

@@ -43,7 +43,7 @@ end
 def looks_like_ec2?
   # Try non-blocking connect so we don't "block" if 
   # the Xen environment is *not* EC2
-  has_ec2_mac? && can_metadata_connect?(EC2_METADATA_ADDR,80)
+  hint?('ec2') || has_ec2_mac? && can_metadata_connect?(EC2_METADATA_ADDR,80)
 end
 
 if looks_like_ec2?

data/lib/ohai/plugins/eucalyptus.rb

@@ -50,7 +50,7 @@ end
 def looks_like_euca?
   # Try non-blocking connect so we don't "block" if 
   # the Xen environment is *not* EC2
-  has_euca_mac? && can_metadata_connect?(EC2_METADATA_ADDR,80)
+  hint?('eucalyptus') || has_euca_mac? && can_metadata_connect?(EC2_METADATA_ADDR,80)
 end
 
 if looks_like_euca?

data/lib/ohai/plugins/java.rb

@@ -21,7 +21,14 @@ require_plugin "languages"
 
 java = Mash.new
 
-status, stdout, stderr = run_command(:no_status_check => true, :command => "java -version")
+status, stdout, stderr = nil
+if RUBY_PLATFORM.downcase.include?("darwin") 
+  if system("/usr/libexec/java_home 2&>1 >/dev/null")
+    status, stdout, stderr = run_command(:no_status_check => true, :command => "java -version")
+  end
+else
+  status, stdout, stderr = run_command(:no_status_check => true, :command => "java -version")
+end
 
 if status == 0
   stderr.split("\n").each do |line|

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

@@ -19,18 +19,6 @@
 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. | 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)
-  end
-rescue Ohai::Exceptions::Exec
-  Ohai::Log.debug("Unable to determine default interface")
-end
-
 def encaps_lookup(encap)
   return "Loopback" if encap.eql?("Local Loopback") || encap.eql?("loopback")
   return "PPP" if encap.eql?("Point-to-Point Protocol")
@@ -52,18 +40,21 @@ IPROUTE_INT_REGEX = /^(\d+): ([0-9a-zA-Z@:\.\-_]*?)(@[0-9a-zA-Z]+|):\s/
 
 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
+  # families to get default routes from
+  families = [
+              {
+                :name => "inet",
+                :default_route => "0.0.0.0/0",
+                :default_prefix => :default,
+                :neighbour_attribute => :arp
+              },
+              {
+                :name => "inet6",
+                :default_route => "::/0",
+                :default_prefix => :default_inet6,
+                :neighbour_attribute => :neighbour_inet6
+              }
+             ]
 
   popen4("ip addr") do |pid, stdin, stdout, stderr|
     stdin.close
@@ -185,33 +176,138 @@ if File.exist?("/sbin/ip")
     end
   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
+  families.each do |family|
+    neigh_attr = family[:neighbour_attribute]
+    default_prefix = family[:default_prefix]
+
+    popen4("ip -f #{family[:name]} neigh show") do |pid, stdin, stdout, stderr|
+      stdin.close
+      stdout.each do |line|
+        if line =~ /^([a-f0-9\:\.]+)\s+dev\s+([^\s]+)\s+lladdr\s+([a-fA-F0-9\:]+)/
+          unless iface[$2]
+            Ohai::Log.warn("neighbour list has entries for unknown interface #{iface[$2]}")
+            next
+          end
+          iface[$2][neigh_attr] = Mash.new unless iface[$2][neigh_attr]
+          iface[$2][neigh_attr][$1] = $3.downcase
+        end
       end
     end
-  end
 
-  popen4("ip route show scope link") do |pid, stdin, stdout, stderr|
-    stdin.close
-    stdout.each do |line|
-      if line =~ /^([^\s]+)\s+dev\s+([^\s]+).*\s+src\s+([^\s]+)\b/
-        tmp_route_cidr = $1
-        tmp_int = $2
-        tmp_source_addr = $3
-        unless iface[tmp_int]
-          Ohai::Log.debug("Skipping previously unseen interface from 'ip route show scope link': #{tmp_int}")
-          next
+    # checking the routing tables
+    # why ?
+    # 1) to set the default gateway and default interfaces attributes
+    # 2) on some occasions, the best way to select node[:ipaddress] is to look at
+    #    the routing table source field.
+    # 3) and since we're at it, let's populate some :routes attributes
+    # (going to do that for both inet and inet6 addresses)
+    popen4("ip -f #{family[:name]} route show") do |pid, stdin, stdout, stderr|
+      stdin.close
+      stdout.each do |line|
+        if line =~ /^([^\s]+)\s(.*)$/
+          route_dest = $1
+          route_ending = $2
+          #
+          if route_ending =~ /\bdev\s+([^\s]+)\b/
+            route_int = $1
+          else
+            Ohai::Log.debug("Skipping route entry without a device: '#{line}'")
+            next
+          end
+
+          unless iface[route_int]
+            Ohai::Log.debug("Skipping previously unseen interface from 'ip route show': #{route_int}")
+            next
+          end
+
+          route_entry = Mash.new( :destination => route_dest,
+                                  :family => family[:name] )
+          %w[via scope metric proto src].each do |k|
+            route_entry[k] = $1 if route_ending =~ /\b#{k}\s+([^\s]+)\b/
+          end
+
+          # a sanity check, especially for Linux-VServer, OpenVZ and LXC:
+          # don't report the route entry if the src address isn't set on the node
+          next if route_entry[:src] and not iface[route_int][:addresses].has_key? route_entry[:src]
+
+          iface[route_int][:routes] = Array.new unless iface[route_int][:routes]
+          iface[route_int][:routes] << route_entry
         end
-        iface[tmp_int][:routes] = Mash.new unless iface[tmp_int][:routes]
-        iface[tmp_int][:routes][tmp_route_cidr] = Mash.new( :scope => "Link", :src => tmp_source_addr )
-        if (network[:default_interface] == tmp_int ) && (IPAddr.new(tmp_route_cidr).include? network[:default_gateway])
-          ipaddress tmp_source_addr
-          macaddress iface[tmp_int][:addresses].select{|k,v| v["family"]=="lladdr"}.first.first
+      end
+    end
+    # now looking at the routes to set the default attributes
+    # for information, default routes can be of this form :
+    # - default via 10.0.2.4 dev br0
+    # - default dev br0  scope link
+    # - default via 10.0.3.1 dev eth1  src 10.0.3.2  metric 10
+    # - default via 10.0.4.1 dev eth2  src 10.0.4.2  metric 20
+
+    # using a temporary var to hold routes and their interface name
+    routes = iface.collect do |i,iv|
+      iv[:routes].collect do |r|
+        r.merge(:dev=>i) if r[:family] == family[:name]
+      end.compact if iv[:routes]
+    end.compact.flatten
+
+    # using a temporary var to hold the default route
+    # in case there are more than 1 default route, sort it by its metric
+    # and return the first one
+    # (metric value when unspecified is 0)
+    default_route = routes.select do |r|
+      r[:destination] == "default"
+    end.sort do |x,y|
+      (x[:metric].nil? ? 0 : x[:metric].to_i) <=> (y[:metric].nil? ? 0 : y[:metric].to_i)
+    end.first
+
+    if default_route.nil? or default_route.empty?
+      Ohai::Log.debug("Unable to determine default #{family[:name]} interface")
+    else
+      network["#{default_prefix}_interface"] = default_route[:dev]
+      Ohai::Log.debug("#{default_prefix}_interface set to #{default_route[:dev]}")
+
+      # setting gateway to 0.0.0.0 or :: if the default route is a link level one
+      network["#{default_prefix}_gateway"] = default_route[:via] ? default_route[:via] : family[:default_route].chomp("/0")
+      Ohai::Log.debug("#{default_prefix}_gateway set to #{network["#{default_prefix}_gateway"]}")
+
+      # since we're at it, let's populate {ip,mac,ip6}address with the best values
+      # using the source field when it's specified :
+      # 1) in the default route
+      # 2) in the route entry used to reach the default gateway
+      route = routes.select do |r|
+        # selecting routes
+        r[:src] and # it has a src field
+          iface[r[:dev]] and # the iface exists
+          iface[r[:dev]][:addresses].has_key? r[:src] and # the src ip is set on the node
+          iface[r[:dev]][:addresses][r[:src]][:scope].downcase != "link" and # this isn't a link level addresse
+          ( r[:destination] == "default" or
+            ( default_route[:via] and # the default route has a gateway
+              IPAddress(r[:destination]).include? IPAddress(default_route[:via]) # the route matches the gateway
+              )
+            )
+      end.sort_by do |r|
+        # sorting the selected routes:
+        # - getting default routes first
+        # - then sort by metric
+        # - then by prefixlen
+        [
+         r[:destination] == "default" ? 0 : 1,
+         r[:metric].nil? ? 0 : r[:metric].to_i,
+         # for some reason IPAddress doesn't accept "::/0", it doesn't like prefix==0
+         # just a quick workaround: use 0 if IPAddress fails
+         begin
+           IPAddress( r[:destination] == "default" ? family[:default_route] : r[:destination] ).prefix
+         rescue
+           0
+         end
+        ]
+      end.first
+
+      unless route.nil? or route.empty?
+        if family[:name] == "inet"
+          ipaddress route[:src]
+          macaddress iface[route[:dev]][:addresses].select{|k,v| v["family"]=="lladdr"}.first.first unless iface[route[:dev]][:flags].include? "NOARP"
+        else
+          ip6address route[:src]
         end
       end
     end

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

@@ -37,18 +37,6 @@ 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] =~ /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")
   platform "debian"
   platform_version File.read("/etc/debian_version").chomp
@@ -74,11 +62,23 @@ 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] # 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/, /mint/
+  when /debian/, /ubuntu/, /linuxmint/
     platform_family "debian"
   when /fedora/
     platform_family "fedora"

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

@@ -72,15 +72,14 @@ if File.exists?("/proc/cpuinfo")
   end
 end
 
-# http://wiki.openvz.org/Proc/user_beancounters
-if File.exists?("/proc/user_beancounters")
-  if File.read("/proc/user_beancounters") =~ /\n\s+0:\s+/
-    virtualization[:emulator] = "openvz"
-    virtualization[:role] = "host"
-  else
-    virtualization[:emulator] = "openvz"
-    virtualization[:role] = "guest"
-  end
+# 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
@@ -124,6 +123,3 @@ if File.exists?("/proc/self/status")
      end
   end
 end
-
-# Detect OpenVZ
-# something in /proc/vz/veinfo

data/lib/ohai/plugins/network.rb

@@ -26,28 +26,30 @@ counters Mash.new unless counters
 counters[:network] = Mash.new unless counters[:network]
 
 ipaddress nil
+ip6address
 macaddress nil
 
 require_plugin "hostname"
 require_plugin "#{os}::network"
 
 # ipaddress and macaddress can be set from the #{os}::network plugin
-# both ipaddress and macaddress have to be set in that case
-return unless ipaddress.nil? or macaddress.nil?
+return unless ipaddress.nil?
 
 def find_ip_and_mac(addresses, match = nil)
-  ip = nil; mac = nil
+  ip = nil; mac = nil; ip6 = nil
   addresses.keys.each do |addr|
     if match.nil?
       ip = addr if addresses[addr]["family"].eql?("inet")
     else
       ip = addr if addresses[addr]["family"].eql?("inet") && network_contains_address(match, addr, addresses[addr])
     end
+    ip6 = addr if addresses[addr]["family"].eql?("inet6") && addresses[addr]["scope"].eql?("Global")
     mac = addr if addresses[addr]["family"].eql?("lladdr")
     break if (ip and mac)
   end
   Ohai::Log.debug("Found IPv4 address #{ip} with MAC #{mac} #{match.nil? ? '' : 'matching address ' + match}")
-  [ip, mac]
+  Ohai::Log.debug("Found IPv6 address #{ip6}") if ip6
+  [ip, mac, ip6]
 end
 
 def network_contains_address(address_to_match, network_ip, network_opts)
@@ -61,13 +63,17 @@ def network_contains_address(address_to_match, network_ip, network_opts)
 end
 
 # If we have a default interface that has addresses, populate the short-cut attributes
+# 0.0.0.0 is not a valid gateway address in this case
 if network[:default_interface] and
+    network[:default_gateway] and
+    network[:default_gateway] != "0.0.0.0" and
     network["interfaces"][network[:default_interface]] and
     network["interfaces"][network[:default_interface]]["addresses"]
   Ohai::Log.debug("Using default interface for default ip and mac address")
   im = find_ip_and_mac(network["interfaces"][network[:default_interface]]["addresses"], network[:default_gateway])
   ipaddress im.shift
   macaddress im.shift
+  ip6address im.shift
 else
   network["interfaces"].keys.sort.each do |iface|
     if network["interfaces"][iface]["encapsulation"].eql?("Ethernet")