ohai 6.24.2 → 7.0.0.rc.0

data/lib/ohai/plugins/rackspace.rb

@@ -14,96 +14,101 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-provides "rackspace"
+Ohai.plugin(:Rackspace) do
+  provides "rackspace"
 
-require_plugin "kernel"
-require_plugin "network"
+  depends "kernel", "network/interfaces"
 
-# Checks for matching rackspace kernel name
-#
-# === Return
-# true:: If kernel name matches
-# false:: Otherwise
-def has_rackspace_kernel?
-  kernel[:release].split('-').last.eql?("rscloud")
-end
+  # Checks for matching rackspace kernel name
+  #
+  # === Return
+  # true:: If kernel name matches
+  # false:: Otherwise
+  def has_rackspace_kernel?
+    kernel[:release].split('-').last.eql?("rscloud")
+  end
 
-# Checks for rackspace provider attribute
-#
-# === Return
-# true:: If rackspace provider attribute found
-# false:: Otherwise
-def has_rackspace_metadata?
-  status, stdout, stderr = run_command(:no_status_check => true, :command => "xenstore-read vm-data/provider_data/provider")
-  if status == 0
-    stdout.strip.downcase == 'rackspace'
+  # Checks for rackspace provider attribute
+  #
+  # === Return
+  # true:: If rackspace provider attribute found
+  # false:: Otherwise
+  def has_rackspace_metadata?
+    so = shell_out("xenstore-read vm-data/provider_data/provider")
+    if so.exitstatus == 0
+      so.stdout.strip.downcase == 'rackspace'
+    end
+  rescue Ohai::Exceptions::Exec
+    false
   end
-rescue Ohai::Exceptions::Exec
-  false
-end
 
-# Identifies the rackspace cloud
-#
-# === Return
-# true:: If the rackspace cloud can be identified
-# false:: Otherwise
-def looks_like_rackspace?
-  hint?('rackspace') || has_rackspace_metadata? || has_rackspace_kernel?
-end
+  # Identifies the rackspace cloud
+  #
+  # === Return
+  # true:: If the rackspace cloud can be identified
+  # false:: Otherwise
+  def looks_like_rackspace?
+    hint?('rackspace') || has_rackspace_metadata? || has_rackspace_kernel?
+  end
 
-# Names rackspace ip address
-#
-# === Parameters
-# name<Symbol>:: Use :public_ip or :private_ip
-# eth<Symbol>:: Interface name of public or private ip
-def get_ip_address(name, eth)
-  network[:interfaces][eth][:addresses].each do |key, info|
-    if info['family'] == 'inet'
-      rackspace[name] = key
-      break # break when we found an address
+  # Names rackspace ip address
+  #
+  # === Parameters
+  # name<Symbol>:: Use :public_ip or :private_ip
+  # eth<Symbol>:: Interface name of public or private ip
+  def get_ip_address(name, eth)
+    network[:interfaces][eth][:addresses].each do |key, info|
+      if info['family'] == 'inet'
+        rackspace[name] = key
+        break # break when we found an address
+      end
     end
   end
-end
 
-# Names rackspace ipv6 address for interface
-#
-# === Parameters
-# name<Symbol>:: Use :public_ip or :private_ip
-# eth<Symbol>:: Interface name of public or private ip
-def get_global_ipv6_address(name, eth)
-  network[:interfaces][eth][:addresses].each do |key, info|
-    # check if we got an ipv6 address and if its in global scope
-    if info['family'] == 'inet6' && info['scope'] == 'Global'
-      rackspace[name] = key
-      break # break when we found an address
+  # Names rackspace ipv6 address for interface
+  #
+  # === Parameters
+  # name<Symbol>:: Use :public_ip or :private_ip
+  # eth<Symbol>:: Interface name of public or private ip
+  def get_global_ipv6_address(name, eth)
+    network[:interfaces][eth][:addresses].each do |key, info|
+      # check if we got an ipv6 address and if its in global scope
+      if info['family'] == 'inet6' && info['scope'] == 'Global'
+        rackspace[name] = key
+        break # break when we found an address
+      end
     end
   end
-end
 
-# Get the rackspace region
-#
-def get_region()
-  status, stdout, stderr = run_command(:no_status_check => true, :command => "xenstore-ls vm-data/provider_data")
-  if status == 0
-    stdout.split("\n").each do |line|
-      rackspace[:region] = line.split[2].delete('\"') if line =~ /^region/
+  # Get the rackspace region
+  #
+  def get_region()
+    so = shell_out("xenstore-ls vm-data/provider_data")
+    if so.exitstatus == 0
+      so.stdout.split("\n").each do |line|
+        rackspace[:region] = line.split[2].delete('\"') if line =~ /^region/
+      end
     end
