ohai 8.11.1 → 8.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f773eb5ea1a32204f9cf602455776492dded72e5
-  data.tar.gz: 9a49d6bba8ea5058935e8a7f12d4ad204db71168
+  metadata.gz: f8f9860cc79310cfd97f6ede9093b0eb6f76b088
+  data.tar.gz: 5c992abbc0cb9f4d189dfd904e5dfd52d3a6d343
 SHA512:
-  metadata.gz: 102f27a1df33f5049c3ca49ed6d4944281b65a2702cdbc11fd7dc2d62fb4fd185359581db7380936ec1d86bc04ca0224bdd6cd237f01695653ba3130b815d284
-  data.tar.gz: 148e626698de7337b8ebaf79b882786ead5a6d7ef04b71d475047c016874952a3f1d5bcae5ea97a2361d3bd354056f99a55833434b29d5d391c115075054320c
+  metadata.gz: 608a4e76cd1ec82e2b45e0d76cd0a39ff15dbc9034b341132917109a10e92336c8139d00841c02eb1a1da24fe33bed73296590b34bbb4f90458fccd6c0fc9742
+  data.tar.gz: 6b7ac1da8c6dc7ddc6e5bcd81e049128201191f612cbbd0230790a930455944438ef2c96b356ab9ceb199a7b49ca74979cc02071299751ae4313ae70f974a354

data/lib/ohai/loader.rb

@@ -39,7 +39,13 @@ module Ohai
 
       # Finds all the *.rb files under the configured paths in :plugin_path
       def self.find_all_in(plugin_dir)
-        Dir[File.join(ChefConfig::PathHelper.escape_glob_dir(plugin_dir), "**", "*.rb")].map do |file|
+        # escape_glob_dir does not exist in 12.7 or below
+        if ChefConfig::PathHelper.respond_to?(:escape_glob_dir)
+          escaped = ChefConfig::PathHelper.escape_glob_dir(plugin_dir)
+        else
+          escaped = ChefConfig::PathHelper.escape_glob(plugin_dir)
+        end
+        Dir[File.join(escaped, "**", "*.rb")].map do |file|
           new(file, plugin_dir)
         end
       end

data/lib/ohai/mixin/dmi_decode.rb

@@ -21,7 +21,7 @@ module ::Ohai::Mixin::DmiDecode
     dmi_data.each_line do |line|
       case line
       when /Manufacturer: Microsoft/
-        if dmi_data =~ /Product Name: Virtual Machine/
+        if dmi_data =~ /Product.*: Virtual Machine/
           if dmi_data =~ /Version: (7.0|Hyper-V)/
             return "hyperv"
           elsif dmi_data =~ /Version: (VS2005R2|6.0)/
@@ -34,9 +34,9 @@ module ::Ohai::Mixin::DmiDecode
         return "vmware"
       when /Manufacturer: Xen/
         return "xen"
-      when /Product Name: VirtualBox/
+      when /Product.*: VirtualBox/
         return "vbox"
-      when /Product Name: OpenStack/
+      when /Product.*: OpenStack/
         return "openstack"
       when /Manufacturer: QEMU|Product Name: (KVM|RHEV)/
         return "kvm"

data/lib/ohai/mixin/gce_metadata.rb

@@ -23,11 +23,17 @@ module Ohai
 
       # Trailing dot to host is added to avoid DNS search path
       GCE_METADATA_ADDR = "metadata.google.internal." unless defined?(GCE_METADATA_ADDR)
-      GCE_METADATA_URL = "/computeMetadata/v1beta1/?recursive=true" unless defined?(GCE_METADATA_URL)
+      GCE_METADATA_URL = "/computeMetadata/v1/?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)
-        saddr = Socket.pack_sockaddr_in(port, addr)
+        begin
+          saddr = Socket.pack_sockaddr_in(port, addr)
+        rescue SocketError => e # occurs when non-GCE systems try to resolve metadata.google.internal
+          Ohai::Log.debug("gce mixin: can_metadata_connect? failed setting up socket: #{e}")
+          return false
+        end
+
         connected = false
 
         begin
@@ -47,24 +53,26 @@ module Ohai
           end
         rescue SystemCallError
         end
-        Ohai::Log.debug("can_metadata_connect? == #{connected}")
+        Ohai::Log.debug("gce mixin: can_metadata_connect? == #{connected}")
         connected
       end
 
-      def http_client
-        Net::HTTP.start(GCE_METADATA_ADDR).tap { |h| h.read_timeout = 6 }
+      # fetch the meta content with a timeout and the required header
+      def http_get(uri)
+        conn = Net::HTTP.start(GCE_METADATA_ADDR)
+        conn.read_timeout = 6
+        conn.get(uri, initheader = { "Metadata-Flavor" => "Google" })
       end
 
       def fetch_metadata(id = "")
