ohai 6.24.2 → 7.0.0.rc.0

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

@@ -16,86 +16,83 @@
 # limitations under the License.
 #
 
-provides "filesystem"
+Ohai.plugin(:Filesystem) do
+  provides "filesystem"
 
-fs = Mash.new
+  collect_data(:solaris2) do
+    fs = Mash.new
 
-# Grab filesystem data from df
-popen4("df -Pka") 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 filesystem data from df
+    so = shell_out("df -Pka")
+    so.stdout.lines 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
 
-# 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 file system type from df (must be done separately)
+    so = shell_out("df -na")
+    so.stdout.lines 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
 
-# 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 mount information from /bin/mount
+    so = shell_out("mount")
+    so.stdout.lines 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
 
-# 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)
-}
+    # Grab any zfs data from "zfs get"
+    zfs = Mash.new
+    so = shell_out("zfs get -p -H all")
+    so.stdout.lines 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
+
+    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
+    # Set the filesystem data
+    filesystem fs
+  end
+end

data/lib/ohai/plugins/{aix/hostname.rb → solaris2/memory.rb}

@@ -1,6 +1,4 @@
 #
-# Author:: Doug MacEachern <dougm@vmware.com>
-# Copyright:: Copyright (c) 2010 VMware, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +14,11 @@
 # limitations under the License.
 #
 
-provides "hostname"
+Ohai.plugin(:Memory) do
+  provides "memory"
 
-hostname from("hostname")
+  collect_data(:solaris2) do
+    memory Mash.new
+    memory[:total] = shell_out("prtconf -m").stdout.to_i
+  end
+end

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

@@ -53,108 +53,113 @@
 # srcof qfe1
 # inet6 fe80::203:baff:fe17:4444/128
 
-provides "network"
+Ohai.plugin(:Network) do
+  provides "network", "network/interfaces"
+  provides "counters/network", "counters/network/interfaces"
 
-require 'scanf'
+  def solaris_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
 
-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
+  def arpname_to_ifname(iface, arpname)
+    iface.keys.each do |ifn|
+      return ifn if ifn.split(':')[0].eql?(arpname)
+    end
 
-def arpname_to_ifname(iface, arpname)
-  iface.keys.each do |ifn|
-    return ifn if ifn.split(':')[0].eql?(arpname)
+    nil
   end
 
-  nil
-end
+  collect_data(:solaris2) do
+    require 'scanf'
 
-iface = Mash.new
-popen4("ifconfig -a") do |pid, stdin, stdout, stderr|
-  stdin.close
-  cint = nil
-  stdout.each do |line|
-    if line =~ /^([0-9a-zA-Z\.\:\-]+): \S+ mtu (\d+) index (\d+)/
-      cint = $1
-      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|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
+    iface = Mash.new
+    network Mash.new unless network
+    network[:interfaces] = Mash.new unless network[:interfaces]
+    counters Mash.new unless counters
+    counters[:network] = Mash.new unless counters[:network]
+
+    so = shell_out("ifconfig -a")
+    cint = nil
+
+    so.stdout.lines do |line|
+      if line =~ /^([0-9a-zA-Z\.\:\-]+): \S+ mtu (\d+) index (\d+)/
+        cint = $1
+        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|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
+        end
+        iface[cint][:flags] = flags.flatten
+        if cint =~ /^(\w+)(\d+.*)/
+          iface[cint][:type] = $1
+          iface[cint][:number] = $2
+          iface[cint][:encapsulation] = solaris_encaps_lookup($1)
+        end
       end
-      iface[cint][:flags] = flags.flatten
-      if cint =~ /^(\w+)(\d+.*)/
-        iface[cint][:type] = $1
-        iface[cint][:number] = $2
-        iface[cint][:encapsulation] = encaps_lookup($1)
+      if line =~ /\s+inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) netmask (([0-9a-f]){1,8})\s*$/
+        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => $2.scanf('%2x'*4)*"."}
+      end
+      if line =~ /\s+inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) netmask (([0-9a-f]){1,8}) broadcast (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
+        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*)\/(\d+)\s*$/
+        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $4 }
       end
     end
-    if line =~ /\s+inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) netmask (([0-9a-f]){1,8})\s*$/
-      iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-      iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => $2.scanf('%2x'*4)*"."}
-    end
-    if line =~ /\s+inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) netmask (([0-9a-f]){1,8}) broadcast (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
-      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*)\/(\d+)\s*$/
-      iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-      iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $4 }
-    end
-  end
-end
-
-popen4("arp -an") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    if line =~ /([0-9a-zA-Z]+)\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+(\w+)\s+([a-zA-Z0-9\.\:\-]+)/
-      next unless iface[arpname_to_ifname(iface, $1)] # this should never happen, except on solaris because sun hates you.
-      iface[arpname_to_ifname(iface, $1)][:arp] = Mash.new unless iface[arpname_to_ifname(iface, $1)][:arp]
-      iface[arpname_to_ifname(iface, $1)][:arp][$2] = $5
-    end
-  end
-end
 