+  rescue Ohai::Exceptions::Exec
+    Ohai::Log.debug("Unable to find xenstore-ls, cannot capture region information for Rackspace cloud")
   end
-rescue Ohai::Exceptions::Exec
-  Ohai::Log.debug("Unable to find xenstore-ls, cannot capture region information for Rackspace cloud")
-end
 
-# Adds rackspace Mash
-if looks_like_rackspace?
-  rackspace Mash.new
-  get_ip_address(:public_ip, :eth0)
-  get_ip_address(:private_ip, :eth1)
-  get_region()
-  # public_ip + private_ip are deprecated in favor of public_ipv4 and local_ipv4 to standardize.
-  rackspace[:public_ipv4] = rackspace[:public_ip]
-  get_global_ipv6_address(:public_ipv6, :eth0)
-  rackspace[:public_hostname] = "#{rackspace[:public_ip].gsub('.','-')}.static.cloud-ips.com"
-  rackspace[:local_ipv4] = rackspace[:private_ip]
-  get_global_ipv6_address(:local_ipv6, :eth1)
-  rackspace[:local_hostname] = hostname
+  collect_data do
+    # Adds rackspace Mash
+    if looks_like_rackspace?
+      rackspace Mash.new
+      get_ip_address(:public_ip, :eth0)
+      get_ip_address(:private_ip, :eth1)
+      get_region()
+      # public_ip + private_ip are deprecated in favor of public_ipv4 and local_ipv4 to standardize.
+      rackspace[:public_ipv4] = rackspace[:public_ip]
+      get_global_ipv6_address(:public_ipv6, :eth0)
+      unless rackspace[:public_ip].nil?
+        rackspace[:public_hostname] = "#{rackspace[:public_ip].gsub('.','-')}.static.cloud-ips.com"
+      end
+      rackspace[:local_ipv4] = rackspace[:private_ip]
+      get_global_ipv6_address(:local_ipv6, :eth1)
+      rackspace[:local_hostname] = hostname
+    end
+  end
 end

data/lib/ohai/plugins/root_group.rb

@@ -15,14 +15,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-provides 'root_group'
+Ohai.plugin(:RootGroup) do
+  provides 'root_group'
 
-case ::RbConfig::CONFIG['host_os']
-when /mswin|mingw32|windows/
-  # TODO: OHAI-491
-  # http://tickets.opscode.com/browse/OHAI-491
-  # The windows implementation of this plugin has been removed because of
-  # performance considerations (see: OHAI-490).
-else
-  root_group Etc.getgrgid(Etc.getpwnam('root').gid).name
+  collect_data do
+    case ::RbConfig::CONFIG['host_os']
+    when /mswin|mingw32|windows/
+      # TODO: OHAI-491
+      # http://tickets.opscode.com/browse/OHAI-491
+      # The windows implementation of this plugin has been removed because of
+      # performance considerations (see: OHAI-490).
+    else
+      root_group Etc.getgrgid(Etc.getpwnam('root').gid).name
+    end
+  end
 end

data/lib/ohai/plugins/ruby.rb

@@ -16,60 +16,62 @@
 # limitations under the License.
 #
 
-provides "languages/ruby"
+Ohai.plugin(:Ruby) do
+  provides "languages/ruby"
 
-require_plugin "languages"
+  depends "languages"
 
+  def run_ruby(command)
+    cmd = "ruby -e \"require 'rbconfig'; #{command}\""
+    so = shell_out(cmd)
+    so.stdout.strip
+  end
 
-def run_ruby(command)
-  cmd = "ruby -e \"require 'rbconfig'; #{command}\""
-  status, stdout, stderr = run_command(:no_status_check => true, :command => cmd)
-  stdout.strip
-end
-
+  collect_data do
+    languages[:ruby] = Mash.new
 
-languages[:ruby] = Mash.new
+    values = {
+      :platform => "RUBY_PLATFORM",
+      :version => "RUBY_VERSION",
+      :release_date => "RUBY_RELEASE_DATE",
+      :target => "::Config::CONFIG['target']",
+      :target_cpu => "::Config::CONFIG['target_cpu']",
+      :target_vendor => "::Config::CONFIG['target_vendor']",
+      :target_os => "::Config::CONFIG['target_os']",
+      :host => "::Config::CONFIG['host']",
+      :host_cpu => "::Config::CONFIG['host_cpu']",
+      :host_os => "::Config::CONFIG['host_os']",
+      :host_vendor => "::Config::CONFIG['host_vendor']",
+      :bin_dir => "::Config::CONFIG['bindir']",
+      :ruby_bin => "::File.join(::Config::CONFIG['bindir'], ::Config::CONFIG['ruby_install_name'])"
+    }
 
