ohai 6.14.0 → 6.16.0.beta.1

data/lib/ohai/plugins/{aix/ssh_host_key.rb → nodejs.rb}

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Jacques Marneweck (<jacques@powertrip.co.za>)
+# Copyright:: Copyright (c) 2012 Jacques Marneweck.  All rights reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,11 +16,19 @@
 # limitations under the License.
 #
 
-provides "keys/ssh"
+provides "languages/nodejs"
 
-require_plugin "keys"
+require_plugin "languages"
 
-keys[:ssh] = Mash.new
+output = nil
 
-keys[:ssh][:host_dsa_public] = IO.read("/etc/ssh/ssh_host_dsa_key.pub").split[1]
-keys[:ssh][:host_rsa_public] = IO.read("/etc/ssh/ssh_host_rsa_key.pub").split[1]
+nodejs = Mash.new
+
+status, stdout, stderr = run_command(:no_status_check => true, :command => "node -v")
+if status == 0
+  output = stdout.split
+  if output.length >= 1
+    nodejs[:version] = output[0][1..output[0].length]
+  end
+  languages[:nodejs] = nodejs if nodejs[:version]
+end

data/lib/ohai/plugins/openstack.rb

@@ -0,0 +1,46 @@
+#
+# Author:: Matt Ray (<matt@opscode.com>)
+# Copyright:: Copyright (c) 2012 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.
+
+provides "openstack"
+
+require 'ohai/mixin/ec2_metadata'
+
+extend Ohai::Mixin::Ec2Metadata
+
+# does it matter that it's not hitting latest?
+#Ec2Metadata::EC2_METADATA_URL = "/latest/meta-data"
+
+# Adds openstack Mash
+if hint?('openstack') || hint?('hp')
+  Ohai::Log.debug("ohai openstack")
+  openstack Mash.new
+  #for now, use the metadata service
+  if can_metadata_connect?(EC2_METADATA_ADDR,80)
+    Ohai::Log.debug("connecting to the OpenStack metadata service")
+    self.fetch_metadata.each {|k, v| openstack[k] = v }
+    case
+    when hint?('hp')
+      openstack['provider'] = 'hp'
+    else
+      openstack['provider'] = 'openstack'
+    end
+  else
+    Ohai::Log.debug("unable to connect to the OpenStack metadata service")
+  end
+else
+  Ohai::Log.debug("NOT ohai openstack")
+end

data/lib/ohai/plugins/rackspace.rb

@@ -58,8 +58,39 @@ end
 # eth<Symbol>:: Interface name of public or private ip
 def get_ip_address(name, eth)
   network[:interfaces][eth][:addresses].each do |key, info|
-    rackspace[name] = key if info['family'] == 'inet'
+    if info['family'] == 'inet'
+      rackspace[name] = key 
+      break # break when we found an address
+    end
+  end
+end
+
+# Names rackspace ipv6 address for interface
+#
+# === Parameters
+# name<Symbol>:: Use :public_ip or :private_ip
+# eth<Symbol>:: Interface name of public or private ip
+def get_global_ipv6_address(name, eth)
+  network[:interfaces][eth][:addresses].each do |key, info|
+    # check if we got an ipv6 address and if its in global scope
+    if info['family'] == 'inet6' && info['scope'] == 'Global'
+      rackspace[name] = key 
+      break # break when we found an address
+    end
+  end
+end
+
+# Get the rackspace region
+#
+def get_region()
+  status, stdout, stderr = run_command(:no_status_check => true, :command => "xenstore-ls vm-data/provider_data")
+  if status == 0
+    stdout.split("\n").each do |line|
+      rackspace[:region] = line.split[2].delete('\"') if line =~ /^region/
+    end
   end
+rescue Ohai::Exceptions::Exec
+  Ohai::Log.debug("Unable to find xenstore-ls, cannot capture region information for Rackspace cloud")
 end
 
 # Adds rackspace Mash
