ohai 13.12.6 → 14.0.28

data/lib/ohai/plugins/rackspace.rb

@@ -52,7 +52,7 @@ Ohai.plugin(:Rackspace) do
     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")
+      logger.trace("Plugin Rackspace: has_rackspace_manufacturer? == true")
       return true
     end
   end
@@ -105,7 +105,7 @@ Ohai.plugin(:Rackspace) do
       end
     end
   rescue Ohai::Exceptions::Exec
-    Ohai::Log.debug("Plugin Rackspace: Unable to find xenstore-ls, cannot capture region information for Rackspace cloud")
+    logger.trace("Plugin Rackspace: Unable to find xenstore-ls, cannot capture region information for Rackspace cloud")
     nil
   end
 
@@ -117,7 +117,7 @@ Ohai.plugin(:Rackspace) do
       rackspace[:instance_id] = so.stdout.gsub(/instance-/, "")
     end
   rescue Ohai::Exceptions::Exec
-    Ohai::Log.debug("Plugin Rackspace: Unable to find xenstore-read, cannot capture instance ID information for Rackspace cloud")
+    logger.trace("Plugin Rackspace: Unable to find xenstore-read, cannot capture instance ID information for Rackspace cloud")
     nil
   end
 
@@ -132,7 +132,7 @@ Ohai.plugin(:Rackspace) do
         if so.exitstatus == 0
           networks.push(FFI_Yajl::Parser.new.parse(so.stdout))
         else
-          Ohai::Log.debug("Plugin Rackspace: Unable to capture custom private networking information for Rackspace cloud")
+          logger.trace("Plugin Rackspace: Unable to capture custom private networking information for Rackspace cloud")
           return false
         end
       end
@@ -141,7 +141,7 @@ Ohai.plugin(:Rackspace) do
       networks.delete_if { |hash| hash["label"] == "public" }
     end
   rescue Ohai::Exceptions::Exec
-    Ohai::Log.debug("Plugin Rackspace: Unable to capture custom private networking information for Rackspace cloud")
+    logger.trace("Plugin Rackspace: Unable to capture custom private networking information for Rackspace cloud")
     nil
   end
 

data/lib/ohai/plugins/root_group.rb

@@ -18,15 +18,12 @@
 Ohai.plugin(:RootGroup) do
   provides "root_group"
 
-  require "ohai/util/win32/group_helper" if RUBY_PLATFORM =~ /mswin|mingw32|windows/
+  collect_data(:windows) do
+    require "ohai/util/win32/group_helper"
+    root_group Ohai::Util::Win32::GroupHelper.windows_root_group_name
+  end
 
-  collect_data do
-    case ::RbConfig::CONFIG["host_os"]
-    when /mswin|mingw32|windows/
-      group = Ohai::Util::Win32::GroupHelper.windows_root_group_name
-      root_group group
-    else
-      root_group Etc.getgrgid(Etc.getpwnam("root").gid).name
-    end
+  collect_data(:default) do
+    root_group Etc.getgrgid(Etc.getpwnam("root").gid).name
   end
 end

data/lib/ohai/plugins/ruby.rb

@@ -47,7 +47,7 @@ Ohai.plugin(:Ruby) do
 
     # Create a query string from above hash
     env_string = ""
-    values.keys.each do |v|
+    values.each_key do |v|
       env_string << "#{v}=\#{#{values[v]}},"
     end
 
@@ -67,7 +67,7 @@ Ohai.plugin(:Ruby) do
                     run_ruby("require 'rubygems'; puts ::Gem.default_exec_format % 'gem'"),
                     "gem",
                    ].map { |bin| ::File.join(bin_dir, bin) }
-    gem_binary = gem_binaries.find { |bin| ::File.exists? bin }
+    gem_binary = gem_binaries.find { |bin| ::File.exist? bin }
     if gem_binary
       languages[:ruby][:gems_dir] = run_ruby "puts %x{#{ruby_bin} #{gem_binary} env gemdir}.chomp!"
       languages[:ruby][:gem_bin] = gem_binary

data/lib/ohai/plugins/rust.rb