-        uri = "#{GCE_METADATA_URL}/#{id}"
-        response = http_client.get(uri)
+        response = http_get("#{GCE_METADATA_URL}/#{id}")
         return nil unless response.code == "200"
 
         if json?(response.body)
           data = StringIO.new(response.body)
           parser = FFI_Yajl::Parser.new
           parser.parse(data)
-        elsif has_trailing_slash?(id) or (id == "")
+        elsif has_trailing_slash?(id) || (id == "")
           temp = {}
           response.body.split("\n").each do |sub_attr|
             temp[sanitize_key(sub_attr)] = fetch_metadata("#{id}#{sub_attr}")

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

@@ -1,6 +1,7 @@
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan
+# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -34,13 +35,18 @@ Ohai.plugin(:Virtualization) do
       virtualization[:system] = "jail"
       virtualization[:role] = "guest"
       virtualization[:systems][:jail] = "guest"
+      Ohai::Log.debug("Virtualization plugin: Guest running in FreeBSD jail detected")
     end
 
-    so = shell_out("jls -n")
+    # run jls to get a list of running jails
+    # -n: name=value 1 line per jail format
+    # -d: list the dying jails as well as active jails
+    so = shell_out("jls -nd")
     if (so.stdout || "").lines.count >= 1
       virtualization[:system] = "jail"
       virtualization[:role] = "host"
       virtualization[:systems][:jail] = "host"
+      Ohai::Log.debug("Virtualization plugin: Host running FreeBSD jails detected")
     end
 
     # detect from modules
@@ -51,20 +57,58 @@ Ohai.plugin(:Virtualization) do
         virtualization[:system] = "vbox"
         virtualization[:role] = "host"
         virtualization[:systems][:vbox] = "host"
+        Ohai::Log.debug("Virtualization plugin: Guest running on VirtualBox detected")
       when /vboxguest/
         virtualization[:system] = "vbox"
         virtualization[:role] = "guest"
         virtualization[:systems][:vbox] = "guest"
+        Ohai::Log.debug("Virtualization plugin: Host running VirtualBox detected")
       end
     end
 
-    # Detect KVM/QEMU from cpu, report as KVM
+    # Detect bhyve by presence of /dev/vmm
+    if File.exist?("/dev/vmm")
+      virtualization[:system] = "bhyve"
+      virtualization[:role] = "host"
+      virtualization[:systems][:bhyve] = "host"
+      Ohai::Log.debug("Virtualization plugin: Host running bhyve detected")
+    end
+
+    # Detect KVM/QEMU paravirt guests 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"
+      Ohai::Log.debug("Virtualization plugin: Guest running on KVM detected")
+    end
+
+    # gather hypervisor of guests from sysctl kern.vm_guest
+    # there are a limited number of hypervisors detected here, BUT it doesn't
+    # require dmidecode to be installed and dmidecode isn't in freebsd out of the box
+    so = shell_out("sysctl -n kern.vm_guest")
+    case so.stdout
+    when /vmware/
+      virtualization[:system] = "vmware"
+      virtualization[:role] = "guest"
+      virtualization[:systems][:vmware] = "guest"
+      Ohai::Log.debug("Virtualization plugin: Guest running on VMware detected")
+    when /hv/
+      virtualization[:system] = "hyperv"
+      virtualization[:role] = "guest"
+      virtualization[:systems][:hyperv] = "guest"
+      Ohai::Log.debug("Virtualization plugin: Guest running on Hyper-V detected")
+    when /xen/
+      virtualization[:system] = "xen"
+      virtualization[:role] = "guest"
+      virtualization[:systems][:xen] = "guest"
+      Ohai::Log.debug("Virtualization plugin: Guest running on Xen detected")
+    when /bhyve/
+      virtualization[:system] = "bhyve"
+      virtualization[:role] = "guest"
+      virtualization[:systems][:bhyve] = "guest"
+      Ohai::Log.debug("Virtualization plugin: Guest running on bhyve detected")
     end
 
     # parse dmidecode to discover various virtualization guests
@@ -74,6 +118,7 @@ Ohai.plugin(:Virtualization) do
         virtualization[:system] = guest
         virtualization[:role] = "guest"
         virtualization[:systems][guest.to_sym] = "guest"
+        Ohai::Log.debug("Virtualization plugin: Guest running on #{guest} detected")
       end
     end
   end

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

