ohai 16.7.18 → 16.10.7

data/lib/ohai/plugins/cloud.rb

@@ -110,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/cpu.rb

@@ -85,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
@@ -200,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
 
@@ -220,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
@@ -278,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
@@ -348,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/network.rb

@@ -27,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")
@@ -41,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" => [] }
@@ -145,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/digital_ocean.rb

@@ -49,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

@@ -93,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
@@ -108,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

data/lib/ohai/plugins/docker.rb

@@ -48,7 +48,7 @@ Ohai.plugin(:Docker) do
     docker[:swarm] = shellout_data["Swarm"]
   end
 
-  collect_data do
+  collect_data(:linux, :windows, :darwin) do
     require "json" unless defined?(JSON)
 
     if virtualization[:systems][:docker]

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

@@ -26,22 +26,22 @@ Ohai.plugin(:Memory) do
 
     # /usr/src/sys/sys/vmmeter.h
     so = shell_out("sysctl -n vm.stats.vm.v_page_size")
-    memory[:page_size] = so.stdout.split($/)[0]
+    memory[:page_size] = so.stdout.strip
     so = shell_out("sysctl -n vm.stats.vm.v_page_count")
-    memory[:page_count] = so.stdout.split($/)[0]
+    memory[:page_count] = so.stdout.strip
     memory[:total] = memory[:page_size].to_i * memory[:page_count].to_i
     so = shell_out("sysctl -n vm.stats.vm.v_free_count")
-    memory[:free] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    memory[:free] = memory[:page_size].to_i * so.stdout.strip.to_i
     so = shell_out("sysctl -n vm.status.vm.v_active_count")
-    memory[:active] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    memory[:active] = memory[:page_size].to_i * so.stdout.strip.to_i
     so = shell_out("sysctl -n vm.status.vm.v_inactive_count")
-    memory[:inactive] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    memory[:inactive] = memory[:page_size].to_i * so.stdout.strip.to_i
     so = shell_out("sysctl -n vm.stats.vm.v_cache_count")
-    memory[:cache] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    memory[:cache] = memory[:page_size].to_i * so.stdout.strip.to_i
     so = shell_out("sysctl -n vm.stats.vm.v_wire_count")
-    memory[:wired] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    memory[:wired] = memory[:page_size].to_i * so.stdout.strip.to_i
     so = shell_out("sysctl -n vfs.bufspace")
-    memory[:buffers] = so.stdout.split($/)[0]
+    memory[:buffers] = so.stdout.strip
 
     so = shell_out("swapinfo")
     so.stdout.lines do |line|

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

@@ -21,8 +21,8 @@ Ohai.plugin(:Platform) do
   provides "platform", "platform_version", "platform_family"
 
   collect_data(:dragonflybsd) do
-    platform shell_out("uname -s").stdout.split($/)[0].downcase
-    platform_version shell_out("uname -r").stdout.split($/)[0]
+    platform shell_out("uname -s").stdout.strip.downcase
+    platform_version shell_out("uname -r").stdout.strip
     platform_family "dragonflybsd"
   end
 end

data/lib/ohai/plugins/ec2.rb

@@ -121,6 +121,9 @@ Ohai.plugin(:EC2) do
       logger.trace("Plugin EC2: looks_like_ec2? == true")
       ec2 Mash.new
       fetch_metadata.each do |k, v|
+        # this includes sensitive data we don't want to store on the node
+        next if k == "identity_credentials_ec2_security_credentials_ec2_instance"
+
         # fetch_metadata returns IAM security credentials, including the IAM user's
         # secret access key. We'd rather not have ohai send this information
         # to the server. If the instance is associated with an IAM role we grab

data/lib/ohai/plugins/eucalyptus.rb

@@ -29,7 +29,7 @@ Ohai.plugin(:Eucalyptus) do
   provides "eucalyptus"
   depends "network/interfaces"
 
-  MAC_MATCH = /^[dD]0:0[dD]:/.freeze
+  MAC_MATCH = /^[dD]0:0[dD]:/.freeze unless defined?(MAC_MATCH)
 
   # returns the mac address from the collection of all address types
   def get_mac_address(addresses)

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

@@ -26,22 +26,22 @@ Ohai.plugin(:Memory) do
 
     # /usr/src/sys/sys/vmmeter.h
     so = shell_out("sysctl -n vm.stats.vm.v_page_size")
