ohai 8.7.0 → 8.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48005ef0ac4164194df7bc906291139ce7227895
-  data.tar.gz: 24932f3bfaa161f5d97e0131801b7f18e999a636
+  metadata.gz: 85e95271fa844c86e7109612c85d6e9dd4c76f0c
+  data.tar.gz: 41c785220f4364c44d6b8df5f267212e60c2854d
 SHA512:
-  metadata.gz: f955882f73da2fc4ff1649f0664224bc6878ae78353883e94e08a36c379d2306da9fb2c632c3f0ed58d00a64ea2b271c98670356f0885410fc872695920c3755
-  data.tar.gz: 80adff5dccf6c1f7ef8afaefda644fc820bcf13f7919277d89f7c0d93388720dd32e961e5296343ee2456f8a86543f3330133dd31699f6c2baf57988c7dc5053
+  metadata.gz: 468cc81d43c4067f7c34dd737fdd4d17acfd26e25082c58b157d228ba22e26534b44ba4741c887e60147461d675b42057a191f28cd4446f16305708066b32e55
+  data.tar.gz: 69873511516a5cad588aa6e241615eebb4b7eedcfdc26e40519018f5829af581700f8bb55441a8098d2bc0d407a5c4d8455b2b2432627bc902be785e924b1125

data/README.md

