Mirrors/Munin-Contrib
1
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2025-07-22 02:51:03 +00:00
Code Issues Releases Wiki Activity

TG585v7__: Better Error handling

Browse source 
Reset the error mode of Net::Telnet to 'return', so that we can (try to)
log out during the error handler without invoking the error handler
(doing so resulted in "Deep Recursion" warnings from perl).

Also, return 'U' for ALL appropriate items in case of error.
This commit is contained in:
Paul Saunders 2012-02-17 10:24:04 +00:00
parent 8484bebdca
commit 6f39dc451a
1 changed files with 37 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

53
plugins/network/tg585v7__
View file

@ -13,7 +13,7 @@ Requires perl and either WWW::Mechanize or Net::Telnet.
=head1 CONFIGURATION =head1 CONFIGURATION
The plugin needs HTML access to the router. If you can get to http://YOUR_ROUTER/, The plugin needs HTML access to the router. If you can get to http://YOUR_ROUTER/,
and are greeting with a page titled "THOMSON TG585 v7", then you can probably use this plugin. and are greeting with a page titled "THOMSON TG585 v7", then you can probably use this plugin.
This is a wildcard plugin, so you will need to create symlinks to this plugin (or create copies if your filesystem doesn't support linking). Links should be of the form: This is a wildcard plugin, so you will need to create symlinks to this plugin (or create copies if your filesystem doesn't support linking). Links should be of the form:
@ -1112,25 +1112,45 @@ else {
sub TelnetError { sub TelnetError {
my $errmsg = shift; my $errmsg = shift;
my @parts; my %parts = (
if ( $mode eq 'bandwidth' ) { 'atm' => [qw(RXCells RxErrors RxOctets TxCells TxErrors TxOctets)],
@parts = qw(down up); 'bandwidth' => [qw(down downrate up uprate)],
} 'conntrack' =>
elsif ( $mode eq 'power' ) { [qw(Active closing expected halfopen ICMP idle loose mcast non TCP TCPclosing TCPestablished TCPopen UDP)],
@parts = qw(downout upout downline upline downsn upsn); 'dhcpclient' =>
} [qw(ACKs Corrupted DECLINEs DISCOVERs failures INFORMs NAKs OFFERs Other RELEASEs REPLIES REQUESTs)],
elsif ( $mode eq 'uptime' ) { 'dhcprelay' =>
@parts = qw(Box DSL iNet); [qw(badc bogusg bogusr clientp corrupta missinga missingc packets serverp)],
} 'dhcpserver' =>
elsif ( $mode eq 'errors' ) { [qw(ACKs BOOTP Corrupted DECLINE DISCOVER dropped failures INFORM NAKs OFFERs Other RELEASE REQUEST)],
@parts = qw(downFEC upFEC downCRC upCRC downHEC upHEC); 'dns' =>
} [qw(corrupted discard external forwarded negative resolved spoofed spurious unknown)],
foreach (@parts) { 'errors' => [qw(downCRC downFEC downHEC upCRC upFEC upHEC)],
'firewall' =>
[qw(DroppedForward DroppedInput DroppedOutput ParsedForward ParsedInput ParsedOutput)],
'ids' => [qw(Active Collisions New Recycled Searches)],
'igmphost' =>
[qw(badchecksum badqueries badttl failing invalidmembership norouter receivedforour reportsreceived reportstransmitted toolong toosmall v1membershipq v2membershipq v3membershipq v3membershipr)],
'igmpproxy' =>
[qw(badchecksum badleavereports badqueries badreports badttl election igmpleavereports mrdadvertise mrdbad mrdsolicits mrdterminate noroute queriesfail toolong tooshort v1queriesr v1queriess v1reportsr v2queriesr v2queriess v2reportsr v3queriesr v3queriess v3reportsr)],
'power' => [qw(downline downout downsn upline upout upsn)],
'protoicmp' =>
[qw(echor echorepr echoreps echos errorsr errorss maskr maskrepr maskreps masks paramr params quenchr quenchs redirectr redirects timeexceedr timeexceeds timestampr timestamprepr timestampreps timestamps unreachabler unreachables)],
'protoip' =>
[qw(droppedfrags forwarded fragerrs fragged fragments fwderrors herrors hostdrop hostfwd hostrec noroute reassembled reserrors totfrags)],
'prototcp' =>
[qw(accepts attempts drops errors established received retransmitted transmitted)],
'protoudp' => [qw(dropped errors received transmitted)],
'uptime' => [qw(Box DSL iNet)]
);
foreach ( @{$parts{$mode}} ) {
print "$_.value U\n"; print "$_.value U\n";
print "$_.extinfo $errmsg\n"; print "$_.extinfo $errmsg\n";
} }
print "# Sending \"exit\"\n" if $MUNIN_DEBUG; print "# Sending \"exit\"\n" if $MUNIN_DEBUG;
if ( defined $telnet ) { if ( defined $telnet ) {
$telnet->errmode('return');
$telnet->print('exit'); $telnet->print('exit');
$telnet->close; $telnet->close;
} }
@ -1141,7 +1161,8 @@ else {
$telnet = new Net::Telnet( $telnet = new Net::Telnet(
Host => $host, Host => $host,
Prompt => '/{.*}.*=>$/', Prompt => '/{.*}.*=>$/',
ErrMode => \&TelnetError ErrMode => \&TelnetError,
Timeout => 10
); );
print "# Logging in...\n" if $MUNIN_DEBUG; print "# Logging in...\n" if $MUNIN_DEBUG;