ohai 8.10.0 → 8.11.1

data/lib/ohai/plugins/cloud_v2.rb

@@ -113,7 +113,6 @@ Ohai.plugin(:CloudV2) do
     end
   end
 
-
   #---------------------------------------
   # Google Compute Engine (gce)
   #--------------------------------------
@@ -123,19 +122,19 @@ Ohai.plugin(:CloudV2) do
   end
 
   def get_gce_values
-    public_ips = gce['instance']['networkInterfaces'].collect do |interface|
-      if interface.has_key?('accessConfigs')
-        interface['accessConfigs'].collect{|ac| ac['externalIp'] unless ac['externalIp'] == ''}
+    public_ips = gce["instance"]["networkInterfaces"].collect do |interface|
+      if interface.has_key?("accessConfigs")
+        interface["accessConfigs"].collect { |ac| ac["externalIp"] unless ac["externalIp"] == "" }
       end
     end.flatten.compact
 
-    private_ips = gce['instance']['networkInterfaces'].collect do |interface|
-      interface['ip']
+    private_ips = gce["instance"]["networkInterfaces"].collect do |interface|
+      interface["ip"]
     end.compact
 
-    public_ips.each { |ipaddr|  @cloud_attr_obj.add_ipv4_addr(ipaddr, :public) }
-    private_ips.each { |ipaddr|  @cloud_attr_obj.add_ipv4_addr(ipaddr, :private) }
-    @cloud_attr_obj.local_hostname = gce['instance']['hostname']
+    public_ips.each { |ipaddr| @cloud_attr_obj.add_ipv4_addr(ipaddr, :public) }
+    private_ips.each { |ipaddr| @cloud_attr_obj.add_ipv4_addr(ipaddr, :private) }
+    @cloud_attr_obj.local_hostname = gce["instance"]["hostname"]
     @cloud_attr_obj.provider = "gce"
   end
 
@@ -154,10 +153,10 @@ Ohai.plugin(:CloudV2) do
 
   # Fill cloud hash with ec2 values
   def get_ec2_values
-    @cloud_attr_obj.add_ipv4_addr(ec2['public_ipv4'], :public)
-    @cloud_attr_obj.add_ipv4_addr(ec2['local_ipv4'], :private)
-    @cloud_attr_obj.public_hostname = ec2['public_hostname']
-    @cloud_attr_obj.local_hostname = ec2['local_hostname']
+    @cloud_attr_obj.add_ipv4_addr(ec2["public_ipv4"], :public)
+    @cloud_attr_obj.add_ipv4_addr(ec2["local_ipv4"], :private)
+    @cloud_attr_obj.public_hostname = ec2["public_hostname"]
+    @cloud_attr_obj.local_hostname = ec2["local_hostname"]
     @cloud_attr_obj.provider = "ec2"
   end
 
@@ -176,12 +175,12 @@ Ohai.plugin(:CloudV2) do
 
   # Fill cloud hash with rackspace values
   def get_rackspace_values
-    @cloud_attr_obj.add_ipv4_addr(rackspace['public_ipv4'], :public)
-    @cloud_attr_obj.add_ipv4_addr(rackspace['local_ipv4'], :private)
-    @cloud_attr_obj.add_ipv6_addr(rackspace['public_ipv6'], :public)
-    @cloud_attr_obj.add_ipv6_addr(rackspace['local_ipv6'], :private)
-    @cloud_attr_obj.public_hostname = rackspace['public_hostname']
-    @cloud_attr_obj.local_hostname = rackspace['local_hostname']
+    @cloud_attr_obj.add_ipv4_addr(rackspace["public_ipv4"], :public)
+    @cloud_attr_obj.add_ipv4_addr(rackspace["local_ipv4"], :private)
+    @cloud_attr_obj.add_ipv6_addr(rackspace["public_ipv6"], :public)
+    @cloud_attr_obj.add_ipv6_addr(rackspace["local_ipv6"], :private)
+    @cloud_attr_obj.public_hostname = rackspace["public_hostname"]
+    @cloud_attr_obj.local_hostname = rackspace["local_hostname"]
     @cloud_attr_obj.provider = "rackspace"
   end
 
@@ -200,10 +199,10 @@ Ohai.plugin(:CloudV2) do
 
   # Fill cloud hash with linode values
   def get_linode_values