@@ -1,6 +1,7 @@
 # ohai
 [![Build Status Master](https://travis-ci.org/chef/ohai.svg?branch=master)](https://travis-ci.org/chef/ohai)
 [![Build Status Master](https://ci.appveyor.com/api/projects/status/github/chef/ohai?branch=master&svg=true&passingText=master%20-%20Ok&pendingText=master%20-%20Pending&failingText=master%20-%20Failing)](https://ci.appveyor.com/project/Chef/ohai/branch/master)
+[![Gem Version](https://badge.fury.io/rb/ohai.svg)](https://badge.fury.io/rb/ohai)
 
 
 # DESCRIPTION:
@@ -16,8 +17,8 @@ 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.chef.io/ohai.html
-* Custom plugin documentation: http://docs.chef.io/ohai_custom.html
+* General documentation: https://docs.chef.io/ohai.html
+* Custom plugin documentation: https://docs.chef.io/ohai_custom.html
 
 # DEVELOPMENT:
 
@@ -67,7 +68,7 @@ Ohai has some Rake tasks for doing various things.
 
 Source:
 
-* http://github.com/chef/ohai/tree/master
+* https://github.com/chef/ohai/tree/master
 
 Issues:
 

data/lib/ohai/application.rb

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'chef-config/path_helper'
 require 'chef-config/workstation_config_loader'
 require 'ohai'
 require 'ohai/log'
@@ -32,7 +33,8 @@ class Ohai::Application
   option :directory,
     :short       => "-d DIRECTORY",
     :long        => "--directory DIRECTORY",
-    :description => "A directory to add to the Ohai search path"
+    :description => "A directory to add to the Ohai search path",
+    :proc        => lambda { |path| Ohai::Config.platform_specific_path(path) }
 
   option :log_level,
     :short        => "-l LEVEL",

data/lib/ohai/loader.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Claire McQuin (<claire@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Claire McQuin (<claire@chef.io>)
+# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+require 'chef-config/path_helper'
 require 'ohai/log'
 require 'ohai/mash'
 require 'ohai/dsl'
@@ -38,7 +39,7 @@ module Ohai
 
       # Finds all the *.rb files under the configured paths in :plugin_path
       def self.find_all_in(plugin_dir)
-        Dir[File.join(plugin_dir, "**", "*.rb")].map do |file|
+        Dir[File.join(ChefConfig::PathHelper.escape_glob(plugin_dir), "**", "*.rb")].map do |file|
           new(file, plugin_dir)
         end
       end

data/lib/ohai/mixin/dmi_decode.rb

@@ -0,0 +1,47 @@
+#
+# Author:: Tim Smith <tsmith@chef.io>
+# Copyright:: Copyright (c) 2015 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.
+
+# http://www.dmo.ca/blog/detecting-virtualization-on-linux
+module ::Ohai::Mixin::DmiDecode
+  def determine_guest(dmi_data)
+    dmi_data.each_line do |line|
+      case line
+      when /Manufacturer: Microsoft/
+        if dmi_data =~ /Product Name: Virtual Machine/
+          if dmi_data =~ /Version: (VS2005R2|6.0)/
+            return 'virtualpc'
+          elsif dmi_data =~ /Version: (7.0|Hyper-V)/
+            return 'hyperv'
+          elsif dmi_data =~ /Version: 5.0/
+            return 'virtualserver'
+          end
+        end
+      when /Manufacturer: VMware/
+        return 'vmware'
+      when /Manufacturer: Xen/
+        return 'xen'
+      when /Product Name: VirtualBox/
+        return 'vbox'
+      when /Product Name: OpenStack/
+        return 'openstack'
+      when /Manufacturer: QEMU|Product Name: (KVM|RHEV)/
+        return 'kvm'
+      end
+    end
+    return nil
+  end
+end

data/lib/ohai/mixin/os.rb

@@ -39,6 +39,8 @@ module Ohai
           return "openbsd"
         when /netbsd(.*)$/
           return "netbsd"
+        when /dragonfly(.*)$/
+          return "dragonflybsd"
         when /solaris2/
           return "solaris2"
         when /mswin|mingw32|windows/

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

@@ -22,10 +22,11 @@ Ohai.plugin(:Kernel) do
   collect_data(:aix) do
     kernel Mash.new
 
-    kernel[:name] = shell_out("uname -s").stdout.split($/)[0].downcase
+    kernel[:name] =    shell_out("uname -s").stdout.split($/)[0].downcase
     kernel[:release] = shell_out("uname -r").stdout.split($/)[0]
     kernel[:version] = shell_out("uname -v").stdout.split($/)[0]
     kernel[:machine] = shell_out("uname -p").stdout.split($/)[0]
+    kernel[:bits] =    shell_out("getconf KERNEL_BITMODE").stdout.strip
 
     modules = Mash.new
     so = shell_out("genkex -d")

data/lib/ohai/plugins/{freebsd → bsd}/filesystem.rb

@@ -1,6 +1,7 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Tim Smith (<tsmith@chef.io>)
+# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +20,7 @@
 Ohai.plugin(:Filesystem) do
   provides "filesystem"
 
-  collect_data(:freebsd) do
+  collect_data(:freebsd, :openbsd, :netbsd, :dragonflybsd) do
     fs = Mash.new
 
     # Grab filesystem data from df
@@ -39,6 +40,23 @@ Ohai.plugin(:Filesystem) do
       end
     end
 
+    # inode parsing from 'df -iP'
+    so = shell_out("df -iP")
+    so.stdout.lines do |line|
+      case line
+      when /^Filesystem/ # skip the header
+        next
+      when /^(.+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\%\s+(\d+)\s+(\d+)\s+(\d+)%(.+)$/
+        filesystem = $1.strip
+        fs[filesystem] ||= Mash.new
+        fs[filesystem][:inodes_used] = $6
+        fs[filesystem][:inodes_available] = $7
+        fs[filesystem][:total_inodes] = ($6.to_i + $7.to_i).to_s
+        fs[filesystem][:inodes_percent_used] = $8
+        fs[filesystem][:mount] = $9.strip
+      end
+    end
+
     # Grab mount information from mount
     so = shell_out("mount -l")
     so.stdout.lines do |line|

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

@@ -0,0 +1,80 @@
+#
+# Author:: Bryan McLellan (btm@loftninjas.org)
+# Copyright:: Copyright (c) 2009 Bryan McLellan
+# 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 'ohai/mixin/dmi_decode'
+
+include Ohai::Mixin::DmiDecode
+
+Ohai.plugin(:Virtualization) do
+  provides 'virtualization'
+
+  collect_data(:freebsd, :openbsd, :netbsd, :dragonflybsd) do
+
+    virtualization Mash.new unless virtualization
+    virtualization[:systems] = Mash.new unless virtualization[:systems]
+
+    # detect when in a jail or when a jail is actively running (not in stopped state)
+    so = shell_out("sysctl -n security.jail.jailed")
+    if so.stdout.split($/)[0].to_i == 1
+      virtualization[:system] = "jail"
+      virtualization[:role] = "guest"
+      virtualization[:systems][:jail] = 'guest'
+    end
+
+    so = shell_out('jls -n')
+    if (so.stdout || '').lines.count >= 1
+      virtualization[:system] = 'jail'
+      virtualization[:role] = 'host'
+      virtualization[:systems][:jail] = 'host'
+    end
+
+    # detect from modules
+    so = shell_out("#{Ohai.abs_path('/sbin/kldstat')}")
+    so.stdout.lines do |line|
+      case line
+      when /vboxdrv/
+        virtualization[:system] = 'vbox'
+        virtualization[:role] = 'host'
+        virtualization[:systems][:vbox] = 'host'
+      when /vboxguest/
+        virtualization[:system] = 'vbox'
+        virtualization[:role] = 'guest'
+        virtualization[:systems][:vbox] = 'guest'
+      end
+    end
+
+    # 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|Common KVM processor|Common 32-bit KVM processor/
+      virtualization[:system] = 'kvm'
+      virtualization[:role] = 'guest'
+      virtualization[:systems][:kvm] = 'guest'
+    end
+
+    # parse dmidecode to discover various virtualization guests
+    if File.exist?('/usr/local/sbin/dmidecode') || File.exist?('/usr/pkg/sbin/dmidecode')
+      guest = determine_guest(shell_out('dmidecode').stdout)
+      if guest
+        virtualization[:system] = guest
+        virtualization[:role] = 'guest'
+        virtualization[:systems][guest.to_sym] = 'guest'
+      end
+    end
+  end
+end

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

@@ -0,0 +1,58 @@
+#
+# Author:: Bryan McLellan (btm@loftninjas.org)
+# Copyright:: Copyright (c) 2008 Bryan McLellan
+# 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.
+#
+
+Ohai.plugin(:CPU) do
+  provides "cpu"
+
+  collect_data(:dragonflybsd) do
+    # all dmesg output for smp I can find only provides info about a single processor
+    # 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: 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
+      when /CPU:\s+(.+) \(([\d.]+).+\)/
+        cpuinfo["model_name"] = $1
+        cpuinfo["mhz"] = $2
+      when /Origin = "(.+)"\s+Id = (.+)\s+Stepping = (.+)/
+        cpuinfo["vendor_id"] = $1
+        cpuinfo["stepping"] = $3
+        # These _should_ match /AMD Features2?/ lines as well
+      when /Features=.+<(.+)>/
+        cpuinfo["flags"].concat($1.downcase.split(','))
+        # Features2=0x80000001<SSE3,<b31>>
+      when /Features2=[a-f\dx]+<(.+)>/
+        cpuinfo["flags"].concat($1.downcase.split(','))
+      end
+    end
+
+    cpu cpuinfo
+    so = shell_out("sysctl -n hw.ncpu")
+    cpu[:total] = so.stdout.split($/)[0].to_i
+  end
+end

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

@@ -0,0 +1,60 @@
+#
+# Author:: Bryan McLellan (btm@loftninjas.org)
+# Copyright:: Copyright (c) 2009 Bryan McLellan
+# 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.
+#
+
+Ohai.plugin(:Memory) do
+  provides "memory", "memory/swap"
+
+  collect_data(:dragonflybsd) do
+    memory Mash.new
+    memory[:swap] = Mash.new
+
+    # /usr/src/sys/sys/vmmeter.h
+    so = shell_out("sysctl -n vm.stats.vm.v_page_size")
+    memory[:page_size] = so.stdout.split($/)[0]
+    so = shell_out("sysctl -n vm.stats.vm.v_page_count")
+    memory[:page_count] = so.stdout.split($/)[0]
+    memory[:total] = memory[:page_size].to_i * memory[:page_count].to_i
+    so = shell_out("sysctl -n vm.stats.vm.v_free_count")
+    memory[:free] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    so = shell_out("sysctl -n vm.status.vm.v_active_count")
+    memory[:active] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    so = shell_out("sysctl -n vm.status.vm.v_inactive_count")
+    memory[:inactive] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    so = shell_out("sysctl -n vm.stats.vm.v_cache_count")
+    memory[:cache] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    so = shell_out("sysctl -n vm.stats.vm.v_wire_count")
+    memory[:wired] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    so = shell_out("sysctl -n vfs.bufspace")
+    memory[:buffers] = so.stdout.split($/)[0]
+
+    so = shell_out("swapinfo")
+    so.stdout.lines do |line|
+      # Device          1K-blocks     Used    Avail Capacity
+      # /dev/ad0s1b        253648        0   253648     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/dragonflybsd/network.rb

@@ -0,0 +1,126 @@
+#
+# Author:: Bryan McLellan (btm@loftninjas.org)
+# Copyright:: Copyright (c) 2009 Bryan McLellan
+# 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.
+#
+
+Ohai.plugin(:Network) do
+  provides "network", "network/interfaces"
+  provides "counters/network", "counters/network/interfaces"
+
+  collect_data(:dragonflybsd) 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]
+
+    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
+
+    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
+      # call the family lladdr to match linux for consistency
+      if line =~ /\s+ether (.+?)\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
+
+    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
+
+    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). 
+    so = shell_out("netstat -ibdn")
+    so.stdout.lines do |line|
+      # Name    Mtu Network       Address              Ipkts Ierrs     Ibytes    Opkts Oerrs     Obytes  Coll Drop
+      # ed0    1500 <Link#1>      54:52:00:68:92:85   333604    26  151905886   175472     0   24897542     0  905 
+      # $1                        $2                      $3    $4         $5       $6    $7         $8    $9  $10
+      if line =~ /^([\w\.\*]+)\s+\d+\s+<Link#\d+>\s+([\w:]*)\s*(\d+)\s+(\d+)\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]["rx"]["bytes"] = $5
+        net_counters[$1]["tx"]["packets"] = $6
+        net_counters[$1]["tx"]["errors"] = $7
+        net_counters[$1]["tx"]["bytes"] = $8
+        net_counters[$1]["tx"]["collisions"] = $9
+        net_counters[$1]["tx"]["dropped"] = $10
+      end
+    end
+
+    counters[:network][:interfaces] = net_counters
+  end
+end