ohai 8.22.1 → 8.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3f2c867deee21b5432041726c39da1ba5a5ed9a
-  data.tar.gz: 7e862ae9bc6807f5b6ceb1eec06e40a5d9e913b7
+  metadata.gz: 89282c58ac1e24456ce207bd1a1c32fb0985ddb1
+  data.tar.gz: 3ba00373a8b89ebca6c67321df854d71191ab451
 SHA512:
-  metadata.gz: 27b916d05bdb1eb8a86c186465c0f926dd30bc6e9664bd7299a1ba0644fc3f516b459cada51e0a2fab6c6abb77c35f348a503320c701b0db90ba373fd45e1b1a
-  data.tar.gz: 4e54aa969ae4d4e9c36b0f00bbfd2bf8dac47c15d180c26415072c15801ea48f87405ed0b757a0860b2c5b3c85ace521c8188314448bafae862ba5762c8aeefe
+  metadata.gz: 838cfac284099378f5ca37317abe23598e7610370ca94406c3fbe98a9a775c955f40ec2c5391985a5a555a04317f0653d71a380c1e812d855810f8047b3dace4
+  data.tar.gz: e09dc27cc5ad660bfbd8433b72579a581ce979167c20063c9bfb2bfc12cdc2b741c65e1bbdf3457afacd41ee1f43b52f2f5f8d8b22e9d6d69049e47bc3562deb

data/lib/ohai/application.rb

@@ -83,6 +83,8 @@ class Ohai::Application
     @attributes = nil if @attributes.empty?
 
     load_workstation_config
+
+    Ohai::Log.init(Ohai.config[:log_location])
   end
 
   def run_application

data/lib/ohai/mixin/dmi_decode.rb

@@ -42,6 +42,8 @@ module ::Ohai::Mixin::DmiDecode
         return "kvm"
       when /Product.*: BHYVE/
         return "bhyve"
+      when /Manufacturer: Veertu/
+        return "veertu"
       end
     end
     return nil

data/lib/ohai/mixin/ec2_metadata.rb

@@ -200,6 +200,20 @@ module Ohai
         response.code == "200" ? response.body : nil
       end
 
+      def fetch_dynamic_data
+        @fetch_dynamic_data ||= begin
+          api_version = best_api_version
+          return {} if api_version.nil?
+          response = http_client.get("/#{api_version}/dynamic/instance-identity/document/")
+
+          if json?(response.body) && response.code == "200"
+            FFI_Yajl::Parser.parse(response.body)
+          else
+            {}
+          end
+        end
+      end
+
       private
 
       def expand_path(file_name)

data/lib/ohai/plugins/azure.rb

@@ -24,14 +24,14 @@ Ohai.plugin(:Azure) do
     # project for details
     azure_metadata_from_hints = hint?("azure")
     if azure_metadata_from_hints
-      Ohai::Log.debug("azure plugin: azure_metadata_from_hints is present.")
+      Ohai::Log.debug("Plugin Azure: azure_metadata_from_hints is present.")
       azure Mash.new
       azure_metadata_from_hints.each { |k, v| azure[k] = v }
     elsif has_waagent? || has_dhcp_option_245?
-      Ohai::Log.debug("azure plugin: No hints present, but system appears to be on azure.")
+      Ohai::Log.debug("Plugin Azure: No hints present, but system appears to be on azure.")
       azure Mash.new
     else
-      Ohai::Log.debug("azure plugin: No hints present for azure and doesn't appear to be azure.")
+      Ohai::Log.debug("Plugin Azure: No hints present for azure and doesn't appear to be azure.")
       false
     end
   end
@@ -40,7 +40,7 @@ Ohai.plugin(:Azure) do
   # http://blog.mszcool.com/index.php/2015/04/detecting-if-a-virtual-machine-runs-in-microsoft-azure-linux-windows-to-protect-your-software-when-distributed-via-the-azure-marketplace/
   def has_waagent?
     if File.exist?("/usr/sbin/waagent") || Dir.exist?('C:\WindowsAzure')
-      Ohai::Log.debug("azure plugin: Found waagent used by MS Azure.")
+      Ohai::Log.debug("Plugin Azure: Found waagent used by MS Azure.")
       return true
     end
   end