@@ -0,0 +1,54 @@
+#
+# Author:: Davide Cavalca <dcavalca@fb.com>
+# Copyright:: Copyright (c) 2016 Facebook
+# 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/util/file_helper"
+
+include Ohai::Util::FileHelper
+
+Ohai.plugin(:Sessions) do
+  provides "sessions/by_session", "sessions/by_user"
+
+  collect_data(:linux) do
+    loginctl_path = which("loginctl")
+    if loginctl_path
+      cmd = "#{loginctl_path} --no-pager --no-legend --no-ask-password " +
+        "list-sessions"
+      loginctl = shell_out(cmd)
+
+      sessions Mash.new unless sessions
+      sessions[:by_session] = Mash.new unless sessions[:by_session]
+      sessions[:by_user] = Mash.new unless sessions[:by_user]
+
+      loginctl.stdout.split("\n").each do |line|
+        session, uid, user, seat = line.split
+        s = {
+          "session" => session,
+          "uid" => uid,
+          "user" => user,
+          "seat" => seat,
+        }
+        sessions[:by_session][session] = s
+        if sessions[:by_user][user]
+          sessions[:by_user][user] << s
+        else
+          sessions[:by_user][user] = [s]
+        end
+      end
+    end
+  end
+end

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

@@ -33,13 +33,14 @@ Ohai.plugin(:Virtualization) do
     which("docker")
   end
 
+  def nova_exists?
+    which("nova")
+  end
+
   collect_data(:linux) do
     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]
-
     ## Xen
     # /proc/xen is an empty dir for EL6 + Linode Guests + Paravirt EC2 instances
     if File.exist?("/proc/xen")
@@ -60,18 +61,13 @@ Ohai.plugin(:Virtualization) do
     # Xen Notes:
     # - cpuid of guests, if we could get it, would also be a clue
     # - may be able to determine if under paravirt from /dev/xen/evtchn (See OHAI-253)
-    # - EL6 guests carry a 'hypervisor' cpu flag
     # - Additional edge cases likely should not change the above assumptions
     #   but rather be additive - btm
 
-    # Detect from kernel module
+    # Detect Virtualbox from kernel module
     if File.exist?("/proc/modules")
       modules = File.read("/proc/modules")
-      if modules =~ /^kvm/
-        virtualization[:system] = "kvm"
-        virtualization[:role] = "host"
-        virtualization[:systems][:kvm] = "host"
-      elsif modules =~ /^vboxdrv/
+      if modules =~ /^vboxdrv/
         virtualization[:system] = "vbox"
         virtualization[:role] = "host"
         virtualization[:systems][:vbox] = "host"
@@ -82,11 +78,14 @@ Ohai.plugin(:Virtualization) do
       end
     end
 
-    # Detect KVM/QEMU from cpuinfo, report as KVM
-    # We could pick KVM from 'Booting paravirtualized kernel on KVM' in dmesg
-    # 2.6.27-9-server (intrepid) has this / 2.6.18-6-amd64 (etch) does not
-    # It would be great if we could read pv_info in the kernel
-    # Wait for reply to: http://article.gmane.org/gmane.comp.emulators.kvm.devel/27885
+    # if nova binary is present we're on an openstack host
+    if nova_exists?
+      virtualization[:system] = "openstack"
+      virtualization[:role] = "host"
+      virtualization[:systems][:openstack] = "host"
+    end
+
+    # Detect paravirt KVM/QEMU from cpuinfo, report as KVM
     if File.exist?("/proc/cpuinfo")
       if File.read("/proc/cpuinfo") =~ /QEMU Virtual CPU|Common KVM processor|Common 32-bit KVM processor/
         virtualization[:system] = "kvm"
@@ -95,6 +94,19 @@ Ohai.plugin(:Virtualization) do
       end
     end
 
+    # Detect KVM systems via /sys
+    # guests will have the hypervisor cpu feature that hosts don't have
+    if File.exist?("/sys/devices/virtual/misc/kvm")
+      virtualization[:system] = "kvm"
+      if File.read("/proc/cpuinfo") =~ /hypervisor/
+        virtualization[:role] = "guest"
+        virtualization[:systems][:kvm] = "guest"
+      else
+        virtualization[:role] = "host"
+        virtualization[:systems][:kvm] = "host"
+      end
+    end
+
     # Detect OpenVZ / Virtuozzo.
     # http://wiki.openvz.org/BC_proc_entries
     if File.exist?("/proc/bc/0")

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

@@ -18,6 +18,9 @@
 # limitations under the License.
 #
 
+require "ohai/mixin/dmi_decode"
+include Ohai::Mixin::DmiDecode
+
 Ohai.plugin(:Virtualization) do
   provides "virtualization"
 
@@ -29,34 +32,28 @@ Ohai.plugin(:Virtualization) do
 
   collect_data(:solaris2) do
     virtualization Mash.new
