ohai 7.0.4 → 7.2.0.alpha.0

data/lib/ohai/plugins/passwd.rb

@@ -19,7 +19,8 @@ Ohai.plugin(:Passwd) do
       Etc.passwd do |entry|
         user_passwd_entry = Mash.new(:dir => entry.dir, :gid => entry.gid, :uid => entry.uid, :shell => entry.shell, :gecos => entry.gecos)
         user_passwd_entry.each_value {|v| fix_encoding(v)}
-        etc[:passwd][fix_encoding(entry.name)] = user_passwd_entry
+        entry_name = fix_encoding(entry.name)
+        etc[:passwd][entry_name] = user_passwd_entry unless etc[:passwd].has_key?(entry_name)
       end
 
       Etc.group do |entry|

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

@@ -50,7 +50,7 @@ Ohai.plugin(:Platform) do
         when /^\s*(OpenSolaris).*snv_(\d+).*$/
           platform "opensolaris"
           platform_version $2
-        when /^\s*(Oracle Solaris) (\d+)\s.*$/
+        when /^\s*(Oracle Solaris)/
           platform "solaris2"
         when /^\s*(Solaris)\s.*$/
           platform "solaris2"

data/lib/ohai/plugins/uptime.rb

@@ -94,9 +94,9 @@ Ohai.plugin(:Uptime) do
   end
 
   collect_data(:windows) do
-    require 'ruby-wmi'
-
-    uptime_seconds ::WMI::Win32_PerfFormattedData_PerfOS_System.find(:first).SystemUpTime.to_i
+    require 'wmi-lite/wmi'
+    wmi = WmiLite::Wmi.new
+    uptime_seconds wmi.first_of('Win32_PerfFormattedData_PerfOS_System')['systemuptime'].to_i
     uptime seconds_to_human(uptime_seconds)
   end
 

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

@@ -20,13 +20,16 @@ Ohai.plugin(:CPU) do
   provides "cpu"
 
   collect_data(:windows) do
-    require 'ruby-wmi'
+    require 'wmi-lite/wmi'
 
     cpuinfo = Mash.new
     cpu_number = 0
     index = 0
 
-    WMI::Win32_Processor.find(:all).each do |processor|
+    wmi = WmiLite::Wmi.new
+    processors = wmi.instances_of('Win32_Processor')
+
+    processors.find(:all).each do |processor|
       #
       # On Windows Server 2003 R2 (i.e. 5.2.*), numberofcores property 
       # doesn't exist on the Win32_Processor class unless the user has
@@ -39,7 +42,7 @@ Ohai.plugin(:CPU) do
 
       number_of_cores = nil
       begin
-        number_of_cores = processor.numberofcores
+        number_of_cores = processor['numberofcores']
         cpu_number += number_of_cores
       rescue NoMethodError => e
         Ohai::Log.info("Can not find numberofcores property on Win32_Processor. Consider applying this patch: http://support.microsoft.com/kb/932370")
@@ -48,16 +51,16 @@ Ohai.plugin(:CPU) do
       current_cpu = index.to_s
       index += 1
       cpuinfo[current_cpu] = Mash.new
-      cpuinfo[current_cpu]["vendor_id"] = processor.manufacturer
-      cpuinfo[current_cpu]["family"] = processor.family.to_s
-      cpuinfo[current_cpu]["model"] = processor.revision.to_s
-      cpuinfo[current_cpu]["stepping"] = processor.stepping
-      cpuinfo[current_cpu]["physical_id"] = processor.deviceid
+      cpuinfo[current_cpu]["vendor_id"] = processor['manufacturer']
+      cpuinfo[current_cpu]["family"] = processor['family'].to_s
+      cpuinfo[current_cpu]["model"] = processor['revision'].to_s
+      cpuinfo[current_cpu]["stepping"] = processor['stepping']
+      cpuinfo[current_cpu]["physical_id"] = processor['deviceid']
       #cpuinfo[current_cpu]["core_id"] = XXX
       cpuinfo[current_cpu]["cores"] = number_of_cores
