ohai 16.6.5 → 16.10.6

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Joshua Timberman <joshua@chef.io>
 # Author:: Isa Farnik (<isa@chef.io>)
@@ -24,10 +25,10 @@ Ohai.plugin(:Memory) do
     memory Mash.new
     memory[:swap] = Mash.new
 
-    meminfo = shell_out("svmon -G -O unit=MB,summary=longreal | grep '[0-9]'").stdout
+    meminfo = shell_out("svmon -G -O unit=KB,summary=longreal | grep '[0-9]'").stdout
     total_in_mb, _u, free_in_mb = meminfo.split
-    memory[:total] = "#{total_in_mb.to_i * 1024}kB"
-    memory[:free] = "#{free_in_mb.to_i * 1024}kB"
+    memory[:total] = "#{total_in_mb.to_i}kB"
+    memory[:free] = "#{free_in_mb.to_i}kB"
 
     swap_info = shell_out("swap -s").stdout.split # returns swap info in 4K blocks
     memory[:swap]["total"] = "#{swap_info[2].to_i * 4}kB"

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
@@ -21,7 +22,7 @@
 Ohai.plugin(:Network) do
   require_relative "../../mixin/network_helper"
 
-  provides "network", "counters/network", "macaddress"
+  provides "network", "network/interfaces", "counters/network", "macaddress"
 
   include Ohai::Mixin::NetworkHelper
 
@@ -37,46 +38,44 @@ Ohai.plugin(:Network) do
     # => state up/down (ifconfig/lsattr)
     # => arp (arp -an)
 
-    iface = Mash.new
+    ifaces = Mash.new
 
     network Mash.new unless network
-    network[:interfaces] ||= Mash.new
 
     # We unfortunately have to do things a bit different here, if ohai is running
     # within a WPAR. For instance, the WPAR isn't aware of some of its own networking
-    # minutia such as default gateway/route.
+    # minutia such as default gateway/route. lpars return 0 here. wpars return > 0
     unless shell_out("uname -W").stdout.to_i > 0
       # :default_interface, :default_gateway - route -n get 0
-      so = shell_out("netstat -rn |grep default")
-      so.stdout.lines.each do |line|
-        items = line.split(" ")
-        if items[0] == "default"
-          network[:default_gateway] = items[1]
-          network[:default_interface] = items[5]
-        end
-      end
+      default_line = shell_out("netstat -rn")
+        .stdout
+        .each_line
+        .detect { |l| l.start_with?("default") }
+        .split
+      network[:default_gateway] = default_line[1]
+      network[:default_interface] = default_line[5]
     end
 
-    # Splits the ifconfig output to 1 line per interface
-    if_so = shell_out("ifconfig -a")
-    if_so.stdout.gsub(/\n(\w+\d+)/, '___\1').split("___").each do |intraface|
-      splat = intraface.split(":")
-      interface = splat[0]
-      line = splat[1..-1][0]
-      iface[interface] = Mash.new
-      iface[interface][:state] = (line.include?("<UP,") ? "up" : "down")
-
-      intraface.lines.each do |lin|
-        case lin
+    # Splits the ifconfig output into arrays of interface strings
+    shell_out("ifconfig -a").stdout.split(/\n(?=\w)/).each do |int_lines|
+      int_name, int_data = int_lines.split(":", 2)
+
+      ifaces[int_name] = Mash.new
+      ifaces[int_name][:addresses] ||= Mash.new
+      ifaces[int_name][:state] = (int_data.include?("<UP,") ? "up" : "down")
+
+      int_data.each_line do |line|
+        case line
         when /flags=\S+<(\S+)>/
-          iface[interface][:flags] = $1.split(",")
-          iface[interface][:metric] = $1 if lin =~ /metric\s(\S+)/
+          ifaces[int_name][:flags] = $1.split(",")
+          ifaces[int_name][:metric] = $1 if line =~ /metric\s(\S+)/
         else
           # We have key value pairs.
-          if lin =~ %r{inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(/(\d{1,2}))?}
-            tmp_addr, tmp_prefix = $1, $3
+          if line =~ %r{inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(/(\d{1,2}))?}
+            tmp_addr = $1
+            tmp_prefix = $3
             if tmp_prefix.nil?
-              netmask = hex_to_dec_netmask($1) if lin =~ /netmask\s0x(\S+)\s/
+              netmask = hex_to_dec_netmask($1) if line =~ /netmask\s0x(\S+)\s/
               unless netmask
                 tmp_prefix ||= "32"
                 netmask = IPAddr.new("255.255.255.255").mask(tmp_prefix.to_i).to_s
@@ -85,57 +84,51 @@ Ohai.plugin(:Network) do
               netmask = IPAddr.new("255.255.255.255").mask(tmp_prefix.to_i).to_s
             end
 