+    virtualization[:systems] = Mash.new
 
-    # Detect KVM/QEMU from cpuinfo, report as KVM
+    # Detect paravirt KVM/QEMU from cpuinfo, report as KVM
     psrinfo_path = Ohai.abs_path( "/usr/sbin/psrinfo" )
-    if File.exists?(psrinfo_path)
+    if File.exist?(psrinfo_path)
       so = shell_out("#{psrinfo_path} -pv")
-      if so.stdout =~ /QEMU Virtual CPU/
+      if so.stdout =~ /QEMU Virtual CPU|Common KVM processor|Common 32-bit KVM processor/
         virtualization[:system] = "kvm"
         virtualization[:role] = "guest"
+        virtualization[:systems][:kvm] = "guest"
       end
     end
 
-    # http://www.dmo.ca/blog/detecting-virtualization-on-linux
-    smbios_path = Ohai.abs_path( "/usr/sbin/smbios" )
-    if File.exists?(smbios_path)
-      so = shell_out(smbios_path)
-      case so.stdout
-      when /Manufacturer: Microsoft/
-        if so.stdout =~ /Product: Virtual Machine/
-          virtualization[:system] = "virtualpc"
-          virtualization[:role] = "guest"
-        end
-      when /Manufacturer: VMware/
-        if so.stdout =~ /Product: VMware Virtual Platform/
-          virtualization[:system] = "vmware"
-          virtualization[:role] = "guest"
-        end
-      else
-        nil
+    # Pass smbios information to the dmi_decode mixin to
+    # identify possible virtualization systems
+    smbios_path = Ohai.abs_path("/usr/sbin/smbios")
+    if File.exist?(smbios_path)
+      guest = guest_from_dmi(shell_out(smbios_path).stdout)
+      if guest
+        virtualization[:system] = guest
+        virtualization[:role] = "guest"
+        virtualization[:systems][guest.to_sym] = "guest"
       end
     end
 
@@ -77,15 +74,17 @@ Ohai.plugin(:Virtualization) do
 
       if zones.length == 1
         first_zone = zones.keys[0]
-        unless( first_zone == "global")
+        unless first_zone == "global"
           virtualization[:system] = "zone"
           virtualization[:role] = "guest"
+          virtualization[:systems][:zone] = "guest"
           virtualization[:guest_uuid] = zones[first_zone]["uuid"]
           virtualization[:guest_id] = collect_solaris_guestid
         end
       elsif zones.length > 1
         virtualization[:system] = "zone"
         virtualization[:role] = "host"
+        virtualization[:systems][:zone] = "host"
         virtualization[:guests] = zones
       end
     end

data/lib/ohai/plugins/virtualization.rb

@@ -16,6 +16,9 @@
 # limitations under the License.
 #
 
+# Note: despite the name this is really a libvirt plugin.
+#       perhaps we'd be better off renaming it? -tsmith
+
 Ohai.plugin(:VirtualizationInfo) do
   %w{ uri capabilities nodeinfo domains networks storage }.each do |info|
     provides "virtualization/#{info}"
@@ -24,8 +27,7 @@ Ohai.plugin(:VirtualizationInfo) do
   collect_data do
     unless virtualization.nil? || !(virtualization[:role].eql?("host"))
       begin
-        require "libvirt"
-        require "hpricot"
+        require "libvirt" # this is the ruby-libvirt gem not the libvirt gem
 
         emu = (virtualization[:system].eql?("kvm") ? "qemu" : virtualization[:system])
         virtualization[:libvirt_version] = Libvirt.version(emu)[0].to_s
@@ -34,8 +36,6 @@ Ohai.plugin(:VirtualizationInfo) do
 
         virtualization[:uri] = virtconn.uri
         virtualization[:capabilities] = Mash.new
-        virtualization[:capabilities][:xml_desc] = (virtconn.capabilities.split("\n").collect { |line| line.strip }).join
-        #xdoc = Hpricot virtualization[:capabilities][:xml_desc]
 
         virtualization[:nodeinfo] = Mash.new
         ni = virtconn.node_get_info
@@ -46,10 +46,8 @@ Ohai.plugin(:VirtualizationInfo) do
           dv = virtconn.lookup_domain_by_id d
           virtualization[:domains][dv.name] = Mash.new
           virtualization[:domains][dv.name][:id] = d
-          virtualization[:domains][dv.name][:xml_desc] = (dv.xml_desc.split("\n").collect { |line| line.strip }).join
           %w{os_type uuid}.each { |a| virtualization[:domains][dv.name][a] = dv.send(a) }
           %w{cpu_time max_mem memory nr_virt_cpu state}.each { |a| virtualization[:domains][dv.name][a] = dv.info.send(a) }
-          #xdoc = Hpricot virtualization[:domains][dv.name][:xml_desc]
 
         end
 
@@ -57,20 +55,15 @@ Ohai.plugin(:VirtualizationInfo) do
         virtconn.list_networks.each do |n|
           nv = virtconn.lookup_network_by_name n
           virtualization[:networks][n] = Mash.new
-          virtualization[:networks][n][:xml_desc] = (nv.xml_desc.split("\n").collect { |line| line.strip }).join
           %w{bridge_name uuid}.each { |a| virtualization[:networks][n][a] = nv.send(a) }
-          #xdoc = Hpricot virtualization[:networks][n][:xml_desc]
-
         end
 
         virtualization[:storage] = Mash.new
         virtconn.list_storage_pools.each do |pool|
           sp = virtconn.lookup_storage_pool_by_name pool
           virtualization[:storage][pool] = Mash.new
-          virtualization[:storage][pool][:xml_desc] = (sp.xml_desc.split("\n").collect { |line| line.strip }).join
           %w{autostart uuid}.each { |a| virtualization[:storage][pool][a] = sp.send(a) }
           %w{allocation available capacity state}.each { |a| virtualization[:storage][pool][a] = sp.info.send(a) }
-          #xdoc = Hpricot virtualization[:storage][pool][:xml_desc]
 
           virtualization[:storage][pool][:volumes] = Mash.new
           sp.list_volumes.each do |v|
@@ -83,7 +76,7 @@ Ohai.plugin(:VirtualizationInfo) do
 
         virtconn.close
       rescue LoadError => e
-        Ohai::Log.debug("Can't load gem: #{e}.  virtualization plugin is disabled.")
+        Ohai::Log.debug("Can't load gem: #{e}. VirtualizationInfo plugin cannot continue.")
       end
     end
   end

data/lib/ohai/util/file_helper.rb

@@ -25,8 +25,12 @@ module Ohai
         paths = ENV["PATH"].split(File::PATH_SEPARATOR) + [ "/bin", "/usr/bin", "/sbin", "/usr/sbin" ]
         paths.each do |path|
           filename = File.join(path, cmd)
-          return filename if File.executable?(filename)
+          if File.executable?(filename)
+            Ohai::Log.debug("#{self.name} plugin: found #{cmd} at #{filename}")
+            return filename
+          end
         end
+        Ohai::Log.debug("#{self.name} plugin: did not find #{cmd}")
         false
       end
     end

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "8.11.1"
+  VERSION = "8.12.0"
 end

data/spec/unit/plugins/bsd/virtualization_spec.rb

@@ -24,8 +24,30 @@ describe Ohai::System, "BSD virtualization plugin" do
     allow(@plugin).to receive(:collect_os).and_return(:freebsd)
     allow(@plugin).to receive(:shell_out).with("sysctl -n security.jail.jailed").and_return(mock_shell_out(0, "0", ""))
     allow(@plugin).to receive(:shell_out).with("#{ Ohai.abs_path( "/sbin/kldstat" )}").and_return(mock_shell_out(0, "", ""))
-    allow(@plugin).to receive(:shell_out).with("jls -n").and_return(mock_shell_out(0, "", ""))
+    allow(@plugin).to receive(:shell_out).with("jls -nd").and_return(mock_shell_out(0, "", ""))
     allow(@plugin).to receive(:shell_out).with("sysctl -n hw.model").and_return(mock_shell_out(0, "", ""))
+    allow(@plugin).to receive(:shell_out).with("sysctl -n kern.vm_guest").and_return(mock_shell_out(0, "", ""))
+    allow(File).to receive(:exist?).and_return false
+  end
+
+  context "when on a bhyve host" do
+    it "detects we are a host" do
+      allow(File).to receive(:exist?).with("/dev/vmm").and_return true
+      @plugin.run
+      expect(@plugin[:virtualization][:system]).to eq("bhyve")
+      expect(@plugin[:virtualization][:role]).to eq("host")
+      expect(@plugin[:virtualization][:systems][:bhyve]).to eq("host")
+    end
+  end
+
+  context "when on a bhyve guest" do
+    it "detects we are a guest" do
+      allow(@plugin).to receive(:shell_out).with("sysctl -n kern.vm_guest").and_return(mock_shell_out(0, "bhyve", ""))
+      @plugin.run
+      expect(@plugin[:virtualization][:system]).to eq("bhyve")
+      expect(@plugin[:virtualization][:role]).to eq("guest")
+      expect(@plugin[:virtualization][:systems][:bhyve]).to eq("guest")
+    end
   end
 
   context "jails" do
@@ -40,7 +62,7 @@ describe Ohai::System, "BSD virtualization plugin" do
     it "detects we are hosting jails" do
       # from http://www.freebsd.org/doc/handbook/jails-application.html
       @jails = "JID  IP Address      Hostname                      Path\n     3  192.168.3.17    ns.example.org                /home/j/ns\n     2  192.168.3.18    mail.example.org              /home/j/mail\n     1  62.123.43.14    www.example.org               /home/j/www"
-      allow(@plugin).to receive(:shell_out).with("jls -n").and_return(mock_shell_out(0, @jails, ""))
+      allow(@plugin).to receive(:shell_out).with("jls -nd").and_return(mock_shell_out(0, @jails, ""))
       @plugin.run
       expect(@plugin[:virtualization][:system]).to eq("jail")
       expect(@plugin[:virtualization][:role]).to eq("host")
@@ -95,4 +117,34 @@ OUT
       end
     end
   end
+
+  context "when on a xen guest" do
+    it "detects we are a guest" do
+      allow(@plugin).to receive(:shell_out).with("sysctl -n kern.vm_guest").and_return(mock_shell_out(0, "xen", ""))
+      @plugin.run
+      expect(@plugin[:virtualization][:system]).to eq("xen")
+      expect(@plugin[:virtualization][:role]).to eq("guest")
+      expect(@plugin[:virtualization][:systems][:xen]).to eq("guest")
+    end
+  end
+
+  context "when on a vmware guest" do
+    it "detects we are a guest" do
+      allow(@plugin).to receive(:shell_out).with("sysctl -n kern.vm_guest").and_return(mock_shell_out(0, "vmware", ""))
+      @plugin.run
+      expect(@plugin[:virtualization][:system]).to eq("vmware")
+      expect(@plugin[:virtualization][:role]).to eq("guest")
+      expect(@plugin[:virtualization][:systems][:vmware]).to eq("guest")
+    end
+  end
+
+  context "when on a hyper-v guest" do
+    it "detects we are a guest" do
+      allow(@plugin).to receive(:shell_out).with("sysctl -n kern.vm_guest").and_return(mock_shell_out(0, "hv", ""))
+      @plugin.run
+      expect(@plugin[:virtualization][:system]).to eq("hyperv")
+      expect(@plugin[:virtualization][:role]).to eq("guest")
+      expect(@plugin[:virtualization][:systems][:hyperv]).to eq("guest")
+    end
+  end
 end

data/spec/unit/plugins/gce_spec.rb

@@ -25,15 +25,20 @@ describe Ohai::System, "plugin gce" do
 
   shared_examples_for "!gce" do
     it "should NOT attempt to fetch the gce metadata" do
-      expect(@plugin).not_to receive(:http_client)
+      expect(@plugin).not_to receive(:http_get)
+      @plugin.run
+    end
+
+    it "should NOT set gce attributes" do
+      expect(@plugin[:gce]).to be_nil
       @plugin.run
     end
   end
 
   shared_examples_for "gce" do
     before(:each) do
-      @http_client = double("Net::HTTP client")
-      allow(@plugin).to receive(:http_client).and_return(@http_client)
+      @http_get = double("Net::HTTP client")
+      allow(@plugin).to receive(:http_get).and_return(double("Net::HTTP Response", :body => '{"instance":{"hostname":"test-host"}}', :code => "200"))
       allow(IO).to receive(:select).and_return([[], [1], []])
       t = double("connection")
       allow(t).to receive(:connect_nonblock).and_raise(Errno::EINPROGRESS)
@@ -42,10 +47,6 @@ describe Ohai::System, "plugin gce" do
     end
 
     it "should recursively fetch and properly parse json metadata" do
-      expect(@http_client).to receive(:get).
-        with("/computeMetadata/v1beta1/?recursive=true/").
-        and_return(double("Net::HTTP Response", :body => '{"instance":{"hostname":"test-host"}}', :code => "200"))
-
       @plugin.run
 
       expect(@plugin[:gce]).not_to be_nil

data/spec/unit/plugins/linux/sessions_spec.rb

@@ -0,0 +1,98 @@
+#
+# Author:: Davide Cavalca <dcavalca@fb.com>
+# Copyright:: Copyright (c) 2016 Facebook
+# 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 File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+
+describe Ohai::System, "Linux sessions plugin" do
+  let(:plugin) { get_plugin("linux/sessions") }
+
+  before(:each) do
+    allow(plugin).to receive(:collect_os).and_return(:linux)
+  end
+
+  it "should populate sessions if loginctl is found" do
+    loginctl_out = <<-LOGINCTL_OUT
+        c1        118 Debian-gdm       seat0
+       318          0 root
+        46          0 root
+       306       1000 joe
+LOGINCTL_OUT
+    allow(plugin).to receive(:which).with("loginctl").and_return("/bin/loginctl")
+    allow(plugin).to receive(:shell_out).with("/bin/loginctl --no-pager --no-legend --no-ask-password list-sessions").and_return(mock_shell_out(0, loginctl_out, ""))
+    plugin.run
+    expect(plugin[:sessions].to_hash).to eq({
+      "by_session" => {
+        "c1" => {
+          "session" => "c1",
+          "uid" => "118",
+          "user" => "Debian-gdm",
+          "seat" => "seat0",
+        },
+        "318" => {
+          "session" => "318",
+          "uid" => "0",
+          "user" => "root",
+          "seat" => nil,
+        },
+        "46" => {
+          "session" => "46",
+          "uid" => "0",
+          "user" => "root",
+          "seat" => nil,
+        },
+        "306" => {
+          "session" => "306",
+          "uid" => "1000",
+          "user" => "joe",
+          "seat" => nil,
+        }
+      },
+      "by_user" => {
+        "Debian-gdm" => [{
+          "session" => "c1",
+          "uid" => "118",
+          "user" => "Debian-gdm",
+          "seat" => "seat0",
+        }],
+        "root" => [{
+          "session" => "318",
+          "uid" => "0",
+          "user" => "root",
+          "seat" => nil
+        }, {
+          "session" => "46",
+          "uid" => "0",
+          "user" => "root",
+          "seat" => nil,
+        }],
+        "joe" => [{
+          "session" => "306",
+          "uid" => "1000",
+          "user" => "joe",
+          "seat" => nil,
+        }],
+      },
+    })
+  end
+
+  it "should not populate sessions if loginctl is not found" do
+    allow(plugin).to receive(:which).with("loginctl").and_return(false)
+    plugin.run
+    expect(plugin[:sessions]).to be(nil)
+  end
+end

data/spec/unit/plugins/linux/virtualization_spec.rb

@@ -37,6 +37,12 @@ describe Ohai::System, "Linux virtualization platform" do
     allow(File).to receive(:exist?).with("/.dockerenv").and_return(false)
     allow(File).to receive(:exist?).with("/.dockerinit").and_return(false)
     allow(File).to receive(:exist?).with("/proc/bus/pci/devices").and_return(false)
+    allow(File).to receive(:exist?).with("/sys/devices/virtual/misc/kvm").and_return(false)
+
+    # default the which wrappers to nil
+    allow(plugin).to receive(:lxc_version_exists?).and_return(false)
+    allow(plugin).to receive(:docker_exists?).and_return(false)
+    allow(plugin).to receive(:nova_exists?).and_return(false)
   end
 
   describe "when we are checking for xen" do
@@ -76,10 +82,29 @@ describe Ohai::System, "Linux virtualization platform" do
     end
   end
 
+  describe "when we are checking for openstack" do
+    it "sets openstack host if nova binary exists" do
+      allow(plugin).to receive(:nova_exists?).and_return("/usr/bin/nova")
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("openstack")
+      expect(plugin[:virtualization][:role]).to eq("host")
+      expect(plugin[:virtualization][:systems][:openstack]).to eq("host")
+    end
+  end
+
   describe "when we are checking for kvm" do
-    it "sets kvm host if /proc/modules contains kvm" do
-      expect(File).to receive(:exist?).with("/proc/modules").and_return(true)
-      allow(File).to receive(:read).with("/proc/modules").and_return("kvm 165872  1 kvm_intel")
+    it "sets kvm guest if /sys/devices/virtual/misc/kvm exists & hypervisor cpu feature is present" do
+      allow(File).to receive(:exist?).with("/sys/devices/virtual/misc/kvm").and_return(true)
+      allow(File).to receive(:read).with("/proc/cpuinfo").and_return("fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ss syscall nx rdtscp lm constant_tsc arch_perfmon rep_good nopl pni vmx ssse3 cx16 sse4_1 sse4_2 x2apic popcnt hypervisor lahf_lm vnmi ept tsc_adjust")
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("kvm")
+      expect(plugin[:virtualization][:role]).to eq("guest")
+      expect(plugin[:virtualization][:systems][:kvm]).to eq("guest")
+    end
+
+    it "sets kvm host if /sys/devices/virtual/misc/kvm exists & hypervisor cpu feature is not present" do
+      allow(File).to receive(:exist?).with("/sys/devices/virtual/misc/kvm").and_return(true)
+      allow(File).to receive(:read).with("/proc/cpuinfo").and_return("fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf pni dtes64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 popcnt lahf_lm ida dtherm tpr_shadow vnmi flexpriority ept vpid")
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("kvm")
       expect(plugin[:virtualization][:role]).to eq("host")

