ohai 16.5.4 → 16.8.1

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Kurt Yoder (<ktyopscode@yoderhome.com>)
 # Author:: Isa Farnik (<isa@chef.io>)
@@ -40,9 +41,9 @@ Ohai.plugin(:Uptime) do
     when /^\d+-\d/
       (d, h, m, s) = so.split(/[-:]/)
     when /^\d+:\d+:\d/
-      (h, m, s) = so.split(/[:]/)
+      (h, m, s) = so.split(":")
     else
-      (m, s) = so.split(/[:]/)
+      (m, s) = so.split(":")
     end
     elapsed_seconds = ((d.to_i * 86400) + (h.to_i * 3600) + (m.to_i * 60) + s.to_i)
 

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

@@ -23,17 +23,14 @@ Ohai.plugin(:Virtualization) do
   collect_data(:aix) do
     virtualization Mash.new
 
-    so = shell_out("uname -L")
-    lpar_no = so.stdout.split($/)[0].split(/\s/)[0]
-    lpar_name = so.stdout.split($/)[0].split(/\s/)[1]
+    lpar_no, lpar_name = shell_out("uname -L").stdout.split(nil, 2)
 
     unless lpar_no.to_i == -1 || (lpar_no.to_i == 1 && lpar_name == "NULL")
       virtualization[:lpar_no] = lpar_no
       virtualization[:lpar_name] = lpar_name
     end
 
-    so = shell_out("uname -W")
-    wpar_no = so.stdout.split($/)[0]
+    wpar_no = shell_out("uname -W").stdout.strip
     if wpar_no.to_i > 0
       virtualization[:wpar_no] = wpar_no
     else
@@ -41,8 +38,11 @@ Ohai.plugin(:Virtualization) do
       so = shell_out("lswpar -L").stdout.scan(/={65}.*?(?:EXPORTED\n\n)+/m)
       wpars = Mash.new
       so.each do |wpar|
-        wpar_name = wpar.lines[1].split[0]
+        wpar_heading = wpar.lines[1].split
+        wpar_name = wpar_heading[0]
+
         wpars[wpar_name] = Mash.new
+        wpars[wpar_name][:state] = wpar_heading[2].downcase
 
         wpar.scan(/^[A-Z]{4,}.*?[A-Z\:0-9]$.*?\n\n/m).each do |section|
 

data/lib/ohai/plugins/azure.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
@@ -34,7 +35,7 @@ Ohai.plugin(:Azure) do
       azure Mash.new
       azure_metadata_from_hints.each { |k, v| azure[k] = v }
       azure["metadata"] = parse_metadata
-    elsif has_waagent? || has_dhcp_option_245?
+    elsif has_waagent? || has_dhcp_option_245? || has_reddog_dhcp_domain?
       logger.trace("Plugin Azure: No hints present, but system appears to be on Azure.")
       azure Mash.new
       azure["metadata"] = parse_metadata
@@ -47,7 +48,7 @@ Ohai.plugin(:Azure) do
   # check for either the waagent or the unknown-245 DHCP option that Azure uses
   # 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')
+    if file_exist?("/usr/sbin/waagent") || dir_exist?('C:\WindowsAzure')
       logger.trace("Plugin Azure: Found waagent used by Azure.")
       true
     end
@@ -55,8 +56,8 @@ Ohai.plugin(:Azure) do
 
   def has_dhcp_option_245?
     has_245 = false
-    if File.exist?("/var/lib/dhcp/dhclient.eth0.leases")
-      File.open("/var/lib/dhcp/dhclient.eth0.leases").each do |line|
+    if file_exist?("/var/lib/dhcp/dhclient.eth0.leases")
+      file_open("/var/lib/dhcp/dhclient.eth0.leases").each do |line|
         if /unknown-245/.match?(line)
           logger.trace("Plugin Azure: Found unknown-245 DHCP option used by Azure.")
           has_245 = true
@@ -67,6 +68,26 @@ Ohai.plugin(:Azure) do
     has_245
   end
 
