ohai 0.5.8 → 0.6.0.beta.0

data/lib/ohai/mixin/ec2_metadata.rb

@@ -0,0 +1,87 @@
+#
+# Author:: Tim Dysinger (<tim@dysinger.net>)
+# Author:: Benjamin Black (<bb@opscode.com>)
+# Author:: Christopher Brown (<cb@opscode.com>)
+# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# 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.
+
+require 'open-uri'
+require 'socket'
+
+module Ohai
+  module Mixin
+    module Ec2Metadata
+
+      EC2_METADATA_ADDR = "169.254.169.254" unless defined?(EC2_METADATA_ADDR)
+      EC2_METADATA_URL = "http://#{EC2_METADATA_ADDR}/2008-02-01/meta-data" unless defined?(EC2_METADATA_URL)
+      EC2_USERDATA_URL = "http://#{EC2_METADATA_ADDR}/2008-02-01/user-data" unless defined?(EC2_USERDATA_URL)
+      EC2_ARRAY_VALUES = %w(security-groups)
+
+      def can_metadata_connect?(addr, port, timeout=2)
+        t = Socket.new(Socket::Constants::AF_INET, Socket::Constants::SOCK_STREAM, 0)
+        saddr = Socket.pack_sockaddr_in(port, addr)
+        connected = false
+      
+        begin
+          t.connect_nonblock(saddr)    
+        rescue Errno::EINPROGRESS
+          r,w,e = IO::select(nil,[t],nil,timeout)
+          if !w.nil?
+            connected = true
+          else
+            begin
+              t.connect_nonblock(saddr)
+            rescue Errno::EISCONN
+              t.close
+              connected = true
+            rescue SystemCallError
+            end
+          end
+        rescue SystemCallError
+        end
+        Ohai::Log.debug("can_metadata_connect? == #{connected}")
+        connected
+      end
+
+      def fetch_metadata(id='')
+        metadata = Hash.new
+        OpenURI.open_uri("#{EC2_METADATA_URL}/#{id}").read.split("\n").each do |o|
+          key = "#{id}#{o.gsub(/\=.*$/, '/')}"
+          if key[-1..-1] != '/'
+            metadata[key.gsub(/\-|\//, '_').to_sym] = 
+              if EC2_ARRAY_VALUES.include? key
+                OpenURI.open_uri("#{EC2_METADATA_URL}/#{key}").read.split("\n")
+              else
+                OpenURI.open_uri("#{EC2_METADATA_URL}/#{key}").read
+              end
+          else
+            next
+          end
+        end
+        metadata
+      end
+      
+      def fetch_userdata()
+        # assumes the only expected error is the 404 if there's no user-data
+        begin
+          OpenURI.open_uri("#{EC2_USERDATA_URL}/").read
+        rescue OpenURI::HTTPError
+          nil
+        end
+      end
+    end
+  end
+end
+

data/lib/ohai/plugins/c.rb

@@ -37,13 +37,16 @@ if status == 0
 end
 
 #glibc
-status, stdout, stderr = run_command(:no_status_check => true, :command => "/lib/libc.so.6")
-if status == 0
-  description = stdout.split($/).first
-  if description =~ /(\d+\.\d+\.\d+)/
-    c[:glibc] = Mash.new
-    c[:glibc][:version] = $1
-    c[:glibc][:description] = description
+["/lib/libc.so.6", "/lib64/libc.so.6"].each do |glibc|
+  status, stdout, stderr = run_command(:no_status_check => true, :command => glibc)
+  if status == 0
+    description = stdout.split($/).first
+    if description =~ /(\d+\.\d+\.?\d*)/
+      c[:glibc] = Mash.new
+      c[:glibc][:version] = $1
+      c[:glibc][:description] = description
+    end
+    break
   end
 end
 
@@ -72,12 +75,12 @@ end
 
 #ibm xlc
 status, stdout, stderr = run_command(:no_status_check => true, :command => "xlc -qversion")
-if status == 0
-  lines = stdout.split($/)
-  if lines.size >= 2
+if status == 0 or (status >> 8) == 249
+  description = stdout.split($/).first
+  if description =~ /V(\d+\.\d+)/
     c[:xlc] = Mash.new
-    c[:xlc][:version] = lines[1].split.last
-    c[:xlc][:description] = lines[0]
+    c[:xlc][:version] = $1
+    c[:xlc][:description] = description.strip
   end
 end
 
@@ -85,7 +88,7 @@ end
 status, stdout, stderr = run_command(:no_status_check => true, :command => "cc -V -flags")
 if status == 0
   output = stderr.split
-  if output.size >= 4
+  if stderr =~ /^cc: Sun C/ && output.size >= 4
     c[:sunpro] = Mash.new
     c[:sunpro][:version] = output[3]
     c[:sunpro][:description] = stderr.chomp

data/lib/ohai/plugins/chef.rb

@@ -16,9 +16,10 @@
 # limitations under the License.
 #
 
-require 'chef'
+require 'chef/version'
 provides "chef"
 
 self[:chef_packages] = Mash.new unless self[:chef_packages]
 self[:chef_packages][:chef] = Mash.new
 self[:chef_packages][:chef][:version] = Chef::VERSION
+self[:chef_packages][:chef][:chef_root] = Chef::CHEF_ROOT

data/lib/ohai/plugins/cloud.rb

@@ -18,6 +18,7 @@ provides "cloud"
 
 require_plugin "ec2"
 require_plugin "rackspace"
+require_plugin "eucalyptus"
 
 # Make top-level cloud hashes
 #
@@ -78,3 +79,27 @@ if on_rackspace?
   create_objects
   get_rackspace_values
 end
+
+# ----------------------------------------
+# eucalyptus
+# ----------------------------------------
+
+# Is current cloud eucalyptus?
+#
+# === Return
+# true:: If eucalyptus Hash is defined
+# false:: Otherwise
+def on_eucalyptus?
+  eucalyptus != nil
+end
+
+def get_eucalyptus_values
+  cloud[:public_ips] << eucalyptus['public_ipv4']
+  cloud[:private_ips] << eucalyptus['local_ipv4']
+  cloud[:provider] = "eucalyptus"
+end
+
+if on_eucalyptus?
+  create_objects
+  get_eucalyptus_values
+end

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

@@ -20,7 +20,16 @@ provides "network", "counters/network"
 
 require 'scanf'
 
-network[:default_interface] = from("route -n get default \| grep interface: \| awk \'/: / \{print \$2\}\'")
+from("route -n get default").split("\n").each do |line|
+  if line =~ /(\w+): ([\w\.]+)/
+    case $1
+    when "gateway"
+      network[:default_gateway] = $2
+    when "interface"
+      network[:default_interface] = $2
+    end
+  end
+end
 
 def parse_media(media_string)
   media = Hash.new

data/lib/ohai/plugins/dmi.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Bryan McLellan (btm@loftninjas.org)
-# Copyright:: Copyright (c) 2009 Bryan McLellan
+# Author:: Kurt Yoder (ktyopscode@yoderhome.com)
+# Copyright:: Copyright (c) 2010 Kurt Yoder
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,44 +16,107 @@
 # limitations under the License.
 #
 
+require "ohai/plugins/dmi_common"
+
 provides "dmi"
 
 # dmidecode does not return data without access to /dev/mem (or its equivalent)
 
 dmi Mash.new
-dmi[:version] = from("dmidecode --version")
-
-dmi[:bios] = Mash.new
-dmi[:bios][:vendor] =             from("dmidecode -s bios-vendor")
-dmi[:bios][:version] =            from("dmidecode -s bios-version")
-dmi[:bios][:release_date] =       from("dmidecode -s bios-release-date")
-
-dmi[:system] = Mash.new
-dmi[:system][:manufacturer] =     from("dmidecode -s system-manufacturer")
-dmi[:system][:product_name] =     from("dmidecode -s system-product-name")
-dmi[:system][:version] =          from("dmidecode -s system-version")
-dmi[:system][:serial_number] =    from("dmidecode -s system-serial-number")
-
-dmi[:baseboard] = Mash.new
-dmi[:baseboard][:manufacturer] =  from("dmidecode -s baseboard-manufacturer")
-dmi[:baseboard][:product_name] =  from("dmidecode -s baseboard-product-name")
-dmi[:baseboard][:version] =       from("dmidecode -s baseboard-version")
-dmi[:baseboard][:serial_number] = from("dmidecode -s baseboard-serial-number")
-dmi[:baseboard][:asset_tag] =     from("dmidecode -s baseboard-asset-tag")
-
-dmi[:chassis] = Mash.new
-dmi[:chassis][:manufacturer] =    from("dmidecode -s chassis-manufacturer")
-dmi[:chassis][:version] =         from("dmidecode -s chassis-version")
-dmi[:chassis][:serial_number] =   from("dmidecode -s chassis-serial-number")
-dmi[:chassis][:asset_tag] =       from("dmidecode -s chassis-asset-tag")
-
-dmi[:processor] = Mash.new
-dmi[:processor][:manufacturer] =  from("dmidecode -s processor-manufacturer")
-dmi[:processor][:version] =       from("dmidecode -s processor-version")
-
-if dmi[:version].to_f >= 2.8
-  dmi[:chassis][:type] =            from("dmidecode -s chassis-type")
-  dmi[:system][:uuid] =             from("dmidecode -s system-uuid") 
-  dmi[:processor][:family] =        from("dmidecode -s processor-family") 
-  dmi[:processor][:frequency] =     from("dmidecode -s processor-frequency")
+
+# all output lines should fall within one of these patterns
+handle_line = /^Handle (0x[0-9A-F]{4}), DMI type (\d+), (\d+) bytes/
+type_line = /^([A-Z][a-zA-Z ]+)( Information)?/
+blank_line = /^\s*$/
+data_line = /^\t([^:]+):(?: (.*))?/
+extended_data_line = /^\t\t(.+)/
+# first lines may contain some interesting information:
+# # dmidecode 2.10
+# SMBIOS 2.5 present.
+# 5 structures occupying 352 bytes.
+# Table at 0x000E1000.
+dmidecode_version_line = /^# dmidecode (\d+\.\d+)/
+smbios_version_line = /^SMBIOS (\d+\.\d+) present\./
+structures_line = /^(\d+) structures occupying (\d+) bytes\./
+table_location_line = /^Table at (0x[0-9A-E]+)\./
+
+dmi_record = nil
+field = nil
+
+popen4("dmidecode") do |pid, stdin, stdout, stderr|
+  stdin.close
+  
+  # ==== EXAMPLE RECORD: ====
+  #Handle 0x0000, DMI type 0, 24 bytes
+  #BIOS Information
+  #        Vendor: American Megatrends Inc.
+  #        Version: 080012 
+  # ... similar lines trimmed
+  #        Characteristics:
+  #                ISA is supported
+  #                PCI is supported
+  # ... similar lines trimmed
+  stdout.each do |line|
+    next if blank_line.match(line)
+
+    if dmidecode_version = dmidecode_version_line.match(line)
+      dmi[:dmidecode_version] = dmidecode_version[1]
+
+    elsif smbios_version = smbios_version_line.match(line)
+      dmi[:smbios_version] = smbios_version[1]
+
+    elsif structures = structures_line.match(line)
+      dmi[:structures] = Mash.new
+      dmi[:structures][:count] = structures[1]
+      dmi[:structures][:size] = structures[2]
+
+    elsif table_location = table_location_line.match(line)
+      dmi[:table_location] = table_location[1]
+
+    elsif handle = handle_line.match(line)
+      dmi_record = {:type => DMI.id_lookup(handle[2])}
+
+      dmi[dmi_record[:type]] = Mash.new unless dmi.has_key?(dmi_record[:type])
+      dmi[dmi_record[:type]][:all_records] = [] unless dmi[dmi_record[:type]].has_key?(:all_records)
+      dmi_record[:position] = dmi[dmi_record[:type]][:all_records].length
+      dmi[dmi_record[:type]][:all_records].push(Mash.new)
+      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:record_id] = handle[1]
+      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:size] = handle[2]
+      field = nil
+    
+    elsif type = type_line.match(line)
+      if dmi_record == nil
+        Ohai::Log.debug("unexpected data line found before header; discarding:\n#{line}")
+        next
+      end
+      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:application_identifier] = type[1]
+
+    elsif data = data_line.match(line)
+      if dmi_record == nil
+        Ohai::Log.debug("unexpected data line found before header; discarding:\n#{line}")
+        next
+      end
+      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][data[1]] = data[2]
+      field = data[1]
+    
+    elsif extended_data = extended_data_line.match(line)
+      if dmi_record == nil
+        Ohai::Log.debug("unexpected extended data line found before header; discarding:\n#{line}")
+        next
+      end
+      if field == nil
+        Ohai::Log.debug("unexpected extended data line found outside data section; discarding:\n#{line}")
+        next
+      end
+      # overwrite "raw" value with a new Mash
+      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field] = Mash.new unless dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field].class.to_s == 'Mash'
+      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field][extended_data[1]] = nil
+
+    else
+      Ohai::Log.debug("unrecognized output line; discarding:\n#{line}")
+
+    end
+  end
 end