@@ -50,7 +50,7 @@ Ohai.plugin(:Azure) do
     if File.exist?("/var/lib/dhcp/dhclient.eth0.leases")
       File.open("/var/lib/dhcp/dhclient.eth0.leases").each do |line|
         if line =~ /unknown-245/
-          Ohai::Log.debug("azure plugin: Found unknown-245 DHCP option used by MS Azure.")
+          Ohai::Log.debug("Plugin Azure: Found unknown-245 DHCP option used by MS Azure.")
           has_245 = true
           break
         end

data/lib/ohai/plugins/c.rb

@@ -16,11 +16,8 @@
 # limitations under the License.
 #
 
-require "rbconfig"
-
 Ohai.plugin(:C) do
   provides "languages/c"
-
   depends "languages"
 
   def collect(cmd, &block)
@@ -28,100 +25,175 @@ Ohai.plugin(:C) do
     if so.exitstatus == 0
       yield(so)
     else
-      Ohai::Log.debug("Plugin C '#{cmd}' failed. Skipping data.")
+      Ohai::Log.debug("Plugin C: '#{cmd}' failed. Skipping data.")
     end
   rescue Ohai::Exceptions::Exec
-    Ohai::Log.debug("Plugin C '#{cmd}' binary could not be found. Skipping data.")
+    Ohai::Log.debug("Plugin C: '#{cmd}' binary could not be found. Skipping data.")
   end
 
-  collect_data do
-    c = Mash.new
+  def xcode_installed?
+    Ohai::Log.debug("Plugin C: Checking for Xcode Command Line Tools.")
+    so = shell_out("/usr/bin/xcode-select -p")
+    if so.exitstatus == 0
+      Ohai::Log.debug("Plugin C: Xcode Command Line Tools found.")
+      return true
+    else
+      Ohai::Log.debug("Plugin C: Xcode Command Line Tools not found.")
+      return false
+    end
+  rescue Ohai::Exceptions::Exec
+    Ohai::Log.debug("Plugin C: xcode-select binary could not be found. Skipping data.")
+  end
 
-    #gcc
+  def collect_gcc
+    # gcc
+    # Sample output on os x:
+    # Configured with: --prefix=/Applications/Xcode.app/Contents/Developer/usr --with-gxx-include-dir=/usr/include/c++/4.2.1
+    # Apple LLVM version 7.3.0 (clang-703.0.29)
+    # Target: x86_64-apple-darwin15.4.0
+    # Thread model: posix
+    # InstalledDir: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin
+    #
+    #
+    # Sample output on Linux:
+    # Using built-in specs.
+    # COLLECT_GCC=gcc
+    # COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/5/lto-wrapper
+    # Target: x86_64-linux-gnu
+    # Configured with: ../src/configure -v --with-pkgversion='Ubuntu 5.4.0-6ubuntu1~16.04.4' --with-bugurl=file:///usr/share/doc/gcc-5/README.Bugs --enable-languages=c,ada,c++,java,go,d,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-5 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-libmpx --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-5-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-5-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-5-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-objc-gc --enable-multiarch --disable-werror --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --enable-multilib --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
+    # Thread model: posix
+    # gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.4)
+    gcc = Mash.new
     collect("gcc -v") do |so|
-      # Sample output:
-      # Configured with: --prefix=/Applications/Xcode.app/Contents/Developer/usr --with-gxx-include-dir=/usr/include/c++/4.2.1
-      # Apple LLVM version 7.3.0 (clang-703.0.29)
-      # Target: x86_64-apple-darwin15.4.0
-      # Thread model: posix
-      # InstalledDir: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin
-      description = so.stderr.split($/).last
-      output = description.split
-      if output.length >= 3
-        c[:gcc] = Mash.new
-        c[:gcc][:version] = output[2]
-        c[:gcc][:description] = description
+      so.stderr.each_line do |line|
+        case line
+        when /^(.*version\s(\S*).*)/
+          gcc[:description] = $1
+          gcc[:version] = $2
+        when /^Target:\s(.*)/
+          gcc[:target] = $1
+        when /^Configured with:\s(.*)/
+          gcc[:configured_with] = $1
+        when /^Thread model:\s(.*)/
+          gcc[:thread_model] = $1
+        end
       end
     end
