ohai 7.0.4 → 7.2.0.alpha.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6729868c6cff750ce13aa0689430d6eebd60c53
-  data.tar.gz: ac65f41df0182aef053b34bba00b83da50660537
+  metadata.gz: 81416c96c35d5769f24aae74567e9937a5e1798a
+  data.tar.gz: 44012ca9a21be521454fe2123e73391c31f9177d
 SHA512:
-  metadata.gz: 7de0db00561efe99995bd91cb25df7d7b8e870ebd14fa525a24dfe7a22dfa512926dea50123dc082e24d9cc2a26be8cd1d5e5a7b4e950c88c4fc2200ce409223
-  data.tar.gz: e2756cb9394f91175100d209537e1deb9ad53642a8a05359ded89348775000e8cb55203e16b0dd7687da895287db49a5a4965994d63d8958c81dd91dd4cf949e
+  metadata.gz: 3d77a851d7feb9394295e5c5165b1a5ea2e97c1e4364e945e931fb177dcbd052c4aa3cf9600f64bcd07468780b6a468d1db070126e61e88d526a3fd65353eaca
+  data.tar.gz: 9e8fca70a6e332456131d6e770a538253a29f739639776f1276d6f3dc849cee3487b6410592fb0404a1e943eca06794d44260696f69e16815b0c231a57744beb

data/README.md

@@ -0,0 +1,93 @@
+# ohai
+
+# DESCRIPTION:
+
+Ohai detects data about your operating system. It can be used
+standalone, but it's primary purpose is to provide node data to Chef.
+
+Ohai will print out a JSON data blob for all the known data about your
+system. When used with Chef, that data is reported back via node
+attributes.
+
+Chef distributes ohai as a RubyGem. This README is for developers who
+want to modify the Ohai source code. For users who want to write plugins
+for Ohai, see the docs:
+
+* General documentation: http://docs.opscode.com/ohai.html
+* Custom plugin documentation: http://docs.opscode.com/ohai_custom.html
+
+# DEVELOPMENT:
+
+Before working on the code, if you plan to contribute your changes, you
+should read the contributing guidelines:
+
+* https://github.com/opscode/ohai/blob/master/CONTRIBUTING.md
+
+The basic process for contributing is:
+
+1. Fork this repo on GitHub.
+2. Create a feature branch for your work.
+3. Make your change, including tests.
+4. Submit a pull request.
+
+# ENVIRONMENT:
+
+Ohai's development dependencies should be installed with bundler. Just
+run `bundle install` in the root of the repo.
+
+## Spec Testing:
+
+We use RSpec for unit/spec tests. To run the full suite, run:
+
+    bundle exec rake spec
+
+You can run individual test files by running the rspec executable:
+
+    bundle exec rspec spec/unit/FILE.rb
+
+## Rake Tasks
+
+Ohai has some Rake tasks for doing various things.
+
+    rake -T
+    rake clobber_package  # Remove package products
+    rake gem              # Build the gem file ohai-$VERSION.gem
+    rake install          # install the gem locally
+    rake make_spec        # create a gemspec file
+    rake package          # Build all the packages
+    rake repackage        # Force a rebuild of the package files
+    rake spec             # Run specs
+  
+    ($VERSION is the current version, from the GemSpec in Rakefile)
+
+# LINKS:
+
+Source:
+
+* http://github.com/opscode/ohai/tree/master
+
+Tickets/Issues:
+
+* http://tickets.opscode.com/
+
+(Use the OHAI project)
+
+# LICENSE:
+
+Ohai - system information application
+
+Author:: Adam Jacob (<adam@getchef.com>)
+Copyright:: Copyright (c) 2008-2014 Chef Software, 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.

data/bin/ohai

@@ -39,13 +39,4 @@ rescue LoadError
   raise
 end
 
-if RUBY_PLATFORM =~ /mswin|mingw32|windows/
-  begin
-    require 'ruby-wmi'
-  rescue LoadError
-    STDERR.puts "ruby-wmi failed to load - is it installed?"
-    raise
-  end
-end
-
 Ohai::Application.new.run

data/lib/ohai/mixin/ec2_metadata.rb

@@ -99,9 +99,10 @@ module Ohai
       end
 
       def metadata_get(id, api_version)
-        response = http_client.get("/#{api_version}/meta-data/#{id}")
+        path = "/#{api_version}/meta-data/#{id}"
+        response = http_client.get(path)
         unless response.code == '200'
