ohai 6.14.0 → 6.16.0.beta.1

data/lib/ohai/mixin/ec2_metadata.rb

@@ -25,9 +25,11 @@ module Ohai
     module Ec2Metadata
 
       EC2_METADATA_ADDR = "169.254.169.254" unless defined?(EC2_METADATA_ADDR)
-      EC2_METADATA_URL = "/2008-02-01/meta-data" unless defined?(EC2_METADATA_URL)
-      EC2_USERDATA_URL = "/2008-02-01/user-data" unless defined?(EC2_USERDATA_URL)
+      EC2_METADATA_URL = "/2012-01-12/meta-data" unless defined?(EC2_METADATA_URL)
+      EC2_USERDATA_URL = "/2012-01-12/user-data" unless defined?(EC2_USERDATA_URL)
       EC2_ARRAY_VALUES = %w(security-groups)
+      EC2_ARRAY_DIR    = %w(network/interfaces/macs)
+      EC2_JSON_DIR     = %w(iam)
 
       def can_metadata_connect?(addr, port, timeout=2)
         t = Socket.new(Socket::Constants::AF_INET, Socket::Constants::SOCK_STREAM, 0)
@@ -62,16 +64,53 @@ module Ohai
       def fetch_metadata(id='')
         metadata = Hash.new
         http_client.get("#{EC2_METADATA_URL}/#{id}").body.split("\n").each do |o|
-          key = "#{id}#{o.gsub(/\=.*$/, '/')}"
+          key = expand_path("#{id}#{o}")
           if key[-1..-1] != '/'