-    memory[:page_size] = so.stdout.split($/)[0]
+    memory[:page_size] = so.stdout.strip
     so = shell_out("sysctl -n vm.stats.vm.v_page_count")
-    memory[:page_count] = so.stdout.split($/)[0]
+    memory[:page_count] = so.stdout.strip
     memory[:total] = memory[:page_size].to_i * memory[:page_count].to_i
     so = shell_out("sysctl -n vm.stats.vm.v_free_count")
-    memory[:free] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    memory[:free] = memory[:page_size].to_i * so.stdout.strip.to_i
     so = shell_out("sysctl -n vm.status.vm.v_active_count")
-    memory[:active] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    memory[:active] = memory[:page_size].to_i * so.stdout.strip.to_i
     so = shell_out("sysctl -n vm.status.vm.v_inactive_count")
-    memory[:inactive] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    memory[:inactive] = memory[:page_size].to_i * so.stdout.strip.to_i
     so = shell_out("sysctl -n vm.stats.vm.v_cache_count")
-    memory[:cache] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    memory[:cache] = memory[:page_size].to_i * so.stdout.strip.to_i
     so = shell_out("sysctl -n vm.stats.vm.v_wire_count")
-    memory[:wired] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    memory[:wired] = memory[:page_size].to_i * so.stdout.strip.to_i
     so = shell_out("sysctl -n vfs.bufspace")
-    memory[:buffers] = so.stdout.split($/)[0]
+    memory[:buffers] = so.stdout.strip
 
     so = shell_out("swapinfo")
     so.stdout.lines do |line|

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

@@ -21,8 +21,8 @@ Ohai.plugin(:Platform) do
   provides "platform", "platform_version", "platform_family"
 
   collect_data(:freebsd) do
-    platform shell_out("uname -s").stdout.split($/)[0].downcase
-    platform_version shell_out("uname -r").stdout.split($/)[0]
+    platform shell_out("uname -s").stdout.strip.downcase
+    platform_version shell_out("uname -r").stdout.strip
     platform_family "freebsd"
   end
 end

data/lib/ohai/plugins/grub2.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+#
+# Author:: Davide Cavalca <dcavalca@fb.com>
+# Copyright:: Copyright (c) 2020 Facebook
+# 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(:Grub2) do
+  provides "grub2/environment"
+  optional true
+
+  collect_data(:dragonflybsd, :freebsd, :linux, :netbsd) do
+    editenv_path = which("grub2-editenv")
+    if editenv_path
+      editenv_out = shell_out("#{editenv_path} list")
+
+      grub2 Mash.new unless grub2
+      grub2[:environment] ||= Mash.new
+
+      editenv_out.stdout.each_line do |line|
+        key, val = line.split("=", 2)
+        grub2[:environment][key] = val.strip
+      end
+    else
+      logger.trace("Plugin Grub2: Could not find grub2-editenv. Skipping plugin.")
+    end
+  end
+end

data/lib/ohai/plugins/hostname.rb

@@ -38,8 +38,7 @@ Ohai.plugin(:Hostname) do
   # fqdn and domain may be broken if DNS is broken on the host
 
   def from_cmd(cmd)
-    so = shell_out(cmd)
-    so.stdout.split($/)[0]
+    shell_out(cmd).stdout.strip
   end
 
   # forward and reverse lookup to canonicalize FQDN (hostname -f equivalent)

data/lib/ohai/plugins/kernel.rb

@@ -34,7 +34,7 @@ Ohai.plugin(:Kernel) do
      ["uname -v", :version], ["uname -m", :machine],
      ["uname -p", :processor]].each do |cmd, property|
        so = shell_out(cmd)
-       kernel[property] = so.stdout.split($/)[0]
+       kernel[property] = so.stdout.strip
      end
     kernel
   end
@@ -115,7 +115,6 @@ Ohai.plugin(:Kernel) do
     when 16 then "WIN95"
     when 17 then "WIN98"
     when 19 then "WINCE"
-    else nil
     end
   end
 
@@ -134,7 +133,6 @@ Ohai.plugin(:Kernel) do
     when 6 then "Appliance PC"
     when 7 then "Performance Server"
     when 8 then "Maximum"
-    else nil
     end
   end
 
@@ -170,7 +168,7 @@ Ohai.plugin(:Kernel) do
     kernel[:os] = kernel[:name]
 
     so = shell_out("sysctl -n hw.optional.x86_64")
