ohai 6.24.2 → 7.0.0.rc.0

data/lib/ohai/mixin/gce_metadata.rb

@@ -21,8 +21,6 @@ module Ohai
   module Mixin
     module GCEMetadata
 
-      extend self
-
       GCE_METADATA_ADDR = "metadata.google.internal" unless defined?(GCE_METADATA_ADDR)
       GCE_METADATA_URL = "/computeMetadata/v1beta1/?recursive=true" unless defined?(GCE_METADATA_URL)
 

data/lib/ohai/{plugins/freebsd/uptime.rb → mixin/network_constants.rb}

@@ -1,6 +1,6 @@
 #
-# Author:: Bryan McLellan (btm@loftninjas.org)
-# Copyright:: Copyright (c) 2009 Bryan McLellan
+# Author:: Serdar Sutay (<serdar@opscode.com>)
+# Copyright:: Copyright (c) 2014 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,22 +11,24 @@
 #
 # 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.
+# 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 "uptime", "uptime_seconds"
+module Ohai
+  module Mixin
+    module NetworkConstants
+      FAMILIES = {
+        "inet" => "default",
+        "inet6" => "default_inet6"
+      }
 
-# kern.boottime: { sec = 1232765114, usec = 823118 } Fri Jan 23 18:45:14 2009
-
-popen4("/sbin/sysctl kern.boottime") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    if line =~ /kern.boottime:\D+(\d+)/
-      uptime_seconds Time.new.to_i - $1.to_i
-      uptime self._seconds_to_human(uptime_seconds)
+      # From sigar: include/sigar.h sigar_net_route_t
+      SIGAR_ROUTE_METHODS = [:destination, :gateway, :mask, :flags, 
+                             :refcnt, :use, :metric, :mtu, :window, 
+                             :irtt, :ifname]
     end
   end
 end
-

data/lib/ohai/mixin/os.rb

@@ -0,0 +1,59 @@
+#
+# 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.
+#
+
+require 'rbconfig'
+
+module Ohai
+  module Mixin
+    module OS
+
+      def collect_os
+        case ::RbConfig::CONFIG['host_os']
+        when /aix(.+)$/
+          return "aix"
+        when /darwin(.+)$/
+          return "darwin"
+        when /hpux(.+)$/
+          return "hpux"
+        when /linux/
+          return "linux"
+        when /freebsd(.+)$/
+          return "freebsd"
+        when /openbsd(.+)$/
+          return "openbsd"
+        when /netbsd(.*)$/
+          return "netbsd"
+        when /solaris2/
+          return "solaris2"
+        when /mswin|mingw32|windows/
+          # After long discussion in IRC the "powers that be" have come to a consensus
+          # that no Windows platform exists that was not based on the
+          # Windows_NT kernel, so we herby decree that "windows" will refer to all
+          # platforms built upon the Windows_NT kernel and have access to win32 or win64
+          # subsystems.
+          return "windows"
+        else
+          return ::RbConfig::CONFIG['host_os']
+        end
+      end
+
+      module_function :collect_os
+    end
+  end
+end

data/lib/ohai/mixin/seconds_to_human.rb

@@ -0,0 +1,48 @@
+#
+# 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
+  module Mixin
+    module SecondsToHuman
+      def seconds_to_human(seconds)
+        days = seconds.to_i / 86400
+        seconds -= 86400 * days
+
+        hours = seconds.to_i / 3600
+        seconds -= 3600 * hours
+
+        minutes = seconds.to_i / 60
+        seconds -= 60 * minutes
+
+        if days > 1
+          return sprintf("%d days %02d hours %02d minutes %02d seconds", days, hours, minutes, seconds)
+        elsif days == 1
+          return sprintf("%d day %02d hours %02d minutes %02d seconds", days, hours, minutes, seconds)
+        elsif hours > 0
+          return sprintf("%d hours %02d minutes %02d seconds", hours, minutes, seconds)
+        elsif minutes > 0
+          return sprintf("%d minutes %02d seconds", minutes, seconds)
+        else
+          return sprintf("%02d seconds", seconds)
+        end
+      end
+    end
+  end
+end
+
+

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

@@ -17,33 +17,37 @@
 # limitations under the License.
 #
 
-provides "cpu"
+Ohai.plugin(:CPU) do
+  provides "cpu"
 
-cpu Mash.new
+  collect_data(:aix) do
+    cpu Mash.new
 