-    @cloud_attr_obj.add_ipv4_addr(linode['public_ip'], :public)
-    @cloud_attr_obj.add_ipv4_addr(linode['private_ip'], :private)
-    @cloud_attr_obj.public_hostname = linode['public_hostname']
-    @cloud_attr_obj.local_hostname = linode['local_hostname']
+    @cloud_attr_obj.add_ipv4_addr(linode["public_ip"], :public)
+    @cloud_attr_obj.add_ipv4_addr(linode["private_ip"], :private)
+    @cloud_attr_obj.public_hostname = linode["public_hostname"]
+    @cloud_attr_obj.local_hostname = linode["local_hostname"]
     @cloud_attr_obj.provider = "linode"
   end
 
@@ -221,10 +220,10 @@ Ohai.plugin(:CloudV2) do
   end
 
   def get_eucalyptus_values
-    @cloud_attr_obj.add_ipv4_addr(eucalyptus['public_ipv4'], :public)
-    @cloud_attr_obj.add_ipv4_addr(eucalyptus['local_ipv4'], :private)
-    @cloud_attr_obj.public_hostname = eucalyptus['public_hostname']
-    @cloud_attr_obj.local_hostname = eucalyptus['local_hostname']
+    @cloud_attr_obj.add_ipv4_addr(eucalyptus["public_ipv4"], :public)
+    @cloud_attr_obj.add_ipv4_addr(eucalyptus["local_ipv4"], :private)
+    @cloud_attr_obj.public_hostname = eucalyptus["public_hostname"]
+    @cloud_attr_obj.local_hostname = eucalyptus["local_hostname"]
     @cloud_attr_obj.provider = "eucalyptus"
   end
 
@@ -243,10 +242,10 @@ Ohai.plugin(:CloudV2) do
 
   # Fill cloud hash with openstack values
   def get_openstack_values
-    @cloud_attr_obj.add_ipv4_addr(openstack['public_ipv4'], :public)
-    @cloud_attr_obj.add_ipv4_addr(openstack['local_ipv4'], :private)
-    @cloud_attr_obj.public_hostname = openstack['public_hostname']
-    @cloud_attr_obj.local_hostname = openstack['local_hostname']
+    @cloud_attr_obj.add_ipv4_addr(openstack["public_ipv4"], :public)
+    @cloud_attr_obj.add_ipv4_addr(openstack["local_ipv4"], :private)
+    @cloud_attr_obj.public_hostname = openstack["public_hostname"]
+    @cloud_attr_obj.local_hostname = openstack["local_hostname"]
     @cloud_attr_obj.provider = "openstack"
   end
 
@@ -265,13 +264,12 @@ Ohai.plugin(:CloudV2) do
 
   # Fill cloud hash with azure values
   def get_azure_values
-    @cloud_attr_obj.add_ipv4_addr(azure['public_ip'], :public)
-    @cloud_attr_obj.add_ipv4_addr(azure['private_ip'], :private)
-    @cloud_attr_obj.public_hostname = azure['public_fqdn']
+    @cloud_attr_obj.add_ipv4_addr(azure["public_ip"], :public)
+    @cloud_attr_obj.add_ipv4_addr(azure["private_ip"], :private)
+    @cloud_attr_obj.public_hostname = azure["public_fqdn"]
     @cloud_attr_obj.provider = "azure"
   end
 
-
   # ----------------------------------------
   # digital_ocean
   # ----------------------------------------
@@ -287,13 +285,13 @@ Ohai.plugin(:CloudV2) do
 
   # Fill cloud hash with digital_ocean values
   def get_digital_ocean_values
-    digital_ocean['networks'].each do |network, addresses|
-      type = network == 'v4' ? 'ipv4' : 'ipv6'
+    digital_ocean["networks"].each do |network, addresses|
+      type = network == "v4" ? "ipv4" : "ipv6"
       addresses.each do |address|
-        @cloud_attr_obj.send("add_#{type}_addr", address['ip_address'], address['type'].to_sym)
+        @cloud_attr_obj.send("add_#{type}_addr", address["ip_address"], address["type"].to_sym)
       end
     end
-    @cloud_attr_obj.public_hostname = digital_ocean['name']
+    @cloud_attr_obj.public_hostname = digital_ocean["name"]
     @cloud_attr_obj.provider = "digital_ocean"
   end
 

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