-          raise "Encountered error retrieving EC2 metadata (returned #{response.code} response)"
+          raise "Encountered error retrieving EC2 metadata (#{path} returned #{response.code} response)"
         end
         response
       end

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

@@ -24,12 +24,15 @@ Ohai.plugin(:CPU) do
     # identical processors is probably a hardware requirement so we'll duplicate data for each cpu
     # old examples: http://www.bnv-bamberg.de/home/ba3294/smp/rbuild/index.htm
     cpuinfo = Mash.new
+    cpuinfo["flags"] = []
 
     # /var/run/dmesg.boot
-    #CPU: QEMU Virtual CPU version 0.9.1 (1862.02-MHz 686-class CPU)
-    #  Origin = "GenuineIntel"  Id = 0x623  Stepping = 3
-    #  Features=0x78bfbfd<FPU,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CLFLUSH,MMX,FXSR,SSE,SSE2>
-    #  Features2=0x80000001<SSE3,<b31>>
+    # CPU: Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz (3516.61-MHz K8-class CPU)
+    # Origin = "GenuineIntel"  Id = 0x306a9  Family = 6  Model = 3a  Stepping = 9
+    # Features=0x783fbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,MMX,FXSR,SSE,SSE2>
+    # Features2=0x209<SSE3,MON,SSSE3>
+    # AMD Features=0x28100800<SYSCALL,NX,RDTSCP,LM>
+    # AMD Features2=0x1<LAHF>
 
     File.open("/var/run/dmesg.boot").each do |line|
       case line
@@ -39,9 +42,9 @@ Ohai.plugin(:CPU) do
       when /Origin = "(.+)"\s+Id = (.+)\s+Stepping = (.+)/
         cpuinfo["vendor_id"] = $1
         cpuinfo["stepping"] = $3
-        # These _should_ match /AMD Features2?/ lines as well 
+        # These _should_ match /AMD Features2?/ lines as well
       when /Features=.+<(.+)>/
-        cpuinfo["flags"] = $1.downcase.split(',')
+        cpuinfo["flags"].concat($1.downcase.split(','))
         # Features2=0x80000001<SSE3,<b31>>
       when /Features2=[a-f\dx]+<(.+)>/
         cpuinfo["flags"].concat($1.downcase.split(','))

data/lib/ohai/plugins/freebsd/virtualization.rb

@@ -54,7 +54,7 @@ Ohai.plugin(:Virtualization) do
     # Detect KVM/QEMU from cpu, report as KVM
     # hw.model: QEMU Virtual CPU version 0.9.1
     so = shell_out("sysctl -n hw.model")
-    if so.stdout.split($/)[0] =~ /QEMU Virtual CPU/
+    if so.stdout.split($/)[0] =~ /QEMU Virtual CPU|Common KVM processor|Common 32-bit KVM processor/
       virtualization[:system] = "kvm"
       virtualization[:role] = "guest"
     end
@@ -83,7 +83,7 @@ Ohai.plugin(:Virtualization) do
         when /Manufacturer: VMware/
           found_virt_manufacturer = "vmware"
         when /Product Name: VMware Virtual Platform/
-          if found_virt_manufacturer == "vmware" 
+          if found_virt_manufacturer == "vmware"
             virtualization[:system] = "vmware"
             virtualization[:role] = "guest"
           end

data/lib/ohai/plugins/hostname.rb

@@ -145,12 +145,14 @@ Ohai.plugin(:Hostname) do
   end
 
   collect_data(:windows) do
-    require 'ruby-wmi'
+    require 'wmi-lite/wmi'
     require 'socket'
 
-    host = WMI::Win32_ComputerSystem.find(:first)
-    hostname "#{host.Name}"
-    machinename "#{host.Name}"
+    wmi = WmiLite::Wmi.new
+    host = wmi.first_of('Win32_ComputerSystem')
+
+    hostname "#{host['name']}"
+    machinename "#{host['name']}"
 
     info = Socket.gethostbyname(Socket.gethostname)
     if info.first =~ /.+?\.(.*)/

data/lib/ohai/plugins/kernel.rb

@@ -155,15 +155,19 @@ Ohai.plugin(:Kernel) do
   end
 
   collect_data(:windows) do