-      cpuinfo[current_cpu]["model_name"] = processor.description
-      cpuinfo[current_cpu]["mhz"] = processor.maxclockspeed.to_s
-      cpuinfo[current_cpu]["cache_size"] = "#{processor.l2cachesize} KB"
+      cpuinfo[current_cpu]["model_name"] = processor['description']
+      cpuinfo[current_cpu]["mhz"] = processor['maxclockspeed'].to_s
+      cpuinfo[current_cpu]["cache_size"] = "#{processor['l2cachesize']} KB"
       #cpuinfo[current_cpu]["flags"] = XXX
     end
 

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

@@ -20,20 +20,24 @@ Ohai.plugin(:Filesystem) do
   provides "filesystem"
 
   collect_data(:windows) do
-    require 'ruby-wmi'
+
+    require 'wmi-lite/wmi'
 
     fs = Mash.new
     ld_info = Mash.new
 
+    wmi = WmiLite::Wmi.new
+
     # Grab filesystem data from WMI
     # Note: we should really be parsing Win32_Volume and Win32_Mapped drive
-    disks = WMI::Win32_LogicalDisk.find(:all)
+    disks = wmi.instances_of('Win32_LogicalDisk')
+
     disks.each do |disk|
-      filesystem = disk.DeviceID
+      filesystem = disk['deviceid']
       fs[filesystem] = Mash.new
       ld_info[filesystem] = Mash.new
-      disk.properties_.each do |p|
-        ld_info[filesystem][p.name.wmi_underscore.to_sym] = disk.send(p.name)
+      disk.wmi_ole_object.properties_.each do |p|
+        ld_info[filesystem][p.name.wmi_underscore.to_sym] = disk[p.name.downcase]
       end
       fs[filesystem][:kb_size] = ld_info[filesystem][:size].to_i / 1000
       fs[filesystem][:kb_available] = ld_info[filesystem][:free_space].to_i / 1000

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

@@ -26,7 +26,8 @@ Ohai.plugin(:Network) do
   end
 
   collect_data(:windows) do
-    require 'ruby-wmi'
+
+    require 'wmi-lite/wmi'
 
     iface = Mash.new
     iface_config = Mash.new
@@ -37,22 +38,28 @@ Ohai.plugin(:Network) do
     counters[:network] = Mash.new unless counters[:network]
 
     # http://msdn.microsoft.com/en-us/library/windows/desktop/aa394217%28v=vs.85%29.aspx
-    adapters = WMI::Win32_NetworkAdapterConfiguration.find(:all)
+    wmi = WmiLite::Wmi.new
+
+    adapters = wmi.instances_of('Win32_NetworkAdapterConfiguration')
+
     adapters.each do |adapter|
-      i = adapter.Index
+
+      i = adapter['index']
       iface_config[i] = Mash.new
-      adapter.properties_.each do |p|
-        iface_config[i][p.name.wmi_underscore.to_sym] = adapter.invoke(p.name)
+      adapter.wmi_ole_object.properties_.each do |p|
+        iface_config[i][p.name.wmi_underscore.to_sym] = adapter[p.name.downcase]
       end
     end
 
     # http://msdn.microsoft.com/en-us/library/windows/desktop/aa394216(v=vs.85).aspx
-    adapters = WMI::Win32_NetworkAdapter.find(:all)
+
+    adapters = wmi.instances_of('Win32_NetworkAdapter')
+
     adapters.each do |adapter|
-      i = adapter.Index
+      i = adapter['index']
       iface_instance[i] = Mash.new
-      adapter.properties_.each do |p|
-        iface_instance[i][p.name.wmi_underscore.to_sym] = adapter.invoke(p.name)
+      adapter.wmi_ole_object.properties_.each do |p|
+        iface_instance[i][p.name.wmi_underscore.to_sym] = adapter[p.name.downcase]
       end
     end
 