@@ -67,9 +98,12 @@ if looks_like_rackspace?
   rackspace Mash.new
   get_ip_address(:public_ip, :eth0)
   get_ip_address(:private_ip, :eth1)
+  get_region()
   # public_ip + private_ip are deprecated in favor of public_ipv4 and local_ipv4 to standardize.
   rackspace[:public_ipv4] = rackspace[:public_ip]
+  get_global_ipv6_address(:public_ipv6, :eth0)
   rackspace[:public_hostname] = "#{rackspace[:public_ip].gsub('.','-')}.static.cloud-ips.com"
   rackspace[:local_ipv4] = rackspace[:private_ip]
+  get_global_ipv6_address(:local_ipv6, :eth1)
   rackspace[:local_hostname] = hostname
 end

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

@@ -21,7 +21,7 @@ provides "filesystem"
 fs = Mash.new
 
 # Grab filesystem data from df
-popen4("df -ka") do |pid, stdin, stdout, stderr|
+popen4("df -Pka") do |pid, stdin, stdout, stderr|
 	stdin.close
 	stdout.each do |line|
 		case line

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

@@ -60,6 +60,7 @@ require 'scanf'
 def encaps_lookup(ifname)
   return "Ethernet" if ifname.eql?("e1000g")
   return "Ethernet" if ifname.eql?("eri")
+  return "Ethernet" if ifname.eql?("net")
   return "Loopback" if ifname.eql?("lo")
   "Unknown"
 end
@@ -82,7 +83,7 @@ popen4("ifconfig -a") do |pid, stdin, stdout, stderr|
       iface[cint] = Mash.new unless iface[cint]
       iface[cint][:mtu] = $2
       iface[cint][:index] = $3
-      if line =~ / flags\=\d+\<((ADDRCONF|ANYCAST|BROADCAST|CoS|DEPRECATED|DHCP|DUPLICATE|FAILED|FIXEDMTU|INACTIVE|LOOPBACK|MIP|MULTI_BCAST|MULTICAST|NOARP|NOFAILOVER|NOLOCAL|NONUD|NORTEXCH|NOXMIT|OFFLINE|POINTOPOINT|PREFERRED|PRIVATE|ROUTER|RUNNING|STANDBY|TEMPORARY|UNNUMBERED|UP|VIRTUAL|XRESOLV|IPv4|IPv6|,)+)\>\s/
+      if line =~ / flags\=\d+\<((ADDRCONF|ANYCAST|BROADCAST|CoS|DEPRECATED|DHCP|DUPLICATE|FAILED|FIXEDMTU|INACTIVE|L3PROTECT|LOOPBACK|MIP|MULTI_BCAST|MULTICAST|NOARP|NOFAILOVER|NOLOCAL|NONUD|NORTEXCH|NOXMIT|OFFLINE|POINTOPOINT|PREFERRED|PRIVATE|ROUTER|RUNNING|STANDBY|TEMPORARY|UNNUMBERED|UP|VIRTUAL|XRESOLV|IPv4|IPv6|,)+)\>\s/
         flags = $1.split(',')
       else
         flags = Array.new

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

@@ -39,6 +39,8 @@ end
 File.open("/etc/release") do |file|
   while line = file.gets
     case line
+    when /^.*(SmartOS).*$/
+      platform "smartos"
     when /^\s*(OmniOS).*r(\d+).*$/
       platform "omnios"
       platform_version $2
@@ -54,8 +56,6 @@ File.open("/etc/release") do |file|
       platform "solaris2"
     when /^\s*(NexentaCore)\s.*$/
       platform "nexentacore"
-    when /^\s*(SmartOS)\s.*$/
-      platform "smartos"
     end
   end
 end

data/lib/ohai/plugins/ssh_host_key.rb

