ohai 6.24.2 → 7.0.0.rc.0

data/lib/ohai/plugins/nodejs.rb

@@ -16,19 +16,23 @@
 # limitations under the License.
 #
 
-provides "languages/nodejs"
+Ohai.plugin(:Nodejs) do
+  provides "languages/nodejs"
 
-require_plugin "languages"
+  depends "languages"
 
-output = nil
+  collect_data do
+    output = nil
 
-nodejs = Mash.new
+    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]
+    so = shell_out("node -v")
+    if so.exitstatus == 0
+      output = so.stdout.split
+      if output.length >= 1
+        nodejs[:version] = output[0][1..output[0].length]
+      end
+      languages[:nodejs] = nodejs if nodejs[:version]
+    end
   end
-  languages[:nodejs] = nodejs if nodejs[:version]
 end

data/lib/ohai/plugins/ohai.rb

@@ -16,10 +16,15 @@
 # limitations under the License.
 #
 
-require "ohai"
-provides "ohai"
+Ohai.plugin(:Ohai) do
+  provides "chef_packages/ohai"
 
-self[:chef_packages] = Mash.new unless self[:chef_packages]
-self[:chef_packages][:ohai] = Mash.new
-self[:chef_packages][:ohai][:version] = Ohai::VERSION
-self[:chef_packages][:ohai][:ohai_root] = Ohai::OHAI_ROOT
+  collect_data do
+    require 'ohai'
+
+    chef_packages Mash.new unless chef_packages
+    chef_packages[:ohai] = Mash.new
+    chef_packages[:ohai][:version] = Ohai::VERSION
+    chef_packages[:ohai][:ohai_root] = Ohai::OHAI_ROOT
+  end
+end

data/lib/ohai/plugins/ohai_time.rb

@@ -16,6 +16,10 @@
 # limitations under the License.
 #
 
-provides "ohai_time"
+Ohai.plugin(:OhaiTime) do
+  provides "ohai_time"
 
-ohai_time Time.now.to_f
+  collect_data do
+    ohai_time Time.now.to_f
+  end
+end

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

@@ -16,23 +16,28 @@
 # limitations under the License.
 #
 
-provides 'cpu'
+Ohai.plugin(:CPU) do
+  provides 'cpu'
 
-cpuinfo = Mash.new
+  collect_data(:openbsd) do
+    cpuinfo = Mash.new
 
-# OpenBSD provides most cpu information via sysctl, the only thing we need to 
-# to scrape from dmesg.boot is the cpu feature list. 
-# cpu0: FPU,V86,DE,PSE,TSC,MSR,MCE,CX8,SEP,MTRR,PGE,MCA,CMOV,PAT,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,TM,SBF,EST,TM2
+    # OpenBSD provides most cpu information via sysctl, the only thing we need to 
+    # to scrape from dmesg.boot is the cpu feature list. 
+    # cpu0: FPU,V86,DE,PSE,TSC,MSR,MCE,CX8,SEP,MTRR,PGE,MCA,CMOV,PAT,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,TM,SBF,EST,TM2
 
-File.open("/var/run/dmesg.boot").each do |line|
-  case line
-    when /cpu\d+:\s+([A-Z]+$|[A-Z]+,.*$)/
-      cpuinfo["flags"] = $1.downcase.split(',')
-  end
-end
+    File.open("/var/run/dmesg.boot").each do |line|
+      case line
+      when /cpu\d+:\s+([A-Z]+$|[A-Z]+,.*$)/
+        cpuinfo["flags"] = $1.downcase.split(',')
+      end
+    end
 
-cpuinfo[:model_name] = from("sysctl -n hw.model")
-cpuinfo[:total] = from("sysctl -n hw.ncpu")
-cpuinfo[:mhz] = from("sysctl -n hw.cpuspeed")
+    [["hw.model", :model_name], ["hw.ncpu", :total], ["hw.cpuspeed", :mhz]].each do |param, node|
+      so = shell_out("sysctl -n #{param}")
+      cpuinfo[node] = so.stdout.split($/)[0]
+    end
 
-cpu cpuinfo
+    cpu cpuinfo
+  end
+end

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

@@ -16,42 +16,42 @@
 # limitations under the License.
 #
 
-provides "filesystem"
+Ohai.plugin(:Filesystem) do
+  provides "filesystem"
 
-fs = Mash.new
+  collect_data(:openbsd) do
+    fs = Mash.new
 
-# Grab filesystem data from df
-popen4("df") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    case line
-    when /^Filesystem/
-      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
+    # Grab filesystem data from df
+    so = shell_out("df")
+    so.stdout.lines do |line|
+      case line
+      when /^Filesystem/
+        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
-end
 
