ohai 13.5.0 → 13.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e65f269d28a4e10d57a696348f63e3ab208e6d55
-  data.tar.gz: 75ed053be1baa6c94abe967f350d8e5469f68a91
+  metadata.gz: f877e6723a132a880743b84ab9a9d6a0ede623eb
+  data.tar.gz: 7bb2833e7c7d12bc8207608bf14f93b266e48371
 SHA512:
-  metadata.gz: 6240f2a183fef7382c07416c887595d6855ff5210c453acbde845b3fb240f8efdbf3a8c41c8e51c39b887a744a34d9d7fe6b8511a9a45697e29fbf60da8957ca
-  data.tar.gz: 56e191347c743a0070b0f82e9f4f99928e954c9376d1778ddfbc4952271972645782fd6ee1b09e0f075e6e1c4233c18450a24e02979923a899e86af6cc182ab5
+  metadata.gz: b7b5ff8c56d7f071ac3278e345c91bd8df4f9a5e4e07fd4aec0a714833f1debaabc02a588d6ca2b5c43595d8799662410d6ec95cca4b9fb84a641358ccfb4c06
+  data.tar.gz: d062c3f9b9595a699be681be9d3b1a8bb6513e61fefc7662fbc3e88f0f5063dbe2b640997e4957e0ff4667b79023e4016e114ba68c34d288b6c2e27479b22e40

data/lib/ohai/config.rb

@@ -35,6 +35,7 @@ module Ohai
       default :log_location, STDERR
       default :plugin, Ohai::PluginConfig.new { |h, k| h[k] = Ohai::PluginConfig.new }
       default :plugin_path, [ File.expand_path(File.join(File.dirname(__FILE__), "plugins")), ChefConfig::Config.platform_specific_path("/etc/chef/ohai/plugins") ]
+      default :critical_plugins, []
     end
   end
 

data/lib/ohai/dsl/plugin.rb

@@ -85,10 +85,12 @@ module Ohai
       include Ohai::Util::FileHelper
 
       attr_reader :data
+      attr_reader :failed
 
       def initialize(data)
         @data = data
         @has_run = false
+        @failed = false
       end
 
       def run
@@ -182,8 +184,10 @@ module Ohai
       def safe_run
         run
       rescue Ohai::Exceptions::Error => e
+        @failed = true
         raise e
       rescue => e
+        @failed = true
         Ohai::Log.debug("Plugin #{name} threw #{e.inspect}")
         e.backtrace.each { |line| Ohai::Log.debug( line ) }
       end

data/lib/ohai/exception.rb

@@ -29,5 +29,6 @@ module Ohai
     class DependencyNotFound < Error; end
     class AttributeSyntaxError < Error; end
     class PluginConfigError < Error; end
+    class CriticalPluginFailure < Error; end
   end
 end

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

@@ -46,7 +46,8 @@ Ohai.plugin(:Uptime) do
     end
     elapsed_seconds = ((d.to_i * 86400) + (h.to_i * 3600) + (m.to_i * 60) + s.to_i)
 
-    uptime_seconds Time.now.to_i - elapsed_seconds
+    # uptime seconds below will return the elapsed time since boot
+    uptime_seconds elapsed_seconds
     uptime seconds_to_human(elapsed_seconds)
   end
 end

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

@@ -130,7 +130,10 @@ Ohai.plugin(:Filesystem) do
           fs[key][:mount] = $6
         end
       end
-    rescue Ohai::Exceptions::Exec
+    rescue Ohai::Exceptions::Exec => e
+      unless Ohai.config[:plugin][:filesystem][:allow_partial_data]
+        raise e
+      end
       Ohai::Log.warn("Plugin Filesystem: df binary is not available. Some data will not be available.")
     end
 
@@ -148,6 +151,9 @@ Ohai.plugin(:Filesystem) do
         end
       end
     rescue Ohai::Exceptions::Exec
+      unless Ohai.config[:plugin][:filesystem][:allow_partial_data]
+        raise e
+      end
       Ohai::Log.warn("Plugin Filesystem: mount binary is not available. Some data will not be available.")
     end
 

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

@@ -22,7 +22,7 @@ Ohai.plugin(:Virtualization) do
   provides "virtualization"
 
   def lxc_version_exists?
-    which("lxc-version")
+    which("lxc-version") || which("lxc-start")
   end
 
   def nova_exists?

data/lib/ohai/plugins/packages.rb

@@ -43,7 +43,7 @@ Ohai.plugin(:Packages) do
         packages[name] = { "version" => version, "arch" => arch }
       end
 
-    when "rhel", "fedora", "suse", "pld"
+    when "rhel", "fedora", "suse", "pld", "amazon"
       format = '%{NAME}\t%|EPOCH?{%{EPOCH}}:{0}|\t%{VERSION}\t%{RELEASE}\t%{INSTALLTIME}\t%{ARCH}\n'
       so = shell_out("rpm -qa --qf '#{format}'")
       pkgs = so.stdout.lines