data/lib/ohai/util/file_helper.rb

@@ -0,0 +1,35 @@
+# Author:: Lamont Granquist (<lamont@opscode.com>)
+#
+# Copyright:: Copyright (c) 2013-14 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.
+
+# Copied from chef/lib/chef/util/selinux.rb
+
+module Ohai
+  module Util
+    module FileHelper
+      def which(cmd)
+        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)
+        end
+        false
+      end
+    end
+  end
+end
+

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '7.0.4'
+  VERSION = '7.2.0.alpha.0'
 end

data/spec/unit/plugins/freebsd/cpu_spec.rb

@@ -0,0 +1,68 @@
+#
+# Author:: Tim Smith <tsmith@limelight.com>
+# Copyright:: Copyright (c) 2014 Limelight Networks, 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')
+
+describe Ohai::System, "FreeBSD cpu plugin" do
+  before(:each) do
+    @plugin = get_plugin("freebsd/cpu")
+    @plugin.stub(:collect_os).and_return(:freebsd)
+    @plugin.stub(:shell_out).with("sysctl -n hw.ncpu").and_return(mock_shell_out(0, "2", ""))
+    @double_file = double("/var/run/dmesg.boot")
+    @double_file.stub(:each).
+      and_yield('CPU: Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz (3516.61-MHz K8-class CPU)').
+      and_yield('  Origin = "GenuineIntel"  Id = 0x306a9  Family = 6  Model = 3a  Stepping = 9').
+      and_yield('  Features=0x783fbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,MMX,FXSR,SSE,SSE2>').
+      and_yield('  Features2=0x209<SSE3,MON,SSSE3>').
+      and_yield('  AMD Features=0x28100800<SYSCALL,NX,RDTSCP,LM>').
+      and_yield('  AMD Features2=0x1<LAHF>').
+      and_yield('  TSC: P-state invariant')
+    File.stub(:open).with("/var/run/dmesg.boot").and_return(@double_file)
+  end
+
+  it "detects all CPU flags" do
+    @plugin.run
+    @plugin[:cpu][:flags].should == %w{fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 mmx fxsr sse sse2 sse3 mon ssse3 syscall nx rdtscp lm lahf}
+  end
+
+  it "detects all CPU model_name" do
+    @plugin.run
+    @plugin[:cpu][:model_name].should == "Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz"
+  end
+
+  it "detects all CPU mhz" do
+    @plugin.run
+    @plugin[:cpu][:mhz].should == "3516.61"
+  end
+
+  it "detects all CPU vendor_id" do
+    @plugin.run
+    @plugin[:cpu][:vendor_id].should == "GenuineIntel"
+  end
+
+  it "detects all CPU stepping" do
+    @plugin.run
+    @plugin[:cpu][:stepping].should == "9"
+  end
+
+  it "detects all CPU total" do
+    @plugin.run
+    @plugin[:cpu][:total].should == "2"
+  end
+
+end

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

@@ -6,9 +6,9 @@
 # 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.
@@ -16,7 +16,6 @@
 # limitations under the License.
 #
 
-
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "FreeBSD virtualization plugin" do
@@ -47,7 +46,6 @@ describe Ohai::System, "FreeBSD virtualization plugin" do
     end
   end
 
-
   context "when on a virtualbox guest" do
     before do
       @vbox_guest = <<-OUT
@@ -55,7 +53,7 @@ Id Refs Address Size Name
 1 40 0xffffffff80100000 d20428 kernel
 7 3 0xffffffff81055000 41e88 vboxguest.ko
 OUT
-      @plugin.stub(:shell_out).with("#{ Ohai.abs_path( "/sbin/kldstat" )}").and_return(mock_shell_out(0, @vbox_guest, ""))
+      @plugin.stub(:shell_out).with("#{ Ohai.abs_path("/sbin/kldstat")}").and_return(mock_shell_out(0, @vbox_guest, ""))
     end
 
     it "detects we are a guest" do