@@ -28,7 +28,7 @@ Ohai.plugin(:Rust) do
         languages[:rust] = rust if rust[:version]
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Plugin Rust: Could not shell_out "rustc --version". Skipping plugin')
+      logger.trace('Plugin Rust: Could not shell_out "rustc --version". Skipping plugin')
     end
   end
 end

data/lib/ohai/plugins/scala.rb

@@ -29,7 +29,7 @@ Ohai.plugin(:Scala) do
         scala[:version] = so.stderr.match(/.*version (\S*)/)[1]
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Plugin Scala: Could not shell_out "scala -version". Skipping data')
+      logger.trace('Plugin Scala: Could not shell_out "scala -version". Skipping data')
     end
 
     languages[:scala] = scala unless scala.empty?

data/lib/ohai/plugins/scaleway.rb

@@ -0,0 +1,56 @@
+#
+# Author:: Jonathan Amiez (<jonathan.amiez@gmail.com>)
+# 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(:Scaleway) do
+  require "ohai/mixin/scaleway_metadata"
+  require "ohai/mixin/http_helper"
+
+  include Ohai::Mixin::ScalewayMetadata
+  include Ohai::Mixin::HttpHelper
+
+  provides "scaleway"
+
+  # looks for `scaleway` keyword in kernel command line
+  # @return [Boolean] do we have the keyword or not?
+  def has_scaleway_cmdline?
+    if ::File.read("/proc/cmdline") =~ /scaleway/
+      logger.trace("Plugin Scaleway: has_scaleway_cmdline? == true")
+      return true
+    end
+    logger.trace("Plugin Scaleway: has_scaleway_cmdline? == false")
+    false
+  end
+
+  # a single check that combines all the various detection methods for Scaleway
+  # @return [Boolean] Does the system appear to be on Scaleway
+  def looks_like_scaleway?
+    return true if hint?("scaleway")
+    return true if has_scaleway_cmdline? && can_socket_connect?(Ohai::Mixin::ScalewayMetadata::SCALEWAY_METADATA_ADDR, 80)
+    false
+  end
+
+  collect_data do
+    if looks_like_scaleway?
+      logger.trace("Plugin Scaleway: looks_like_scaleway? == true")
+      scaleway Mash.new
+      fetch_metadata.each do |k, v|
+        scaleway[k] = v
+      end
+    else
+      logger.trace("Plugin Scaleway: No hints present for and doesn't look like scaleway")
+    end
+  end
+end

data/lib/ohai/plugins/shard.rb

@@ -20,6 +20,7 @@ Ohai.plugin(:ShardSeed) do
   require "digest/md5"
   depends "hostname", "dmi", "machine_id", "machinename"
   provides "shard_seed"
+  optional true
 
   def get_dmi_property(dmi, thing)
     %w{system base_board chassis}.each do |section|

data/lib/ohai/plugins/softlayer.rb

@@ -36,12 +36,12 @@ Ohai.plugin(:Softlayer) do
   collect_data do
     # Adds softlayer Mash
     if looks_like_softlayer?
-      Ohai::Log.debug("Plugin Softlayer: looks_like_softlayer? == true")
+      logger.trace("Plugin Softlayer: looks_like_softlayer? == true")
       metadata = fetch_metadata
       softlayer Mash.new
       metadata.each { |k, v| softlayer[k] = v } if metadata
     else
-      Ohai::Log.debug("Plugin Softlayer: looks_like_softlayer? == false")
+      logger.trace("Plugin Softlayer: looks_like_softlayer? == false")
     end
   end
 end

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

@@ -31,7 +31,7 @@ Ohai.plugin(:CPU) do
     cpucores = Array.new
     cpusockets = Array.new
     processor_info.each_with_index do |processor, i|
-      desc, instance, record, keyvalue = processor.split(":")
+      _desc, instance, _record, keyvalue = processor.split(":")
       cpu[instance] ||= Mash.new
       if currentcpu != instance
         cpu["total"] += 1

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

@@ -25,7 +25,7 @@ Ohai.plugin(:DMI) do
     # if we already have a "dmi" with keys (presumably from dmidecode), don't try smbios
     # note that a single key just means dmidecode exited with its version
     if (dmi.class.to_s == "Mash") && (dmi.keys.length > 1)