-# IBM is the only maker of CPUs for AIX systems.
-cpu[:vendor_id] = "IBM"
-# At least one CPU will be available, but we'll wait to increment this later.
-cpu[:available] = 0
-cpu[:total] = 0
+    # IBM is the only maker of CPUs for AIX systems.
+    cpu[:vendor_id] = "IBM"
+    # At least one CPU will be available, but we'll wait to increment this later.
+    cpu[:available] = 0
+    cpu[:total] = 0
 
-cpudevs = from("lsdev -Cc processor").lines
-cpudevs.each do |c|
-	cpu[:total] += 1
-  name, status, location = c.split
-  cpu[name] = Mash.new
-  cpu[name][:status] = status
-	cpu[name][:location] = location
-  if status =~ /Available/
+    cpudevs = shell_out("lsdev -Cc processor").stdout.lines
+    cpudevs.each do |c|
+      cpu[:total] += 1
+      name, status, location = c.split
+      cpu[name] = Mash.new
+      cpu[name][:status] = status
+      cpu[name][:location] = location
+      if status =~ /Available/
   	cpu[:available] += 1
-  	lsattr = from("lsattr -El #{name}").lines
+  	lsattr = shell_out("lsattr -El #{name}").stdout.lines
   	lsattr.each do |attribute|
-  		attrib, value = attribute.split
-  		cpu[name][attrib] = value
+          attrib, value = attribute.split
+          cpu[name][attrib] = value
   	end
+      end
+    end
+
+    # Every AIX system has proc0.
+    cpu[:model] = cpu[:proc0][:type]
+    cpu[:mhz] = cpu[:proc0][:frequency].to_i / 1024
   end
 end
-
-# Every AIX system has proc0.
-cpu[:model] = cpu[:proc0][:type]
-cpu[:mhz] = cpu[:proc0][:frequency].to_i / 1024

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

@@ -12,62 +12,61 @@
 #
 # 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.
+# 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"
+Ohai.plugin(:Filesystem) do
+  provides "filesystem"
 
-fs = Mash.new
+  collect_data(:aix) do
+    fs = Mash.new
 
-# Grab filesystem data from df
-popen4("df -P") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    case line
-    when /^Filesystem\s+1024-blocks/
-      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 -P")
+    so.stdout.lines.each do |line|
+      case line
+      when /^Filesystem\s+1024-blocks/
+        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 /bin/mount
-popen4("mount") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    case line
-     when /^\s*node/
-      next
-     when /^\s*---/
-      next
-     when /^\s*\/\w/
-      fields = line.split
-      filesystem = fields[0]
-      fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
-      fs[filesystem][:mount] = fields[1]
-      fs[filesystem][:fs_type] = fields[2]
-      #fs[filesystem][:mount_options] = fields[6]
-      fs[filesystem][:mount_options] = fields[6]
-     else
-      fields = line.split
-      filesystem = fields[0] + ":" + fields[1]
-      fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
-      fs[filesystem][:mount] = fields[2]
-      fs[filesystem][:fs_type] = fields[3]
-      fs[filesystem][:mount_options] = fields[7]
+    # Grab mount information from /bin/mount
+    so = shell_out("mount")
+    so.stdout.lines.each do |line|
+      case line
+      when /^\s*node/
+        next
+      when /^\s*---/
+        next
+      when /^\s*\/\w/
+        fields = line.split
+        filesystem = fields[0]
+        fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
+        fs[filesystem][:mount] = fields[1]
+        fs[filesystem][:fs_type] = fields[2]
+        fs[filesystem][:mount_options] = fields[6]
+      else
+        fields = line.split
+        filesystem = fields[0] + ":" + fields[1]
+        fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
+        fs[filesystem][:mount] = fields[2]
+        fs[filesystem][:fs_type] = fields[3]
+        fs[filesystem][:mount_options] = fields[7]
+      end
     end
+
+    # Set the filesystem data
+    filesystem fs
   end
 end
-
-# Set the filesystem data
-filesystem fs
-

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

@@ -16,12 +16,16 @@
 # limitations under the License.
 #
 
-provides "kernel"
+Ohai.plugin(:Kernel) do
+  provides "kernel", "kernel/modules"
 
-kernel Mash.new
+  collect_data(:aix) do
+    kernel Mash.new
 