data/spec/unit/plugins/solaris2/virtualization_spec.rb

@@ -30,16 +30,16 @@ PSRINFO_PV
     allow(@plugin).to receive(:collect_os).and_return(:solaris2)
 
     # default to all requested Files not existing
-    allow(File).to receive(:exists?).with("/usr/sbin/psrinfo").and_return(false)
-    allow(File).to receive(:exists?).with("/usr/sbin/smbios").and_return(false)
-    allow(File).to receive(:exists?).with("/usr/sbin/zoneadm").and_return(false)
+    allow(File).to receive(:exist?).with("/usr/sbin/psrinfo").and_return(false)
+    allow(File).to receive(:exist?).with("/usr/sbin/smbios").and_return(false)
+    allow(File).to receive(:exist?).with("/usr/sbin/zoneadm").and_return(false)
     allow(@plugin).to receive(:shell_out).with("/usr/sbin/smbios").and_return(mock_shell_out(0, "", ""))
     allow(@plugin).to receive(:shell_out).with("#{ Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, "", ""))
   end
 
   describe "when we are checking for kvm" do
     before(:each) do
-      expect(File).to receive(:exists?).with("/usr/sbin/psrinfo").and_return(true)
+      expect(File).to receive(:exist?).with("/usr/sbin/psrinfo").and_return(true)
     end
 
     it "should run psrinfo -pv" do
@@ -52,18 +52,19 @@ PSRINFO_PV
       @plugin.run
       expect(@plugin[:virtualization][:system]).to eq("kvm")
       expect(@plugin[:virtualization][:role]).to eq("guest")
+      expect(@plugin[:virtualization][:systems][:kvm]).to eq("guest")
     end
 
     it "should not set virtualization if kvm isn't there" do
       expect(@plugin).to receive(:shell_out).with("#{ Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, @psrinfo_pv, ""))
       @plugin.run
-      expect(@plugin[:virtualization]).to eq({})
+      expect(@plugin[:virtualization][:systems]).to eq({})
     end
   end
 
   describe "when we are parsing smbios" do
     before(:each) do
-      expect(File).to receive(:exists?).with("/usr/sbin/smbios").and_return(true)
+      expect(File).to receive(:exist?).with("/usr/sbin/smbios").and_return(true)
     end
 
     it "should run smbios" do
@@ -107,17 +108,18 @@ VMWARE
       @plugin.run
       expect(@plugin[:virtualization][:system]).to eq("vmware")
       expect(@plugin[:virtualization][:role]).to eq("guest")
+      expect(@plugin[:virtualization][:systems][:vmware]).to eq("guest")
     end
 
     it "should run smbios and not set virtualization if nothing is detected" do
       expect(@plugin).to receive(:shell_out).with("/usr/sbin/smbios")
       @plugin.run
-      expect(@plugin[:virtualization]).to eq({})
+      expect(@plugin[:virtualization][:systems]).to eq({})
     end
   end
 
   it "should not set virtualization if no tests match" do
     @plugin.run
-    expect(@plugin[:virtualization]).to eq({})
+    expect(@plugin[:virtualization][:systems]).to eq({})
   end
 end

data/spec/unit/util/file_helper_spec.rb

@@ -27,6 +27,7 @@ describe "Ohai::Util::FileHelper" do
   let(:file_helper) { FileHelperMock.new }
 
   before(:each) do
+    allow(file_helper).to receive(:name).and_return("Fakeclass")
     allow(File).to receive(:executable?).and_return(false)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.11.1
+  version: 8.12.0
 platform: ruby
 authors:
 - Adam Jacob
@@ -367,6 +367,7 @@ files:
 - lib/ohai/plugins/linux/memory.rb
 - lib/ohai/plugins/linux/network.rb
 - lib/ohai/plugins/linux/platform.rb
+- lib/ohai/plugins/linux/sessions.rb
 - lib/ohai/plugins/linux/virtualization.rb
 - lib/ohai/plugins/lua.rb
 - lib/ohai/plugins/mono.rb
@@ -540,6 +541,7 @@ files:
 - spec/unit/plugins/linux/memory_spec.rb
 - spec/unit/plugins/linux/network_spec.rb
 - spec/unit/plugins/linux/platform_spec.rb
+- spec/unit/plugins/linux/sessions_spec.rb
 - spec/unit/plugins/linux/uptime_spec.rb
 - spec/unit/plugins/linux/virtualization_spec.rb
 - spec/unit/plugins/lua_spec.rb