-    require 'ruby-wmi'
+    require 'win32ole'
+    require 'wmi-lite/wmi'
+
     WIN32OLE.codepage = WIN32OLE::CP_UTF8
 
+    wmi = WmiLite::Wmi.new
+
     kernel Mash.new
 
-    host = WMI::Win32_OperatingSystem.find(:first)
+    host = wmi.first_of('Win32_OperatingSystem')
     kernel[:os_info] = Mash.new
-    host.properties_.each do |p|
-      kernel[:os_info][p.name.wmi_underscore.to_sym] = host.send(p.name)
+    host.wmi_ole_object.properties_.each do |p|
+      kernel[:os_info][p.name.wmi_underscore.to_sym] = host[p.name.downcase]
     end
 
     kernel[:name] = "#{kernel[:os_info][:caption]}"
@@ -171,10 +175,10 @@ Ohai.plugin(:Kernel) do
     kernel[:version] = "#{kernel[:os_info][:version]} #{kernel[:os_info][:csd_version]} Build #{kernel[:os_info][:build_number]}"
     kernel[:os] = os_lookup(kernel[:os_info][:os_type]) || languages[:ruby][:host_os]
 
-    host = WMI::Win32_ComputerSystem.find(:first)
+    host = wmi.first_of('Win32_ComputerSystem')
     kernel[:cs_info] = Mash.new
-    host.properties_.each do |p|
-      kernel[:cs_info][p.name.wmi_underscore.to_sym] = host.send(p.name)
+    host.wmi_ole_object.properties_.each do |p|
+      kernel[:cs_info][p.name.wmi_underscore.to_sym] = host[p.name.downcase]
     end
 
     kernel[:machine] = machine_lookup("#{kernel[:cs_info][:system_type]}")
@@ -182,16 +186,16 @@ Ohai.plugin(:Kernel) do
     kext = Mash.new
     pnp_drivers = Mash.new
 
-    drivers = WMI::Win32_PnPSignedDriver.find(:all)
+    drivers = wmi.instances_of('Win32_PnPSignedDriver')
     drivers.each do |driver|
-      pnp_drivers[driver.DeviceID] = Mash.new
-      driver.properties_.each do |p|
-        pnp_drivers[driver.DeviceID][p.name.wmi_underscore.to_sym] = driver.send(p.name)
+      pnp_drivers[driver['deviceid']] = Mash.new
+      driver.wmi_ole_object.properties_.each do |p|
+        pnp_drivers[driver['deviceid']][p.name.wmi_underscore.to_sym] = driver[p.name.downcase]
       end
-      if driver.DeviceName
-        kext[driver.DeviceName] = pnp_drivers[driver.DeviceID]
-        kext[driver.DeviceName][:version] = pnp_drivers[driver.DeviceID][:driver_version]
-        kext[driver.DeviceName][:date] = pnp_drivers[driver.DeviceID][:driver_date] ? pnp_drivers[driver.DeviceID][:driver_date].to_s[0..7] : nil
+      if driver['devicename']
+        kext[driver['devicename']] = pnp_drivers[driver['deviceid']]
+        kext[driver['devicename']][:version] = pnp_drivers[driver['deviceid']][:driver_version]
+        kext[driver['devicename']][:date] = pnp_drivers[driver['deviceid']][:driver_date] ? pnp_drivers[driver['deviceid']][:driver_date].to_s[0..7] : nil
       end
     end
 

data/lib/ohai/plugins/linux/mdadm.rb

