ohai 0.5.8 → 0.6.0.beta.0

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

@@ -0,0 +1,101 @@
+#
+# Author:: Kurt Yoder (ktyopscode@yoderhome.com)
+# Copyright:: Copyright (c) 2008 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 "filesystem"
+
+fs = Mash.new
+
+# Grab filesystem data from df
+popen4("df -ka") do |pid, stdin, stdout, stderr|
+	stdin.close
+	stdout.each do |line|
+		case line
+		when /^Filesystem\s+kbytes/
+			next
+		when /^(.+?)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+\%)\s+(.+)$/
+			filesystem = $1
+			fs[filesystem] = Mash.new
+			fs[filesystem][:kb_size] = $2
+			fs[filesystem][:kb_used] = $3
+			fs[filesystem][:kb_available] = $4
+			fs[filesystem][:percent_used] = $5
+			fs[filesystem][:mount] = $6
+		end
+	end
+end
+
+# Grab file system type from df (must be done separately)
+popen4("df -na") do |pid, stdin, stdout, stderr|
+	stdin.close
+	stdout.each do |line|
+		next unless (line =~ /^(.+?)\s*: (\S+)\s*$/)
+		mount = $1
+		fs.each { |filesystem,fs_attributes|
+			next unless (fs_attributes[:mount] == mount)
+			fs[filesystem][:fs_type] = $2
+		}
+	end
+end
+
+# Grab mount information from /bin/mount
+popen4("mount") do |pid, stdin, stdout, stderr|
+	stdin.close
+	stdout.each do |line|
+		next unless (line =~ /^(.+?) on (.+?) (.+?) on (.+?)$/)
+		filesystem = $2
+		fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
+		fs[filesystem][:mount] = $1
+		fs[filesystem][:mount_time] = $4 # $4 must come before "split", else it becomes nil
+		fs[filesystem][:mount_options] = $3.split("/")
+	end
+end
+
+# Grab any zfs data from "zfs get"
+zfs = Mash.new
+popen4("zfs get -p -H all") do |pid, stdin, stdout, stderr|
+	stdin.close
+	stdout.each do |line|
+		next unless (line =~ /^([^\t]+)\t([^\t]+)\t([^\t]+)\t([^\t]+)$/)
+		filesystem = $1
+		zfs[filesystem] = Mash.new unless zfs.has_key?(filesystem)
+		zfs[filesystem][:values] = Mash.new unless zfs[filesystem].has_key?('values')
+		zfs[filesystem][:sources] = Mash.new unless zfs[filesystem].has_key?('sources')
+		zfs[filesystem][:values][$2] = $3
+		zfs[filesystem][:sources][$2] = $4.chomp
+	end
+end
+zfs.each { |filesystem, attributes|
+	fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
+	fs[filesystem][:fs_type] = 'zfs'
+	fs[filesystem][:mount] = attributes[:values][:mountpoint] if attributes[:values].has_key?('mountpoint')
+	fs[filesystem][:zfs_values] = attributes[:values]
+	fs[filesystem][:zfs_sources] = attributes[:sources]
+	# find all zfs parents
+	parents = filesystem.split('/')
+	zfs_parents = []
+	(0 .. parents.length - 1).to_a.each { |parent_indexes|
+		next_parent = parents[0 .. parent_indexes].join('/')
+		zfs_parents.push(next_parent)
+	}
+	zfs_parents.pop
+	fs[filesystem][:zfs_parents] = zfs_parents
+	fs[filesystem][:zfs_zpool] = (zfs_parents.length == 0)
+}
+
+# Set the filesystem data
+filesystem fs

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

@@ -17,9 +17,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+require 'socket'
 
 provides "hostname", "fqdn"
 
 hostname from("hostname")
 
-fqdn(from("hostname") + "." + from("domainname"))
+fqdn_lookup = Socket.getaddrinfo(hostname, nil, nil, nil, nil, Socket::AI_CANONNAME).first[2]
+
+if fqdn_lookup.split('.').length > 1
+  # we recieved an fqdn
+  fqdn fqdn_lookup
+else
+  # default to assembling one
+  fqdn(from("hostname") + "." + from("domainname"))
+end

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

@@ -142,7 +142,7 @@ end
 
 network[:interfaces] = iface
 
-popen4("route get default") do |pid, stdin, stdout, stderr|
+popen4("route -n get default") do |pid, stdin, stdout, stderr|
   stdin.close
   route_get = stdout.read
   matches = /interface: (\S+)/.match(route_get)
@@ -150,5 +150,10 @@ popen4("route get default") do |pid, stdin, stdout, stderr|
     Ohai::Log.debug("found gateway device: #{$1}")
     network[:default_interface] = matches[1]
   end
+  matches = /gateway: (\S+)/.match(route_get)
+  if matches
+    Ohai::Log.debug("found gateway: #{$1}")
+    network[:default_gateway] = matches[1]
+  end
 end
 

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