-values = {
-  :platform => "RUBY_PLATFORM",
-  :version => "RUBY_VERSION",
-  :release_date => "RUBY_RELEASE_DATE",
-  :target => "::Config::CONFIG['target']",
-  :target_cpu => "::Config::CONFIG['target_cpu']",
-  :target_vendor => "::Config::CONFIG['target_vendor']",
-  :target_os => "::Config::CONFIG['target_os']",
-  :host => "::Config::CONFIG['host']",
-  :host_cpu => "::Config::CONFIG['host_cpu']",
-  :host_os => "::Config::CONFIG['host_os']",
-  :host_vendor => "::Config::CONFIG['host_vendor']",
-  :bin_dir => "::Config::CONFIG['bindir']",
-  :ruby_bin => "::File.join(::Config::CONFIG['bindir'], ::Config::CONFIG['ruby_install_name'])"
-}
+    # Create a query string from above hash
+    env_string = ""
+    values.keys.each do |v| 
+      env_string << "#{v}=\#{#{values[v]}},"
+    end
 
-# Create a query string from above hash
-env_string = ""
-values.keys.each do |v| 
-  env_string << "#{v}=\#{#{values[v]}},"
-end
+    # Query the system ruby
+    result = run_ruby "puts %Q(#{env_string})"
 
-# Query the system ruby
-result = run_ruby "puts %Q(#{env_string})"
-
-# Parse results to plugin hash
-result.split(',').each do |entry|
- key, value = entry.split('=')
- languages[:ruby][key.to_sym] = value || ""
-end
+    # Parse results to plugin hash
+    result.split(',').each do |entry|
+      key, value = entry.split('=')
+      languages[:ruby][key.to_sym] = value || ""
+    end
 
-# Perform one more (conditional) query
-bin_dir = languages[:ruby][:bin_dir]
-ruby_bin = languages[:ruby][:ruby_bin]
-gem_binaries = [ 
-  run_ruby("require 'rubygems'; puts ::Gem.default_exec_format % 'gem'"),
-  "gem"
-].map {|bin| ::File.join(bin_dir, bin)}
-gem_binary = gem_binaries.find {|bin| ::File.exists? bin }
-if gem_binary
-  languages[:ruby][:gems_dir] = run_ruby "puts %x{#{ruby_bin} #{gem_binary} env gemdir}.chomp!"
-  languages[:ruby][:gem_bin] = gem_binary
+    # Perform one more (conditional) query
+    bin_dir = languages[:ruby][:bin_dir]
+    ruby_bin = languages[:ruby][:ruby_bin]
+    gem_binaries = [ 
+                    run_ruby("require 'rubygems'; puts ::Gem.default_exec_format % 'gem'"),
+                    "gem"
+                   ].map {|bin| ::File.join(bin_dir, bin)}
+    gem_binary = gem_binaries.find {|bin| ::File.exists? bin }
+    if gem_binary
+      languages[:ruby][:gems_dir] = run_ruby "puts %x{#{ruby_bin} #{gem_binary} env gemdir}.chomp!"
+      languages[:ruby][:gem_bin] = gem_binary
+    end
+  end
 end

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

@@ -16,25 +16,29 @@
 # limitations under the License.
 #
 
-require "sigar"
+Ohai.plugin(:CPU) do
+  provides "cpu"
 
-sigar = Sigar.new
+  collect_data(:hpux, :default) do
+    require 'sigar'
 
-provides "cpu"
+    sigar = Sigar.new
 
-cpuinfo = Mash.new
-ix = 0
+    cpuinfo = Mash.new
+    ix = 0
 