data/lib/ohai/plugins/rackspace.rb

@@ -43,13 +43,27 @@ Ohai.plugin(:Rackspace) do
     false
   end
 
+  # Checks for the rackspace manufacturer on Windows
+  # === Return
+  # true:: If the rackspace cloud can be identified
+  # false:: Otherwise
+  def has_rackspace_manufacturer?
+    return false unless RUBY_PLATFORM =~ /mswin|mingw32|windows/
+    require "wmi-lite/wmi"
+    wmi = WmiLite::Wmi.new
+    if wmi.first_of("Win32_ComputerSystem")["PrimaryOwnerName"] == "Rackspace"
+      Ohai::Log.debug("Plugin Rackspace: has_rackspace_manufacturer? == true")
+      return true
+    end
+  end
+
   # Identifies the rackspace cloud
   #
   # === Return
   # true:: If the rackspace cloud can be identified
   # false:: Otherwise
   def looks_like_rackspace?
-    hint?("rackspace") || has_rackspace_metadata? || has_rackspace_kernel?
+    hint?("rackspace") || has_rackspace_metadata? || has_rackspace_kernel? || has_rackspace_manufacturer?
   end
 
   # Names rackspace ip address
@@ -137,8 +151,8 @@ Ohai.plugin(:Rackspace) do
       rackspace Mash.new
       get_ip_address(:public_ip, :eth0)
       get_ip_address(:private_ip, :eth1)
-      get_region()
-      get_instance_id()
+      get_region
+      get_instance_id
       # public_ip + private_ip are deprecated in favor of public_ipv4 and local_ipv4 to standardize.
       rackspace[:public_ipv4] = rackspace[:public_ip]
       get_global_ipv6_address(:public_ipv6, :eth0)

data/lib/ohai/runner.rb

@@ -23,11 +23,13 @@ require "benchmark"
 module Ohai
   class Runner
 
+    attr_reader :failed_plugins
     # safe_run: set to true if this runner will run plugins in
     # safe-mode. default false.
     def initialize(controller, safe_run = false)
       @provides_map = controller.provides_map
       @safe_run = safe_run
+      @failed_plugins = []
     end
 
     # Runs plugins and any un-run dependencies.
@@ -86,6 +88,9 @@ module Ohai
 
         if dependency_providers.empty?
           @safe_run ? next_plugin.safe_run : next_plugin.run
+          if next_plugin.failed
+            @failed_plugins << next_plugin.name
+          end
         else
           visited << next_plugin << dependency_providers.first
         end

data/lib/ohai/system.rb

@@ -47,6 +47,7 @@ module Ohai
       @cli = config[:invoked_from_cli]
       @plugin_path = ""
       @config = config
+      @failed_plugins = []
       reset_system
     end
 
@@ -107,6 +108,16 @@ module Ohai
         Ohai::Log.error("Encountered error while running plugins: #{e.inspect}")
         raise
       end
+      critical_failed = Ohai::Config.ohai[:critical_plugins] & @runner.failed_plugins
+      unless critical_failed.empty?
+        msg = "The following Ohai plugins marked as critical failed: #{critical_failed}"
+        if @cli
+          Ohai::Log.error(msg)
+          exit(true)
+        else
+          raise Ohai::Exceptions::CriticalPluginFailure, "#{msg}. Failing Chef run."
+        end
+      end
 
       # Freeze all strings.
       freeze_strings!

data/lib/ohai/version.rb

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

data/spec/unit/plugins/aix/uptime_spec.rb

@@ -24,13 +24,12 @@ describe Ohai::System, "Aix plugin uptime" do
     @plugin = get_plugin("aix/uptime")
     allow(@plugin).to receive(:collect_os).and_return(:aix)
     allow(@plugin).to receive(:shell_out).and_call_original
-    allow(Time).to receive_message_chain(:now, :to_i).and_return(1504287957)
     allow(@plugin).to receive(:shell_out).with("LC_ALL=POSIX ps -o etime= -p 1").and_return(mock_shell_out(0, "1148-20:54:50", nil))
     @plugin.run
   end
 
   it "should set uptime_seconds to uptime with days" do
-    expect(@plugin[:uptime_seconds]).to eq(1405025467)
+    expect(@plugin[:uptime_seconds]).to eq(99262490)
   end
 
   it "should set uptime to a human readable date with days" do

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

@@ -533,8 +533,17 @@ BLKID_TYPE
   end
 
   %w{df mount}.each do |command|
-    describe "when #{command} does not exist" do
+    describe "when :allow_partial_data set, #{command} does not exist" do
+      before do
+        Ohai.config[:plugin][:filesystem][:allow_partial_data] = true
+      end
+
+      after do
+        Ohai.config[:plugin][:filesystem][:allow_partial_data] = false
+      end
+
       it "logs warning about #{command} missing" do