@@ -0,0 +1,36 @@
+#
+# Author:: Kurt Yoder (<ktyopscode@yoderhome.com>)
+# Copyright:: Copyright (c) 2008 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 'date'
+# It would be far better if we could include sys/uptime from sys-uptime RubyGem
+# It would also be good if we could pull idle time; how do we do this on Solaris?
+
+provides "uptime", "uptime_seconds"
+
+# Example output:
+# $ who -b
+#   .       system boot  Jul  9 17:51
+popen4('who -b') do |pid, stdin, stdout, stderr|
+  stdin.close
+  stdout.each do |line|
+    if line =~ /.* boot (.+)/
+      uptime_seconds Time.now.to_i - DateTime.parse($1).strftime('%s').to_i
+		uptime self._seconds_to_human(uptime_seconds)
+		break
+    end
+  end
+end

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

@@ -0,0 +1,91 @@
+#
+# Author:: Sean Walbran (<seanwalbran@gmail.com>)
+# Author:: Kurt Yoder (<ktyopscode@yoderhome.com>)
+# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# 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.
+#
+
+provides "virtualization"
+
+virtualization Mash.new
+
+# Detect KVM/QEMU from cpuinfo, report as KVM
+psrinfo_path="/usr/sbin/psrinfo"
+if File.exists?(psrinfo_path)
+  popen4(psrinfo_path + " -pv") do |pid, stdin, stdout, stderr|
+    stdin.close
+    psr_info = stdout.read
+    if psr_info =~ /QEMU Virtual CPU/
+      virtualization[:system] = "kvm"
+      virtualization[:role] = "guest"
+    end
+  end
+end
+
+# http://www.dmo.ca/blog/detecting-virtualization-on-linux
+smbios_path="/usr/sbin/smbios"
+if File.exists?(smbios_path)
+  popen4(smbios_path) do |pid, stdin, stdout, stderr|
+    stdin.close
+    dmi_info = stdout.read
+    case dmi_info
+    when /Manufacturer: Microsoft/
+      if dmi_info =~ /Product: Virtual Machine/ 
+        virtualization[:system] = "virtualpc"
+        virtualization[:role] = "guest"
+      end 
+    when /Manufacturer: VMware/
+      if dmi_info =~ /Product: VMware Virtual Platform/ 
+        virtualization[:system] = "vmware"
+        virtualization[:role] = "guest"
+      end
+    else
+      nil
+    end
+  end
+end
+
+if File.executable?('/usr/sbin/zoneadm')
+  zones = Mash.new
+
+  popen4("zoneadm list -pc") do |pid, stdin, stdout, stderr|
+    stdin.close
+    stdout.each{ |line|
+      info = line.chomp.split(/:/)
+      zones[info[1]] = {
+        'id' => info[0],
+        'state' => info[2],
+        'root' => info[3],
+        'uuid' => info[4],
+        'brand' => info[5],
+        'ip' => info[6],
+      }
+    }
+    
+    if (zones.length == 1)
+      first_zone = zones.keys[0]
+      unless( first_zone == 'global')
+        virtualization[:system] = 'zone'
+        virtualization[:role] = 'guest'
+        virtualization[:guest_uuid] = zones[first_zone]['uuid']
+      end
+    elsif (zones.length > 1)
+      virtualization[:system] = 'zone'
+      virtualization[:role] = 'host'
+      virtualization[:guests] = zones
+    end
+  end
+end

data/lib/ohai/plugins/virtualization.rb

@@ -25,7 +25,7 @@ unless virtualization.nil? || !(virtualization[:role].eql?("host"))
     require 'libvirt'
     require 'hpricot'
 
-    emu = (virtualization[:emulator].eql?('kvm') ? 'qemu' : virtualization[:emulator])
+    emu = (virtualization[:system].eql?('kvm') ? 'qemu' : virtualization[:system])
     virtualization[:libvirt_version] = Libvirt::version(emu)[0].to_s
 
     virtconn = Libvirt::open_read_only("#{emu}:///system")

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

@@ -16,6 +16,8 @@
 # limitations under the License.
 #
 
+provides "network"
+
 require 'ruby-wmi'
 
 def encaps_lookup(encap)
@@ -63,7 +65,7 @@ end
 
 iface_instance.keys.each do |i|
   if iface_config[i][:ip_enabled] and iface_instance[i][:net_connection_id] and iface_instance[i][:interface_index]
-    cint = sprintf("0x%X", iface_instance[i][:interface_index])
+    cint = sprintf("0x%x", iface_instance[i][:interface_index]).downcase
     iface[cint] = Mash.new
     iface[cint][:configuration] = iface_config[i]
     iface[cint][:instance] = iface_instance[i]
