ohai 8.17.1 → 8.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b474815c9a67658b2190cad18967511a48593d4
-  data.tar.gz: 268d26318d08819041eb136cb06dff59a15cab5e
+  metadata.gz: 1b422d14afdb82f8fe3f07aa0aaa8dd82c30fa06
+  data.tar.gz: f99bb4675dcbfca6ffbb28420fbcae88072b55ff
 SHA512:
-  metadata.gz: 5a7d729b4dab3483ab3d08ed0e383503a7720ef3bad30b0395c44a1c00419531db582f7d9e9fdb6f6d93ac40049da37fbcbde3fb1bae666b2368187e7aeba980
-  data.tar.gz: 8dfa9640dcf754831ebf088fa544e81d9de823a1b5dc9040f4d1fd2c34ce358d3dab20f5cfa758d319d7132185a31e2718cee7f34638cac7a41cd90cdf91cdbd
+  metadata.gz: 0755c29277022af57f5535a3ced25262ab34e190f8c25d2ed390e0b0324374511ed9ec9c2ca93848fcf2287dfd34d83a849a369ab3271a5e950c9268c8ab430f
+  data.tar.gz: 99d5e61254335f5e2274c2ef0f36cf401fa11c0b2ea69cfd3a5514025297e5fdca1d9546670a7364a1c765a434fc57979da777b39c9390391ce766ece3b3d270

data/lib/ohai/dsl/plugin.rb

@@ -22,6 +22,7 @@ require "ohai/mixin/os"
 require "ohai/mixin/command"
 require "ohai/mixin/seconds_to_human"
 require "ohai/hints"
+require "ohai/util/file_helper"
 
 module Ohai
 
@@ -81,6 +82,7 @@ module Ohai
       include Ohai::Mixin::OS
       include Ohai::Mixin::Command
       include Ohai::Mixin::SecondsToHuman
+      include Ohai::Util::FileHelper
 
       attr_reader :data
 

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

@@ -19,9 +19,8 @@
 
 require "ohai/mixin/dmi_decode"
 
-include Ohai::Mixin::DmiDecode
-
 Ohai.plugin(:Virtualization) do
+  include Ohai::Mixin::DmiDecode
   provides "virtualization"
 
   collect_data(:freebsd, :openbsd, :netbsd, :dragonflybsd) do

data/lib/ohai/plugins/darwin/hardware.rb

@@ -0,0 +1,98 @@
+#
+# Author:: Nate Walck (<nate.walck@gmail.com>)
+# Copyright:: Copyright (c) 2016-present Facebook, 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.
+#
+
+Ohai.plugin(:Hardware) do
+  provides "hardware"
+
+  def system_profiler(datatype)
+    sp_cmd = "system_profiler #{datatype} -xml"
+    # Hardware queries
+    sp_std = shell_out(sp_cmd)
+    sp_hash = Plist.parse_xml(sp_std.stdout)
+  end
+
+  collect_data(:darwin) do
+    unless hardware
+      hardware Mash.new
+    else
+      Ohai::Log.debug("Plugin Darwin Hardware: namespace already exists")
+      next
+    end
+
+    begin
+      require "plist"
+    rescue LoadError => e
+      # In case the plist gem isn't present, skip this plugin.
+      Ohai::Log.debug("Plugin Hardware: Can't load gem: #{e}. Cannot continue.")
+      next
+    end
+
+    hw_hash = system_profiler("SPHardwareDataType")
+    hw_hash[0]["_items"][0].delete("_name")
+    hardware.merge!(hw_hash[0]["_items"][0])
+
+    {
+      "operating_system" => "sw_vers -productName",
+      "operating_system_version" => "sw_vers -productVersion",
+      "build_version" => "sw_vers -buildVersion",
+      "architecture" => "uname -m",
+    }.each do |var, cmd|
+      os_info = shell_out(cmd).stdout
+      hardware[var] = os_info.strip unless os_info.nil?
+    end
+
+    # Storage queries
+    storage = []
+    storage_hash = system_profiler("SPStorageDataType")
+    drives = storage_hash[0]["_items"]
+    drives.each do |drive_entry|
+      drive = Mash.new
+      drive[:name] = drive_entry["_name"]
+      drive[:bsd_name] = drive_entry["bsd_name"]
+      drive[:capacity] = drive_entry["size_in_bytes"]
+      if drive_entry.has_key?("com.apple.corestorage.pv")
+        drive[:drive_type] = drive_entry["com.apple.corestorage.pv"][0]["medium_type"]
+        drive[:smart_status] = drive_entry["com.apple.corestorage.pv"][0]["smart_status"]
+        drive[:partitions] = drive_entry["com.apple.corestorage.pv"].count
+      end
+      storage << drive
+    end
+
+    hardware["storage"] = storage
+
+    # Battery queries
+    battery_hash = system_profiler("SPPowerDataType")
+    power_entries = battery_hash[0]["_items"]
+    battery = Mash.new
+    power_entries.each do |entry|
+      if entry.value?("spbattery_information")
+        charge = entry["sppower_battery_charge_info"]
+        health = entry["sppower_battery_health_info"]
+        battery[:current_capacity] = charge["sppower_battery_current_capacity"]
+        battery[:max_capacity] = charge["sppower_battery_max_capacity"]
+        battery[:fully_charged] = charge["sppower_battery_fully_charged"].eql?("TRUE")
+        battery[:is_charging] = charge["sppower_battery_is_charging"].eql?("TRUE")
+        battery[:charge_cycle_count] = health["sppower_battery_cycle_count"]
+        battery[:health] = health["sppower_battery_health"]
+        battery[:serial] = entry["sppower_battery_model_info"]["sppower_battery_serial_number"]
+        battery[:remaining] = (battery["current_capacity"].to_f / battery["max_capacity"].to_f * 100).to_i
+      end
+    end
+    hardware[:battery] = battery
+  end
+end

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