+    @c[:gcc] = gcc unless gcc.empty?
+  end
 
-    #glibc
+  def collect_glibc
+    # glibc
     ["/lib/libc.so.6", "/lib64/libc.so.6"].each do |glibc|
       collect( Ohai.abs_path( glibc )) do |so|
         description = so.stdout.split($/).first
         if description =~ /(\d+\.\d+\.?\d*)/
-          c[:glibc] = Mash.new
-          c[:glibc][:version] = $1
-          c[:glibc][:description] = description
+          @c[:glibc] = Mash.new
+          @c[:glibc][:version] = $1
+          @c[:glibc][:description] = description
         end
-      end unless c[:glibc] || ::RbConfig::CONFIG["host_os"] =~ /mswin|mingw32|windows/
+      end
     end
+  end
 
-    #ms cl
+  def check_for_cl
+    # ms cl
     collect("cl /?") do |so|
       description = so.stderr.lines.first.chomp
       if description =~ /Compiler Version ([\d\.]+)/
-        c[:cl] = Mash.new
-        c[:cl][:version] = $1
-        c[:cl][:description] = description
+        @c[:cl] = Mash.new
+        @c[:cl][:version] = $1
+        @c[:cl][:description] = description
       end
     end
+  end
 
-    #ms vs
+  def check_for_devenv
+    # ms vs
     collect("devenv.com /?") do |so|
       lines = so.stdout.split($/)
       description = lines[0].length == 0 ? lines[1] : lines[0]
       if description =~ /Visual Studio Version ([\d\.]+)/
-        c[:vs] = Mash.new
-        c[:vs][:version] = $1.chop
-        c[:vs][:description] = description
+        @c[:vs] = Mash.new
+        @c[:vs][:version] = $1.chop
+        @c[:vs][:description] = description
       end
     end
+  end
 
-    #ibm xlc
+  def collect_xlc
+    # ibm xlc
     begin
       so = shell_out("xlc -qversion")
       if so.exitstatus == 0 || (so.exitstatus >> 8) == 249
         description = so.stdout.split($/).first
         if description =~ /V(\d+\.\d+)/
-          c[:xlc] = Mash.new
-          c[:xlc][:version] = $1
-          c[:xlc][:description] = description.strip
+          @c[:xlc] = Mash.new
+          @c[:xlc][:version] = $1
+          @c[:xlc][:description] = description.strip
         end
       end
     rescue Ohai::Exceptions::Exec
     end
+  end
 
-    #sun pro
+  def collect_sunpro
+    # sun pro
     collect("cc -V -flags") do |so|
       output = so.stderr.split
       if so.stderr =~ /^cc: Sun C/ && output.size >= 4
-        c[:sunpro] = Mash.new
-        c[:sunpro][:version] = output[3]
-        c[:sunpro][:description] = so.stderr.chomp
+        @c[:sunpro] = Mash.new
+        @c[:sunpro][:version] = output[3]
+        @c[:sunpro][:description] = so.stderr.chomp
       end
     end
+  end
 
-    #hpux cc
+  def collect_hpux_cc
+    # hpux cc
     collect("what /opt/ansic/bin/cc") do |so|
       description = so.stdout.split($/).select { |line| line =~ /HP C Compiler/ }.first
       if description
         output = description.split
-        c[:hpcc] = Mash.new
-        c[:hpcc][:version] = output[1] if output.size >= 1
-        c[:hpcc][:description] = description.strip
+        @c[:hpcc] = Mash.new
+        @c[:hpcc][:version] = output[1] if output.size >= 1
+        @c[:hpcc][:description] = description.strip
       end
     end
+  end
+
+  collect_data(:aix) do
+    @c = Mash.new
+    collect_xlc
+    collect_gcc
+    languages[:c] = @c unless @c.empty?
+  end
+
+  collect_data(:darwin) do
+    @c = Mash.new
+    collect_gcc if xcode_installed?
+    languages[:c] = @c unless @c.empty?
+  end
+
+  collect_data(:windows) do
+    @c = Mash.new
+    check_for_cl
+    check_for_devenv
+    languages[:c] = @c unless @c.empty?
+  end
+
+  collect_data(:hpux) do
+    @c = Mash.new
+    collect_gcc
+    collect_hpux_cc
+    languages[:c] = @c unless @c.empty?
+  end
 