@@ -84,16 +82,14 @@ OUT
 
   context "when on a QEMU guest" do
     it "detects we are a guest" do
-      @qemu_guest = 'QEMU Virtual CPU version (cpu64-rhel6) ("GenuineIntel" 686-class)'
-      @plugin.stub(:shell_out).with("sysctl -n hw.model").and_return(mock_shell_out(0, @qemu_guest, ""))
-      @plugin.run
-      @plugin[:virtualization][:system].should == "kvm"
-      @plugin[:virtualization][:role].should == "guest"
+      [ 'Common KVM processor', 'QEMU Virtual CPU version (cpu64-rhel6) ("GenuineIntel" 686-class)', 'Common 32-bit KVM processor'].each do |kvm_string|
+        @plugin.stub(:shell_out).with("sysctl -n hw.model").and_return(mock_shell_out(0, kvm_string, ""))
+        @plugin.run
+        @plugin[:virtualization][:system].should == "kvm"
+        @plugin[:virtualization][:role].should == "guest"
+      end
     end
   end
 
   # TODO upfactor tests from linux virtualization plugin for dmidecode
 end
-
-
-

data/spec/unit/plugins/kernel_spec.rb

@@ -37,33 +37,44 @@ describe Ohai::System, "plugin kernel" do
 
   describe "when running on windows", :windows_only do
     before do
-      require 'ruby-wmi'
+      require 'wmi-lite/wmi'
 
       @ohai_system = Ohai::System.new
       @plugin = get_plugin("kernel", @ohai_system)
 
-      caption = double("WIN32OLE", :name => "caption")
-      version = double("WIN32OLE", :name => "version")
+      # Mock a Win32_OperatingSystem OLE32 WMI object
+      caption = double("WIN32OLE", :name => "Caption")
+      version = double("WIN32OLE", :name => "Version")
       build_number = double("WIN32OLE", :name => "BuildNumber")
       csd_version  = double("WIN32OLE", :name => "CsdVersion")
       os_type = double("WIN32OLE", :name => "OsType")
       os_properties = [ caption, version, build_number, csd_version, os_type ]
 
-      os =  double("WIN32OLE",
-                     :properties_ => os_properties,
-                     :caption => "Microsoft Windows 7 Ultimate",
-                     :version => "6.1.7601",
-                     :BuildNumber => "7601",
-                     :CsdVersion => "Service Pack 1",
-                     :OsType => 18)
-      WMI::Win32_OperatingSystem.should_receive(:find).with(:first).and_return(os)
+      os =  double( "WIN32OLE",
+                    :properties_ => os_properties)
+
+      os.stub(:invoke).with(build_number.name).and_return('7601')
+      os.stub(:invoke).with(csd_version.name).and_return('Service Pack 1')
+      os.stub(:invoke).with(os_type.name).and_return(18)
+      os.stub(:invoke).with(caption.name).and_return('Microsoft Windows 7 Ultimate')
+      os.stub(:invoke).with(version.name).and_return('6.1.7601')
+
+      os_wmi = WmiLite::Wmi::Instance.new(os)
+
+      WmiLite::Wmi.any_instance.should_receive(:first_of).with('Win32_OperatingSystem').and_return(os_wmi)
+
+      # Mock a Win32_ComputerSystem OLE32 WMI object
+      x64_system_type = 'x64-based PC'
 
       cs = double("WIN32OLE",
-                  :properties_ => [ double("WIN32OLE", :name => "SystemType") ],
-                  :SystemType => "x64-based PC")
-      WMI::Win32_ComputerSystem.should_receive(:find).with(:first).and_return(cs)
+                  :properties_ => [ double("WIN32OLE", :name => "SystemType") ])
+
+      cs.stub(:invoke).with('SystemType').and_return(x64_system_type)
+
+      cs_wmi = WmiLite::Wmi::Instance.new(cs)
 