-kernel[:name] = from("uname -s").downcase
-kernel[:release] = from("uname -r")
-kernel[:version] = from("uname -v")
-kernel[:machine] = from("uname -p")
-kernel[:modules] = Mash.new
+    kernel[:name] = shell_out("uname -s").stdout.downcase
+    kernel[:release] = shell_out("uname -r").stdout
+    kernel[:version] = shell_out("uname -v").stdout
+    kernel[:machine] = shell_out("uname -p").stdout
+    kernel[:modules] = Mash.new
+  end
+end

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

@@ -16,9 +16,13 @@
 # limitations under the License.
 #
 
-provides "memory"
+Ohai.plugin(:Memory) do
+  provides "memory"
 
-memory = Mash.new
+  collect_data(:aix) do
+    memory = Mash.new
 
-meminfo = from("svmon -G -O unit=MB,summary=longreal | grep '[0-9]'")
-memory[:total], u, memory[:free] = meminfo.split
+    meminfo = shell_out("svmon -G -O unit=MB,summary=longreal | grep '[0-9]'").stdout
+    memory[:total], u, memory[:free] = meminfo.split
+  end
+end

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

@@ -17,56 +17,54 @@
 # limitations under the License.
 #
 
-require 'ipaddr'
-provides "network", "counters/network"
+Ohai.plugin(:Network) do
+  require 'ipaddr'
 
-# Loads following information.
-# :default_interface, :default_gateway - route -n get 0
-# :interfaces
-# => routes(netstat -nr | grep en0)
-# => addresses (ifconfig en0 or lsattr -El en0), macaddress (entstat -d en0 = Hardware Address: be:42:80:00:b0:05)
-# => flags (ifconfig en0)
-# => state up/down (ifconfig/lsattr)
-# => arp (arp -an)
+  provides "network", "counters/network"
 
-iface = Mash.new
-
-
-# :default_interface, :default_gateway - route -n get 0
-popen4("route -n get 0") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    case line
-    when /gateway: (\S+)/
-      network[:default_gateway] = $1
-    when /interface: (\S+)/
-      network[:default_interface] = $1
-    end
+  # Helpers
+  def hex_to_dec_netmask(netmask)
+    # example '0xffff0000' -> '255.255.0.0'
+    dec = netmask[2..3].to_i(16).to_s(10)
+    [4,6,8].each { |n| dec = dec + "." + netmask[n..n+1].to_i(16).to_s(10) }
+    dec
   end
-end
 
-# Helpers
-def hex_to_dec_netmask(netmask)
-  # example '0xffff0000' -> '255.255.0.0'
-  dec = netmask[2..3].to_i(16).to_s(10)
-  [4,6,8].each { |n| dec = dec + "." + netmask[n..n+1].to_i(16).to_s(10) }
-  dec
-end
+  collect_data(:aix) do
+    # Loads following information.
+    # :default_interface, :default_gateway - route -n get 0
+    # :interfaces
+    # => routes(netstat -nr | grep en0)
+    # => addresses (ifconfig en0 or lsattr -El en0), macaddress (entstat -d en0 = Hardware Address: be:42:80:00:b0:05)
+    # => flags (ifconfig en0)
+    # => state up/down (ifconfig/lsattr)
+    # => arp (arp -an)
 
-# List the interfaces in system.
-popen4("lsdev -Cc if") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    if line =~ /(\S+) (\S+)\s+(.+)/
-      interface = $1
-      iface[interface] = Mash.new unless iface[interface]
-      iface[interface][:state] = ($2 == 'Available' ? 'up' : 'down')
-      iface[interface][:description] = $3
+    iface = Mash.new
 
-      # Query the interface information
-      popen4("ifconfig #{interface}") do |if_pid, if_stdin, if_stdout, if_stderr|
-        if_stdin.close
-        if_stdout.each do |line|
+    # :default_interface, :default_gateway - route -n get 0
+    so = shell_out("route -n get 0")
+    so.stdout.lines.each do |line|
+      case line
+      when /gateway: (\S+)/
+        network[:default_gateway] = $1
+      when /interface: (\S+)/
+        network[:default_interface] = $1
+      end
+    end
+
+    # List the interfaces in system.
+    so = shell_out("lsdev -Cc if")
+    so.stdout.lines.each do |line|
+      if line =~ /(\S+) (\S+)\s+(.+)/
+        interface = $1
+        iface[interface] = Mash.new unless iface[interface]
+        iface[interface][:state] = ($2 == 'Available' ? 'up' : 'down')
+        iface[interface][:description] = $3
+        
+        # Query the interface information
+        if_so = shell_out("ifconfig #{interface}")
+        if_so.stdout.lines.each do |line|
           case line
           when /^#{interface}:\sflags=\S+<(\S+)>/
             iface[interface][:flags] = $1.split(',')