+  def has_reddog_dhcp_domain?
+    tcp_ip_dhcp_domain == "reddog.microsoft.com"
+  end
+
+  def tcp_ip_dhcp_domain
+    return unless RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
+
+    require "win32/registry" unless defined?(Win32::Registry)
+
+    begin
+      key = Win32::Registry::HKEY_LOCAL_MACHINE.open("SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters")
+      dhcp_domain = key["DhcpDomain"]
+      Ohai::Log.trace("Plugin Azure: DhcpDomain registry value is #{dhcp_domain}")
+    rescue Win32::Registry::Error
+      Ohai::Log.trace("Plugin Azure: DhcpDomain registry value cannot be found")
+    end
+
+    dhcp_domain
+  end
+
   # create the basic structure we'll store our data in
   def initialize_metadata_mash_compute
     metadata = Mash.new

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan
@@ -30,7 +31,7 @@ Ohai.plugin(:Virtualization) do
 
     # detect when in a jail or when a jail is actively running (not in stopped state)
     so = shell_out("sysctl -n security.jail.jailed")
-    if so.stdout.split($/)[0].to_i == 1
+    if so.stdout.strip.to_i == 1
       virtualization[:system] = "jail"
       virtualization[:role] = "guest"
       virtualization[:systems][:jail] = "guest"
@@ -66,7 +67,7 @@ Ohai.plugin(:Virtualization) do
     end
 
     # Detect bhyve by presence of /dev/vmm
-    if File.exist?("/dev/vmm")
+    if file_exist?("/dev/vmm")
       virtualization[:system] = "bhyve"
       virtualization[:role] = "host"
       virtualization[:systems][:bhyve] = "host"

data/lib/ohai/plugins/c.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Doug MacEachern <dougm@vmware.com>
 # Copyright:: Copyright (c) 2010 VMware, Inc.
@@ -122,12 +123,12 @@ Ohai.plugin(:C) do
   end
 
   def collect_xlc
-    # ibm xlc
-
+    # IBM XL C/C++ for AIX, V13.1.3 (5725-C72, 5765-J07)
+    # Version: 13.01.0003.0000
     so = shell_out("xlc -qversion")
     if so.exitstatus == 0 || (so.exitstatus >> 8) == 249
       description = so.stdout.split($/).first
-      if description =~ /V(\d+\.\d+)/
+      if description =~ /V(\d+\.\d+(.\d+)?)/
         @c[:xlc] = Mash.new
         @c[:xlc][:version] = $1
         @c[:xlc][:description] = description.strip

data/lib/ohai/plugins/chef.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Tollef Fog Heen <tfheen@err.no>
 # Copyright:: Copyright (c) 2010 Tollef Fog Heen
@@ -19,7 +20,7 @@
 Ohai.plugin(:Chef) do
   provides "chef_packages/chef"
 
-  collect_data do
+  collect_data(:default, :target) do
     begin
       require "chef/version"
     rescue Gem::LoadError

data/lib/ohai/plugins/cloud.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Cary Penniman (<cary@rightscale.com>)
 # License:: Apache License, Version 2.0
@@ -109,7 +110,7 @@ Ohai.plugin(:Cloud) do
       ipaddr = ""
       begin
         ipaddr = IPAddr.new(ip)
-        raise ArgumentError, "not valid #{address_family} address" unless (address_family == :ipv4) ? ipaddr.ipv4? : ipaddr.ipv6?
+        raise ArgumentError, "not valid #{address_family} address" unless address_family == :ipv4 ? ipaddr.ipv4? : ipaddr.ipv6?
       rescue ArgumentError => e
         raise "ERROR: the ohai 'cloud' plugin failed with an IP address of '#{ip}' : #{e.message}"
       end

data/lib/ohai/plugins/command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/plugins/cpu.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Bryan McLellan (btm@loftninjas.org)
@@ -30,16 +31,14 @@ Ohai.plugin(:CPU) do
   def parse_bsd_dmesg(&block)
     cpuinfo = Mash.new
     cpuinfo["flags"] = []
-    File.open("/var/run/dmesg.boot").each do |line|
+    file_open("/var/run/dmesg.boot").each do |line|
       case line
       when /CPU:\s+(.+) \(([\d.]+).+\)/
         cpuinfo["model_name"] = $1
         cpuinfo["mhz"] = $2
-      when /Features=.+<(.+)>/
+      when /Features=.+<(.+)>/, /Features2=[a-f\dx]+<(.+)>/
         cpuinfo["flags"].concat($1.downcase.split(","))
         # Features2=0x80000001<SSE3,<b31>>
-      when /Features2=[a-f\dx]+<(.+)>/
-        cpuinfo["flags"].concat($1.downcase.split(","))
       else
         yield(cpuinfo, line)
       end
@@ -53,7 +52,7 @@ Ohai.plugin(:CPU) do
     cpu_number = 0
     current_cpu = nil
 