-      WMI::Win32_PnPSignedDriver.should_receive(:find).with(:all).and_return([ ])
+      WmiLite::Wmi.any_instance.should_receive(:first_of).with('Win32_ComputerSystem').and_return(cs_wmi)
+      WmiLite::Wmi.any_instance.should_receive(:instances_of).with('Win32_PnPSignedDriver').and_return([])
 
       @plugin.run
     end

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

@@ -0,0 +1,104 @@
+#
+#  Author:: Tim Smith <tsmith@limelight.com>
+#  Copyright:: Copyright (c) 2014 Limelight Networks, 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')
+
+describe Ohai::System, "Linux Mdadm Plugin" do
+  before(:each) do
+    @md0 = <<-MD
+/dev/md0:
+        Version : 1.2
+  Creation Time : Thu Jan 30 03:11:40 2014
+     Raid Level : raid10
+     Array Size : 2929893888 (2794.16 GiB 3000.21 GB)
+  Used Dev Size : 976631296 (931.39 GiB 1000.07 GB)
+   Raid Devices : 6
+  Total Devices : 6
+    Persistence : Superblock is persistent
+
+    Update Time : Tue May  6 23:30:32 2014
+          State : clean
+ Active Devices : 6
+Working Devices : 6
+ Failed Devices : 0
+  Spare Devices : 0
+
+         Layout : near=2
+     Chunk Size : 256K
+
+           Name : host.therealtimsmith.com:3  (local to host host.therealtimsmith.com)
+           UUID : 5ed74d5b:70bfe21d:8cd57792:c1e13d65
+         Events : 155
+
+    Number   Major   Minor   RaidDevice State
+       0       8       32        0      active sync   /dev/sdc
+       1       8       48        1      active sync   /dev/sdd
+       2       8       64        2      active sync   /dev/sde
+       3       8       80        3      active sync   /dev/sdf
+       4       8       96        4      active sync   /dev/sdg
+       5       8      112        5      active sync   /dev/sdh
+MD
+    @plugin = get_plugin("linux/mdadm")
+    @plugin.stub(:collect_os).and_return(:linux)
+    @double_file = double("/proc/mdstat")
+    @double_file.stub(:each).
+    and_yield("Personalities : [raid1] [raid6] [raid5] [raid4] [linear] [multipath] [raid0] [raid10]").
+    and_yield("md0 : active raid10 sdh[5] sdg[4] sdf[3] sde[2] sdd[1] sdc[0]").
+    and_yield("      2929893888 blocks super 1.2 256K chunks 2 near-copies [6/6] [UUUUUU]")
+    File.stub(:open).with("/proc/mdstat").and_return(@double_file)
+    File.stub(:exist?).with("/proc/mdstat").and_return(true)
+    @plugin.stub(:shell_out).with("mdadm --detail /dev/md0").and_return(mock_shell_out(0, @md0, ""))
+  end
+
+  describe "gathering Mdadm information via /proc/mdstat and mdadm" do
+
+    it "should not raise an error" do
+      lambda { @plugin.run }.should_not raise_error
+    end
+
+    it "should detect raid level" do
+      @plugin.run
+      @plugin[:mdadm][:md0][:level].should == 10
+    end
+
+    it "should detect raid state" do
+      @plugin.run
+      @plugin[:mdadm][:md0][:state].should == "clean"
+    end
+
+    it "should detect raid size" do
+      @plugin.run
+      @plugin[:mdadm][:md0][:size].should == 2794.16
+    end
+
+    it "should detect raid metadata level" do
+      @plugin.run
+      @plugin[:mdadm][:md0][:version].should == 1.2
+    end
+
+    device_counts = { :raid => 6, :total => 6, :active => 6, :working => 6, :failed => 0, :spare => 0 }
+    device_counts.each_pair do |item, expected_value|
+      it "should detect device count of \"#{item}\"" do
+        @plugin.run
+        @plugin[:mdadm][:md0][:device_counts][item].should == expected_value
+      end
+    end
+
+  end
+
+end