@@ -1,6 +1,8 @@
 #
 # Author:: Pavel Yudin (<pyudin@parallels.com>)
+# Author:: Tim Smith (<tsmith@chef.io>)
 # Copyright:: Copyright (c) 2015 Pavel Yudin
+# Copyright:: Copyright (c) 2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,13 +18,13 @@
 # limitations under the License.
 #
 
-require "ohai/util/file_helper"
-
-include Ohai::Util::FileHelper
-
 Ohai.plugin(:Virtualization) do
   provides "virtualization"
 
+  def vboxmanage_exists?
+    which("VBoxManage")
+  end
+
   def prlctl_exists?
     which("prlctl")
   end
@@ -31,18 +33,31 @@ Ohai.plugin(:Virtualization) do
     which("ioreg")
   end
 
+  def fusion_exists?
+    ::File.exist?("/Applications/VMware\ Fusion.app/")
+  end
+
   collect_data(:darwin) do
     virtualization Mash.new unless virtualization
     virtualization[:systems] = Mash.new unless virtualization[:systems]
 
+    if vboxmanage_exists?
+      virtualization[:system] = "vbox"
+      virtualization[:role] = "host"
+      virtualization[:systems][:vbox] = "host"
+    end
+
+    if fusion_exists?
+      virtualization[:system] = "vmware"
+      virtualization[:role] = "host"
+      virtualization[:systems][:vmware] = "host"
+    end
+
     if prlctl_exists?
       virtualization[:system] = "parallels"
       virtualization[:role] = "host"
       virtualization[:systems][:parallels] = "host"
-    end
-
-    # Detect Parallels virtual machine from pci devices
-    if ioreg_exists?
+    elsif ioreg_exists?
       so = shell_out("ioreg -l")
       if so.stdout =~ /pci1ab8,4000/
         virtualization[:system] = "parallels"

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