-      Ohai::Log.debug("Plugin DMI: skipping smbios output, since DMI information has already been provided")
+      logger.trace("Plugin DMI: skipping smbios output, since DMI information has already been provided")
       return
     end
 
@@ -118,10 +118,10 @@ Ohai.plugin(:DMI) do
       # remove/replace any characters that don't fall inside permissible ASCII range, or whitespace
       line = raw_line.gsub(/[^\x20-\x7E\n\t\r]/, ".")
       if line != raw_line
-        Ohai::Log.debug("Plugin DMI: converted characters from line:\n#{raw_line}")
+        logger.trace("Plugin DMI: converted characters from line:\n#{raw_line}")
       end
 
-      if header_information = header_information_line.match(line)
+      if ( header_information = header_information_line.match(line) )
         dmi_record = {}
 
         # look up SMB ID
@@ -129,7 +129,7 @@ Ohai.plugin(:DMI) do
           id = smb_to_id[header_information[3]]
 
           # Don't overcapture for now (OHAI-260)
-          unless Ohai::Common::DMI.whitelisted_ids.include?(id)
+          unless Ohai::Common::DMI::ID_TO_CAPTURE.include?(id)
             dmi_record = nil
             next
           end
@@ -137,7 +137,7 @@ Ohai.plugin(:DMI) do
           dmi_record[:type] = Ohai::Common::DMI.id_lookup(id)
 
         else
-          Ohai::Log.debug("Plugin DMI: unrecognized header type; skipping")
+          logger.trace("Plugin DMI: unrecognized header type; skipping")
           dmi_record = nil
           next
         end
@@ -151,29 +151,29 @@ Ohai.plugin(:DMI) do
         dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:application_identifier] = header_information[4]
         field = nil
 
-      elsif data = data_key_value_line.match(line)
+      elsif ( data = data_key_value_line.match(line) )
         if dmi_record.nil?
-          Ohai::Log.debug("Plugin DMI: unexpected data line found before header; discarding:\n#{line}")
+          logger.trace("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]
         field = data[1]
 
-      elsif data = data_key_only_line.match(line)
+      elsif ( data = data_key_only_line.match(line) )
         if dmi_record.nil?
-          Ohai::Log.debug("Plugin DMI: unexpected data line found before header; discarding:\n#{line}")
+          logger.trace("Plugin DMI: unexpected data line found before header; discarding:\n#{line}")
           next
         end
         dmi[dmi_record[:type]][:all_records][dmi_record[:position]][data[1]] = ""
         field = data[1]
 
-      elsif extended_data = extended_data_line.match(line)
+      elsif ( extended_data = extended_data_line.match(line) )
         if dmi_record.nil?
-          Ohai::Log.debug("Plugin DMI: unexpected extended data line found before header; discarding:\n#{line}")
+          logger.trace("Plugin DMI: unexpected extended data line found before header; discarding:\n#{line}")
           next
         end
         if field.nil?
-          Ohai::Log.debug("Plugin DMI: unexpected extended data line found outside data section; discarding:\n#{line}")
+          logger.trace("Plugin DMI: unexpected extended data line found outside data section; discarding:\n#{line}")
           next
         end
         # overwrite "raw" value with a new Mash
@@ -181,7 +181,7 @@ Ohai.plugin(:DMI) do
         dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field][extended_data[1]] = extended_data[2]
 
       else
-        Ohai::Log.debug("Plugin DMI: unrecognized output line; discarding:\n#{line}")
+        logger.trace("Plugin DMI: unrecognized output line; discarding:\n#{line}")
 
       end
     end

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

@@ -74,7 +74,7 @@ Ohai.plugin(:Network) do
   end
 
   def arpname_to_ifname(iface, arpname)
-    iface.keys.each do |ifn|
+    iface.each_key do |ifn|
       return ifn if ifn.split(":")[0].eql?(arpname)
     end
 
@@ -146,17 +146,17 @@ Ohai.plugin(:Network) do
       end
     end
 
-    iface.keys.each do |ifn|
+    iface.each_key do |ifn|
       iaddr = nil
       if iface[ifn][:encapsulation].eql?("Ethernet")