-    languages[:c] = c unless c.empty?
+  collect_data(:default) do
+    @c = Mash.new
+    collect_gcc
+    collect_glibc
+    collect_sunpro
+    languages[:c] = @c unless @c.empty?
   end
 end

data/lib/ohai/plugins/cloud.rb

@@ -208,6 +208,7 @@ Ohai.plugin(:Cloud) do
   # Fill cloud hash with azure values
   def get_azure_values
     cloud[:vm_name] = azure["vm_name"]
+    cloud[:private_ips] << azure["private_ip"]
     cloud[:public_ips] << azure["public_ip"]
     cloud[:public_ipv4] = azure["public_ip"]
     cloud[:public_fqdn] = azure["public_fqdn"]

data/lib/ohai/plugins/dmi.rb

@@ -92,14 +92,14 @@ Ohai.plugin(:DMI) do
 
       elsif type = type_line.match(line)
         if dmi_record == nil
-          Ohai::Log.debug("unexpected data line found before header; discarding:\n#{line}")
+          Ohai::Log.debug("Plugin DMI: unexpected data line found before header; discarding:\n#{line}")
           next
         end
         dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:application_identifier] = type[1]
 
       elsif data = data_line.match(line)
         if dmi_record == nil
-          Ohai::Log.debug("unexpected data line found before header; discarding:\n#{line}")
+          Ohai::Log.debug("Plugin DMI: unexpected data line found before header; discarding:\n#{line}")
           next
         end
         dmi[dmi_record[:type]][:all_records][dmi_record[:position]][data[1]] = data[2]
@@ -107,11 +107,11 @@ Ohai.plugin(:DMI) do
 
       elsif extended_data = extended_data_line.match(line)
         if dmi_record == nil
-          Ohai::Log.debug("unexpected extended data line found before header; discarding:\n#{line}")
+          Ohai::Log.debug("Plugin DMI: unexpected extended data line found before header; discarding:\n#{line}")
           next
         end
         if field == nil
-          Ohai::Log.debug("unexpected extended data line found outside data section; discarding:\n#{line}")
+          Ohai::Log.debug("Plugin DMI: unexpected extended data line found outside data section; discarding:\n#{line}")
           next
         end
         # overwrite "raw" value with a new Mash
@@ -119,7 +119,7 @@ Ohai.plugin(:DMI) do
         dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field][extended_data[1]] = nil
 
       else
-        Ohai::Log.debug("unrecognized output line; discarding:\n#{line}")
+        Ohai::Log.debug("Plugin DMI: unrecognized output line; discarding:\n#{line}")
 
       end
     end

data/lib/ohai/plugins/ec2.rb

@@ -96,6 +96,7 @@ Ohai.plugin(:EC2) do
         ec2[k] = v
       end
       ec2[:userdata] = fetch_userdata
+      ec2[:account_id] = fetch_dynamic_data["accountId"]
       # ASCII-8BIT is equivalent to BINARY in this case
       if ec2[:userdata] && ec2[:userdata].encoding.to_s == "ASCII-8BIT"
         Ohai::Log.debug("Plugin EC2: Binary UserData Found. Storing in base64")

data/lib/ohai/plugins/erlang.rb

@@ -24,13 +24,11 @@ Ohai.plugin(:Erlang) do
     erlang = Mash.new
 
     begin
-      so = shell_out("erl -eval 'erlang:display(erlang:system_info(otp_release)), erlang:display(erlang:system_info(version)), erlang:display(erlang:system_info(nif_version)), halt().'  -noshell")
+      so = shell_out("erl -eval '{ok, Ver} = file:read_file(filename:join([code:root_dir(), \"releases\", erlang:system_info(otp_release), \"OTP_VERSION\"])), Vsn = binary:bin_to_list(Ver, {0, byte_size(Ver) - 1}), io:format(\"~s,~s,~s\", [Vsn, erlang:system_info(version), erlang:system_info(nif_version)]), halt().' -noshell")
       # Sample output:
-      # "18"
-      # "7.3"
-      # "2.10"
+      # 19.1,8.1,2.11
       if so.exitstatus == 0