@@ -35,7 +35,7 @@ Ohai.plugin(:BlockDevice) do
             File.open("/sys/block/#{dir}/device/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
           end
         end
-        %w{rotational}.each do |check|
+        %w{rotational physical_block_size logical_block_size}.each do |check|
           if File.exists?("/sys/block/#{dir}/queue/#{check}")
             File.open("/sys/block/#{dir}/queue/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
           end

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

@@ -22,6 +22,7 @@ Ohai.plugin(:Memory) do
   collect_data(:linux) do
     memory Mash.new
     memory[:swap] = Mash.new
+    memory[:hugepages] = Mash.new
 
     File.open("/proc/meminfo").each do |line|
       case line
@@ -81,6 +82,16 @@ Ohai.plugin(:Memory) do
         memory[:swap][:total] = "#{$1}#{$2}"
       when /^SwapFree:\s+(\d+) (.+)$/
         memory[:swap][:free] = "#{$1}#{$2}"
+      when /^HugePages_Total:\s+(\d+)$/
+        memory[:hugepages][:total] = "#{$1}"
+      when /^HugePages_Free:\s+(\d+)$/
+        memory[:hugepages][:free] = "#{$1}"
+      when /^HugePages_Rsvd:\s+(\d+)$/
+        memory[:hugepages][:reserved] = "#{$1}"
+      when /^HugePages_Surp:\s+(\d+)$/
+        memory[:hugepages][:surplus] = "#{$1}"
+      when /^Hugepagesize:\s+(\d+) (.+)$/
+        memory[:hugepage_size] = "#{$1}#{$2}"
       end
     end
   end

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

@@ -16,10 +16,6 @@
 # limitations under the License.
 #
 
-require "ohai/util/file_helper"
-
-include Ohai::Util::FileHelper
-
 Ohai.plugin(:Sessions) do
   provides "sessions/by_session", "sessions/by_user"
 

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

@@ -16,13 +16,10 @@
 # limitations under the License.
 #
 
-require "ohai/util/file_helper"
 require "ohai/mixin/dmi_decode"
 
-include Ohai::Util::FileHelper
-include Ohai::Mixin::DmiDecode
-
 Ohai.plugin(:Virtualization) do
+  include Ohai::Mixin::DmiDecode
   provides "virtualization"
 
   def lxc_version_exists?

data/lib/ohai/plugins/php.rb

@@ -33,7 +33,7 @@ Ohai.plugin(:PHP) do
         php = Mash.new
         so.stdout.each_line do |line|
           case line
-          when /PHP (\S+).+built: ([^)]+)/
+          when /^PHP (\S+)(?:.*built: ([^)]+))?/
             php[:version] = $1
             php[:builddate] = $2
           when /Zend Engine v([^\s]+),/

data/lib/ohai/plugins/shells.rb

@@ -0,0 +1,31 @@
+#
+# Author:: Tim Smith (<tsmith@chef.io>)
+# Copyright:: Copyright (c) 2016 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.
+#
+
+Ohai.plugin(:Shells) do
+  provides "shells"
+
+  collect_data do
+    if ::File.exist?("/etc/shells")
+      shells []
+      ::File.readlines("/etc/shells").each do |line|
+        # remove carriage returns and skip over comments / empty lines
+        shells << line.chomp if line[0] == "/"
+      end
+    end
+  end
+end

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

@@ -19,9 +19,9 @@
 #
 
 require "ohai/mixin/dmi_decode"
-include Ohai::Mixin::DmiDecode
 
 Ohai.plugin(:Virtualization) do
+  include Ohai::Mixin::DmiDecode
   provides "virtualization"
 
   def collect_solaris_guestid

data/lib/ohai/version.rb

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

data/ohai.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.email = "adam@chef.io"
   s.homepage = "https://docs.chef.io/ohai.html"
 
-  s.required_ruby_version = ">= 2.0.0"
+  s.required_ruby_version = ">= 2.1.0"
 
   s.add_dependency "systemu", "~> 2.6.4"
   s.add_dependency "ffi-yajl", "~> 2.2"

data/spec/unit/plugins/darwin/hardware_spec.rb

@@ -0,0 +1,116 @@
+#
+# Author:: Nate Walck (<nate.walck@gmail.com>)
+# Copyright:: Copyright (c) 2016-present Facebook, 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.
+#
+
+require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require File.expand_path("#{File.dirname(__FILE__)}/hardware_system_profiler_output.rb")
+
+describe Ohai::System, "Darwin hardware plugin", :unix_only do
+  let (:plugin) { get_plugin("darwin/hardware") }
+  before(:each) do
+    allow(plugin).to receive(:collect_os).and_return(:darwin)
+    # Make sure it always runs correct commands and mock the data as it calls them
+    allow(plugin).to receive(:shell_out).with(
+      "system_profiler SPHardwareDataType -xml"
+    ).and_return(
+      mock_shell_out(0, HardwareSystemProfilerOutput::Hardware, "")
+    )
+
+    allow(plugin).to receive(:shell_out).with(
+      "sw_vers -productName"
+    ).and_return(
+      mock_shell_out(0, "Mac OS X", "")
+    )
+
+    allow(plugin).to receive(:shell_out).with(
+      "sw_vers -productVersion"
+    ).and_return(
+      mock_shell_out(0, "10.12", "")
+    )
+
+    allow(plugin).to receive(:shell_out).with(
+      "sw_vers -buildVersion"
+    ).and_return(
+      mock_shell_out(0, "16A239j", "")
+    )
+
+    allow(plugin).to receive(:shell_out).with(
+      "uname -m"
+    ).and_return(
+      mock_shell_out(0, "x86_64", "")
+    )
+
+    allow(plugin).to receive(:shell_out).with(
+      "system_profiler SPStorageDataType -xml"
+    ).and_return(
+      mock_shell_out(0, HardwareSystemProfilerOutput::Storage, "")
+    )
+
+    allow(plugin).to receive(:shell_out).with(
+      "system_profiler SPPowerDataType -xml"
+    ).and_return(
+      mock_shell_out(0, HardwareSystemProfilerOutput::Power, "")
+    )
+  end
+
+  it "parses hardware data correctly" do
+    plugin.run
+    expect(plugin["hardware"]["SMC_version_system"]).to eq("2.16f68")
+    expect(plugin["hardware"]["boot_rom_version"]).to eq("MBP111.0138.B17")
+    expect(plugin["hardware"]["cpu_type"]).to eq("Intel Core i7")
+    expect(plugin["hardware"]["current_processor_speed"]).to eq("3 GHz")
+    expect(plugin["hardware"]["l2_cache_core"]).to eq("256 KB")
+    expect(plugin["hardware"]["l3_cache"]).to eq("4 MB")
+    expect(plugin["hardware"]["machine_model"]).to eq("MacBookPro11,1")
+    expect(plugin["hardware"]["machine_name"]).to eq("MacBook Pro")
+    expect(plugin["hardware"]["number_processors"]).to eq(2)
+    expect(plugin["hardware"]["packages"]).to eq(1)
+    expect(plugin["hardware"]["physical_memory"]).to eq("16 GB")
+    expect(plugin["hardware"]["platform_UUID"]).to eq("F1A4AE0F-84A8-45D8-83C7-F3F904464FC5")
+    expect(plugin["hardware"]["serial_number"]).to eq("ABCDEFG12345")
+  end
+
+  it "parses sw_vers and uname data correctly" do
+    plugin.run
+    expect(plugin["hardware"]["operating_system"]).to eq("Mac OS X")
+    expect(plugin["hardware"]["operating_system_version"]).to eq("10.12")
+    expect(plugin["hardware"]["build_version"]).to eq("16A239j")
+    expect(plugin["hardware"]["architecture"]).to eq("x86_64")
+  end
+
+  it "parses storage data correctly" do
+    plugin.run
+    expect(plugin["hardware"]["storage"][0]["name"]).to eq("Macintosh HD")
+    expect(plugin["hardware"]["storage"][0]["bsd_name"]).to eq("disk1")
+    expect(plugin["hardware"]["storage"][0]["capacity"]).to eq(249661751296)
+    expect(plugin["hardware"]["storage"][0]["drive_type"]).to eq("ssd")
+    expect(plugin["hardware"]["storage"][0]["smart_status"]).to eq("Verified")
+    expect(plugin["hardware"]["storage"][0]["partitions"]).to eq(1)
+  end
+
+  it "parses storage data correctly" do
+    plugin.run
+    expect(plugin["hardware"]["battery"]["current_capacity"]).to eq(5841)
+    expect(plugin["hardware"]["battery"]["max_capacity"]).to eq(5841)
+    expect(plugin["hardware"]["battery"]["fully_charged"]).to eq(true)
+    expect(plugin["hardware"]["battery"]["is_charging"]).to eq(false)
+    expect(plugin["hardware"]["battery"]["charge_cycle_count"]).to eq(201)
+    expect(plugin["hardware"]["battery"]["health"]).to eq("Good")
+    expect(plugin["hardware"]["battery"]["serial"]).to eq("D123456789ABCDEFG")
+    expect(plugin["hardware"]["battery"]["remaining"]).to eq(100)
+  end
+end