-        iface[ifn][:addresses].keys.each do |addr|
+        iface[ifn][:addresses].each_key do |addr|
           if iface[ifn][:addresses][addr]["family"].eql?("inet")
             iaddr = addr
             break
           end
         end
         if iface[ifn][:arp]
-          iface[ifn][:arp].keys.each do |addr|
+          iface[ifn][:arp].each_key do |addr|
             if addr.eql?(iaddr)
               iface[ifn][:addresses][iface[ifn][:arp][iaddr]] = { "family" => "lladdr" }
               break
@@ -181,11 +181,11 @@ Ohai.plugin(:Network) do
           else
             matches[:name]
           end
-        Ohai::Log.debug("Plugin Network: found interface device: #{network[:default_interface]} #{matches[:name]}")
+        logger.trace("Plugin Network: found interface device: #{network[:default_interface]} #{matches[:name]}")
       end
       matches = /gateway: (\S+)/.match(line)
       if matches
-        Ohai::Log.debug("Plugin Network: found gateway: #{matches[1]}")
+        logger.trace("Plugin Network: found gateway: #{matches[1]}")
         network[:default_gateway] = matches[1]
       end
     end

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

@@ -20,7 +20,7 @@ Ohai.plugin(:Platform) do
   provides "platform", "platform_version", "platform_build", "platform_family"
 
   collect_data(:solaris2) do
-    if File.exists?("/sbin/uname")
+    if File.exist?("/sbin/uname")
       uname_exec = "/sbin/uname"
     else
       uname_exec = "uname"
@@ -37,7 +37,7 @@ Ohai.plugin(:Platform) do
     end
 
     File.open("/etc/release") do |file|
-      while line = file.gets
+      while ( line = file.gets )
         case line
         when /^.*(SmartOS).*$/
           platform "smartos"

data/lib/ohai/plugins/ssh_host_key.rb

@@ -38,13 +38,13 @@ Ohai.plugin(:SSHHostKey) do
   collect_data do
     keys[:ssh] = Mash.new
 
-    sshd_config = if File.exists?("/etc/ssh/sshd_config")
+    sshd_config = if File.exist?("/etc/ssh/sshd_config")
                     "/etc/ssh/sshd_config"
-                  elsif File.exists?("/etc/sshd_config")
+                  elsif File.exist?("/etc/sshd_config")
                     # Darwin
                     "/etc/sshd_config"
                   else
-                    Ohai::Log.debug("Plugin SSHHostKey: Failed to find sshd configuration file")
+                    logger.trace("Plugin SSHHostKey: Failed to find sshd configuration file")
                     nil
                   end
 
@@ -62,21 +62,21 @@ Ohai.plugin(:SSHHostKey) do
       end
     end
 
-    if keys[:ssh][:host_dsa_public].nil? && File.exists?("/etc/ssh/ssh_host_dsa_key.pub")
+    if keys[:ssh][:host_dsa_public].nil? && File.exist?("/etc/ssh/ssh_host_dsa_key.pub")
       keys[:ssh][:host_dsa_public] = IO.read("/etc/ssh/ssh_host_dsa_key.pub").split[1]
     end
 
-    if keys[:ssh][:host_rsa_public].nil? && File.exists?("/etc/ssh/ssh_host_rsa_key.pub")
+    if keys[:ssh][:host_rsa_public].nil? && File.exist?("/etc/ssh/ssh_host_rsa_key.pub")
       keys[:ssh][:host_rsa_public] = IO.read("/etc/ssh/ssh_host_rsa_key.pub").split[1]
     end
 
-    if keys[:ssh][:host_ecdsa_public].nil? && File.exists?("/etc/ssh/ssh_host_ecdsa_key.pub")
+    if keys[:ssh][:host_ecdsa_public].nil? && File.exist?("/etc/ssh/ssh_host_ecdsa_key.pub")
       content = IO.read("/etc/ssh/ssh_host_ecdsa_key.pub")
       keys[:ssh][:host_ecdsa_public] = content.split[1]
       keys[:ssh][:host_ecdsa_type] = content.split[0]
     end
 