+
+DMI.convenience_keys(dmi)

data/lib/ohai/plugins/dmi_common.rb

@@ -0,0 +1,117 @@
+#
+# Author:: Kurt Yoder (ktyopscode@yoderhome.com)
+# Copyright:: Copyright (c) 2010 Kurt Yoder
+# 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.
+#
+
+module DMI
+  # List of IDs and what they translate to
+  # from 'man 8 dmidecode'
+  # all-lowercase, all non-alphanumeric converted to '_'
+  # 128-255 are 'oem_data_[id]'
+  # Everything else is 'unknown'
+  IdToDescription = {
+    0 =>   'bios',
+    1 =>   'system',
+    2 =>   'base_board',
+    3 =>   'chassis',
+    4 =>   'processor',
+    5 =>   'memory_controller',
+    6 =>   'memory_module',
+    7 =>   'cache',
+    8 =>   'port_connector',
+    9 =>   'system_slots',
+    10 =>  'on_board_devices',
+    11 =>  'oem_strings',
+    12 =>  'system_configuration_options',
+    13 =>  'bios_language',
+    14 =>  'group_associations',
+    15 =>  'system_event_log',
+    16 =>  'physical_memory_array',
+    17 =>  'memory_device',
+    18 =>  '32_bit_memory_error',
+    19 =>  'memory_array_mapped_address',
+    20 =>  'memory_device_mapped_address',
+    21 =>  'built_in_pointing_device',
+    22 =>  'portable_battery',
+    23 =>  'system_reset',
+    24 =>  'hardware_security',
+    25 =>  'system_power_controls',
+    26 =>  'voltage_probe',
+    27 =>  'cooling_device',
+    28 =>  'temperature_probe',
+    29 =>  'electrical_current_probe',
+    30 =>  'out_of_band_remote_access',
+    31 =>  'boot_integrity_services',
+    32 =>  'system_boot',
+    33 =>  '64_bit_memory_error',
+    34 =>  'management_device',
+    35 =>  'management_device_component',
+    36 =>  'management_device_threshold_data',
+    37 =>  'memory_channel',
+    38 =>  'ipmi_device',
+    39 =>  'power_supply',
+    126 => 'disabled_entries',
+    127 => 'end_of_table_marker',
+  }
+
+  # look up DMI ID
+  def DMI.id_lookup(id)
+    begin
+      id = id.to_i
+      if (id >= 128) and (id <= 255)
+        id = "oem_data_#{id}"
+      elsif DMI::IdToDescription.has_key?(id)
+        id = DMI::IdToDescription[id]
+      else
+        Ohai::Log.debug("unrecognized header id; falling back to 'unknown'")
+        id = 'unknown'
+      end
+    rescue
+      Ohai::Log.debug("failed to look up id #{id}, returning unchanged")
+      id
+    end
+  end
+
+  # create simplified convenience access keys for each record type
+  # for single occurrences of one type, copy to top level all fields and values
+  # for multiple occurrences of same type, copy to top level all fields and values that are common to all records
+  def DMI.convenience_keys(dmi)
+    dmi.each{ |type, records|
+      in_common = Mash.new
+      next unless records.class.to_s == 'Mash'
+      next unless records.has_key?('all_records')
+      records[:all_records].each{ |record| 
+        record.each{ |field, value| 
+          next if value.class.to_s == 'Mash'
+          next if field.to_s == 'application_identifier'
+          next if field.to_s == 'size'
+          next if field.to_s == 'record_id'
+          translated = field.downcase.gsub(/[^a-z0-9]/, '_')
+          if in_common.has_key?(translated)
+            in_common[translated] = nil unless in_common[translated] == value
+          else
+            in_common[translated] = value
+          end
+        }
+      }
+      in_common.each{ |field, value|
+        next if value == nil
+        dmi[type][field] = value
+      }
+    }
+  end
+
+end