-        output = so.stdout.split(/\r\n/).map! { |x| x.delete('\\"') }
+        output = so.stdout.split(",")
         erlang[:version] = output[0]
         erlang[:erts_version] = output[1]
         erlang[:nif_version] = output[2]

data/lib/ohai/plugins/groovy.rb

@@ -32,7 +32,7 @@ Ohai.plugin(:Groovy) do
         languages[:groovy] = groovy
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Groovy plugin: Could not shell_out "groovy -v". Skipping plugin')
+      Ohai::Log.debug('Plugin Groovy: Could not shell_out "groovy -v". Skipping plugin')
     end
   end
 end

data/lib/ohai/plugins/haskell.rb

@@ -39,7 +39,7 @@ Ohai.plugin(:Haskell) do
         haskell[:ghc][:description] = so.stdout.chomp
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Haskell plugin: Could not shell_out "ghc --version". Skipping data')
+      Ohai::Log.debug('Plugin Haskell: Could not shell_out "ghc --version". Skipping data')
     end
 
     # Check for ghci
@@ -54,7 +54,7 @@ Ohai.plugin(:Haskell) do
         haskell[:ghci][:description] = so.stdout.chomp
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Haskell plugin: Could not shell_out "ghci --version". Skipping data')
+      Ohai::Log.debug('Plugin Haskell: Could not shell_out "ghci --version". Skipping data')
     end
 
     # Check for cabal
@@ -70,7 +70,7 @@ Ohai.plugin(:Haskell) do
         haskell[:cabal][:description] = so.stdout.split("\n")[0].chomp
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Haskell plugin: Could not shell_out "cabal --version". Skipping data')
+      Ohai::Log.debug('Plugin Haskell: Could not shell_out "cabal --version". Skipping data')
     end
 
     # Check for stack
@@ -87,7 +87,7 @@ Ohai.plugin(:Haskell) do
         haskell[:stack][:description] = so.stdout.chomp
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Haskell plugin: Could not shell_out "stack --version". Skipping data')
+      Ohai::Log.debug('Plugin Haskell: Could not shell_out "stack --version". Skipping data')
     end
 
     languages[:haskell] = haskell unless haskell.empty?

data/lib/ohai/plugins/hostname.rb

@@ -120,19 +120,19 @@ Ohai.plugin(:Hostname) do
       # Sometimes... very rarely, but sometimes, 'hostname --fqdn' falsely
       # returns a blank string. WTF.
       if ourfqdn.nil? || ourfqdn.empty?
-        Ohai::Log.debug("hostname returned an empty string, retrying once.")
+        Ohai::Log.debug("Plugin Hostname: hostname returned an empty string, retrying once.")
         ourfqdn = resolve_fqdn
       end
 
       if ourfqdn.nil? || ourfqdn.empty?
-        Ohai::Log.debug("hostname returned an empty string twice and will" +
+        Ohai::Log.debug("Plugin Hostname: hostname returned an empty string twice and will" +
                         "not be set.")
       else
         fqdn ourfqdn
       end
     rescue
       Ohai::Log.debug(
-        "hostname returned an error, probably no domain set")
+        "Plugin Hostname: hostname returned an error, probably no domain set")
     end
     domain collect_domain
   end
@@ -152,20 +152,20 @@ Ohai.plugin(:Hostname) do
       # Sometimes... very rarely, but sometimes, 'hostname --fqdn' falsely
       # returns a blank string. WTF.
       if ourfqdn.nil? || ourfqdn.empty?
-        Ohai::Log.debug("hostname --fqdn returned an empty string, retrying " +
+        Ohai::Log.debug("Plugin Hostname: hostname --fqdn returned an empty string, retrying " +
                         "once.")
         ourfqdn = from_cmd("hostname --fqdn")
       end
 
       if ourfqdn.nil? || ourfqdn.empty?
-        Ohai::Log.debug("hostname --fqdn returned an empty string twice and " +
+        Ohai::Log.debug("Plugin Hostname: hostname --fqdn returned an empty string twice and " +
                         "will not be set.")
       else
         fqdn ourfqdn
       end
     rescue
       Ohai::Log.debug(
-        "hostname --fqdn returned an error, probably no domain set")
+        "Plugin Hostname: hostname --fqdn returned an error, probably no domain set")
     end
     domain collect_domain
   end