@@ -0,0 +1,63 @@
+#
+# Author:: Bryan McLellan <btm@opscode.com>
+# Copyright:: Copyright (c) 2012 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.
+#
+
+provides "keys/ssh"
+require_plugin "keys"
+
+keys[:ssh] = Mash.new
+
+def is_dsa_or_rsa?(file)
+  case IO.read(file).split[0]
+  when "ssh-dss"
+    "dsa"
+  when "ssh-rsa"
+    "rsa"
+  else
+    nil
+  end
+end
+
+sshd_config = if File.exists?("/etc/ssh/sshd_config")
+                "/etc/ssh/sshd_config"
+              elsif File.exists?("/etc/sshd_config")
+                # Darwin
+                "/etc/sshd_config"
+              else
+                Ohai::Log.debug("Failed to find sshd configuration file")
+                nil
+              end
+
+if sshd_config
+  File.open(sshd_config) do |conf|
+    conf.each_line do |line|
+      if line.match(/^hostkey\s/i)
+        pub_file = "#{line.split[1]}.pub"
+        key_type = is_dsa_or_rsa?(pub_file)
+        keys[:ssh]["host_#{key_type}_public"] = IO.read(pub_file).split[1] unless key_type.nil?
+      end
+    end
+  end
+else
+  if keys[:ssh][:host_dsa_public].nil? && File.exists?("/etc/ssh/ssh_host_dsa_key.pub")
+    keys[:ssh][:host_dsa_public] = IO.read("/etc/ssh/ssh_host_dsa_key.pub").split[1]
+  end
+
+  if keys[:ssh][:host_rsa_public].nil? && File.exists?("/etc/ssh/ssh_host_rsa_key.pub")
+    keys[:ssh][:host_rsa_public] = IO.read("/etc/ssh/ssh_host_rsa_key.pub").split[1]
+  end
+end

data/lib/ohai/plugins/virtualization.rb

@@ -73,7 +73,7 @@ unless virtualization.nil? || !(virtualization[:role].eql?("host"))
       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 pool
+        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)}
       end

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

@@ -25,7 +25,24 @@ cpu_number = 0
 index = 0
 
 WMI::Win32_Processor.find(:all).each do |processor|
-  cpu_number += processor.numberofcores
+  #
+  # On Windows Server 2003 R2 (i.e. 5.2.*), numberofcores property 
+  # doesn't exist on the Win32_Processor class unless the user has
+  # patched their system with:
+  # http://support.microsoft.com/kb/932370
+  # 
+  # We're returning nil for cpu["cores"] and cpu["count"]
+  # when we don't see numberofcores property
+  #
+
+  number_of_cores = nil
+  begin
+    number_of_cores = processor.numberofcores
+    cpu_number += number_of_cores
+  rescue NoMethodError => e
+    Ohai::Log.info("Can not find numberofcores property on Win32_Processor. Consider applying this patch: http://support.microsoft.com/kb/932370")
+  end
+
   current_cpu = index.to_s
   index += 1
   cpuinfo[current_cpu] = Mash.new
@@ -35,7 +52,7 @@ WMI::Win32_Processor.find(:all).each do |processor|
   cpuinfo[current_cpu]["stepping"] = processor.stepping
   cpuinfo[current_cpu]["physical_id"] = processor.deviceid
   #cpuinfo[current_cpu]["core_id"] = XXX
-  cpuinfo[current_cpu]["cores"] = processor.numberofcores
+  cpuinfo[current_cpu]["cores"] = number_of_cores
   cpuinfo[current_cpu]["model_name"] = processor.description
   cpuinfo[current_cpu]["mhz"] = processor.maxclockspeed.to_s
   cpuinfo[current_cpu]["cache_size"] = "#{processor.l2cachesize} KB"
@@ -43,5 +60,5 @@ WMI::Win32_Processor.find(:all).each do |processor|
 end
 
 cpu cpuinfo
-cpu[:total] = cpu_number
+cpu[:total] = (cpu_number == 0) ? nil : cpu_number
 cpu[:real] = index

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