-            iface[interface][:addresses] ||= Mash.new
-            iface[interface][:addresses][tmp_addr] = { "family" => "inet", "prefixlen" => tmp_prefix }
-            iface[interface][:addresses][tmp_addr][:netmask] = netmask
+            ifaces[int_name][:addresses][tmp_addr] = { "family" => "inet", "prefixlen" => tmp_prefix }
+            ifaces[int_name][:addresses][tmp_addr][:netmask] = netmask
 
-            if lin =~ /broadcast\s(\S+)\s/
-              iface[interface][:addresses][tmp_addr][:broadcast] = $1
+            if line =~ /broadcast\s(\S+)\s/
+              ifaces[int_name][:addresses][tmp_addr][:broadcast] = $1
             end
-          elsif lin =~ %r{inet6 ([a-f0-9\:]+)%?([\d]*)/?(\d*)?}
-            # TODO do we have more properties on inet6 in aix? broadcast
-            iface[interface][:addresses] ||= Mash.new
-            iface[interface][:addresses][$1] = { "family" => "inet6", "zone_index" => $2, "prefixlen" => $3 }
+          elsif line =~ %r{inet6 ([a-f0-9\:]+)%?(\d*)/?(\d*)?}
+            # TODO: do we have more properties on inet6 in aix? broadcast
+            ifaces[int_name][:addresses] ||= Mash.new
+            ifaces[int_name][:addresses][$1] = { "family" => "inet6", "zone_index" => $2, "prefixlen" => $3 }
           else
-            # load all key-values, example "tcp_sendspace 131072 tcp_recvspace 131072 rfc1323 1"
-            properties = lin.split
-            n = properties.length / 2 - 1
-            (0..n).each do |i|
-              iface[interface][properties[i * 2]] = properties[(i * 2 + 1)]
+            # add all key value data into the interface mash
+            # for example "tcp_sendspace 131072 tcp_recvspace 131072 rfc1323 1"
+            # has keys tcp_sendspace, tcp_recvspace, and rfc1323
+            line.split.each_slice(2) do |key, value|
+              ifaces[int_name][key] = value
             end
           end
         end
       end
 
       # Query macaddress
-      e_so = shell_out("entstat -d #{interface} | grep \"Hardware Address\"")
-      iface[interface][:addresses] ||= Mash.new
-      e_so.stdout.lines.each do |l|
-        if l =~ /Hardware Address: (\S+)/
-          iface[interface][:addresses][$1.upcase] = { "family" => "lladdr" }
-          macaddress $1.upcase unless shell_out("uname -W").stdout.to_i > 0
-        end
+      shell_out("entstat -d #{int_name}").stdout =~ /Hardware Address: (\S+)/
+      if $1
+        ifaces[int_name][:addresses][$1.upcase] = { "family" => "lladdr" }
+        macaddress $1.upcase unless shell_out("uname -W").stdout.to_i > 0
       end
     end # ifconfig stdout
 
     # Query routes information
     %w{inet inet6}.each do |family|
-      so_n = shell_out("netstat -nrf #{family}")
-      so_n.stdout.lines.each do |line|
+      shell_out("netstat -nrf #{family}").stdout.each_line do |line|
         if line =~ /(\S+)\s+(\S+)\s+(\S+)\s+(\d+)\s+(\d+)\s+(\S+)/
           interface = $6
-          iface[interface][:routes] = [] unless iface[interface][:routes]
-          iface[interface][:routes] << Mash.new( destination: $1, family: family,
-                                                 via: $2, flags: $3)
+          ifaces[interface][:routes] ||= []
+          ifaces[interface][:routes] << Mash.new( destination: $1, family: family,
+                                                  via: $2, flags: $3)
         end
       end
     end
 
     # List the arp entries in system.
-    so = shell_out("arp -an")
     count = 0
-    so.stdout.lines.each do |line|
-      network[:arp] ||= Mash.new
+    network[:arp] ||= Mash.new
+    shell_out("arp -an").stdout.each_line do |line|
       if line =~ /\s*(\S+) \((\S+)\) at ([a-fA-F0-9\:]+) \[(\w+)\] stored in bucket/
         network[:arp][count] ||= Mash.new
         network[:arp][count][:remote_host] = $1
@@ -144,6 +137,6 @@ Ohai.plugin(:Network) do
         count += 1
       end
     end
-    network["interfaces"] = iface
+    network["interfaces"] = ifaces
   end
 end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Joshua Timberman <joshua@chef.io>
 # Author:: Isa Farnik (<isa@chef.io>)
@@ -22,8 +23,8 @@ Ohai.plugin(:Platform) do
   depends "kernel"
 
   collect_data(:aix) do
-    platform kernel[:name]
+    platform "aix"
+    platform_family "aix"
     platform_version [kernel[:version], kernel[:release]].join(".")
-    platform_family platform
   end
 end

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
 #

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"

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

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)
@@ -35,11 +36,9 @@ Ohai.plugin(:CPU) do
       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
@@ -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
 
@@ -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
@@ -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