ohai 6.18.0 → 6.20.0.rc.1

data/lib/ohai/mixin/command.rb

@@ -128,12 +128,12 @@ module Ohai
       #
       # Thanks Ara!
       def popen4(cmd, args={}, &b)
-	
+
 	## Disable garbage collection to work around possible bug in MRI
   # Ruby 1.8 suffers from intermittent segfaults believed to be due to GC while IO.select
   # See OHAI-330 / CHEF-2916 / CHEF-1305
 	GC.disable
-	
+
         # Waitlast - this is magic.
         #
         # Do we wait for the child process to die before we yield
@@ -329,9 +329,10 @@ module Ohai
               # have encoding methods.
               if "".respond_to?(:force_encoding) && defined?(Encoding)
                 o.string.force_encoding(Encoding.default_external)
+                o.string.encode!('UTF-8', :invalid => :replace, :undef => :replace, :replace => '?')
                 e.string.force_encoding(Encoding.default_external)
+                e.string.encode!('UTF-8', :invalid => :replace, :undef => :replace, :replace => '?')
               end
-
               b[cid, pi[0], o, e]
               results.last
             end

data/lib/ohai/mixin/gce_metadata.rb

@@ -24,7 +24,7 @@ module Ohai
       extend self
 
       GCE_METADATA_ADDR = "metadata.google.internal" unless defined?(GCE_METADATA_ADDR)
-      GCE_METADATA_URL = "/0.1/meta-data" unless defined?(GCE_METADATA_URL)
+      GCE_METADATA_URL = "/computeMetadata/v1beta1/?recursive=true" unless defined?(GCE_METADATA_URL)
 
       def can_metadata_connect?(addr, port, timeout=2)
         t = Socket.new(Socket::Constants::AF_INET, Socket::Constants::SOCK_STREAM, 0)

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

@@ -1,6 +1,7 @@
 #
-# Author:: Doug MacEachern <dougm@vmware.com>
-# Copyright:: Copyright (c) 2010 VMware, Inc.
+# Author:: Joshua Timberman <joshua@opscode.com>
+# Author:: Prabhu Das (<prabhu.das@clogeny.com>)
+# Copyright:: Copyright (c) 2013, Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,4 +17,33 @@
 # limitations under the License.
 #
 
-require_plugin "sigar::cpu"
+provides "cpu"
+
+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
+
+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/
+  	cpu[:available] += 1
+  	lsattr = from("lsattr -El #{name}").lines
+  	lsattr.each do |attribute|
+  		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

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

@@ -1,6 +1,7 @@
 #
-# Author:: Doug MacEachern <dougm@vmware.com>
-# Copyright:: Copyright (c) 2010 VMware, Inc.
+# Author:: Deepali Jagtap (<deepali.jagtap@clogeny.com>)
+# Author:: Prabhu Das (<prabhu.das@clogeny.com>)
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,4 +17,57 @@
 # limitations under the License.
 #
 
-require_plugin "sigar::filesystem"
+provides "filesystem"
+
+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
+    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]
+    end
+  end
+end
+
+# Set the filesystem data
+filesystem fs
+

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

@@ -16,4 +16,6 @@
 # limitations under the License.
 #
 
-require_plugin "sigar::hostname"
+provides "hostname"
+
+hostname from("hostname")

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

@@ -0,0 +1,27 @@
+#
+# Author:: Joshua Timberman <joshua@opscode.com>
+# Copyright:: Copyright (c) 2013 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 "kernel"
+
+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

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

@@ -1,6 +1,6 @@
 #
-# Author:: Doug MacEachern <dougm@vmware.com>
-# Copyright:: Copyright (c) 2010 VMware, Inc.
+# Author:: Joshua Timberman <joshua@opscode.com>
+# Copyright:: Copyright (c) 2013, Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,4 +16,9 @@
 # limitations under the License.
 #
 
-require_plugin "sigar::memory"
+provides "memory"
+
+memory = Mash.new
+
+meminfo = from("svmon -G -O unit=MB,summary=longreal | grep '[0-9]'")
+memory[:total], u, memory[:free] = meminfo.split

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

@@ -1,6 +1,7 @@
 #
-# Author:: Doug MacEachern <dougm@vmware.com>
-# Copyright:: Copyright (c) 2010 VMware, Inc.
+# Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
+# Author:: Prabhu Das (<prabhu.das@clogeny.com>)
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,4 +17,139 @@
 # limitations under the License.
 #
 
