ohai 8.6.0.alpha.1 → 8.6.0

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

@@ -28,18 +28,48 @@ Ohai.plugin(:Platform) do
     contents[/Rawhide/i] ? contents[/((\d+) \(Rawhide\))/i, 1].downcase : contents[/release ([\d\.]+)/, 1]
   end
 
-  def os_release_file_is_cisco?
-    return false unless File.exist?('/etc/os-release')
-    os_release_info = File.read('/etc/os-release').split.inject({}) do |map, key_value_line|
-      key, _separator, value = key_value_line.partition('=')
-      map[key] = value
+  #
+  # Reads an os-release-info file and parse it into a hash
+  #
+  # @param file [String] the filename to read (e.g. '/etc/os-release')
+  #
+  # @returns [Hash] the file parsed into a Hash or nil
+  #
+  def read_os_release_info(file)
+    return nil unless File.exist?(file)
+    File.read(file).split.inject({}) do |map, line|
+      key, value = line.split('=')
+      map[key] = value.gsub(/\A"|"\Z/, '') if value
       map
     end
-    if os_release_info['CISCO_RELEASE_INFO'] && File.exist?(os_release_info['CISCO_RELEASE_INFO'])
-      os_release_info
-    else
-      false
-    end
+  end
+
+  #
+  # Cached /etc/os-release info Hash.  Also has logic for Cisco Nexus
+  # switches that pulls the chained CISCO_RELEASE_INFO file into the Hash (other
+  # distros can also reuse this method safely).
+  #
+  # @returns [Hash] the canonical, cached Hash of /etc/os-release info or nil
+  #
+  def os_release_info
+    @os_release_info ||=
+      begin
+        os_release_info = read_os_release_info('/etc/os-release')
+        cisco_release_info = os_release_info['CISCO_RELEASE_INFO'] if os_release_info
+        if cisco_release_info && File.exist?(cisco_release_info)
+          os_release_info.merge!(read_os_release_info(cisco_release_info))
+        end
+        os_release_info
+      end
+  end
+
+  #
+  # If /etc/os-release indicates we are Cisco based
+  #
+  # @returns [Boolean] if we are Cisco according to /etc/os-release
+  #
+  def os_release_file_is_cisco?
+    File.exist?('/etc/os-release') && os_release_info['CISCO_RELEASE_INFO']
   end
 
   collect_data(:linux) do
@@ -74,10 +104,9 @@ Ohai.plugin(:Platform) do
       platform get_redhatish_platform(contents)
       platform_version contents.match(/(\d\.\d\.\d)/)[0]
     elsif File.exist?("/etc/redhat-release")
-      if File.exist?('/etc/os-release') && (os_release_info = os_release_file_is_cisco? ) # check if Cisco
-        platform os_release_info['ID']
-        platform_family os_release_info['ID_LIKE']
-        platform_version os_release_info['VERSION'] || ""
+      if os_release_file_is_cisco? # Cisco guestshell
+        platform 'nexus_centos'
+        platform_version os_release_info['VERSION']
       else
         contents = File.read("/etc/redhat-release").chomp
         platform get_redhatish_platform(contents)
@@ -113,6 +142,12 @@ Ohai.plugin(:Platform) do
       # no way to determine platform_version in a rolling release distribution
       # kernel release will be used - ex. 3.13
       platform_version `uname -r`.strip
+    elsif os_release_file_is_cisco?
+      raise "unknown Cisco /etc/os-release ID field" unless os_release_info['ID'].include?('nexus')
+      raise "unknown Cisco /etc/os-release ID-LIKE field" unless os_release_info['ID_LIKE'].include?('wrlinux')
+      platform 'nexus'
+      platform_family 'wrlinux'
+      platform_version os_release_info['VERSION']
     elsif lsb[:id] =~ /RedHat/i
       platform "redhat"
       platform_version lsb[:release]
@@ -135,7 +170,7 @@ Ohai.plugin(:Platform) do
       platform_family "debian"
     when /fedora/, /pidora/
       platform_family "fedora"
-    when /oracle/, /centos/, /redhat/, /scientific/, /enterpriseenterprise/, /amazon/, /xenserver/, /cloudlinux/, /ibm_powerkvm/, /parallels/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID"
+    when /oracle/, /centos/, /redhat/, /scientific/, /enterpriseenterprise/, /amazon/, /xenserver/, /cloudlinux/, /ibm_powerkvm/, /parallels/, /nexus_centos/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID"
       platform_family "rhel"
     when /suse/
       platform_family "suse"

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