-# Grab mount information from mount
-popen4("mount -l") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    if line =~ /^(.+?) on (.+?) \((.+?), (.+?)\)$/
-      filesystem = $1
-      fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
-      fs[filesystem]['mount'] = $2
-      fs[filesystem]['fs_type'] = $3
-      fs[filesystem]['mount-options'] = $4.split(/,\s*/)
+    # Grab mount information from mount
+    so = shell_out("mount -l")
+    so.stdout.lines do |line|
+      if line =~ /^(.+?) on (.+?) \((.+?), (.+?)\)$/
+        filesystem = $1
+        fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
+        fs[filesystem]['mount'] = $2
+        fs[filesystem]['fs_type'] = $3
+        fs[filesystem]['mount-options'] = $4.split(/,\s*/)
+      end
     end
+
+    # Set the filesystem data
+    filesystem fs
   end
 end
-
-# Set the filesystem data
-filesystem fs

data/lib/ohai/plugins/openbsd/memory.rb

@@ -16,54 +16,55 @@
 # limitations under the License.
 #
 
-provides "memory"
+Ohai.plugin(:Memory) do
+  provides "memory", "memory/swap"
 
-memory Mash.new
-memory[:swap] = Mash.new
+  collect_data(:openbsd) do
+    memory Mash.new
+    memory[:swap] = Mash.new
 
-# $ vmstat -s
-#        4096 bytes per page
-#      514011 pages managed
-#      224519 pages free
-#      209339 pages active
-#        4647 pages inactive
-#           0 pages being paged out
-#           5 pages wired
-#           0 pages zeroed
-#           4 pages reserved for pagedaemon
-#           6 pages reserved for kernel
-#      262205 swap pages
-#           0 swap pages in use
-#           0 total anon's in system
-#           0 free anon's
-#  1192991609 page faults
-#  1369579301 traps
-#   814549706 interrupts
-#   771702498 cpu context switches
-#   208810590 fpu context switches
-#   492361360 software interrupts
-#  1161998825 syscalls
-#           0 pagein operations
-#           0 swap ins
-#           0 swap outs
-#      768352 forks
-#          16 forks where vmspace is shared
-#        1763 kernel map entries
-#           0 number of times the pagedaemon woke up
-#           0 revolutions of the clock hand
-#           0 pages freed by pagedaemon
-#           0 pages scanned by pagedaemon
-#           0 pages reactivated by pagedaemon
-#           0 busy pages found by pagedaemon
-#  1096393776 total name lookups
-#             cache hits (37% pos + 2% neg) system 1% per-directory
-#             deletions 0%, falsehits 6%, toolong 26%
-#           0 select collisions
+    # $ vmstat -s
+    #        4096 bytes per page
+    #      514011 pages managed
+    #      224519 pages free
+    #      209339 pages active
+    #        4647 pages inactive
+    #           0 pages being paged out
+    #           5 pages wired
+    #           0 pages zeroed
+    #           4 pages reserved for pagedaemon
+    #           6 pages reserved for kernel
+    #      262205 swap pages
+    #           0 swap pages in use
+    #           0 total anon's in system
+    #           0 free anon's
+    #  1192991609 page faults
+    #  1369579301 traps
+    #   814549706 interrupts
+    #   771702498 cpu context switches
+    #   208810590 fpu context switches
+    #   492361360 software interrupts
+    #  1161998825 syscalls
+    #           0 pagein operations
+    #           0 swap ins
+    #           0 swap outs
+    #      768352 forks
+    #          16 forks where vmspace is shared
+    #        1763 kernel map entries
+    #           0 number of times the pagedaemon woke up
+    #           0 revolutions of the clock hand
+    #           0 pages freed by pagedaemon
+    #           0 pages scanned by pagedaemon
+    #           0 pages reactivated by pagedaemon
+    #           0 busy pages found by pagedaemon
+    #  1096393776 total name lookups
+    #             cache hits (37% pos + 2% neg) system 1% per-directory
+    #             deletions 0%, falsehits 6%, toolong 26%
+    #           0 select collisions
 
-popen4("vmstat -s") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    case line
+    so = shell_out("vmstat -s")
+    so.stdout.lines do |line|
+      case line
       when /(\d+) bytes per page/
         memory[:page_size] = $1
       when /(\d+) pages managed/
@@ -78,21 +79,20 @@ popen4("vmstat -s") do |pid, stdin, stdout, stderr|
       when /(\d+) pages wired/
         memory[:wired] = memory[:page_size].to_i * $1.to_i 
       end