-require_plugin "sigar::network"
+require 'ipaddr'
+provides "network", "counters/network"
+
+# 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)
+
+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
+  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
+
+# 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
+
+      # Query the interface information
+      popen4("ifconfig #{interface}") do |if_pid, if_stdin, if_stdout, if_stderr|
+        if_stdin.close
+        if_stdout.each do |line|
+          case line
+          when /^#{interface}:\sflags=\S+<(\S+)>/
+            iface[interface][:flags] = $1.split(',')
+            iface[interface][:metric] = $1 if line =~ /metric\s(\S+)/
+          else
+            # We have key value pairs.
+            if line =~ /inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(\/(\d{1,2}))?/
+              tmp_addr, tmp_prefix = $1, $3
+              if tmp_prefix.nil?
+                netmask = hex_to_dec_netmask($1) if line =~ /netmask\s(\S+)\s/
+                unless netmask
+                  tmp_prefix ||= "32"
+                  netmask = IPAddr.new("255.255.255.255").mask(tmp_prefix.to_i).to_s
+                end
+              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
+            elsif line =~ /inet6 ([a-f0-9\:%]+)\/(\d+)/
+              # TODO do we have more properties on inet6 in aix? broadcast
+              iface[interface][:addresses] = Mash.new unless iface[interface][:addresses]
+              iface[interface][:addresses][$1] = { "family" => "inet6", "prefixlen" => $2 }
+            else
+              # load all key-values, example "tcp_sendspace 131072 tcp_recvspace 131072 rfc1323 1"
+              properties = line.split
+              n = properties.length/2 - 1
+              (0..n).each do |i|
+                iface[interface][properties[i*2]] = properties[(i*2+1)]
+              end
+            end
+          end
+        end
+      end  #ifconfig stdout
+
+      # Query macaddress
+      popen4("entstat -d #{interface} | grep \"Hardware Address\"") do |e_pid, e_stdin, e_stdout, e_stderr|
+        e_stdin.close
+        iface[interface][:addresses] = Mash.new unless iface[interface][:addresses]
+        e_stdout.each do |line|
+          iface[interface][:addresses][$1.upcase] = { "family" => "lladdr" } if line =~ /Hardware Address: (\S+)/
+        end
+      end
+    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)
+      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
+    end
+  end
+end
+
+network["interfaces"] = iface
+

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

@@ -1,6 +1,6 @@
 #
-# Author:: Doug MacEachern <dougm@vmware.com>
-# Copyright:: Copyright (c) 2010 VMware, Inc.
+# Author:: Joshua Timberman <joshua@opscode.com>
+# Copyright:: Copyright (c) 2013, Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,4 +16,10 @@
 # limitations under the License.
 #
 
-require_plugin "sigar::platform"
+require_plugin "#{os}::kernel"
+
+provides "platform", "platform_version", "platform_family"
+
+platform kernel[:name]
+platform_version [kernel[:version], kernel[:release]].join(".")
+platform_family platform

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

@@ -1,6 +1,6 @@
 #
-# Author:: Doug MacEachern <dougm@vmware.com>
-# Copyright:: Copyright (c) 2010 VMware, Inc.
+# Author:: Kurt Yoder (<ktyopscode@yoderhome.com>)
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,5 +15,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+require 'date'
 
-require_plugin "sigar::uptime"
+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/cloud.rb

@@ -35,20 +35,27 @@ end
 # Google Compute Engine (gce)
 #--------------------------------------
 
+# Is current cloud gce?
+#
+# === Return
+# true:: If gce Hash is defined
+# false:: Otherwise
 def on_gce?
   gce != nil
 end
+
+# Fill cloud hash with gce values
 def get_gce_values
   cloud[:public_ipv4] = []
   cloud[:local_ipv4] = []
 
-  public_ips = gce['network']["networkInterface"].collect do |interface|
-    if interface.has_key?('accessConfiguration')
-      interface['accessConfiguration'].collect{|ac| ac['externalIp']}
+  public_ips = gce['instance']["networkInterfaces"].collect do |interface|
+    if interface.has_key?('accessConfigs')
+      interface['accessConfigs'].collect{|ac| ac['externalIp']}
     end
   end.flatten.compact
 
-  private_ips = gce['network']["networkInterface"].collect do |interface|
+  private_ips = gce['instance']["networkInterfaces"].collect do |interface|
     interface['ip']
   end.compact
   
@@ -57,7 +64,7 @@ def get_gce_values
   cloud[:public_ipv4] +=  public_ips
   cloud[:public_hostname] = nil
   cloud[:local_ipv4] += private_ips
-  cloud[:local_hostname] = gce['hostname']
+  cloud[:local_hostname] = gce['instance']['hostname']
   cloud[:provider] = "gce"
 end
 
@@ -244,4 +251,4 @@ end
 if on_azure?
   create_objects
   get_azure_values
-end
+end