-    if so.stdout.split($/)[0].to_i == 1
+    if so.stdout.strip.to_i == 1
       kernel[:machine] = "x86_64"
     end
 
@@ -190,7 +188,7 @@ Ohai.plugin(:Kernel) do
     kernel[:os] = kernel[:name]
 
     so = shell_out("uname -i")
-    kernel[:ident] = so.stdout.split($/)[0]
+    kernel[:ident] = so.stdout.strip
     so = shell_out("sysctl kern.securelevel")
     kernel[:securelevel] = so.stdout.split($/).select { |e| e =~ /kern.securelevel: (.+)$/ }
 
@@ -201,7 +199,7 @@ Ohai.plugin(:Kernel) do
     kernel init_kernel
 
     so = shell_out("uname -o")
-    kernel[:os] = so.stdout.split($/)[0]
+    kernel[:os] = so.stdout.strip
 
     modules = Mash.new
     so = shell_out("env lsmod")
@@ -233,7 +231,7 @@ Ohai.plugin(:Kernel) do
     kernel init_kernel
 
     so = shell_out("uname -s")
-    kernel[:os] = so.stdout.split($/)[0]
+    kernel[:os] = so.stdout.strip
 
     so = file_open("/etc/release", &:gets)
     md = /(?<update>\d.*\d)/.match(so)

data/lib/ohai/plugins/libvirt.rb

@@ -17,11 +17,11 @@
 # limitations under the License.
 #
 
-# Note: This plugin requires libvirt-bin/libvirt-dev as well as the ruby-libvirt
+# NOTE: This plugin requires libvirt-bin/libvirt-dev as well as the ruby-libvirt
 #       gem to be installed before it will properly parse data
 
 Ohai.plugin(:Libvirt) do
-  %w{ uri capabilities nodeinfo domains networks storage }.each do |info|
+  %w{uri capabilities nodeinfo domains networks storage}.each do |info|
     provides "libvirt/#{info}"
     depends "virtualization"
   end
@@ -89,7 +89,7 @@ Ohai.plugin(:Libvirt) do
     storage_data
   end
 
-  collect_data do
+  collect_data(:linux) do
     if virtualization[:role].eql?("host")
       load_libvirt
       begin

data/lib/ohai/plugins/linode.rb

@@ -18,31 +18,38 @@
 Ohai.plugin(:Linode) do
   provides "linode"
 
-  depends "kernel"
+  depends "domain"
   depends "network/interfaces"
 
-  # Checks for matching linode kernel name
+  # Checks to see if the node is in the members.linode.com domain
   #
-  # Returns true or false
-  def has_linode_kernel?
-    if ( kernel_data = kernel )
-      kernel_data[:release].split("-").last.include?("linode")
-    end
+  # @return [Boolean]
+  #
+  def has_linode_domain?
+    domain&.include?("linode")
+  end
+
+  # Checks for linode mirrors in the apt sources.list file
+  #
+  # @return [Boolean]
+  #
+  def has_linode_apt_repos?
+    file_exist?("/etc/apt/sources.list") && file_read("/etc/apt/sources.list").include?("linode")
   end
 
   # Identifies the linode cloud by preferring the hint, then
   #
-  # Returns true or false
+  # @return [Boolean]
+  #
   def looks_like_linode?
-    hint?("linode") || has_linode_kernel?
+    hint?("linode") || has_linode_domain? || has_linode_apt_repos?
   end
 
-  # Names linode ip address
+  # Alters linode mash with new interface based on name parameter
   #
-  # name - symbol of ohai name (e.g. :public_ip)
-  # eth - Interface name (e.g. :eth0)
+  # @param [Symbol] name Ohai name (e.g. :public_ip)
+  # @param [Symbol] eth Interface name (e.g. :eth0)
   #
-  # Alters linode mash with new interface based on name parameter
   def get_ip_address(name, eth)
     if ( eth_iface = network[:interfaces][eth] )
       eth_iface[:addresses].each do |key, info|
@@ -51,7 +58,7 @@ Ohai.plugin(:Linode) do
     end
   end
 
-  collect_data do
+  collect_data(:linux) do
     # Setup linode mash if it is a linode system
     if looks_like_linode?
       logger.trace("Plugin Linode: looks_like_linode? == true")