ohai 8.8.1 → 8.9.0

data/lib/ohai/plugins/eucalyptus.rb

@@ -1,8 +1,8 @@
 #
 # Author:: Tim Dysinger (<tim@dysinger.net>)
-# Author:: Benjamin Black (<bb@opscode.com>)
-# Author:: Christopher Brown (<cb@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Benjamin Black (<bb@chef.io>)
+# Author:: Christopher Brown (<cb@chef.io>)
+# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -36,6 +36,9 @@ Ohai.plugin(:CPU) do
     #   AMD Features2=0x21<LAHF,ABM>
     #   Structured Extended Features=0x2000<NFPUSG>
     #   TSC: P-state invariant
+    #   ...
+    #   FreeBSD/SMP: Multiprocessor System Detected: 16 CPUs
+    #   FreeBSD/SMP: 2 package(s) x 4 core(s) x 2 SMT threads
 
     File.open("/var/run/dmesg.boot").each do |line|
       case line
@@ -54,13 +57,14 @@ Ohai.plugin(:CPU) do
         # Features2=0x80000001<SSE3,<b31>>
       when /Features2=[a-f\dx]+<(.+)>/
         cpuinfo["flags"].concat($1.downcase.split(','))
-      when /Logical CPUs per core: (\d+)/
-        cpuinfo["cores"] = $1
+      when /FreeBSD\/SMP: Multiprocessor System Detected: (\d*) CPUs/
+        cpuinfo["total"] = $1.to_i
+      when /FreeBSD\/SMP: (\d*) package\(s\) x (\d*) core\(s\)/
+        cpuinfo["real"] = $1.to_i
+        cpuinfo["cores"] = $1.to_i * $2.to_i
       end
     end
 
     cpu cpuinfo
-    so = shell_out("sysctl -n hw.ncpu")
-    cpu[:total] = so.stdout.split($/)[0].to_i
   end
 end

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

@@ -1,7 +1,7 @@
 #
-# Authors:: Adam Jacob (<adam@opscode.com>)
+# Authors:: Adam Jacob (<adam@chef.io>)
 #           Richard Manyanza (<liseki@nyikacraftsmen.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # Copyright:: Copyright (c) 2014 Richard Manyanza.
 # License:: Apache License, Version 2.0
 #

data/lib/ohai/plugins/hostname.rb

@@ -1,11 +1,12 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Benjamin Black (<nostromo@gmail.com>)
 # Author:: Bryan McLellan (<btm@loftninjas.org>)
 # Author:: Daniel DeLeo (<dan@kallistec.com>)
 # Author:: Doug MacEachern (<dougm@vmware.com>)
 # Author:: James Gartrell (<jgartrel@gmail.com>)
-# Copyright:: Copyright (c) 2008, 2009 Opscode, Inc.
+# Author:: Isa Farnik (<isa@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # Copyright:: Copyright (c) 2009 Bryan McLellan
 # Copyright:: Copyright (c) 2009 Daniel DeLeo
 # Copyright:: Copyright (c) 2010 VMware, Inc.
@@ -67,7 +68,7 @@ Ohai.plugin(:Hostname) do
   def collect_hostname
     # Hostname is everything before the first dot
     if machinename
-      machinename =~ /(\w+)\.?/
+      machinename =~ /([^.]+)\.?/
       hostname $1
     elsif fqdn
       fqdn =~ /(.+?)\./
@@ -90,13 +91,20 @@ Ohai.plugin(:Hostname) do
     end
   end
 
-  collect_data(:aix, :hpux, :default) do
+  collect_data(:hpux, :default) do
     machinename from_cmd("hostname")
     fqdn sigar_is_available? ? get_fqdn_from_sigar : resolve_fqdn
     collect_hostname
     collect_domain
   end
 
+  collect_data(:aix) do
+    machinename from_cmd("hostname -s")
+    fqdn resolve_fqdn || from_cmd("hostname")
+    collect_hostname
+    collect_domain
+  end
+
   collect_data(:darwin, :netbsd, :openbsd, :dragonflybsd) do
     hostname from_cmd("hostname -s")
     fqdn resolve_fqdn