@@ -41,6 +41,6 @@ Ohai.plugin(:CPU) do
     so = shell_out("sysctl -n machdep.cpu.stepping")
     cpu[:stepping] = so.stdout.to_i
     so = shell_out("sysctl -n machdep.cpu.features")
-    cpu[:flags] = so.stdout.downcase.split(' ')
+    cpu[:flags] = so.stdout.downcase.split(" ")
   end
 end

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

@@ -26,7 +26,7 @@ Ohai.plugin(:Filesystem2) do
     fs.each_value do |entry|
       view[entry[:device]] = Mash.new unless view[entry[:device]]
       entry.each do |key, val|
-        next if ['device', 'mount'].include?(key)
+        next if %w{device mount}.include?(key)
         view[entry[:device]][key] = val
       end
       if entry[:mount]
@@ -43,7 +43,7 @@ Ohai.plugin(:Filesystem2) do
       next unless entry[:mount]
       view[entry[:mount]] = Mash.new unless view[entry[:mount]]
       entry.each do |key, val|
-        next if ['mount', 'device'].include?(key)
+        next if %w{mount device}.include?(key)
         view[entry[:mount]][key] = val
       end
       if entry[:device]
@@ -98,9 +98,9 @@ Ohai.plugin(:Filesystem2) do
     by_mountpoint = generate_mountpoint_view(fs)
 
     fs2 = Mash.new
-    fs2['by_device'] = by_device
-    fs2['by_mountpoint'] = by_mountpoint
-    fs2['by_pair'] = by_pair
+    fs2["by_device"] = by_device
+    fs2["by_mountpoint"] = by_mountpoint
+    fs2["by_pair"] = by_pair
 
     filesystem2 fs2
   end

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

@@ -17,7 +17,7 @@
 #
 
 Ohai.plugin(:Memory) do
-  provides 'memory'
+  provides "memory"
 
   collect_data(:darwin) do
     memory Mash.new
@@ -37,17 +37,17 @@ Ohai.plugin(:Memory) do
                 end
 
     vm_stat.split("\n").each do |line|
-      ['wired down', 'active', 'inactive'].each do |match|
+      ["wired down", "active", "inactive"].each do |match|
         unless line.index("Pages #{match}:").nil?
           pages = line.split.last.to_i
           megabyte_val = (pages * page_size) / 1024 / 1024.0
           total_consumed += megabyte_val
           case match
-          when 'wired down'
+          when "wired down"
             active += megabyte_val.to_i
-          when 'active'
+          when "active"
             active += megabyte_val.to_i
-          when 'inactive'
+          when "inactive"
             inactive += megabyte_val.to_i
           end
         end
@@ -61,4 +61,3 @@ Ohai.plugin(:Memory) do
     memory[:free] = "#{free_memory.to_i}MB" if total_consumed > 0
   end
 end
-

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

@@ -22,7 +22,7 @@ Ohai.plugin(:Network) do
 
   def parse_media(media_string)
     media = Hash.new
-    line_array = media_string.split(' ')
+    line_array = media_string.split(" ")
 
     0.upto(line_array.length - 1) do |i|
       unless line_array[i].eql?("none")
@@ -67,7 +67,7 @@ Ohai.plugin(:Network) do
   end
 
   def excluded_setting?(setting)
-    setting.match('_sw_cksum')
+    setting.match("_sw_cksum")
   end
 
   def locate_interface(ifaces, ifname, mac)
@@ -84,7 +84,7 @@ Ohai.plugin(:Network) do
   end
 
   collect_data(:darwin) do
-    require 'scanf'
+    require "scanf"
 
     network Mash.new unless network
     network[:interfaces] = Mash.new unless network[:interfaces]
@@ -112,7 +112,7 @@ Ohai.plugin(:Network) do
         iface[cint] = Mash.new unless iface[cint]; iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
         iface[cint][:mtu] = $2
         if line =~ /\sflags\=\d+\<((UP|BROADCAST|DEBUG|SMART|SIMPLEX|LOOPBACK|POINTOPOINT|NOTRAILERS|RUNNING|NOARP|PROMISC|ALLMULTI|SLAVE|MASTER|MULTICAST|DYNAMIC|,)+)\>\s/