-    if keys[:ssh][:host_ed25519_public].nil? && File.exists?("/etc/ssh/ssh_host_ed25519_key.pub")
+    if keys[:ssh][:host_ed25519_public].nil? && File.exist?("/etc/ssh/ssh_host_ed25519_key.pub")
       keys[:ssh][:host_ed25519_public] = IO.read("/etc/ssh/ssh_host_ed25519_key.pub").split[1]
     end
   end

data/lib/ohai/plugins/uptime.rb

@@ -28,7 +28,6 @@ Ohai.plugin(:Uptime) do
   require "ohai/mixin/seconds_to_human"
   provides "uptime", "uptime_seconds"
   provides "idletime", "idletime_seconds" # linux only
-  depends "platform_version"
 
   def collect_uptime(path)
     # kern.boottime: { sec = 1232765114, usec = 823118 } Fri Jan 23 18:45:14 2009
@@ -87,12 +86,8 @@ Ohai.plugin(:Uptime) do
   collect_data(:windows) do
     require "wmi-lite/wmi"
     wmi = WmiLite::Wmi.new
-    if platform_version.to_f >= 6.0 ## for newer version of Windows starting from Windows Server 2008 ##
-      last_boot_up_time = wmi.first_of("Win32_OperatingSystem")["lastbootuptime"]
-      uptime_seconds Time.new.to_i - Time.parse(last_boot_up_time).to_i
-    else ## for older version of Windows starting from Windows Server 2003 ##
-      uptime_seconds wmi.first_of("Win32_PerfFormattedData_PerfOS_System")["systemuptime"].to_i
-    end
+    last_boot_up_time = wmi.first_of("Win32_OperatingSystem")["lastbootuptime"]
+    uptime_seconds Time.new.to_i - Time.parse(last_boot_up_time).to_i
     uptime seconds_to_human(uptime_seconds)
   end
 

data/lib/ohai/plugins/virtualbox.rb

@@ -43,7 +43,7 @@ Ohai.plugin(:Virtualbox) do
         end
       end
     rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Plugin Virtualbox: Could not execute "VBoxControl guestproperty enumerate". Skipping data')
+      logger.trace('Plugin Virtualbox: Could not execute "VBoxControl guestproperty enumerate". Skipping data')
     end
   end
 end

data/lib/ohai/plugins/vmware.rb

@@ -42,7 +42,7 @@ Ohai.plugin(:VMware) do
 
   def get_vm_attributes(vmtools_path)
     if !File.exist?(vmtools_path)
-      Ohai::Log.debug("Plugin VMware: #{vmtools_path} not found")
+      logger.trace("Plugin VMware: #{vmtools_path} not found")
     else
       vmware Mash.new
       begin
@@ -62,7 +62,7 @@ Ohai.plugin(:VMware) do
           vmware[param] = from_cmd("#{vmtools_path} #{param} status")
         end
       rescue
-        Ohai::Log.debug("Plugin VMware: Error while collecting VMware guest attributes")
+        logger.trace("Plugin VMware: Error while collecting VMware guest attributes")
       end
     end
   end

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

@@ -32,23 +32,9 @@ Ohai.plugin(:CPU) do
     processors.each_with_index do |processor, index|
       current_cpu = index.to_s
       cpu[current_cpu] = Mash.new
-      #
-      # On Windows Server 2003 R2 (i.e. 5.2.*), numberofcores property
-      # doesn't exist on the Win32_Processor class unless the user has
-      # patched their system with:
-      # http://support.microsoft.com/kb/932370
-      #
-      # We're returning nil for cpu["cores"]
-      # when we don't see numberofcores property
-      #
 
-      begin
-        cpu[current_cpu]["cores"] = processor["numberofcores"]
-        cores += processor["numberofcores"]
-      rescue NoMethodError => e
-        Ohai::Log.info("Can not find numberofcores property on Win32_Processor. Consider applying this patch: http://support.microsoft.com/kb/932370")
-        cpu[current_cpu]["cores"] = nil
-      end
+      cpu[current_cpu]["cores"] = processor["numberofcores"]
+      cores += processor["numberofcores"]
 
       logical_processors += processor["numberoflogicalprocessors"]
       cpu[current_cpu]["vendor_id"] = processor["manufacturer"]