data/lib/ohai/plugins/init_package.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Caleb Tennis (<caleb.tennis@gmail.com>)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Copyright:: Copyright (c) 2012-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,12 +20,6 @@ Ohai.plugin(:InitPackage) do
   provides "init_package"
 
   collect_data(:linux) do
-    package_name = nil
-
-    if File.exists?("/proc/1/comm")
-      package_name = File.open("/proc/1/comm").gets.chomp
-    end
-
-    init_package package_name
+    init_package File.exists?("/proc/1/comm") ? File.open("/proc/1/comm").gets.chomp : 'init'
   end
 end

data/lib/ohai/plugins/java.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Benjamin Black (<bb@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Benjamin Black (<bb@chef.io>)
+# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/plugins/kernel.rb

@@ -1,10 +1,10 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Benjamin Black (<nostromo@gmail.com>)
 # Author:: Bryan McLellan (<btm@loftninjas.org>)
-# Author:: Claire McQuin (<claire@opscode.com>)
+# Author:: Claire McQuin (<claire@chef.io>)
 # Author:: James Gartrell (<jgartrel@gmail.com>)
-# Copyright:: Copyright (c) 2008, 2009, 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # Copyright:: Copyright (c) 2009 Bryan McLellan
 # License:: Apache License, Version 2.0
 #
@@ -29,7 +29,8 @@ Ohai.plugin(:Kernel) do
   def init_kernel
     kernel Mash.new
     [["uname -s", :name], ["uname -r", :release],
-     ["uname -v", :version], ["uname -m", :machine]].each do |cmd, property|
+     ["uname -v", :version], ["uname -m", :machine],
+     ["uname -p", :processor]].each do |cmd, property|
       so = shell_out(cmd)
       kernel[property] = so.stdout.split($/)[0]
     end

data/lib/ohai/plugins/keys.rb

@@ -2,14 +2,14 @@
 # Cookbook Name:: apache2
 # Recipe:: default
 #
-# Copyright 2008, OpsCode, Inc.
+# Copyright 2008-2016 Chef Software, Inc.
 #
 # 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.

data/lib/ohai/plugins/languages.rb

@@ -1,14 +1,14 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # 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.