@@ -190,7 +190,9 @@ Ohai.plugin(:Virtualization) do
     # Full notes, https://tickets.opscode.com/browse/OHAI-551
     # Kernel docs, https://www.kernel.org/doc/Documentation/cgroups
     if File.exists?("/proc/self/cgroup")
-      if File.read("/proc/self/cgroup") =~ %r{^\d+:[^:]+:/(lxc|docker)/.+$}
+      cgroup_content = File.read("/proc/self/cgroup")
+      if cgroup_content =~ %r{^\d+:[^:]+:/(lxc|docker)/.+$} ||
+         cgroup_content =~ %r{^\d+:[^:]+:/[^/]+/(lxc|docker)-.+$}
         virtualization[:system] = $1
         virtualization[:role] = "guest"
         virtualization[:systems][$1.to_sym] = "guest"

data/lib/ohai/plugins/softlayer.rb

@@ -0,0 +1,47 @@
+#
+# Author:: Alexey Karpik <alexey.karpik@rightscale.com>
+# Author:: Peter Schroeter <peter.schroeter@rightscale.com>
+# Author:: Stas Turlo <stanislav.turlo@rightscale.com>
+# Copyright:: Copyright (c) 2010-2014 RightScale 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 'ohai/mixin/softlayer_metadata'
+
+Ohai.plugin(:Softlayer) do
+  include ::Ohai::Mixin::SoftlayerMetadata
+
+  provides 'softlayer'
+
+  # Identifies the softlayer cloud
+  #
+  # === Return
+  # true:: If the softlayer cloud can be identified
+  # false:: Otherwise
+  def looks_like_softlayer?
+    hint?('softlayer')
+  end
+
+  collect_data do
+    # Adds softlayer Mash
+    if looks_like_softlayer?
+      ::Ohai::Log.debug("looks_like_softlayer? == true")
+      metadata = fetch_metadata
+      softlayer Mash.new
+      metadata.each { |k,v| softlayer[k] = v } if metadata
+    end
+
+  end
+end

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

@@ -16,26 +16,55 @@
 
 Ohai.plugin(:CPU) do
   provides "cpu"
-
+  
   collect_data(:solaris2) do
     cpu Mash.new
-    cpu[:total] = shell_out("psrinfo | wc -l").stdout.to_i
-    cpu[:real] = shell_out("psrinfo -p").stdout.to_i
-
-    processor_info = shell_out("psrinfo -v -p | grep Hz").stdout
-    processors = processor_info.split(/^    [^\s]/)
-    processors.each_with_index do |processor, i|
-      cpu_info, model_name = processor.split("\n      ")
-      cpu_info = cpu_info.tr("()","").split
+    # This does assume that /usr/bin/kstat is in the path
+    processor_info = shell_out("kstat -p cpu_info").stdout.lines
+    cpu["total"] = 0 
+    cpu["sockets"] = 0 
+    cpu["cores"] = 0
+    cpu["corethreads"] = 0
+    cpu["cpustates"] = Mash.new
 
-      index = i.to_s
-      cpu[index] = Mash.new
-      cpu[index]['vendor_id'] = cpu_info[1]
-      cpu[index]['family'] = cpu_info[4]
-      cpu[index]['model'] = cpu_info[6]
-      cpu[index]['stepping'] = cpu_info[8]
-      cpu[index]['model_name'] = model_name.strip
-      cpu[index]['mhz'] = cpu_info[10]
+    currentcpu = 0
+    cpucores = Array.new
+    cpusockets = Array.new
+    processor_info.each_with_index do |processor, i|
+      desc,instance,record,keyvalue = processor.split(":")
+      cpu[instance] ||= Mash.new
+      if (currentcpu !=  instance)
+         cpu["total"] += 1
+         currentcpu = instance
+      end 
+      kv = keyvalue.split(/\s+/)
+      key = kv.shift
+      value = kv.join(" ").chomp
+      case key
+        when /chip_id/
+           cpu[instance]["socket"] = value
+           cpusockets.push(value) if cpusockets.index(value).nil?
+        when /cpu_type/
+           cpu[instance]["arch"] = value
+        when /clock_MHz/
+           cpu[instance]["mhz"] = value
+        when /brand/
+           cpu[instance]["model_name"] = value.sub(/\s+/," ")
+        when /^state$/
+           cpu[instance]["state"] = value
+           cpu["cpustates"][value] ||= 0 
+           cpu["cpustates"][value] += 1 
+        when /core_id/
+           cpu[instance]["core_id"] = value
+           # Detect hyperthreading/multithreading
+           cpucores.push(value) if cpucores.index(value).nil?
+        when /family|fpu_type|model|stepping|vendor_id/
+           cpu[instance][key] = value
+      end
     end
