diff options
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | lib/Smokeping.pm | 3 | ||||
| -rw-r--r-- | lib/Smokeping/probes/CiscoRTTMonEchoICMP.pm | 21 |
3 files changed, 25 insertions, 5 deletions
@@ -1,3 +1,9 @@ +* Set an --end time for graphs so that fetch does get its its + undies in a twist when selecting the RRA and goes for hires + due to coverage -- tobi +* CiscoRTTMonEchoICMP.pm: new variable vrf + - Kevin Stewart <kevins *callplus.co.nz> + 2005/12/20 -- released version 20051220_trunk 2005/12/19 -- released version 20051219_trunk diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm index 344318f..ae908ab 100644 --- a/lib/Smokeping.pm +++ b/lib/Smokeping.pm @@ -635,7 +635,8 @@ sub findmax ($$) { my ($desc,$start) = @{$_}; $start = exp2seconds($start); my ($graphret,$xs,$ys) = RRDs::graph - ("dummy", '--start', -$start, + ("dummy", '--start', -$start, + '--end','-'.int($start / $cfg->{Presentation}{detail}{width}), "DEF:maxping=${rrd}:median:AVERAGE", 'PRINT:maxping:MAX:%le' ); my $ERROR = RRDs::error(); diff --git a/lib/Smokeping/probes/CiscoRTTMonEchoICMP.pm b/lib/Smokeping/probes/CiscoRTTMonEchoICMP.pm index c542ed1..615fb84 100644 --- a/lib/Smokeping/probes/CiscoRTTMonEchoICMP.pm +++ b/lib/Smokeping/probes/CiscoRTTMonEchoICMP.pm @@ -108,7 +108,7 @@ sub pingone ($$) { if (defined StartRttMibEcho($target->{vars}{ioshost}.":::::2", $target->{addr}, - $bytes, $pings, $target->{vars}{iosint}, $tos, $row)) + $bytes, $pings, $target->{vars}{iosint}, $tos, $row, $target->{vars}{vrf})) { # wait for the series to finish sleep ($pings*$pingtimeout+5); @@ -126,7 +126,7 @@ sub pingone ($$) { } sub StartRttMibEcho ($$$$$$){ - my ($host, $target, $size, $pings, $sourceip, $tos, $row) = @_; + my ($host, $target, $size, $pings, $sourceip, $tos, $row,$vrf) = @_; # resolve the target name and encode its IP address $_=$target; @@ -196,6 +196,10 @@ sub StartRttMibEcho ($$$$$$){ "rttMonScheduleAdminRttLife.$row", 'integer', $pings*$pingtimeout+3, "rttMonScheduleAdminConceptRowAgeout.$row",'integer', 60; + if(defined($vrf)){ + push @params,"rttMonEchoAdminVrfName.$row",'octetstring',$vrf; + } + # with udpEcho support (>= 12.0(3)T ) the ICMP ping support was enhanced in the RTTMon SW - we are # NOT using udpEcho, but echo (ICMP echo, ping) if ($udpEchoSupported) { @@ -292,6 +296,15 @@ values times 32 to calculate the ToS values to configure, e.g. ToS 160 corresponds to a DSCP value 40 and a Precedence value of 5. The RTTMon MIB versions before IOS 12.0(3)T didn't support this parameter. DOC + }, + vrf => { + _example => "INTERNET", + _doc => <<DOC, +The the VPN name in which the RTT operation will be used. For regular RTT +operation this field should not be configured. The agent +will use this field to identify the VPN routing Table for +this operation. +DOC }, packetsize => { _doc => <<DOC, @@ -306,8 +319,8 @@ DOC return "ERROR: packetsize must be between 8 and 16392" unless $val >= 8 and $val <= 16392; return undef; - }, - }, + } + } }); } |