lib/ohai/plugins/openbsd/network.rb in ohai-6.24.2 vs lib/ohai/plugins/openbsd/network.rb in ohai-7.0.0.rc.0
- old
+ new
@@ -14,107 +14,111 @@
# 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.
#
-provides "network", "counters/network"
+Ohai.plugin(:Network) do
+ provides "network", "network/interfaces"
+ provides "counters/network", "counters/network/interfaces"
-from("route -n get default").split("\n").each do |line|
- if line =~ /(\w+): ([\w\.]+)/
- case $1
- when "gateway"
- network[:default_gateway] = $2
- when "interface"
- network[:default_interface] = $2
- end
- end
-end
+ collect_data(:openbsd) do
+ network Mash.new unless network
+ network[:interfaces] = Mash.new unless network[:interfaces]
+ counters Mash.new unless counters
+ counters[:network] = Mash.new unless counters[:network]
-iface = Mash.new
-popen4("/sbin/ifconfig -a") do |pid, stdin, stdout, stderr|
- stdin.close
- cint = nil
- stdout.each do |line|
- if line =~ /^([0-9a-zA-Z\.]+):\s+/
- cint = $1
- iface[cint] = Mash.new
- if cint =~ /^(\w+)(\d+.*)/
- iface[cint][:type] = $1
- iface[cint][:number] = $2
+ so = shell_out("route -n get default")
+ so.stdout.lines do |line|
+ if line =~ /(\w+): ([\w\.]+)/
+ case $1
+ when "gateway"
+ network[:default_gateway] = $2
+ when "interface"
+ network[:default_interface] = $2
+ end
end
end
- # call the family lladdr to match linux for consistency
- if line =~ /\s+lladdr (.+?)\s/
- iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
- iface[cint][:addresses][$1] = { "family" => "lladdr" }
- end
- if line =~ /\s+inet ([\d.]+) netmask ([\da-fx]+)\s*\w*\s*([\d.]*)/
- iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
- # convert the netmask to decimal for consistency
- netmask = "#{$2[2,2].hex}.#{$2[4,2].hex}.#{$2[6,2].hex}.#{$2[8,2].hex}"
- if $3.empty?
- iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => netmask }
- else
- # found a broadcast address
- iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => netmask, "broadcast" => $3 }
+
+ iface = Mash.new
+ so = shell_out( "#{ Ohai.abs_path( "/sbin/ifconfig" ) } -a" )
+ cint = nil
+ so.stdout.lines do |line|
+ if line =~ /^([0-9a-zA-Z\.]+):\s+/
+ cint = $1
+ iface[cint] = Mash.new
+ if cint =~ /^(\w+)(\d+.*)/
+ iface[cint][:type] = $1
+ iface[cint][:number] = $2
+ end
end
- end
- if line =~ /\s+inet6 ([a-f0-9\:]+)%?(\w*)\s+prefixlen\s+(\d+)\s*\w*\s*([\da-fx]*)/
- iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
- if $4.empty?
- iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $3 }
- else
- #found a zone_id / scope
- iface[cint][:addresses][$1] = { "family" => "inet6", "zoneid" => $2, "prefixlen" => $3, "scopeid" => $4 }
+ # call the family lladdr to match linux for consistency
+ if line =~ /\s+lladdr (.+?)\s/
+ iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+ iface[cint][:addresses][$1] = { "family" => "lladdr" }
end
+ if line =~ /\s+inet ([\d.]+) netmask ([\da-fx]+)\s*\w*\s*([\d.]*)/
+ iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+ # convert the netmask to decimal for consistency
+ netmask = "#{$2[2,2].hex}.#{$2[4,2].hex}.#{$2[6,2].hex}.#{$2[8,2].hex}"
+ if $3.empty?
+ iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => netmask }
+ else
+ # found a broadcast address
+ iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => netmask, "broadcast" => $3 }
+ end
+ end
+ if line =~ /\s+inet6 ([a-f0-9\:]+)%?(\w*)\s+prefixlen\s+(\d+)\s*\w*\s*([\da-fx]*)/
+ iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+ if $4.empty?
+ iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $3 }
+ else
+ #found a zone_id / scope
+ iface[cint][:addresses][$1] = { "family" => "inet6", "zoneid" => $2, "prefixlen" => $3, "scopeid" => $4 }
+ end
+ end
+ if line =~ /flags=\d+<(.+)>/
+ flags = $1.split(',')
+ iface[cint][:flags] = flags if flags.length > 0
+ end
+ if line =~ /metric: (\d+) mtu: (\d+)/
+ iface[cint][:metric] = $1
+ iface[cint][:mtu] = $2
+ end
end
- if line =~ /flags=\d+<(.+)>/
- flags = $1.split(',')
- iface[cint][:flags] = flags if flags.length > 0
- end
- if line =~ /metric: (\d+) mtu: (\d+)/
- iface[cint][:metric] = $1
- iface[cint][:mtu] = $2
- end
- end
-end
-popen4("arp -an") do |pid, stdin, stdout, stderr|
- stdin.close
- stdout.each do |line|
- if line =~ /\((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) on ([0-9a-zA-Z\.\:\-]+)/
- next unless iface[$3] # this should never happen
- iface[$3][:arp] = Mash.new unless iface[$3][:arp]
- iface[$3][:arp][$1] = $2.downcase
+ so = shell_out("arp -an")
+ so.stdout.lines do |line|
+ if line =~ /\((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) on ([0-9a-zA-Z\.\:\-]+)/
+ next unless iface[$3] # this should never happen
+ iface[$3][:arp] = Mash.new unless iface[$3][:arp]
+ iface[$3][:arp][$1] = $2.downcase
+ end
end
- end
-end
-network["interfaces"] = iface
+ network["interfaces"] = iface
-net_counters = Mash.new
-# From netstat(1), not sure of the implications:
-# Show the state of all network interfaces or a single interface
-# which have been auto-configured (interfaces statically configured
-# into a system, but not located at boot time are not shown).
-popen4("netstat -idn") do |pid, stdin, stdout, stderr|
- stdin.close
- stdout.each do |line|
- # Name Mtu Network Address Ipkts Ierrs Opkts Oerrs Coll Drop
- # em0 1500 <Link> 00:11:25:2d:90:be 3719557 0 3369969 0 0 0
- # $1 $2 $3 $4 $5 $6 $7 $8
- if line =~ /^([\w\.\*]+)\s+\d+\s+<Link>\s+([\w:]*)\s*(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
- cint = $1
- net_counters[cint] = Mash.new unless net_counters[cint]
- net_counters[cint] = Mash.new unless net_counters[cint]["rx"]
- net_counters[cint] = Mash.new unless net_counters[cint]["tx"]
- net_counters[cint] = $3
- net_counters[cint] = $4
- net_counters[cint] = $5
- net_counters[cint] = $6
- net_counters[cint] = $7
- net_counters[cint] = $8
+ net_counters = Mash.new
+ # From netstat(1), not sure of the implications:
+ # Show the state of all network interfaces or a single interface
+ # which have been auto-configured (interfaces statically configured
+ # into a system, but not located at boot time are not shown).
+ so = shell_out("netstat -idn")
+ so.stdout.lines do |line|
+ # Name Mtu Network Address Ipkts Ierrs Opkts Oerrs Coll Drop
+ # em0 1500 <Link> 00:11:25:2d:90:be 3719557 0 3369969 0 0 0
+ # $1 $2 $3 $4 $5 $6 $7 $8
+ if line =~ /^([\w\.\*]+)\s+\d+\s+<Link>\s+([\w:]*)\s*(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
+ net_counters[$1] = Mash.new unless net_counters[$1]
+ net_counters[$1]["rx"] = Mash.new unless net_counters[$1]["rx"]
+ net_counters[$1]["tx"] = Mash.new unless net_counters[$1]["tx"]
+ net_counters[$1]["rx"]["packets"] = $3
+ net_counters[$1]["rx"]["errors"] = $4
+ net_counters[$1]["tx"]["packets"] = $5
+ net_counters[$1]["tx"]["errors"] = $6
+ net_counters[$1]["tx"]["collisions"] = $7
+ net_counters[$1]["tx"]["dropped"] = $8
+ end
end
+
+ counters[:network][:interfaces] = net_counters
end
end
-
-counters[:network][:interfaces] = net_counters