+    cpu["cores"] = cpucores.size
+    cpu["corethreads"] = (cpu["total"] / cpucores.size)
+    cpu["sockets"] = cpusockets.size
+    cpu["real"] = cpusockets.size
   end
 end

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

@@ -19,6 +19,14 @@ Ohai.plugin(:Memory) do
 
   collect_data(:solaris2) do
     memory Mash.new
-    memory[:total] = shell_out("prtconf -m").stdout.to_i
+    memory[:swap] = Mash.new
+    meminfo =  shell_out("prtconf | grep Memory").stdout
+    memory[:total] = "#{meminfo.split[2].to_i * 1024}kB"
+    
+    tokens = shell_out("swap -s").stdout.strip.split
+    used_swap = tokens[8][0..-1].to_i #strip k from end
+    free_swap = tokens[10][0..-1].to_i #strip k from end
+    memory[:swap][:total] = "#{used_swap + free_swap}kB"
+    memory[:swap][:free] = "#{free_swap}kB"
   end
 end

data/lib/ohai/plugins/vmware.rb

@@ -0,0 +1,73 @@
+#
+# Author:: "Dan Robinson" <drobinson@getchef.com>
+# Author:: "Christopher M. Luciano" <cmlucian@us.ibm.com>
+# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# Copyright (C) 2015 IBM Corp.
+# 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.
+#
+
+#
+# Provides a set of attributes for a VMware ESX virtual machine with results
+# obtained from vmware-toolbox-cmd.  VMware Tools must be installed
+# on the virtual machine.
+#
+# Modify the path to vmware-toolbox-cmd in the call to get_vm_attributes for
+# your particular operating system and configuration
+#
+# Example:
+#
+# get_vm_attributes("/usr/bin/vmware-toolbox-cmd")
+#
+
+Ohai.plugin(:VMware) do
+  provides "vmware"
+
+  def from_cmd(cmd)
+    so = shell_out(cmd)
+    so.stdout.split($/)[0]
+  end
+
+  def get_vm_attributes(vmtools_path)
+    if !File.exist?(vmtools_path)
+      Ohai::Log.debug("#{vmtools_path} not found")
+    else
+      vmware Mash.new
+      begin
+        # vmware-toolbox-cmd stat <param> commands
+        # Iterate through each parameter supported by the "vwware-toolbox-cmd stat" command, assign value
+        # to attribute "vmware[:<parameter>]"
+        [ "hosttime", "speed", "sessionid", "balloon", "swap", "memlimit", "memres", "cpures", "cpulimit" ].each do |param|
+          vmware[param] = from_cmd("#{vmtools_path} stat #{param}")
+          if vmware[param] =~ /UpdateInfo failed/
+            vmware[param] = nil
+          end
+        end
+        # vmware-toolbox-cmd <param> status commands
+        # Iterate through each parameter supported by the "vwware-toolbox-cmd status" command, assign value
+        # to attribute "vmware[:<parameter>]"
+        [ "upgrade", "timesync" ].each do |param|
+          vmware[param] = from_cmd("#{vmtools_path} #{param} status")
+        end
+      rescue
+        Ohai::Log.debug("Error while collecting VMware guest attributes")
+      end
+    end
+  end
+
+  collect_data(:linux) do
+    get_vm_attributes("/usr/bin/vmware-toolbox-cmd")
+  end
+
+end

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

@@ -0,0 +1,38 @@
+#
+# 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"
+
+  collect_data(:windows) do
+    require "wmi-lite/wmi"
+
+    memory Mash.new
+    memory[:swap] = Mash.new
+
+    wmi = WmiLite::Wmi.new
+
+    os = wmi.first_of("Win32_OperatingSystem")
+
+    # MemTotal
+    memory[:total] = os["TotalVisibleMemorySize"] + "kB"
+    # MemFree
+    memory[:free] = os["FreePhysicalMemory"] + "kB"
+    # SwapTotal
+    memory[:swap][:total] = os["SizeStoredInPagingFiles"] + "kB"
+    # SwapFree
+    memory[:swap][:free] = os["FreeSpaceInPagingFiles"] + "kB"
+  end
+end