-            metadata[key.gsub(/\-|\//, '_').to_sym] =
+            metadata[metadata_key(key)] =
               if EC2_ARRAY_VALUES.include? key
                 http_client.get("#{EC2_METADATA_URL}/#{key}").body.split("\n")
               else
                 http_client.get("#{EC2_METADATA_URL}/#{key}").body
               end
-          else
-            fetch_metadata(key).each{|k,v| metadata[k] = v}
+          elsif not key.eql?(id) and not key.eql?('/')
+            name = key[0..-2]
+	    sym = metadata_key(name)
+            if EC2_ARRAY_DIR.include?(name)
+              metadata[sym] = fetch_dir_metadata(key)
+            elsif EC2_JSON_DIR.include?(name)
+              metadata[sym] = fetch_json_dir_metadata(key)
+            else
+              fetch_metadata(key).each{|k,v| metadata[k] = v}
+            end
+          end
+        end
+        metadata
+      end
+
+      def fetch_dir_metadata(id)
+        metadata = Hash.new
+        http_client.get("#{EC2_METADATA_URL}/#{id}").body.split("\n").each do |o|
+          key = expand_path(o)
+          if key[-1..-1] != '/'
+            metadata[metadata_key(key)] = http_client.get("#{EC2_METADATA_URL}/#{id}#{key}").body
+          elsif not key.eql?('/')
+            metadata[key[0..-2]] = fetch_dir_metadata("#{id}#{key}")
+          end
+        end
+        metadata
+      end
+
+      def fetch_json_dir_metadata(id)
+        metadata = Hash.new
+        http_client.get("#{EC2_METADATA_URL}/#{id}").body.split("\n").each do |o|
+          key = expand_path(o)
+          if key[-1..-1] != '/'
+            data = http_client.get("#{EC2_METADATA_URL}/#{id}#{key}").body
+            json = StringIO.new(data)
+            parser = Yajl::Parser.new
+            metadata[metadata_key(key)] = parser.parse(json)
+          elsif not key.eql?('/')
+            metadata[key[0..-2]] = fetch_json_dir_metadata("#{id}#{key}")
           end
         end
         metadata
@@ -81,6 +120,22 @@ module Ohai
         response = http_client.get("#{EC2_USERDATA_URL}/")
         response.code == "200" ? response.body : nil
       end
+
+      private
+
+      def expand_path(file_name)
+        uri = URI.parse(file_name.gsub(/\=.*$/, '/'))
+        path = uri.normalize.to_s
+        # ignore "./" and "../"
+        path.gsub(%r{/\.\.?(?:/|$)}, '/').
+          sub(%r{^\.\.?(?:/|$)}, '').
+          sub(%r{^$}, '/')
+      end
+
+      def metadata_key(key)
+        key.gsub(/\-|\//, '_')
+      end
+
     end
   end
 end

data/lib/ohai/plugins/cloud.rb

@@ -19,6 +19,8 @@ provides "cloud"
 require_plugin "ec2"
 require_plugin "rackspace"
 require_plugin "eucalyptus"
+require_plugin "linode"
+require_plugin "openstack"
 
 # Make top-level cloud hashes
 #
@@ -42,7 +44,7 @@ def on_ec2?
 end
 
 # Fill cloud hash with ec2 values
-def get_ec2_values 
+def get_ec2_values
   cloud[:public_ips] << ec2['public_ipv4']
   cloud[:private_ips] << ec2['local_ipv4']
   cloud[:public_ipv4] = ec2['public_ipv4']
@@ -52,7 +54,7 @@ def get_ec2_values
   cloud[:provider] = "ec2"
 end
 
-# setup ec2 cloud  
+# setup ec2 cloud
 if on_ec2?
   create_objects
   get_ec2_values
@@ -73,21 +75,53 @@ end
 
 # Fill cloud hash with rackspace values
 def get_rackspace_values 
-  cloud[:public_ips] << rackspace['public_ip']
-  cloud[:private_ips] << rackspace['private_ip']
+  cloud[:public_ips] << rackspace['public_ipv4'] if rackspace['public_ipv4']
+  cloud[:private_ips] << rackspace['local_ipv4'] if rackspace['local_ipv4']
   cloud[:public_ipv4] = rackspace['public_ipv4']
+  cloud[:public_ipv6] = rackspace['public_ipv6']
   cloud[:public_hostname] = rackspace['public_hostname']
   cloud[:local_ipv4] = rackspace['local_ipv4']
+  cloud[:local_ipv6] = rackspace['local_ipv6']
   cloud[:local_hostname] = rackspace['local_hostname']
   cloud[:provider] = "rackspace"
 end
 
-# setup rackspace cloud 
+# setup rackspace cloud
 if on_rackspace?
   create_objects
   get_rackspace_values
 end
 
+# ----------------------------------------
+# linode
+# ----------------------------------------
+
+# Is current cloud linode?
+#
+# === Return
+# true:: If linode Hash is defined
+# false:: Otherwise
+def on_linode?
+  linode != nil
+end
+
+# Fill cloud hash with linode values
+def get_linode_values
+  cloud[:public_ips] << linode['public_ip']
+  cloud[:private_ips] << linode['private_ip']
+  cloud[:public_ipv4] = linode['public_ipv4']
+  cloud[:public_hostname] = linode['public_hostname']
+  cloud[:local_ipv4] = linode['local_ipv4']
+  cloud[:local_hostname] = linode['local_hostname']
+  cloud[:provider] = "linode"
+end
+
+# setup linode cloud data
+if on_linode?
+  create_objects
+  get_linode_values
+end
+
 # ----------------------------------------
 # eucalyptus
 # ----------------------------------------
@@ -115,3 +149,33 @@ if on_eucalyptus?
   create_objects
   get_eucalyptus_values
 end
+
+# ----------------------------------------
+# openstack
+# ----------------------------------------
+
+# Is current cloud openstack-based?
+#
+# === Return
+# true:: If openstack Hash is defined
+# false:: Otherwise
+def on_openstack?
+  openstack != nil
+end
+
+# Fill cloud hash with openstack values
+def get_openstack_values
+  cloud[:public_ips] << openstack['public_ipv4']
+  cloud[:private_ips] << openstack['local_ipv4']
+  cloud[:public_ipv4] = openstack['public_ipv4']
+  cloud[:public_hostname] = openstack['public_hostname']
+  cloud[:local_ipv4] = openstack['local_ipv4']
+  cloud[:local_hostname] = openstack['local_hostname']
+  cloud[:provider] = openstack['provider']
+end
+
+# setup openstack cloud
+if on_openstack?
+  create_objects
+  get_openstack_values
+end

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

@@ -15,19 +15,56 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
 provides "system_profile"
 
-begin  
+begin
   require 'plist'
 
   system_profile Array.new
-  popen4("system_profiler -xml -detailLevel mini") do |pid, stdin, stdout, stderr|
-    stdin.close
-    Plist::parse_xml(stdout.read).each do |e|
-      system_profile << e
+  items Array.new
+  detail_level = {
+    'mini' => [
+      "SPParallelATAData",
+      "SPAudioData",
+      "SPBluetoothData",
+      "SPCardReaderData",
+      "SPDiagnosticsData",
+      "SPDiscBurningData",
+      "SPEthernetData",
+      "SPFibreChannelData",
+      "SPFireWireData",
+      "SPDisplaysData",
+      "SPHardwareRAIDData",
+      "SPMemoryData",
+      "SPModemData",
+      "SPNetworkData",
+      "SPPCIData",
+      "SPParallelSCSIData",
+      "SPPrintersSoftwareData",
+      "SPPrintersData",
+      "SPSASData",
+      "SPSerialATAData",
+      "SPSoftwareData",
+      "SPThunderboltData",
+      "SPUSBData",
+      "SPWWANData",
+      "SPAirPortData"
+    ],
+    'full' => [
+      "SPHardwareDataType"
+    ]
+  }
+
+  detail_level.each do |level, data_types|
+    popen4("system_profiler -xml -detailLevel #{level} #{data_types.join(' ')}") do |pid, stdin, stdout, stderr|
+      stdin.close
+      Plist::parse_xml(stdout.read).each do |e|
+        items << e
+      end
     end
   end
+
+  system_profile items.sort_by { |h| h['_dataType'] }
 rescue LoadError => e
   Ohai::Log.debug("Can't load gem: #{e})")
-end
+end

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

@@ -25,6 +25,22 @@ if from("sysctl -n security.jail.jailed").to_i == 1
   virtualization[:role] = "guest"
 end
 
+# detect from modules
+popen4("/sbin/kldstat") do |pid, stdin, stdout, stderr|
+  stdin.close
+  stdout.each do |line|
+    case line
+    when /vboxdrv/
+      virtualization[:system] = "vbox"
+      virtualization[:role] = "host"
+    when /vboxguest/
+      virtualization[:system] = "vbox"
+      virtualization[:role] = "guest"
+    end
+  end
+end
+
+
 # XXX doesn't work when jail is there but not running (ezjail-admin stop)
 if from("jls -n \| wc -l").to_i >= 1
     virtualization[:system] = "jail"

data/lib/ohai/plugins/java.rb

@@ -23,7 +23,7 @@ java = Mash.new
 
 status, stdout, stderr = nil
 if RUBY_PLATFORM.downcase.include?("darwin") 
-  if system("/usr/libexec/java_home 2&>1 >/dev/null")
+  if system("/usr/libexec/java_home 2>&1 >/dev/null")
     status, stdout, stderr = run_command(:no_status_check => true, :command => "java -version")
   end
 else

data/lib/ohai/plugins/kernel.rb

@@ -24,6 +24,7 @@ kernel Mash.new
 case languages[:ruby][:host_os]
 when /mswin|mingw32|windows/
   require_plugin "windows::kernel"
+  require_plugin "windows::kernel_devices"
 else
   kernel[:name] = from("uname -s")
   kernel[:release] = from("uname -r")

data/lib/ohai/plugins/linode.rb

@@ -0,0 +1,53 @@
+#
+# Author:: Aaron Kalin (<akalin@martinisoftware.com>)
+# 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.
+
+provides "linode"
+
+require_plugin "kernel"
+require_plugin "network"
+
+# Checks for matching linode kernel name
+#
+# Returns true or false
+def has_linode_kernel?
+  kernel[:release].split('-').last =~ /linode/
+end
+
+# Identifies the linode cloud by preferring the hint, then
+#
+# Returns true or false
+def looks_like_linode?
+  hint?('linode') || has_linode_kernel?
+end
+
+# Names linode ip address
+#
+# name - symbol of ohai name (e.g. :public_ip)
+# eth - Interface name (e.g. :eth0)
+#
+# Alters linode mash with new interface based on name parameter
+def get_ip_address(name, eth)
+  network[:interfaces][eth][:addresses].each do |key, info|
+    linode[name] = key if info['family'] == 'inet'
+  end
+end
+
+# Setup linode mash if it is a linode system
+if looks_like_linode?
+  linode Mash.new
+  get_ip_address(:public_ip, :eth0)
+  get_ip_address(:private_ip, "eth0:1")
+end

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

@@ -44,7 +44,11 @@ elsif File.exists?("/etc/debian_version")
     platform "ubuntu"
     platform_version lsb[:release]
   else 
-    platform "debian"
+    if File.exists?("/usr/bin/raspi-config")
+      platform "raspbian"
+    else
+      platform "debian"
+    end
     platform_version File.read("/etc/debian_version").chomp
   end
 elsif File.exists?("/etc/redhat-release")
@@ -85,7 +89,7 @@ end
 
 
 case platform
-  when /debian/, /ubuntu/, /linuxmint/
+  when /debian/, /ubuntu/, /linuxmint/, /raspbian/
     platform_family "debian"
   when /fedora/
     platform_family "fedora"

data/lib/ohai/plugins/network.rb

@@ -25,63 +25,149 @@ network[:interfaces] = Mash.new unless network[:interfaces]
 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
-return unless ipaddress.nil?
+FAMILIES = {
+  "inet" => "default",
+  "inet6" => "default_inet6"
+}
+
+def sorted_ips(family = "inet")
+  raise "bad family #{family}" unless [ "inet", "inet6" ].include? family
+
+  # going to use that later to sort by scope
+  scope_prio = [ "global", "site", "link", "host", "node", nil ]
+
+  ipaddresses = []
+  # ipaddresses going to hold #{family} ipaddresses and their scope
+  Mash[network['interfaces']].each do |iface, iface_v|
+    iface_v['addresses'].each do |addr, addr_v|
+      next if addr_v.nil? or not addr_v.has_key? "family" or addr_v['family'] != family
+      ipaddresses <<  {
+        :ipaddress => addr_v["prefixlen"] ? IPAddress("#{addr}/#{addr_v["prefixlen"]}") : IPAddress("#{addr}/#{addr_v["netmask"]}"),
+        :scope => addr_v["scope"].nil? ? nil : addr_v["scope"].downcase,
+        :iface => iface
+      }
+    end
+  end
+
+  # sort ip addresses by scope, by prefixlen and then by ip address
+  # 128 - prefixlen: longest prefixes first
+  ipaddresses.sort_by do |v|
+    [ ( scope_prio.index(v[:scope]) or 999999 ),
+      128 - v[:ipaddress].prefix.to_i,
+      ( family == "inet" ? v[:ipaddress].to_u32 : v[:ipaddress].to_u128 )
+    ]
+  end
+end
+
+def find_ip(family = "inet")
+  r=sorted_ips(family)
+
+  # return if there isn't any #{family} address !
+  return [ nil, nil ] if r.empty?
 
-def find_ip_and_mac(addresses, match = nil)
-  ip = nil; mac = nil; ip6 = nil
-  addresses.keys.each do |addr|
-    if match.nil?
-      ip = addr if addresses[addr]["family"].eql?("inet")
+  # shortcuts to access default #{family} interface and gateway
+  int_attr = FAMILIES[family] +"_interface"
+  gw_attr = FAMILIES[family] + "_gateway"
+
+  # If we have a default interface that has addresses,
+  # populate the short-cut attributes
+  if network[int_attr]
+
+    # network[int_attr] exists, the choosen ip must be exist on this interface
+    r = r.select do |v|
+      v[:iface] == network[int_attr]
+    end
+    if r.empty?
+      Ohai::Log.warn("[#{family}] no ip on #{network[int_attr]}")
+    elsif network[gw_attr] and
+        network["interfaces"][network[int_attr]] and
+        network["interfaces"][network[int_attr]]["addresses"]
+      if [ "0.0.0.0", "::" ].include? network[gw_attr]
+        # link level default route
+        Ohai::Log.debug("link level default #{family} route, picking ip from #{network[gw_attr]}")
+        r = r.first
+      else
+        r = r.select do |v|
+          network_contains_address(network[gw_attr], v[:ipaddress], v[:iface])
+        end.first
+        if r.nil?
+          Ohai::Log.warn("[#{family}] no ipaddress/mask on #{network[int_attr]} matching the gateway #{network[gw_attr]}")
+        else
+          Ohai::Log.debug("[#{family}] Using default interface #{network[int_attr]} and default gateway #{network[gw_attr]} to set the default ip to #{r[:ipaddress]}")
+        end
+      end
     else
-      ip = addr if addresses[addr]["family"].eql?("inet") && network_contains_address(match, addr, addresses[addr])
+      # return the first ip address on network[int_attr]
+      r = r.first
     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)
+  else
+    r = r.first
+    Ohai::Log.info("[#{family}] no default interface, picking the first ipaddress")
   end
-  Ohai::Log.debug("Found IPv4 address #{ip} with MAC #{mac} #{match.nil? ? '' : 'matching address ' + match}")
-  Ohai::Log.debug("Found IPv6 address #{ip6}") if ip6
-  [ip, mac, ip6]
+
+  return [ nil, nil ] if r.nil? or r.empty?
+
+  [ r[:ipaddress].to_s, r[:iface] ]
 end
 
-def network_contains_address(address_to_match, network_ip, network_opts)
-  if network_opts[:peer]
-    network_opts[:peer] == address_to_match
+def find_mac_from_iface(iface)
+  r = network["interfaces"][iface]["addresses"].select{|k,v| v["family"]=="lladdr"}
+  r.nil? or r.first.nil? ? nil : r.first.first
+end
+
+def network_contains_address(address_to_match, ipaddress, iface)
+  # address_to_match: String
+  # ipaddress: IPAddress
+  # iface: String
+  if peer = network["interfaces"][iface]["addresses"][ipaddress.to_s][:peer]
+    IPAddress(peer) == IPAddress(address_to_match)
   else
-    network = IPAddress "#{network_ip}/#{network_opts[:netmask]}"
-    host = IPAddress address_to_match
-    network.include?(host)
+    ipaddress.include? IPAddress(address_to_match)
   end
 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")
-      Ohai::Log.debug("Picking ip and mac address from first Ethernet interface")
-      im = find_ip_and_mac(network["interfaces"][iface]["addresses"])
-      ipaddress im.shift
-      macaddress im.shift
-      return if (ipaddress and macaddress)
+# ipaddress, ip6address and macaddress can be set by the #{os}::network plugin
+# atm it is expected macaddress is set at the same time than ipaddress
+# if ipaddress is set and macaddress is nil, that means the interface
+# ipaddress is bound to has the NOARP flag
+
+
+results = {}
+
+# inet family is treated before inet6
+FAMILIES.keys.sort.each do |family|
+  r = {}
+  ( r["ip"], r["iface"] ) = find_ip(family)
+  r["mac"] = find_mac_from_iface(r["iface"]) unless r["iface"].nil?
+  # don't overwrite attributes if they've already been set by the "#{os}::network" plugin
+  if family == "inet" and ipaddress.nil?
+    if r["ip"].nil?
+      Ohai::Log.warn("unable to detect ipaddress")
+      # i don't issue this warning if r["ip"] exists and r["mac"].nil?
+      # as it could be a valid setup with a NOARP default_interface
+      Ohai::Log.warn("unable to detect macaddress")
+    else
+      ipaddress r["ip"]
+      macaddress r["mac"]
+    end
+  elsif family == "inet6" and ip6address.nil?
+    if r["ip"].nil?
+      Ohai::Log.warn("unable to detect ip6address")
+    else
+      ip6address r["ip"]
+      if r["mac"] and macaddress.nil? and ipaddress.nil?
+        Ohai::Log.info("macaddress set to #{r["mac"]} from the ipv6 setup")
+        macaddress r["mac"]
+      end
     end
   end
+  results[family] = r
+end
+
+if results["inet"]["iface"] and results["inet6"]["iface"] and
+    results["inet"]["iface"] != results["inet6"]["iface"]
+  Ohai::Log.info("ipaddress and ip6address are set from different interfaces (#{results["inet"]["iface"]} & #{results["inet6"]["iface"]}), macaddress has been set using the ipaddress interface")
 end