-  end
-end
+    end
 
-popen4("swapctl -l") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    # Device      1024-blocks     Used    Avail Capacity  Priority
-    # swap_device     1048824        0  1048824     0%    0
-    if line =~ /^([\d\w\/]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+([\d\%]+)/
-      mdev = $1
-      memory[:swap][mdev] = Mash.new
-      memory[:swap][mdev][:total] = $2
-      memory[:swap][mdev][:used] = $3
-      memory[:swap][mdev][:free] = $4
-      memory[:swap][mdev][:percent_free] = $5
+    so = shell_out("swapctl -l")
+    so.stdout.lines do |line|
+      # Device      1024-blocks     Used    Avail Capacity  Priority
+      # swap_device     1048824        0  1048824     0%    0
+      if line =~ /^([\d\w\/]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+([\d\%]+)/
+        mdev = $1
+        memory[:swap][mdev] = Mash.new
+        memory[:swap][mdev][:total] = $2
+        memory[:swap][mdev][:used] = $3
+        memory[:swap][mdev][:free] = $4
+        memory[:swap][mdev][:percent_free] = $5
+      end
     end
   end
 end

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

@@ -16,105 +16,109 @@
 # limitations under the License.
 #
 
-provides "network", "counters/network"
+Ohai.plugin(:Network) do
+  provides "network", "network/interfaces"
+  provides "counters/network", "counters/network/interfaces"
 
-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
+  collect_data(:openbsd) do
+    network Mash.new unless network
+    network[:interfaces] = Mash.new unless network[:interfaces]
+    counters Mash.new unless counters
+    counters[:network] = Mash.new unless counters[:network]
 
-iface = Mash.new
-popen4("/sbin/ifconfig -a") do |pid, stdin, stdout, stderr|
-  stdin.close
-  cint = nil
-  stdout.each do |line|
-    if line =~ /^([0-9a-zA-Z\.]+):\s+/
-      cint = $1
-      iface[cint] = Mash.new
-      if cint =~ /^(\w+)(\d+.*)/
-        iface[cint][:type] = $1
-        iface[cint][:number] = $2
+    so = shell_out("route -n get default")
+    so.stdout.lines do |line|
+      if line =~ /(\w+): ([\w\.]+)/
+        case $1
+        when "gateway"
+          network[:default_gateway] = $2
+        when "interface"
+          network[:default_interface] = $2
+        end
       end
     end
-    # call the family lladdr to match linux for consistency
-    if line =~ /\s+lladdr (.+?)\s/
-      iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-      iface[cint][:addresses][$1] = { "family" => "lladdr" }
-    end
-    if line =~ /\s+inet ([\d.]+) netmask ([\da-fx]+)\s*\w*\s*([\d.]*)/
-      iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-      # convert the netmask to decimal for consistency
-      netmask = "#{$2[2,2].hex}.#{$2[4,2].hex}.#{$2[6,2].hex}.#{$2[8,2].hex}"
-      if $3.empty?
-        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => netmask }
-      else
-        # found a broadcast address
-        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => netmask, "broadcast" => $3 }
+
+    iface = Mash.new
+    so = shell_out( "#{ Ohai.abs_path( "/sbin/ifconfig" ) } -a" )
+    cint = nil
+    so.stdout.lines do |line|
+      if line =~ /^([0-9a-zA-Z\.]+):\s+/
+        cint = $1
+        iface[cint] = Mash.new
+        if cint =~ /^(\w+)(\d+.*)/
+          iface[cint][:type] = $1
+          iface[cint][:number] = $2
+        end
       end
-    end
-    if line =~ /\s+inet6 ([a-f0-9\:]+)%?(\w*)\s+prefixlen\s+(\d+)\s*\w*\s*([\da-fx]*)/
-      iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-      if $4.empty?
-        iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $3 }
-      else
-        #found a zone_id / scope
-        iface[cint][:addresses][$1] = { "family" => "inet6", "zoneid" => $2, "prefixlen" => $3, "scopeid" => $4 }
+      # call the family lladdr to match linux for consistency
+      if line =~ /\s+lladdr (.+?)\s/
+        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses][$1] = { "family" => "lladdr" }
+      end
+      if line =~ /\s+inet ([\d.]+) netmask ([\da-fx]+)\s*\w*\s*([\d.]*)/
+        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        # convert the netmask to decimal for consistency
+        netmask = "#{$2[2,2].hex}.#{$2[4,2].hex}.#{$2[6,2].hex}.#{$2[8,2].hex}"
+        if $3.empty?
+          iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => netmask }
+        else
+          # found a broadcast address
+          iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => netmask, "broadcast" => $3 }
+        end
+      end
+      if line =~ /\s+inet6 ([a-f0-9\:]+)%?(\w*)\s+prefixlen\s+(\d+)\s*\w*\s*([\da-fx]*)/
+        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        if $4.empty?
+          iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $3 }
+        else
+          #found a zone_id / scope
+          iface[cint][:addresses][$1] = { "family" => "inet6", "zoneid" => $2, "prefixlen" => $3, "scopeid" => $4 }
+        end
+      end
+      if line =~ /flags=\d+<(.+)>/
+        flags = $1.split(',')
+        iface[cint][:flags] = flags if flags.length > 0
+      end
+      if line =~ /metric: (\d+) mtu: (\d+)/
+        iface[cint][:metric] = $1
+        iface[cint][:mtu] = $2
       end
     end