data/lib/ohai/plugins/linux/block_device.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,7 +30,7 @@ Ohai.plugin(:BlockDevice) do
             File.open("/sys/block/#{dir}/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
           end
         end
-        %w{model rev state timeout vendor}.each do |check|
+        %w{model rev state timeout vendor queue_depth}.each do |check|
           if File.exists?("/sys/block/#{dir}/device/#{check}")
             File.open("/sys/block/#{dir}/device/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
           end

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

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/plugins/linux/filesystem.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -1,7 +1,7 @@
 #
 # Author:: Phil Dibowitz <phil@ipom.com>
 # Author:: Adam Jacob <adam@chef.io>
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # Copyright:: Copyright (c) 2015 Facebook, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -109,7 +109,7 @@ Ohai.plugin(:Filesystem2) do
         fs[key][:mount] = $6
       end
     end
-    
+
     # Grab filesystem inode data from df
     so = shell_out("df -iP")
     so.stdout.each_line do |line|
@@ -159,7 +159,7 @@ Ohai.plugin(:Filesystem2) do
       fs.each_key do |key|
         keys_to_update << key if key.start_with?("#{parsed[:dev]},")
       end
-        
+
       if keys_to_update.empty?
         key = "#{parsed[:dev]},"
         fs[key] = Mash.new

data/lib/ohai/plugins/linux/lsb.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -1,7 +1,7 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Chris Read <chris.read@gmail.com>
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,6 +41,10 @@ Ohai.plugin(:Network) do
     ["/sbin/ip", "/usr/bin/ip", "/bin/ip"].any? { |path| File.exist?(path) }
   end
 
+  def find_ethtool_binary
+    ["/sbin/ethtool", "/usr/sbin/ethtool"].find { |path| File.exist?(path) }
+  end
+
   def is_openvz?
     ::File.directory?('/proc/vz')
   end
@@ -72,8 +76,8 @@ Ohai.plugin(:Network) do
   #    the routing table source field.
   # 3) and since we're at it, let's populate some :routes attributes
   # (going to do that for both inet and inet6 addresses)
-  def check_routing_table(family, iface)
-    so = shell_out("ip -o -f #{family[:name]} route show")
+  def check_routing_table(family, iface, default_route_table)
+    so = shell_out("ip -o -f #{family[:name]} route show table #{default_route_table}")
     so.stdout.lines do |line|
       line.strip!
       Ohai::Log.debug("Parsing #{line}")
@@ -134,7 +138,31 @@ Ohai.plugin(:Network) do
     end.compact.flatten
   end
 
+  # determine layer 1 details for the interface using ethtool
+  def ethernet_layer_one(iface)
+    return iface unless ethtool_binary = find_ethtool_binary
+    keys = %w[ Speed Duplex Port Transceiver Auto-negotiation MDI-X ]
+    iface.each_key do |tmp_int|
+      next unless iface[tmp_int][:encapsulation] == 'Ethernet'
+      so = shell_out("#{ethtool_binary} #{tmp_int}")
+      so.stdout.lines do |line|
+        line.chomp!
+        Ohai::Log.debug("Parsing ethtool output: #{line}")
+        line.lstrip!
+        k, v = line.split(': ')
+        next unless keys.include? k
+        k.downcase!.tr!('-', '_')
+        if k == 'speed'
+          k = 'link_speed'   # This is not necessarily the maximum speed the NIC supports
+          v = v[/\d+/].to_i
+        end
+        iface[tmp_int][k] = v
+      end
+    end
+    iface
+  end
 
+  # determine link stats, vlans, queue length, and state for an interface using ip
   def link_statistics(iface, net_counters)
     so = shell_out("ip -d -s link")
     tmp_int = nil
@@ -225,7 +253,6 @@ Ohai.plugin(:Network) do
     end
   end
 
-
   def parse_ip_addr_link_line(cint, iface, line)
     if line =~ /link\/(\w+) ([\da-f\:]+) /
       iface[cint][:encapsulation] = linux_encaps_lookup($1)
@@ -267,7 +294,7 @@ Ohai.plugin(:Network) do
         iface[cint][:addresses][tmp_addr][:scope] = ($1.eql?("host") ? "Node" : $1.capitalize)
       end
 
-      # If we found we were an an alias interface, restore cint to its original value
+      # If we found we were an alias interface, restore cint to its original value
       cint = original_int unless original_int.nil?
     end
     cint
@@ -281,6 +308,71 @@ Ohai.plugin(:Network) do
     end
   end
 
+  # returns the macaddress for interface from a hash of interfaces (iface elsewhere in this file)
+  def get_mac_for_interface(interfaces, interface)
+    interfaces[interface][:addresses].select{|k,v| v["family"]=="lladdr"}.first.first unless interfaces[interface][:flags].include? "NOARP"
+  end
+
+  # returns the default route with the lowest metric (unspecified metric is 0)
+  def choose_default_route(routes)
+    default_route = routes.select do |r|
+      r[:destination] == "default"
+    end.sort do |x,y|
+      (x[:metric].nil? ? 0 : x[:metric].to_i) <=> (y[:metric].nil? ? 0 : y[:metric].to_i)
+    end.first
+  end
+
+  # ipv4/ipv6 routes are different enough that having a single algorithm to select the favored route for both creates unnecessary complexity
+  # this method attempts to deduce the route that is most important to the user, which is later used to deduce the favored values for {ip,mac,ip6}address
+  # we only consider routes that are default routes, or those routes that get us to the gateway for a default route
+  def favored_default_route(routes, iface, default_route, family)
+    routes.select do |r|
+      if family[:name] == "inet"
+        # selecting routes for ipv4
+        # using the source field when it's specified :
+        # 1) in the default route
+        # 2) in the route entry used to reach the default gateway
+        r[:src] and # it has a src field
+          iface[r[:dev]] and # the iface exists
+          iface[r[:dev]][:addresses].has_key? r[:src] and # the src ip is set on the node
+          iface[r[:dev]][:addresses][r[:src]][:scope].downcase != "link" and # this isn't a link level addresse
+          ( r[:destination] == "default" or
+            ( default_route[:via] and # the default route has a gateway
+              IPAddress(r[:destination]).include? IPAddress(default_route[:via]) # the route matches the gateway
+              )
+            )
+      elsif family[:name] == "inet6"
+        # selecting routes for ipv6
+        iface[r[:dev]] and # the iface exists
+          iface[r[:dev]][:state] == "up" and # the iface is up
+          ( r[:destination] == "default" or
+            ( default_route[:via] and # the default route has a gateway
+              IPAddress(r[:destination]).include? IPAddress(default_route[:via]) # the route matches the gateway
+              )
+            )
+      end
+    end.sort_by do |r|
+      # sorting the selected routes:
+      # - getting default routes first
+      # - then sort by metric
+      # - then by prefixlen
+      [
+       r[:destination] == "default" ? 0 : 1,
+       r[:metric].nil? ? 0 : r[:metric].to_i,
+       # for some reason IPAddress doesn't accept "::/0", it doesn't like prefix==0
+       # just a quick workaround: use 0 if IPAddress fails
+       begin
+         IPAddress( r[:destination] == "default" ? family[:default_route] : r[:destination] ).prefix
+       rescue
+         0
+       end
+      ]
+    end.first
+  end
+
+  # Both the network plugin and this plugin (linux/network) are run on linux. This plugin runs first.
+  # If the 'ip' binary is available, this plugin may set {ip,mac,ip6}address. The network plugin should not overwrite these.
+  # The older code section below that relies on the deprecated net-tools, e.g. netstat and ifconfig, provides less functionality.
   collect_data(:linux) do
     require 'ipaddr'
 
@@ -292,6 +384,14 @@ Ohai.plugin(:Network) do
     counters Mash.new unless counters
     counters[:network] = Mash.new unless counters[:network]
 
+    # ohai.plugin[:network][:default_route_table] = 'default'
+    if configuration(:default_route_table).nil? || configuration(:default_route_table).empty?
+      default_route_table = 'main'
+    else
+      default_route_table = configuration(:default_route_table)
+    end
+    Ohai::Log.debug("default route table is '#{default_route_table}'")
+
     # Match the lead line for an interface from iproute2
     # 3: eth0.11@eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP
     # The '@eth0:' portion doesn't exist on primary interfaces and thus is optional in the regex
@@ -323,22 +423,19 @@ Ohai.plugin(:Network) do
 
         iface = extract_neighbors(family, iface, neigh_attr)
 
-        iface = check_routing_table(family, iface)
+        iface = check_routing_table(family, iface, default_route_table)
 
         routes = parse_routes(family, iface)
 
-        # using a temporary var to hold the default route
-        # in case there are more than 1 default route, sort it by its metric
-        # and return the first one
-        # (metric value when unspecified is 0)
-        default_route = routes.select do |r|
-          r[:destination] == "default"
-        end.sort do |x,y|
-          (x[:metric].nil? ? 0 : x[:metric].to_i) <=> (y[:metric].nil? ? 0 : y[:metric].to_i)
-        end.first
+        default_route = choose_default_route(routes)
 
         if default_route.nil? or default_route.empty?
-          Ohai::Log.debug("Unable to determine default #{family[:name]} interface")
+          attribute_name == if family[:name] == "inet"
+                              "default_interface"
+                            else
+                              "default_#{family[:name]}_interface"
+                            end
+          Ohai::Log.debug("Unable to determine '#{attribute_name}' as no default routes were found for that interface family")
         else
           network["#{default_prefix}_interface"] = default_route[:dev]
           Ohai::Log.debug("#{default_prefix}_interface set to #{default_route[:dev]}")
@@ -347,52 +444,35 @@ Ohai.plugin(:Network) do
           network["#{default_prefix}_gateway"] = default_route[:via] ? default_route[:via] : family[:default_route].chomp("/0")
           Ohai::Log.debug("#{default_prefix}_gateway set to #{network["#{default_prefix}_gateway"]}")
 
+          # deduce the default route the user most likely cares about to pick {ip,mac,ip6}address below
+          favored_route = favored_default_route(routes, iface, default_route, family)
+
+          # FIXME: This entire block should go away, and the network plugin should be the sole source of {ip,ip6,mac}address
+
           # since we're at it, let's populate {ip,mac,ip6}address with the best values
-          # using the source field when it's specified :
-          # 1) in the default route
-          # 2) in the route entry used to reach the default gateway
-          route = routes.select do |r|
-            # selecting routes
-            r[:src] and # it has a src field
-              iface[r[:dev]] and # the iface exists
-              iface[r[:dev]][:addresses].has_key? r[:src] and # the src ip is set on the node
-              iface[r[:dev]][:addresses][r[:src]][:scope].downcase != "link" and # this isn't a link level addresse
-              ( r[:destination] == "default" or
-                ( default_route[:via] and # the default route has a gateway
-                  IPAddress(r[:destination]).include? IPAddress(default_route[:via]) # the route matches the gateway
-                  )
-                )
-          end.sort_by do |r|
-            # sorting the selected routes:
-            # - getting default routes first
-            # - then sort by metric
-            # - then by prefixlen
-            [
-             r[:destination] == "default" ? 0 : 1,
-             r[:metric].nil? ? 0 : r[:metric].to_i,
-             # for some reason IPAddress doesn't accept "::/0", it doesn't like prefix==0
-             # just a quick workaround: use 0 if IPAddress fails
-             begin
-               IPAddress( r[:destination] == "default" ? family[:default_route] : r[:destination] ).prefix
-             rescue
-               0
-             end
-            ]
-          end.first
-
-          unless route.nil? or route.empty?
+          # if we don't set these, the network plugin may set them afterwards
+          if favored_route && !favored_route.empty?
             if family[:name] == "inet"
-              ipaddress route[:src]
-              macaddress iface[route[:dev]][:addresses].select{|k,v| v["family"]=="lladdr"}.first.first unless iface[route[:dev]][:flags].include? "NOARP"
-            else
-              ip6address route[:src]
+              ipaddress favored_route[:src]
+              m = get_mac_for_interface(iface, favored_route[:dev])
+              Ohai::Log.debug("Overwriting macaddress #{macaddress} with #{m} from interface #{favored_route[:dev]}") if macaddress
+              macaddress m
+            elsif family[:name] == "inet6"
+              # this rarely does anything since we rarely have src for ipv6, so this usually falls back on the network plugin
+              ip6address favored_route[:src]
+              if macaddress
+                Ohai::Log.debug("Not setting macaddress from ipv6 interface #{favored_route[:dev]} because macaddress is already set")
+              else
+                macaddress get_mac_for_interface(iface, favored_route[:dev])
+              end
             end
+          else
+            Ohai::Log.debug("the linux/network plugin was unable to deduce the favored default route for family '#{family[:name]}' despite finding a default route, and is not setting ipaddress/ip6address/macaddress. the network plugin may provide fallbacks.")
+            Ohai::Log.debug("this potential default route was excluded: #{default_route}")
           end
         end
-      end
-
-    else
-
+      end # end families.each
+    else # ip binary not available, falling back to net-tools, e.g. route, ifconfig
       begin
         so = shell_out("route -n")
         route_result = so.stdout.split($/).grep( /^0.0.0.0/ )[0].split( /[ \t]+/ )
@@ -476,7 +556,9 @@ Ohai.plugin(:Network) do
           iface[$4][:arp][$1] = $2.downcase
         end
       end
-    end
+    end # end "ip else net-tools" block
+
+    iface = ethernet_layer_one(iface)
     counters[:network][:interfaces] = net_counters
     network["interfaces"] = iface
   end