@@ -0,0 +1,75 @@
+#
+# Author:: Tim Smith <tsmith@limelight.com>
+# Copyright:: Copyright (c) 2013-2014, Limelight Networks, Inc.
+# Plugin:: mdadm
+#
+# 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.
+#
+
+Ohai.plugin(:Mdadm) do
+  provides 'mdadm'
+
+  def create_raid_device_mash(stdout)
+    device_mash = Mash.new
+    device_mash[:device_counts] = Mash.new
+    stdout.lines.each do |line|
+      case line
+      when /Version\s+: ([0-9.]+)/
+        device_mash[:version] = Regexp.last_match[1].to_f
+      when /Raid Level\s+: raid([0-9]+)/
+        device_mash[:level] = Regexp.last_match[1].to_i
+      when /Array Size.*\(([0-9.]+)/
+        device_mash[:size] = Regexp.last_match[1].to_f
+      when /State\s+: ([a-z]+)/
+        device_mash[:state] = Regexp.last_match[1]
+      when /Total Devices\s+: ([0-9]+)/
+        device_mash[:device_counts][:total] = Regexp.last_match[1].to_i
+      when /Raid Devices\s+: ([0-9]+)/
+        device_mash[:device_counts][:raid] = Regexp.last_match[1].to_i
+      when /Working Devices\s+: ([0-9]+)/
+        device_mash[:device_counts][:working] = Regexp.last_match[1].to_i
+      when /Failed Devices\s+: ([0-9]+)/
+        device_mash[:device_counts][:failed] = Regexp.last_match[1].to_i
+      when /Active Devices\s+: ([0-9]+)/
+        device_mash[:device_counts][:active] = Regexp.last_match[1].to_i
+      when /Spare Devices\s+: ([0-9]+)/
+        device_mash[:device_counts][:spare] = Regexp.last_match[1].to_i
+      end
+    end
+    device_mash
+  end
+
+  collect_data(:linux) do
+    # gather a list of all raid arrays
+    if File.exist?('/proc/mdstat')
+      devices = []
+      File.open('/proc/mdstat').each do |line|
+        devices << Regexp.last_match[1] if line =~ /(md[0-9]+)/
+      end
+
+      # create the mdadm mash and gather individual information if devices are present
+      unless devices.empty?
+        mdadm Mash.new
+        devices.sort.each do |device|
+          mdadm[device] = Mash.new
+
+          # gather detailed information on the array
+          so = shell_out("mdadm --detail /dev/#{device}")
+
+          # if the mdadm command was sucessful pass so.stdout to create_raid_device_mash to grab the tidbits we want
+          mdadm[device] = create_raid_device_mash(so.stdout) if so.stdout
+        end
+      end
+    end
+  end
+end

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

@@ -46,7 +46,7 @@ Ohai.plugin(:Network) do
     # Match the lead line for an interface from iproute2
     # 3: eth0.11@eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP
     # The '@eth0:' portion doesn't exist on primary interfaces and thus is optional in the regex
-    IPROUTE_INT_REGEX = /^(\d+): ([0-9a-zA-Z@:\.\-_]*?)(@[0-9a-zA-Z]+|):\s/
+    IPROUTE_INT_REGEX = /^(\d+): ([0-9a-zA-Z@:\.\-_]*?)(@[0-9a-zA-Z]+|):\s/ unless defined? IPROUTE_INT_REGEX
 
     if File.exist?("/sbin/ip")
 

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

@@ -83,6 +83,10 @@ Ohai.plugin(:Platform) do
       platform "arch"
       # no way to determine platform_version in a rolling release distribution
       # kernel release will be used - ex. 2.6.32-ARCH
+    elsif File.exists?('/etc/exherbo-release')
+      platform "exherbo"
+      # no way to determine platform_version in a rolling release distribution
+      # kernel release will be used - ex. 3.13
     elsif lsb[:id] =~ /RedHat/i
       platform "redhat"
       platform_version lsb[:release]
@@ -115,6 +119,8 @@ Ohai.plugin(:Platform) do
       platform_family "slackware"
     when /arch/
       platform_family "arch"
+    when /exherbo/
+      platform_family "exherbo"
     end
   end
 end

data/lib/ohai/plugins/linux/virtualization.rb

@@ -16,11 +16,20 @@
 # limitations under the License.
 #
 
+require 'ohai/util/file_helper'
+
+include Ohai::Util::FileHelper
+
 Ohai.plugin(:Virtualization) do
   provides "virtualization"
 
+  def lxc_version_exists?
+    which('lxc-version')
+  end
+
   collect_data(:linux) do
-    virtualization Mash.new
+    virtualization Mash.new unless virtualization
+    virtualization[:systems] = Mash.new unless virtualization[:systems]
 
     # if it is possible to detect paravirt vs hardware virt, it should be put in
     # virtualization[:mechanism]
@@ -31,11 +40,13 @@ Ohai.plugin(:Virtualization) do
       virtualization[:system] = "xen"
       # Assume guest
       virtualization[:role] = "guest"
+      virtualization[:systems][:xen] = "guest"
 
       # This file should exist on most Xen systems, normally empty for guests
       if File.exists?("/proc/xen/capabilities")
         if File.read("/proc/xen/capabilities") =~ /control_d/i
           virtualization[:role] = "host"
+          virtualization[:systems][:xen] = "host"
         end
       end
     end
@@ -53,12 +64,15 @@ Ohai.plugin(:Virtualization) do
       if modules =~ /^kvm/
         virtualization[:system] = "kvm"
         virtualization[:role] = "host"
+        virtualization[:systems][:kvm] = "host"
       elsif modules =~ /^vboxdrv/
         virtualization[:system] = "vbox"
         virtualization[:role] = "host"
+        virtualization[:systems][:vbox] = "host"
       elsif modules =~ /^vboxguest/
         virtualization[:system] = "vbox"
         virtualization[:role] = "guest"
+        virtualization[:systems][:vbox] = "guest"
       end
     end
 
@@ -71,6 +85,7 @@ Ohai.plugin(:Virtualization) do
       if File.read("/proc/cpuinfo") =~ /QEMU Virtual CPU|Common KVM processor|Common 32-bit KVM processor/
         virtualization[:system] = "kvm"
         virtualization[:role] = "guest"
+        virtualization[:systems][:kvm] = "guest"
       end
     end
 
@@ -79,9 +94,11 @@ Ohai.plugin(:Virtualization) do
     if File.exists?("/proc/bc/0")
       virtualization[:system] = "openvz"
       virtualization[:role] = "host"
+      virtualization[:systems][:openvz] = "host"
     elsif File.exists?("/proc/vz")
       virtualization[:system] = "openvz"
       virtualization[:role] = "guest"
+      virtualization[:systems][:openvz] = "guest"
     end
 
     # http://www.dmo.ca/blog/detecting-virtualization-on-linux
@@ -92,21 +109,25 @@ Ohai.plugin(:Virtualization) do
         if so.stdout =~ /Product Name: Virtual Machine/
           virtualization[:system] = "virtualpc"
           virtualization[:role] = "guest"
+          virtualization[:systems][:virtualpc] = "guest"
         end
       when /Manufacturer: VMware/
         if so.stdout =~ /Product Name: VMware Virtual Platform/
           virtualization[:system] = "vmware"
           virtualization[:role] = "guest"
+          virtualization[:systems][:vmware] = "guest"
         end
       when /Manufacturer: Xen/
         if so.stdout =~ /Product Name: HVM domU/
           virtualization[:system] = "xen"
           virtualization[:role] = "guest"
+          virtualization[:systems][:xen] = "guest"
         end
       when /Manufacturer: Oracle Corporation/
         if so.stdout =~ /Product Name: VirtualBox/
           virtualization[:system] = "vbox"
           virtualization[:role] = "guest"
+          virtualization[:systems][:vbox] = "guest"
         end
       else
         nil
@@ -121,8 +142,10 @@ Ohai.plugin(:Virtualization) do
         virtualization[:system] = "linux-vserver"
         if vxid[2] == "0"
           virtualization[:role] = "host"
+          virtualization[:systems]["linux-vserver"] = "host"
         else
           virtualization[:role] = "guest"
+          virtualization[:systems]["linux-vserver"] = "guest"
         end
       end
     end
@@ -149,9 +172,20 @@ Ohai.plugin(:Virtualization) do
       if File.read("/proc/self/cgroup") =~ %r{^\d+:[^:]+:/(lxc|docker)/.+$}
         virtualization[:system] = "lxc"
         virtualization[:role] = "guest"
-      elsif File.read("/proc/self/cgroup") =~ %r{\d:[^:]+:/$}
-        virtualization[:system] = "lxc"
-        virtualization[:role] = "host"
+        virtualization[:systems][:lxc] = "guest"
+      elsif lxc_version_exists? && File.read("/proc/self/cgroup") =~ %r{\d:[^:]+:/$}
+        # lxc-version shouldn't be installed by default
+        # Even so, it is likely we are on an LXC capable host that is not being used as such
+        # So we're cautious here to not overwrite other existing values (OHAI-573)
+        unless virtualization[:system] && virtualization[:role]
+          virtualization[:system] = "lxc"
+          virtualization[:role] = "host"
+        end
+
+        # In general, the 'systems' framework from OHAI-182 is less susceptible to conflicts
+        # But, this could overwrite virtualization[:systems][:lxc] = "guest"
+        # If so, we may need to look further for a differentiator (OHAI-573)
+        virtualization[:systems][:lxc] = "host"
       end
     end
   end