+        Ohai.config[:plugin][:filesystem][:allow_partial_data] = true
         allow(plugin).to receive(:shell_out).with(/#{command}/).and_raise(Ohai::Exceptions::Exec)
         expect(Ohai::Log).to receive(:warn).with("Plugin Filesystem: #{command} binary is not available. Some data will not be available.")
         plugin.run

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

@@ -42,7 +42,8 @@ describe Ohai::System, "Linux virtualization platform" do
     allow(File).to receive(:exist?).with("/var/lib/lxd/devlxd").and_return(false)
 
     # default the which wrappers to nil
-    allow(plugin).to receive(:lxc_version_exists?).and_return(false)
+    allow(plugin).to receive(:which).with("lxc-version").and_return(nil)
+    allow(plugin).to receive(:which).with("lxc-start").and_return(nil)
     allow(plugin).to receive(:nova_exists?).and_return(false)
   end
 
@@ -577,7 +578,15 @@ CGROUP
       end
 
       it "sets lxc host if lxc-version exists" do
-        allow(plugin).to receive(:lxc_version_exists?).and_return("/usr/bin/lxc-version")
+        allow(plugin).to receive(:which).with("lxc-start").and_return("/usr/bin/lxc-version")
+        plugin.run
+        expect(plugin[:virtualization][:system]).to eq("lxc")
+        expect(plugin[:virtualization][:role]).to eq("host")
+        expect(plugin[:virtualization][:systems][:lxc]).to eq("host")
+      end
+
+      it "sets lxc host if lxc-start exists" do
+        allow(plugin).to receive(:which).with("lxc-start").and_return("/usr/bin/lxc-start")
         plugin.run
         expect(plugin[:virtualization][:system]).to eq("lxc")
         expect(plugin[:virtualization][:role]).to eq("host")
@@ -585,7 +594,7 @@ CGROUP
       end
 
       it "does not set the old virtualization attributes if they are already set" do
-        allow(plugin).to receive(:lxc_version_exists?).and_return("/usr/bin/lxc-version")
+        allow(plugin).to receive(:which).with("lxc-version").and_return("/usr/bin/lxc-version")
         plugin[:virtualization] = Mash.new
         plugin[:virtualization][:system] = "the cloud"
         plugin[:virtualization][:role] = "cumulonimbus"
@@ -594,8 +603,7 @@ CGROUP
         expect(plugin[:virtualization][:role]).not_to eq("host")
       end
 
-      it "does not set lxc host if lxc-version does not exist" do
-        allow(plugin).to receive(:lxc_version_exists?).and_return(false)
+      it "does not set lxc host if neither lxc-version nor lxc-start exists" do
         plugin.run
         expect(plugin[:virtualization][:system]).to be_nil
         expect(plugin[:virtualization][:role]).to be_nil

data/spec/unit/plugins/rackspace_spec.rb

@@ -223,6 +223,18 @@ OUT
     end
   end
 
+  describe "with Rackspace windows manufacturer data" do
+    it "has rackspace attribute" do
+      plugin.run
+      expect(plugin[:rackspace]).not_to be_nil
+    end
+
+    before(:each) do
+      allow(plugin).to receive(:hint?).with("rackspace").and_return(false)
+      allow(plugin).to receive(:has_rackspace_manufacturer?).and_return(true)
+    end
+  end
+
   describe "xenstore provider returns rackspace" do
     it_behaves_like "rackspace"
 

data/spec/unit/system_spec.rb

@@ -43,6 +43,7 @@ describe "Ohai::System" do
       config = {
         disabled_plugins: [ :Foo, :Baz ],
         directory: "/some/extra/plugins",
+        critical_plugins: [ :Foo, :Bar ],
       }
       Ohai::System.new(config)
       config.each do |option, value|
@@ -307,6 +308,15 @@ Ohai.plugin(:Park) do
     park("plants")
   end
 end
+EOF
+
+      with_plugin("fails.rb", <<EOF)
+Ohai.plugin(:Fails) do
+  provides 'fails'
+  collect_data(:default) do
+    fail 'thing'
+  end
+end
 EOF
 
       it "should collect data from all the plugins" do
@@ -343,6 +353,22 @@ EOF
           expect(ohai.data[:park]).to eq("plants")
         end
       end
+
+      describe "when using :critical_plugins" do
+        before do
+          Ohai.config[:critical_plugins] = [ :Fails ]
+        end
+        after do
+          Ohai.config[:critical_plugins] = []
+        end
+
+        it "should fail when critical plugins fail" do
+          Ohai.config[:plugin_path] = [ path_to(".") ]
+          expect(Ohai::Log).to receive(:error).with(/marked as critical/)
+          ohai.all_plugins
+        end
+
+      end
     end
 
     when_plugins_directory "contains v6 & v7 plugins in different directories" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 13.5.0
+  version: 13.6.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu