mirror of
https://github.com/munin-monitoring/contrib.git
synced 2018-11-08 00:59:34 +01:00
Merge pull request #400 from dotdoom/master-netstat_s_-arp-in_out
netstat_s_: merge ARP in/out into one
This commit is contained in:
Steve Schnepp
commit
ac138f05f5
@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env ruby
|
||||
|
||||
# netstat_s revision 5 (Aug 2013)
|
||||
# netstat_s revision 6 (Nov 2013)
|
||||
#
|
||||
# This plugin shows various statistics from 'netstat -s'
|
||||
#
|
||||
@ -9,7 +9,7 @@
|
||||
# OS:
|
||||
# Supposed: BSD, Linux (only a few items, see netstat_multi for more)
|
||||
# Tested: FreeBSD: 8.2, 8.3, 9.1
|
||||
# Linux : Debian 6 (kernel 2.6.32), Arch (kernel 3.8.3), CentOS 6
|
||||
# Linux : Debian 6 (kernel 2.6.32), Arch (kernel 3.11.6), CentOS 6
|
||||
#
|
||||
# Author: Artem Sheremet <dot.doom@gmail.com>
|
||||
#
|
||||
@ -53,34 +53,65 @@ class Graph
|
||||
# Hash key is unit, and the value is array of labels
|
||||
multigraphs = {}
|
||||
@parse_expr.each { |expr, descr|
|
||||
next unless descr # no label - skip this entry
|
||||
descr.each { |entry|
|
||||
labels_array = (multigraphs[entry[0]] ||= [])
|
||||
labels_array.push entry[1]
|
||||
labels_array.push [entry[1], entry[2]]
|
||||
}
|
||||
}
|
||||
|
||||
multigraphs.each_pair { |unit, labels|
|
||||
multigraphs.each_pair { |unit, labels_and_negatives|
|
||||
# now just add options to the config
|
||||
|
||||
config_options += [
|
||||
config_options.concat [
|
||||
"multigraph #{name(unit)}",
|
||||
"graph_title Netstat: #{@protocol}: #{@name}#{" (#{unit})" if multigraphs.size > 1}",
|
||||
"graph_category netstat",
|
||||
"graph_vlabel per second",
|
||||
"graph_order #{labels.map(&:escape).join(' ')}"
|
||||
"graph_order #{labels_and_negatives.map { |label, _negative| label.escape }.join(' ')}"
|
||||
]
|
||||
|
||||
config_options.push "graph_args --base 1024" if unit == :bytes
|
||||
has_negatives = false
|
||||
|
||||
labels.each { |label|
|
||||
labels_and_negatives.each { |label, negative|
|
||||
label_esc = label.escape
|
||||
config_options += [
|
||||
has_negatives = true unless negative == nil
|
||||
|
||||
if negative == true
|
||||
# the value has no opposite and is negative
|
||||
config_options.concat [
|
||||
"#{label_esc}.graph no",
|
||||
"#{label_esc}_neg.type DERIVE",
|
||||
"#{label_esc}_neg.min 0",
|
||||
"#{label_esc}_neg.draw LINE",
|
||||
"#{label_esc}_neg.label #{label}",
|
||||
"#{label_esc}_neg.negative #{label_esc}"
|
||||
]
|
||||
else
|
||||
config_options.concat [
|
||||
"#{label_esc}.type DERIVE",
|
||||
"#{label_esc}.min 0",
|
||||
"#{label_esc}.draw LINE",
|
||||
"#{label_esc}.label #{label}"
|
||||
]
|
||||
end
|
||||
|
||||
if negative == false
|
||||
# the value has no opposite and is positive
|
||||
config_options.concat [
|
||||
"#{label_esc}_neg.graph off",
|
||||
"#{label_esc}.negative #{label_esc}_neg"
|
||||
]
|
||||
elsif negative
|
||||
negative_esc = negative.escape
|
||||
config_options.concat [
|
||||
"#{label_esc}.negative #{negative_esc}",
|
||||
"#{negative_esc}.graph no"
|
||||
]
|
||||
end
|
||||
}
|
||||
|
||||
config_options.push "graph_vlabel per second#{" in (-) / out (+)" if has_negatives}"
|
||||
}
|
||||
|
||||
config_options
|
||||
@ -93,6 +124,7 @@ class Graph
|
||||
# Hash key is unit, and the value is a hash of 'escaped label' => 'value'
|
||||
multigraphs = {}
|
||||
@parse_expr.each { |expr, descr|
|
||||
next unless descr # no label - skip this entry
|
||||
index = data.index { |line| line =~ expr }
|
||||
if index
|
||||
data.delete_at index
|
||||
@ -127,9 +159,11 @@ def graphs_for(protocol)
|
||||
Graph.new('sent', protocol, [
|
||||
# Description of the elements of arrays below:
|
||||
# 0: regexp to parse the line
|
||||
# 1: Array<Array[2]> for each matching group in the regular expression.
|
||||
# The first element for a group is unit name, the second is the label.
|
||||
# It could be reasonable to add third etc as warning and critical values.
|
||||
# 1: Array<Array[3]> for each matching group in the regular expression.
|
||||
# 0: unit name
|
||||
# 1: label
|
||||
# 2 (optional): negative label
|
||||
# It could be reasonable to add more elements as warning and critical values.
|
||||
|
||||
[ /(\d+) segments send out$/, [ [ :segments, 'total' ] ] ],
|
||||
[ /(\d+) segments retransmited$/, [ [ :segments, 'retransmitted' ] ] ]
|
||||
@ -316,16 +350,14 @@ def graphs_for(protocol)
|
||||
]
|
||||
when 'arp'
|
||||
$os == :linux ? [] : [
|
||||
Graph.new('sent', protocol, [
|
||||
[ /(\d+) ARP requests? sent$/, [ [ :packets, 'requests' ] ] ],
|
||||
[ /(\d+) ARP repl(?:y|ies) sent$/, [ [ :packets, 'replies' ] ] ]
|
||||
]),
|
||||
|
||||
Graph.new('received', protocol, [
|
||||
[ /(\d+) ARP packets? received$/, [ [ :packets, 'total' ] ] ],
|
||||
[ /(\d+) ARP requests? received$/, [ [ :packets, 'requests' ] ] ],
|
||||
[ /(\d+) ARP repl(?:y|ies) received$/, [ [ :packets, 'replies' ] ] ],
|
||||
[ /(\d+) total packets dropped due to no ARP entry$/, [ [ :packets, 'dropped: no entry' ] ] ]
|
||||
Graph.new('packets', protocol, [
|
||||
# This is just a total, so ignore the value but keep regexp to avoid 'not parsed' warning.
|
||||
[ /(\d+) ARP packets? received$/ ],
|
||||
[ /(\d+) ARP requests? received$/, [ [ :packets, 'requests received' ] ] ],
|
||||
[ /(\d+) ARP repl(?:y|ies) received$/, [ [ :packets, 'replies received' ] ] ],
|
||||
[ /(\d+) ARP requests? sent$/, [ [ :packets, 'requests', 'requests received' ] ] ],
|
||||
[ /(\d+) ARP repl(?:y|ies) sent$/, [ [ :packets, 'replies', 'replies received' ] ] ],
|
||||
[ /(\d+) total packets? dropped due to no ARP entry$/, [ [ :packets, 'no entry' ] ] ]
|
||||
]),
|
||||
|
||||
Graph.new('entries', protocol, [
|
||||
|
||||
Loading…
Reference in New Issue
Block a user