-          flags = $1.split(',')
+          flags = $1.split(",")
         else
           flags = Array.new
         end
@@ -134,11 +134,11 @@ 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})\s*$/
         iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => $2.scanf('%2x'*4)*"."}
+        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => $2.scanf("%2x" * 4) * "." }
       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 unless iface[cint][:addresses]
-        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => $2.scanf('%2x'*4)*".", "broadcast" => $4 }
+        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => $2.scanf("%2x" * 4) * ".", "broadcast" => $4 }
       end
       if line =~ /\s+inet6 ([a-f0-9\:]+)(\s*|(\%[a-z0-9]+)\s*) prefixlen (\d+)\s*/
         iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
@@ -190,7 +190,7 @@ Ohai.plugin(:Network) do
         next if iface[ifname].nil? # this shouldn't happen, but just in case
         net_counters[ifname] = Mash.new unless net_counters[ifname]
         net_counters[ifname] = { :rx => { :bytes => $5, :packets => $3, :errors => $4, :drop => 0, :overrun => 0, :frame => 0, :compressed => 0, :multicast => 0 },
-          :tx => { :bytes => $8, :packets => $6, :errors => $7, :drop => 0, :overrun => 0, :collisions => $9, :carrier => 0, :compressed => 0 }
+                                 :tx => { :bytes => $8, :packets => $6, :errors => $7, :drop => 0, :overrun => 0, :collisions => $9, :carrier => 0, :compressed => 0 },
         }
       end
     end

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

@@ -21,51 +21,50 @@ Ohai.plugin(:SystemProfile) do
 
   collect_data(:darwin) do
     begin
-      require 'plist'
+      require "plist"
 
       system_profile Array.new
-      items =  Array.new
+      items = Array.new
       detail_level = {
-        'mini' => [
-                   "SPParallelATAData",
-                   "SPAudioData",
-                   "SPBluetoothData",
-                   "SPCardReaderData",
-                   "SPDiagnosticsData",
-                   "SPDiscBurningData",
-                   "SPEthernetData",
-                   "SPFibreChannelData",
-                   "SPFireWireData",
-                   "SPDisplaysData",
-                   "SPHardwareRAIDData",
-                   "SPMemoryData",
-                   "SPModemData",
-                   "SPNetworkData",
-                   "SPPCIData",
-                   "SPParallelSCSIData",
-                   "SPPrintersSoftwareData",
-                   "SPPrintersData",
-                   "SPSASData",
-                   "SPSerialATAData",
-                   "SPSoftwareData",
-                   "SPThunderboltData",
-                   "SPUSBData",
-                   "SPWWANData",
-                   "SPAirPortData"
-                  ],
-        'full' => [
+        "mini" => %w{
+SPParallelATAData
+SPAudioData
+SPBluetoothData
+SPCardReaderData
+SPDiagnosticsData
+SPDiscBurningData
+SPEthernetData
+SPFibreChannelData
+SPFireWireData
+SPDisplaysData
+SPHardwareRAIDData
+SPMemoryData
+SPModemData
+SPNetworkData
+SPPCIData
+SPParallelSCSIData
+SPPrintersSoftwareData
+SPPrintersData
+SPSASData
+SPSerialATAData
+SPSoftwareData
+SPThunderboltData
+SPUSBData
+SPWWANData
+SPAirPortData},
+        "full" => [
                    "SPHardwareDataType"
-                  ]
+                  ],
       }
 
       detail_level.each do |level, data_types|
         so = shell_out("system_profiler -xml -detailLevel #{level} #{data_types.join(' ')}")
-        Plist::parse_xml(so.stdout).each do |e|
+        Plist.parse_xml(so.stdout).each do |e|
           items << e
         end
       end
 
-      system_profile items.sort_by { |h| h['_dataType'] }
+      system_profile items.sort_by { |h| h["_dataType"] }
     rescue LoadError => e
       Ohai::Log.debug("Can't load gem: #{e})")
     end

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'ohai/util/file_helper'
+require "ohai/util/file_helper"
 
 include Ohai::Util::FileHelper
 
@@ -24,11 +24,11 @@ Ohai.plugin(:Virtualization) do
   provides "virtualization"
 
   def prlctl_exists?
-    which('prlctl')
+    which("prlctl")
   end
 
   def ioreg_exists?