@@ -56,22 +56,3 @@ host.properties_.each do |p|
 end
 
 kernel[:machine] = machine_lookup("#{kernel[:cs_info][:system_type]}")
-
-kext = Mash.new
-pnp_drivers = Mash.new
-
-drivers = WMI::Win32_PnPSignedDriver.find(:all)
-drivers.each do |driver|
-  pnp_drivers[driver.DeviceID] = Mash.new
-  driver.properties_.each do |p|
-    pnp_drivers[driver.DeviceID][p.name.wmi_underscore.to_sym] = driver.send(p.name)
-  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
-  end 
-end
-
-kernel[:pnp_drivers] = pnp_drivers
-kernel[:modules] = kext

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

@@ -0,0 +1,39 @@
+#
+# Author:: James Gartrell (<jgartrel@gmail.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 'ruby-wmi'
+
+WIN32OLE.codepage = WIN32OLE::CP_UTF8
+
+kext = Mash.new
+pnp_drivers = Mash.new
+
+drivers = WMI::Win32_PnPSignedDriver.find(:all)
+drivers.each do |driver|
+  pnp_drivers[driver.DeviceID] = Mash.new
+  driver.properties_.each do |p|
+    pnp_drivers[driver.DeviceID][p.name.wmi_underscore.to_sym] = driver.send(p.name)
+  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
+  end 
+end
+
+kernel[:pnp_drivers] = pnp_drivers
+kernel[:modules] = kext

data/lib/ohai/system.rb

@@ -21,6 +21,7 @@ require 'ohai/log'
 require 'ohai/mixin/from_file'
 require 'ohai/mixin/command'
 require 'ohai/mixin/string'
+require 'mixlib/shellout'
 
 require 'yajl'
 
@@ -244,8 +245,8 @@ module Ohai
         data = data[part]
       end
       raise ArgumentError, "I cannot find an attribute named #{a}!" if data.nil?
-      case a
-      when Hash,Mash,Array
+      case data
+      when Hash,Mash,Array,Fixnum
         json_pretty_print(data)
       when String
         if data.respond_to?(:lines)

data/lib/ohai/version.rb

@@ -18,6 +18,6 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '6.14.0'
+  VERSION = '6.16.0.beta.1'
 end
 

data/spec/spec_helper.rb

@@ -1,7 +1,9 @@
 require 'rspec'
-require 'mixlib/config'
 
+$:.unshift(File.expand_path("../..", __FILE__))
 $:.unshift(File.dirname(__FILE__) + '/../lib')
+
+require 'spec/support/platform_helpers'
 require 'ohai'
 Ohai::Config[:log_level] = :error
 
@@ -54,3 +56,14 @@ module SimpleFromFile
     self.instance_eval(IO.read(filename), filename, 1)
   end
 end
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+
+  config.filter_run_excluding :windows_only => true unless windows?
+  config.filter_run_excluding :unix_only => true unless unix?
+  config.filter_run_excluding :ruby_18_only => true unless ruby_18?
+  config.filter_run_excluding :ruby_19_only => true unless ruby_19?
+  config.filter_run_excluding :requires_root => true unless ENV['USER'] == 'root'
+  config.filter_run_excluding :requires_unprivileged_user => true if ENV['USER'] == 'root'
+end

data/spec/support/platform_helpers.rb

@@ -0,0 +1,31 @@
+def ruby_19?
+  !!(RUBY_VERSION =~ /^1.9/)
+end
+
+def ruby_18?
+  !!(RUBY_VERSION =~ /^1.8/)
+end
+
+def windows?
+  !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
+end
+
+# def jruby?
+
+def unix?
+  !windows?
+end
+
+def os_x?
+  !!(RUBY_PLATFORM =~ /darwin/)
+end
+
+def solaris?
+  !!(RUBY_PLATFORM =~ /solaris/)
+end
+
+def freebsd?
+  !!(RUBY_PLATFORM =~ /freebsd/)
+end
+
+DEV_NULL = windows? ? 'NUL' : '/dev/null'