-    if line =~ /flags=\d+<(.+)>/
-      flags = $1.split(',')
-      iface[cint][:flags] = flags if flags.length > 0
-    end
-    if line =~ /metric: (\d+) mtu: (\d+)/
-      iface[cint][:metric] = $1
-      iface[cint][:mtu] = $2
-    end
-  end
-end
 
-popen4("arp -an") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    if line =~ /\((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) on ([0-9a-zA-Z\.\:\-]+)/
-      next unless iface[$3] # this should never happen
-      iface[$3][:arp] = Mash.new unless iface[$3][:arp]
-      iface[$3][:arp][$1] = $2.downcase
+    so = shell_out("arp -an")
+    so.stdout.lines do |line|
+      if line =~ /\((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) on ([0-9a-zA-Z\.\:\-]+)/
+        next unless iface[$3] # this should never happen
+        iface[$3][:arp] = Mash.new unless iface[$3][:arp]
+        iface[$3][:arp][$1] = $2.downcase
+      end
     end
-  end
-end
 
-network["interfaces"] = iface
+    network["interfaces"] = iface
 
-net_counters = Mash.new
-# From netstat(1), not sure of the implications:
-# Show the state of all network interfaces or a single interface
-# which have been auto-configured (interfaces statically configured
-# into a system, but not located at boot time are not shown). 
-popen4("netstat -idn") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    # Name    Mtu Network       Address              Ipkts Ierrs    Opkts Oerrs  Coll Drop
-    # em0     1500  <Link>      00:11:25:2d:90:be  3719557     0  3369969     0     0    0
-    # $1                        $2                      $3    $4    $5       $6    $7   $8
-    if line =~ /^([\w\.\*]+)\s+\d+\s+<Link>\s+([\w:]*)\s*(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
-      cint = $1
-      net_counters[cint] = Mash.new unless net_counters[cint]
-      net_counters[cint] = Mash.new unless net_counters[cint]["rx"]
-      net_counters[cint] = Mash.new unless net_counters[cint]["tx"]
-      net_counters[cint] = $3
-      net_counters[cint] = $4
-      net_counters[cint] = $5
-      net_counters[cint] = $6
-      net_counters[cint] = $7
-      net_counters[cint] = $8
+    net_counters = Mash.new
+    # From netstat(1), not sure of the implications:
+    # Show the state of all network interfaces or a single interface
+    # which have been auto-configured (interfaces statically configured
+    # into a system, but not located at boot time are not shown). 
+    so = shell_out("netstat -idn")
+    so.stdout.lines do |line|
+      # Name    Mtu Network       Address              Ipkts Ierrs    Opkts Oerrs  Coll Drop
+      # em0     1500  <Link>      00:11:25:2d:90:be  3719557     0  3369969     0     0    0
+      # $1                        $2                      $3    $4    $5       $6    $7   $8
+      if line =~ /^([\w\.\*]+)\s+\d+\s+<Link>\s+([\w:]*)\s*(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
+        net_counters[$1] = Mash.new unless net_counters[$1]
+        net_counters[$1]["rx"] = Mash.new unless net_counters[$1]["rx"]
+        net_counters[$1]["tx"] = Mash.new unless net_counters[$1]["tx"]
+        net_counters[$1]["rx"]["packets"] = $3
+        net_counters[$1]["rx"]["errors"] = $4
+        net_counters[$1]["tx"]["packets"] = $5
+        net_counters[$1]["tx"]["errors"] = $6
+        net_counters[$1]["tx"]["collisions"] = $7
+        net_counters[$1]["tx"]["dropped"] = $8
+      end
     end
+
+    counters[:network][:interfaces] = net_counters
   end
 end
-
-counters[:network][:interfaces] = net_counters