-iface.keys.each do |ifn|
-  iaddr = nil
-  if iface[ifn][:encapsulation].eql?("Ethernet")
-    iface[ifn][:addresses].keys.each do |addr|
-      if iface[ifn][:addresses][addr]["family"].eql?("inet")
-        iaddr = addr
-        break
+    so = shell_out("arp -an")
+    so.stdout.lines do |line|
+      if line =~ /([0-9a-zA-Z]+)\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+(\w+)\s+([a-zA-Z0-9\.\:\-]+)/
+        next unless iface[arpname_to_ifname(iface, $1)] # this should never happen, except on solaris because sun hates you.
+        iface[arpname_to_ifname(iface, $1)][:arp] = Mash.new unless iface[arpname_to_ifname(iface, $1)][:arp]
+        iface[arpname_to_ifname(iface, $1)][:arp][$2] = $5
       end
     end
-    if iface[ifn][:arp]
-      iface[ifn][:arp].keys.each do |addr|
-        if addr.eql?(iaddr)
-          iface[ifn][:addresses][iface[ifn][:arp][iaddr]] = { "family" => "lladdr" }
-          break
+
+    iface.keys.each do |ifn|
+      iaddr = nil
+      if iface[ifn][:encapsulation].eql?("Ethernet")
+        iface[ifn][:addresses].keys.each do |addr|
+          if iface[ifn][:addresses][addr]["family"].eql?("inet")
+            iaddr = addr
+            break
+          end
+        end
+        if iface[ifn][:arp]
+          iface[ifn][:arp].keys.each do |addr|
+            if addr.eql?(iaddr)
+              iface[ifn][:addresses][iface[ifn][:arp][iaddr]] = { "family" => "lladdr" }
+              break
+            end
+          end
         end
       end
     end
-  end
-end
 
-network[:interfaces] = iface
+    network[:interfaces] = iface
 
-popen4("route -n get default") do |pid, stdin, stdout, stderr|
-  stdin.close
-  route_get = stdout.read
-  matches = /interface: (\S+)/.match(route_get)
-  if matches
-    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]
+    so = shell_out("route -n get default")
+    so.stdout.lines do |line|
+      matches = /interface: (\S+)/.match(line)
+      if matches
+        Ohai::Log.debug("found gateway device: #{$1}")
+        network[:default_interface] = matches[1]
+      end
+      matches = /gateway: (\S+)/.match(line)
+      if matches
+        Ohai::Log.debug("found gateway: #{$1}")
+        network[:default_gateway] = matches[1]
+      end
+    end
   end
 end
-

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

@@ -16,46 +16,50 @@
 # limitations under the License.
 #
 
-provides "platform", "platform_version", "platform_build"
+Ohai.plugin(:Platform) do
+  provides "platform", "platform_version", "platform_build", "platform_family"
 
-if File.exists?("/sbin/uname")
-  uname_exec = "/sbin/uname"
-else
-  uname_exec = "uname"
-end
+  collect_data(:solaris2) do
+    if File.exists?("/sbin/uname")
+      uname_exec = "/sbin/uname"
+    else
+      uname_exec = "uname"
+    end
 
-popen4("#{uname_exec} -X") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    case line
-    when /^Release =\s+(.+)$/
-      platform_version $1
-    when /^KernelID =\s+(.+)$/
-      platform_build $1
+    so = shell_out("#{uname_exec} -X")
+    so.stdout.lines do |line|
+      case line
+      when /^Release =\s+(.+)$/
+        platform_version $1
+      when /^KernelID =\s+(.+)$/
+        platform_build $1
+      end
     end
-  end
-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
-    when /^\s*(OpenIndiana).*oi_(\d+).*$/
-      platform "openindiana"
-      platform_version $2
-    when /^\s*(OpenSolaris).*snv_(\d+).*$/
-      platform "opensolaris"
-      platform_version $2
-    when /^\s*(Oracle Solaris) (\d+)\s.*$/
-      platform "solaris2"
-    when /^\s*(Solaris)\s.*$/
-      platform "solaris2"
-    when /^\s*(NexentaCore)\s.*$/
-      platform "nexentacore"
+    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
+        when /^\s*(OpenIndiana).*oi_(\d+).*$/
+          platform "openindiana"
+          platform_version $2
+        when /^\s*(OpenSolaris).*snv_(\d+).*$/
+          platform "opensolaris"
+          platform_version $2
+        when /^\s*(Oracle Solaris) (\d+)\s.*$/
+          platform "solaris2"
+        when /^\s*(Solaris)\s.*$/
+          platform "solaris2"
+        when /^\s*(NexentaCore)\s.*$/
+          platform "nexentacore"
+        end
+      end
     end
+
+    platform_family platform
   end
 end