@@ -84,11 +82,11 @@ popen4("lsdev -Cc if") do |pid, stdin, stdout, stderr|
               else
                 netmask = IPAddr.new("255.255.255.255").mask(tmp_prefix.to_i).to_s
               end
-
+              
               iface[interface][:addresses] = Mash.new unless iface[interface][:addresses]
               iface[interface][:addresses][tmp_addr] = { "family" => "inet", "prefixlen" => tmp_prefix }
               iface[interface][:addresses][tmp_addr][:netmask] = netmask
-
+              
               if line =~ /broadcast\s(\S+)\s/
                 iface[interface][:addresses][tmp_addr][:broadcast] = $1
               end
@@ -105,51 +103,44 @@ popen4("lsdev -Cc if") do |pid, stdin, stdout, stderr|
               end
             end
           end
-        end
-      end  #ifconfig stdout
+        end #ifconfig stdout
 
-      # Query macaddress
-      popen4("entstat -d #{interface} | grep \"Hardware Address\"") do |e_pid, e_stdin, e_stdout, e_stderr|
-        e_stdin.close
+        # Query macaddress
+        e_so = shell_out("entstat -d #{interface} | grep \"Hardware Address\"")
         iface[interface][:addresses] = Mash.new unless iface[interface][:addresses]
-        e_stdout.each do |line|
+        e_so.stdout.lines.each do |line|
           iface[interface][:addresses][$1.upcase] = { "family" => "lladdr" } if line =~ /Hardware Address: (\S+)/
         end
-      end
+      end  #lsdev stdout
     end
-  end  #lsdev stdout
-end
 
-# Query routes information
-%w{inet inet6}.each do |family|
-  popen4("netstat -nrf #{family}") do |n_pid, n_stdin, n_stdout, n_stderr|
-    n_stdin.close
-    n_stdout.each do |line|
-      if line =~ /(\S+)\s+(\S+)\s+(\S+)\s+(\d+)\s+(\d+)\s+(\S+)/
-        interface = $6
-        iface[interface][:routes] = Array.new unless iface[interface][:routes]
-        iface[interface][:routes] << Mash.new( :destination => $1, :family => family,
-                                :via => $2, :flags => $3)
+    # Query routes information
+    %w{inet inet6}.each do |family|
+      so_n = shell_out("netstat -nrf #{family}")
+      so_n.stdout.lines.each do |line|
+        if line =~ /(\S+)\s+(\S+)\s+(\S+)\s+(\d+)\s+(\d+)\s+(\S+)/
+          interface = $6
+          iface[interface][:routes] = Array.new unless iface[interface][:routes]
+          iface[interface][:routes] << Mash.new( :destination => $1, :family => family,
+                                                 :via => $2, :flags => $3)
+        end
       end
     end
-  end
-end
 
-# List the arp entries in system.
-popen4("arp -an") do |pid, stdin, stdout, stderr|
-  stdin.close
-  count = 0
-  stdout.each do |line|
-    network[:arp] = Mash.new unless network[:arp]
-    if line =~ /\s*(\S+) \((\S+)\) at ([a-fA-F0-9\:]+) \[(\w+)\] stored in bucket/
-      network[:arp][count] = Mash.new unless network[:arp][count]
-      network[:arp][count][:remote_host] = $1
-      network[:arp][count][:remote_ip] = $2
-      network[:arp][count][:remote_mac] = $3.downcase
-      count += 1
+    # List the arp entries in system.
+    so = shell_out("arp -an")
+    count = 0
+    so.stdout.lines.each do |line|
+      network[:arp] = Mash.new unless network[:arp]
+      if line =~ /\s*(\S+) \((\S+)\) at ([a-fA-F0-9\:]+) \[(\w+)\] stored in bucket/
+        network[:arp][count] = Mash.new unless network[:arp][count]
+        network[:arp][count][:remote_host] = $1
+        network[:arp][count][:remote_ip] = $2
+        network[:arp][count][:remote_mac] = $3.downcase
+        count += 1
+      end
     end
+    
+    network["interfaces"] = iface
   end
 end
-
-network["interfaces"] = iface
-