-sigar.cpu_info_list.each do |info|
-  current_cpu = ix.to_s
-  ix += 1
-  cpuinfo[current_cpu] = Mash.new
-  cpuinfo[current_cpu]["vendor_id"] = info.vendor
-  cpuinfo[current_cpu]["model"] = info.model
-  cpuinfo[current_cpu]["mhz"] = info.mhz.to_s
-  cpuinfo[current_cpu]["cache_size"] = info.cache_size.to_s
-  cpuinfo[:total] = info.total_cores
-  cpuinfo[:real] = info.total_sockets
-end
+    sigar.cpu_info_list.each do |info|
+      current_cpu = ix.to_s
+      ix += 1
+      cpuinfo[current_cpu] = Mash.new
+      cpuinfo[current_cpu]["vendor_id"] = info.vendor
+      cpuinfo[current_cpu]["model"] = info.model
+      cpuinfo[current_cpu]["mhz"] = info.mhz.to_s
+      cpuinfo[current_cpu]["cache_size"] = info.cache_size.to_s
+      cpuinfo[:total] = info.total_cores
+      cpuinfo[:real] = info.total_sockets
+    end
 
-cpu cpuinfo
+    cpu cpuinfo
+  end
+end

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

@@ -16,32 +16,35 @@
 # limitations under the License.
 #
 
-provides "filesystem"
+Ohai.plugin(:Filesystem) do
+  provides "filesystem"
 
-require "sigar"
+  collect_data(:hpux, :default) do
+    require "sigar"
+    sigar = Sigar.new
 
-fs = Mash.new
+    fs = Mash.new
 
-sigar = Sigar.new
+    sigar.file_system_list.each do |fsys|
+      filesystem = fsys.dev_name
+      fs[filesystem] = Mash.new
+      fs[filesystem][:mount] = fsys.dir_name
+      fs[filesystem][:fs_type] = fsys.sys_type_name
+      fs[filesystem][:mount_options] = fsys.options
+      begin
+        usage = sigar.file_system_usage(fsys.dir_name)
+        fs[filesystem][:kb_size] = (usage.total / 1024).to_s
+        fs[filesystem][:kb_used] = ((usage.total - usage.free) / 1024).to_s
+        fs[filesystem][:kb_available] = (usage.free / 1024).to_s
+        fs[filesystem][:percent_used] = (usage.use_percent * 100).to_s + '%'
+      rescue SystemExit => e
+        raise
+      rescue Exception => e
+        #e.g. floppy or cdrom drive
+      end
+    end
 
-sigar.file_system_list.each do |fsys|
-  filesystem = fsys.dev_name
-  fs[filesystem] = Mash.new
-  fs[filesystem][:mount] = fsys.dir_name
-  fs[filesystem][:fs_type] = fsys.sys_type_name
-  fs[filesystem][:mount_options] = fsys.options
-  begin
-    usage = sigar.file_system_usage(fsys.dir_name)
-    fs[filesystem][:kb_size] = (usage.total / 1024).to_s
-    fs[filesystem][:kb_used] = ((usage.total - usage.free) / 1024).to_s
-    fs[filesystem][:kb_available] = (usage.free / 1024).to_s
-    fs[filesystem][:percent_used] = (usage.use_percent * 100).to_s + '%'
-  rescue SystemExit => e
-    raise
-  rescue Exception => e
-    #e.g. floppy or cdrom drive
+    # Set the filesystem data
+    filesystem fs
   end
 end
-
-# Set the filesystem data
-filesystem fs

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

@@ -16,21 +16,24 @@
 # limitations under the License.
 #
 
-require "sigar"
+Ohai.plugin(:Memory) do
+  provides "memory"
 
-sigar = Sigar.new
+  collect_data(:hpux, :default) do
+    require "sigar"
+    sigar = Sigar.new
 
-provides "memory"
+    memory Mash.new
+    memory[:swap] = Mash.new
 
-memory Mash.new
-memory[:swap] = Mash.new
+    mem = sigar.mem
+    swap = sigar.swap
 
-mem = sigar.mem
-swap = sigar.swap
-
-memory[:total] = (mem.total / 1024).to_s + "kB"
-memory[:free] = (mem.free / 1024).to_s + "kB"
-memory[:used] = (mem.used / 1024).to_s + "kB"
-memory[:swap][:total] = (swap.total / 1024).to_s + "kB"
-memory[:swap][:free] = (swap.free / 1024).to_s + "kB"
-memory[:swap][:used] = (swap.used / 1024).to_s + "kB"
+    memory[:total] = (mem.total / 1024).to_s + "kB"
+    memory[:free] = (mem.free / 1024).to_s + "kB"
+    memory[:used] = (mem.used / 1024).to_s + "kB"
+    memory[:swap][:total] = (swap.total / 1024).to_s + "kB"
+    memory[:swap][:free] = (swap.free / 1024).to_s + "kB"
+    memory[:swap][:used] = (swap.used / 1024).to_s + "kB"
+  end
+end