data/lib/ohai/version.rb

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

data/spec/unit/config_spec.rb

@@ -90,6 +90,34 @@ RSpec.describe Ohai::Config do
     end
   end
 
+  describe "config_context :ohai" do
+    describe "option :plugin" do
+      it "gets configured with a value" do
+        Ohai::Config.ohai[:plugin][:foo] = true
+        expect(Ohai::Config.ohai[:plugin]).to have_key(:foo)
+        expect(Ohai::Config.ohai[:plugin][:foo]).to be true
+      end
+
+      it "gets configured with a Hash" do
+        value = { :bar => true, :baz => true }
+        Ohai::Config.ohai[:plugin][:foo] = value
+        expect(Ohai::Config.ohai[:plugin]).to have_key(:foo)
+        expect(Ohai::Config.ohai[:plugin][:foo]).to eq(value)
+      end
+
+      it "raises an error if the plugin name is not a symbol" do
+        expect { Ohai::Config.ohai[:plugin]["foo"] = false }.
+          to raise_error(Ohai::Exceptions::PluginConfigError, /Expected Symbol/)
+      end
+
+      it "raises an error if the value Hash has non-Symbol key" do
+        value = { :bar => true, "baz" => true }
+        expect { Ohai::Config.ohai[:plugin][:foo] = value }.
+          to raise_error(Ohai::Exceptions::PluginConfigError, /Expected Symbol/)
+      end
+    end
+  end
+
   describe "::merge_deprecated_config" do
     before(:each) do
       allow(Ohai::Log).to receive(:warn)

data/spec/unit/dsl/plugin_spec.rb

@@ -293,6 +293,79 @@ describe Ohai::DSL::Plugin::VersionVII do
     end
   end
 
+  describe "#configuration" do
+    let(:plugin) do
+      klass = Ohai.plugin(camel_name) { }
+      klass.new({})
+    end
+
+    shared_examples_for "plugin config lookup" do
+      it "returns the configuration option value" do
+        Ohai.config[:plugin][snake_name][:foo] = true
+        expect(plugin.configuration(:foo)).to eq(true)
+      end
+    end
+
+    describe "a plugin named Abc" do
+      let(:camel_name) { :Abc }
+      let(:snake_name) { :abc }
+
+      it "returns nil when the plugin is not configured" do
+        expect(plugin.configuration(:foo)).to eq(nil)
+      end
+
+      it "does not auto-vivify an un-configured plugin" do
+        plugin.configuration(:foo)
+        expect(Ohai.config[:plugin]).to_not have_key(:test)
+      end
+
+      it "returns nil when the option is not configured" do
+        Ohai.config[:plugin][snake_name][:foo] = true
+        expect(plugin.configuration(:bar)).to eq(nil)
+      end
+
+      it "returns nil when the suboption is not configured" do
+        Ohai.config[:plugin][snake_name][:foo] = { }
+        expect(plugin.configuration(:foo, :bar)).to eq(nil)
+      end
+
+      include_examples "plugin config lookup"
+
+      it "returns the configuration sub-option value" do
+        Ohai.config[:plugin][snake_name][:foo] = { :bar => true }
+        expect(plugin.configuration(:foo, :bar)).to eq(true)
+      end
+    end
+
+    describe "a plugin named ABC" do
+      let(:camel_name) { :ABC }
+      let(:snake_name) { :abc }
+
+      include_examples "plugin config lookup"
+    end
+
+    describe "a plugin named Abc2" do
+      let(:camel_name) { :Abc2 }
+      let(:snake_name) { :abc_2 }
+
+      include_examples "plugin config lookup"
+    end
+
+    describe "a plugin named AbcAbc" do
+      let(:camel_name) { :AbcXyz }
+      let(:snake_name) { :abc_xyz }
+
+      include_examples "plugin config lookup"
+    end
+
+    describe "a plugin named ABCLmnoXyz" do
+      let(:camel_name) { :ABCLmnoXyz }
+      let(:snake_name) { :abc_lmno_xyz }
+
+      include_examples "plugin config lookup"
+    end
+  end
+
   it_behaves_like "Ohai::DSL::Plugin" do
     let(:ohai) { Ohai::System.new }
     let(:plugin) { Ohai::DSL::Plugin::VersionVII.new(ohai.data) }