@@ -94,20 +96,24 @@ iface_instance.keys.each do |i|
     iface[cint][:type] = iface[cint][:instance][:adapter_type]
     iface[cint][:arp] = {}
     iface[cint][:encapsulation] = encaps_lookup(iface[cint][:instance][:adapter_type])
+    if iface[cint][:configuration][:default_ip_gateway] != nil and iface[cint][:configuration][:default_ip_gateway].size > 0
+      network[:default_gateway] = iface[cint][:configuration][:default_ip_gateway].first
+      network[:default_interface] = cint
+    end
   end
 end
 
 cint=nil
-from("arp /a").split("\n").each do |line|
-  if line == ""
-    cint = nil
-  end
-  if line =~ /^Interface:\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+[-]+\s+(0x\d+)/
-    cint = $2
-  end
-  next unless iface[cint]
-  if line =~ /^\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+([a-fA-F0-9\:-]+)/
-    iface[cint][:arp][$1] = $2.gsub("-",":").downcase
+status, stdout, stderr = run_command(:command => "arp -a")
+if status == 0
+  stdout.each do |line|
+    if line =~ /^Interface:\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+[-]+\s+(0x\S+)/
+      cint = $2.downcase
+    end
+    next unless iface[cint]
+    if line =~ /^\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+([a-fA-F0-9\:-]+)/
+      iface[cint][:arp][$1] = $2.gsub("-",":").downcase
+    end
   end
 end
 

data/lib/ohai/system.rb

@@ -16,22 +16,13 @@
 # limitations under the License.
 #
 
-require 'extlib'
+require 'ohai/mash'
 require 'ohai/log'
 require 'ohai/mixin/from_file'
 require 'ohai/mixin/command'
 require 'ohai/mixin/string'
 
-begin
-  require 'json'
-rescue LoadError
-  begin
-    require 'json/pure'
-  rescue LoadError
-    STDERR.puts "No valid JSON library detected, please install one of 'json' or 'json_pure'."
-    exit -2
-  end
-end
+require 'yajl'
 
 module Ohai
   class System
@@ -72,7 +63,7 @@ module Ohai
     def from(cmd)
       status, stdout, stderr = run_command(:command => cmd)
       return "" if stdout.nil? || stdout.empty?
-      stdout.chomp!.strip
+      stdout.strip
     end
 
     def provides(*paths)
@@ -198,8 +189,10 @@ module Ohai
           Ohai::Log.debug("Loading plugin #{plugin_name}")
           from_file(check_path)
           return true
-        rescue IOError => e
+        rescue Errno::ENOENT => e
           Ohai::Log.debug("No #{plugin_name} at #{check_path}")
+        rescue SystemExit, Interrupt
+          raise
         rescue Exception,Errno::ENOENT => e
           Ohai::Log.debug("Plugin #{plugin_name} threw exception #{e.inspect} #{e.backtrace.join("\n")}")
         end
@@ -211,36 +204,33 @@ module Ohai
     alias :_require_plugin :require_plugin
 
     # Serialize this object as a hash
-    def to_json(*a)
-      output = @data.clone
-      output["json_class"] = self.class.name
-      output.to_json(*a)
+    def to_json
+      Yajl::Encoder.new.encode(@data)
     end
 
     # Pretty Print this object as JSON
-    def json_pretty_print
-      JSON.pretty_generate(@data)
+    def json_pretty_print(item=nil)
+      Yajl::Encoder.new(:pretty => true).encode(item || @data)
     end
 
     def attributes_print(a)
-      raise ArgumentError, "I cannot find an attribute named #{a}!" unless @data.has_key?(a)
+      data = @data
+      a.split("/").each do |part|
+        data = data[part]
+      end
+      raise ArgumentError, "I cannot find an attribute named #{a}!" if data.nil?
       case a
       when Hash,Mash,Array
-        JSON.pretty_generate(@data[a])
+        json_pretty_print(data)
       when String
-        JSON.pretty_generate(@data[a].to_a)
+        if data.respond_to?(:lines)
+          json_pretty_print(data.lines.to_a)
+        else
+          json_pretty_print(data.to_a)
+        end
       else
-        raise ArgumentError, "I can only generate JSON for Hashes, Mashes, Arrays and Strings. You fed me a #{@data[a].class}!"
-      end
-    end
-
-    # Create an Ohai::System from JSON
-    def self.json_create(o)
-      ohai = new
-      o.each do |key, value|
-        ohai.data[key] = value unless key == "json_class"
+        raise ArgumentError, "I can only generate JSON for Hashes, Mashes, Arrays and Strings. You fed me a #{data.class}!"
       end
-      ohai
     end
 
     def method_missing(name, *args)

data/lib/ohai/version.rb

@@ -0,0 +1,23 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2008 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.
+#
+
+module Ohai
+  OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
+  VERSION = '0.6.0.beta.0'
+end
+