-    File.open("/proc/cpuinfo").each do |line|
+    file_open("/proc/cpuinfo").each do |line|
       case line
       when /processor\s+:\s(.+)/
         cpuinfo[$1] = Mash.new
@@ -86,15 +85,15 @@ Ohai.plugin(:CPU) do
       when /cache size\s+:\s(.+)/
         cpuinfo[current_cpu]["cache_size"] = $1
       when /flags\s+:\s(.+)/
-        cpuinfo[current_cpu]["flags"] = $1.split(" ")
+        cpuinfo[current_cpu]["flags"] = $1.split
       when /BogoMIPS\s+:\s(.+)/
         cpuinfo[current_cpu]["bogomips"] = $1
       when /Features\s+:\s(.+)/
-        cpuinfo[current_cpu]["features"] = $1.split(" ")
+        cpuinfo[current_cpu]["features"] = $1.split
       when /bogomips per cpu:\s(.+)/
         cpuinfo["bogomips_per_cpu"] = $1
       when /features\s+:\s(.+)/
-        cpuinfo["features"] = $1.split(" ")
+        cpuinfo["features"] = $1.split
       when /processor\s(\d):\s(.+)/
         current_cpu = $1
         cpu_number += 1
@@ -201,7 +200,7 @@ Ohai.plugin(:CPU) do
     end
 
     so = shell_out("sysctl -n hw.ncpu")
-    info[:total] = so.stdout.split($/)[0].to_i
+    info[:total] = so.stdout.strip.to_i
     cpu info
   end
 
@@ -212,7 +211,7 @@ Ohai.plugin(:CPU) do
     # to scrape from dmesg.boot is the cpu feature list.
     # cpu0: FPU,V86,DE,PSE,TSC,MSR,MCE,CX8,SEP,MTRR,PGE,MCA,CMOV,PAT,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,TM,SBF,EST,TM2
 
-    File.open("/var/run/dmesg.boot").each do |line|
+    file_open("/var/run/dmesg.boot").each do |line|
       case line
       when /cpu\d+:\s+([A-Z]+$|[A-Z]+,.*$)/
         cpuinfo["flags"] = $1.downcase.split(",")
@@ -221,7 +220,7 @@ Ohai.plugin(:CPU) do
 
     [["hw.model", :model_name], ["hw.ncpu", :total], ["hw.cpuspeed", :mhz]].each do |param, node|
       so = shell_out("sysctl -n #{param}")
-      cpuinfo[node] = so.stdout.split($/)[0]
+      cpuinfo[node] = so.stdout.strip
     end
 
     cpu cpuinfo
@@ -235,7 +234,7 @@ Ohai.plugin(:CPU) do
     # available instruction set
     # cpu0 at mainbus0 apid 0: Intel 686-class, 2134MHz, id 0x6f6
 
-    File.open("/var/run/dmesg.boot").each do |line|
+    file_open("/var/run/dmesg.boot").each do |line|
       case line
       when /cpu[\d\w\s]+:\s([\w\s\-]+),\s+(\w+),/
         cpuinfo[:model_name] = $1
@@ -279,7 +278,7 @@ Ohai.plugin(:CPU) do
       when /^machdep.cpu.stepping: (.*)$/
         cpu[:stepping] = Regexp.last_match[1].to_i
       when /^machdep.cpu.features: (.*)$/
-        cpu[:flags] = Regexp.last_match[1].downcase.split(" ")
+        cpu[:flags] = Regexp.last_match[1].downcase.split
       end
     end
   end
@@ -349,25 +348,25 @@ Ohai.plugin(:CPU) do
       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
+      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

data/lib/ohai/plugins/darwin/hardware.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Nate Walck (<nate.walck@gmail.com>)
 # Copyright:: Copyright (c) 2016-present Facebook, Inc.

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Patrick Collins (<pat@burned.com>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -43,9 +44,7 @@ Ohai.plugin(:Memory) do
           megabyte_val = (pages * page_size) / 1024 / 1024.0
           total_consumed += megabyte_val
           case match
-          when "wired down"
-            active += megabyte_val.to_i
-          when "active"
+          when "wired down", "active"
             active += megabyte_val.to_i
           when "inactive"
             inactive += megabyte_val.to_i

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Benjamin Black (<bb@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -26,7 +27,7 @@ Ohai.plugin(:Network) do
 
   def parse_media(media_string)
     media = {}
-    line_array = media_string.split(" ")
+    line_array = media_string.split
 
     0.upto(line_array.length - 1) do |i|
       unless line_array[i].eql?("none")
@@ -40,11 +41,9 @@ Ohai.plugin(:Network) do
           else
             media[line_array[i]]["options"] = $1.split(",")
           end
-        else
-          if line_array[i].eql?("autoselect")
-            media["autoselect"] = {} unless media.key?("autoselect")
-            media["autoselect"]["options"] = []
-          end
+        elsif line_array[i].eql?("autoselect")
+          media["autoselect"] = {} unless media.key?("autoselect")
+          media["autoselect"]["options"] = []
         end
       else
         media["none"] = { "options" => [] }
@@ -144,15 +143,15 @@ Ohai.plugin(:Network) do
       end
       if line =~ /\s+inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) netmask 0x(([0-9a-f]){1,8}) broadcast (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
         iface[cint][:addresses] ||= Mash.new
-        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => hex_to_dec_netmask($2) , "broadcast" => $4 }
+        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => hex_to_dec_netmask($2), "broadcast" => $4 }
       end
       if line =~ /\s+inet6 ([a-f0-9\:]+)(\s*|(\%[a-z0-9]+)\s*) prefixlen (\d+)\s*/
         iface[cint][:addresses] ||= Mash.new
-        iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $4 , "scope" => scope_lookup($1) }
+        iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $4, "scope" => scope_lookup($1) }
       end
       if line =~ /\s+inet6 ([a-f0-9\:]+)(\s*|(\%[a-z0-9]+)\s*) prefixlen (\d+) scopeid 0x([a-f0-9]+)/
         iface[cint][:addresses] ||= Mash.new
-        iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $4 , "scope" => scope_lookup($1) }
+        iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $4, "scope" => scope_lookup($1) }
       end
       if line =~ /^\s+media: ((\w+)|(\w+ [a-zA-Z0-9\-\<\>]+)) status: (\w+)/
         iface[cint][:media] ||= Mash.new

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Pavel Yudin (<pyudin@parallels.com>)
 # Author:: Tim Smith (<tsmith@chef.io>)
@@ -35,7 +36,7 @@ Ohai.plugin(:Virtualization) do
   end
 
   def fusion_exists?
-    ::File.exist?("/Applications/VMware\ Fusion.app/")
+    file_exist?("/Applications/VMware\ Fusion.app/")
   end
 
   def docker_exists?

data/lib/ohai/plugins/digital_ocean.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Dylan Page (<dpage@digitalocean.com>)
 # Author:: Stafford Brunk (<stafford.brunk@gmail.com>)
@@ -48,7 +49,8 @@ Ohai.plugin(:DigitalOcean) do
     false
   end
 
-  collect_data do
+  # linux and freebsd is all digitalocean supports
+  collect_data(:linux, :freebsd) do
     if looks_like_digital_ocean?
       logger.trace("Plugin Digitalocean: looks_like_digital_ocean? == true")
       digital_ocean Mash.new

data/lib/ohai/plugins/dmi.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Kurt Yoder (ktyopscode@yoderhome.com)
 # Copyright:: Copyright (c) 2010 Kurt Yoder
@@ -76,7 +77,7 @@ Ohai.plugin(:DMI) do
           dmi[:table_location] = table_location[1]
 
         elsif ( handle = handle_line.match(line) )
-          unless Ohai::Common::DMI.whitelisted_ids.include?(handle[2].to_i)
+          unless Ohai::Common::DMI.allowlisted_ids.include?(handle[2].to_i)
             dmi_record = nil
             next
           end
@@ -92,14 +93,14 @@ Ohai.plugin(:DMI) do
           field = nil
 
         elsif ( type = type_line.match(line) )
-          if dmi_record .nil?
+          if dmi_record.nil?
             logger.trace("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?
+          if dmi_record.nil?
             logger.trace("Plugin DMI: unexpected data line found before header; discarding:\n#{line}")
             next
           end
@@ -107,11 +108,11 @@ Ohai.plugin(:DMI) do
           field = data[1]
 
         elsif ( extended_data = extended_data_line.match(line) )
-          if dmi_record .nil?
+          if dmi_record.nil?
             logger.trace("Plugin DMI: unexpected extended data line found before header; discarding:\n#{line}")
             next
           end
-          if field .nil?
+          if field.nil?
             logger.trace("Plugin DMI: unexpected extended data line found outside data section; discarding:\n#{line}")
             next
           end