-    which('ioreg')
+    which("ioreg")
   end
 
   collect_data(:darwin) do
@@ -36,18 +36,18 @@ Ohai.plugin(:Virtualization) do
     virtualization[:systems] = Mash.new unless virtualization[:systems]
 
     if prlctl_exists?
-      virtualization[:system] = 'parallels'
-      virtualization[:role] = 'host'
-      virtualization[:systems][:parallels] = 'host'
+      virtualization[:system] = "parallels"
+      virtualization[:role] = "host"
+      virtualization[:systems][:parallels] = "host"
     end
 
     # Detect Parallels virtual machine from pci devices
     if ioreg_exists?
       so = shell_out("ioreg -l")
       if so.stdout =~ /pci1ab8,4000/
-        virtualization[:system] = 'parallels'
-        virtualization[:role] = 'guest'
-        virtualization[:systems][:parallels] = 'guest'
+        virtualization[:system] = "parallels"
+        virtualization[:role] = "guest"
+        virtualization[:systems][:parallels] = "guest"
       end
     end
   end

data/lib/ohai/plugins/digital_ocean.rb

@@ -14,59 +14,59 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'ohai/util/ip_helper'
+require "ohai/util/ip_helper"
 
 Ohai.plugin(:DigitalOcean) do
   include Ohai::Util::IpHelper
 
-  DIGITALOCEAN_FILE = '/etc/digitalocean' unless defined?(DIGITALOCEAN_FILE)
+  DIGITALOCEAN_FILE = "/etc/digitalocean" unless defined?(DIGITALOCEAN_FILE)
 
   provides "digital_ocean"
-
   depends "network/interfaces"
 
   def extract_droplet_ip_addresses
-    addresses = Mash.new({'v4' => [], 'v6' => []})
+    addresses = Mash.new({ "v4" => [], "v6" => [] })
     network[:interfaces].each_value do |iface|
       iface[:addresses].each do |address, details|
-        next if loopback?(address) || details[:family] == 'lladdr'
+        next if details[:family] == "lladdr" || loopback?(address)
 
         ip = IPAddress(address)
         type = digital_ocean_address_type(ip)
         address_hash = build_address_hash(ip, details)
         addresses[type] << address_hash
-      end 
+      end
     end
     addresses
   end
 
   def build_address_hash(ip, details)
     address_hash = Mash.new({
-      'ip_address' => ip.address,
-      'type' => private_address?(ip.address) ? 'private' : 'public'
-    })
+      "ip_address" => ip.address,
+      "type" => private_address?(ip.address) ? "private" : "public",
+    },)
 
     if ip.ipv4?
-      address_hash['netmask'] = details[:netmask]
+      address_hash["netmask"] = details[:netmask]
     elsif ip.ipv6?
-      address_hash['cidr'] = ip.prefix
+      address_hash["cidr"] = ip.prefix
     end
     address_hash
   end
 
   def digital_ocean_address_type(ip)
-    ip.ipv4? ? 'v4' : 'v6'
+    ip.ipv4? ? "v4" : "v6"
   end
 
   def looks_like_digital_ocean?
-    hint?('digital_ocean') || File.exist?(DIGITALOCEAN_FILE)
+    hint?("digital_ocean") || File.exist?(DIGITALOCEAN_FILE)
   end
 
   collect_data do
     if looks_like_digital_ocean?
+      Ohai::Log.debug("digitalocean plugin: looks_like_digital_ocean? == true")
       digital_ocean Mash.new
-      hint = hint?('digital_ocean') || {}
-      hint.each {|k, v| digital_ocean[k] = v unless k == 'ip_addresses'}
+      hint = hint?("digital_ocean") || {}
+      hint.each { |k, v| digital_ocean[k] = v unless k == "ip_addresses" }
 
       # Extract actual ip addresses
       # The networks sub-hash is structured similarly to how
@@ -74,7 +74,7 @@ Ohai.plugin(:DigitalOcean) do
       # https://developers.digitalocean.com/#droplets
       digital_ocean[:networks] = extract_droplet_ip_addresses
     else
-      Ohai::Log.debug("No hints present for digital_ocean.")
+      Ohai::Log.debug("digitalocean plugin: No hints present for and doesn't look like digitalocean")
       false
     end
   end