From: <buc...@us...> - 2015-09-15 15:18:10
|
Revision: 252 http://sourceforge.net/p/devmon/code/252 Author: buchanmilne Date: 2015-09-15 15:18:07 +0000 (Tue, 15 Sep 2015) Log Message: ----------- Use high-speed counters/rates for Cisco ASR1000 Modified Paths: -------------- trunk/templates/cisco-asr1000/if_dsc/oids trunk/templates/cisco-asr1000/if_dsc/thresholds trunk/templates/cisco-asr1000/if_dsc/transforms trunk/templates/cisco-asr1000/if_err/oids trunk/templates/cisco-asr1000/if_err/thresholds trunk/templates/cisco-asr1000/if_err/transforms trunk/templates/cisco-asr1000/if_load/message trunk/templates/cisco-asr1000/if_load/oids trunk/templates/cisco-asr1000/if_load/thresholds trunk/templates/cisco-asr1000/if_load/transforms trunk/templates/cisco-asr1000/if_stat/message trunk/templates/cisco-asr1000/if_stat/oids trunk/templates/cisco-asr1000/if_stat/transforms Modified: trunk/templates/cisco-asr1000/if_dsc/oids =================================================================== --- trunk/templates/cisco-asr1000/if_dsc/oids 2015-06-02 15:28:36 UTC (rev 251) +++ trunk/templates/cisco-asr1000/if_dsc/oids 2015-09-15 15:18:07 UTC (rev 252) @@ -1,6 +1,10 @@ ifName : .1.3.6.1.2.1.31.1.1.1.1 : branch ifAlias : .1.3.6.1.2.1.31.1.1.1.18 : branch -ifInOctets : .1.3.6.1.2.1.2.2.1.10 : branch ifInDiscards : .1.3.6.1.2.1.2.2.1.13 : branch -ifOutOctets : .1.3.6.1.2.1.2.2.1.16 : branch ifOutDiscards : .1.3.6.1.2.1.2.2.1.19 : branch +ifHCInUcastPkts : .1.3.6.1.2.1.31.1.1.1.7 : branch +ifHCInMulticastPkts : 1.3.6.1.2.1.31.1.1.1.8 : branch +ifHCInBroadcastPkts : .1.3.6.1.2.1.31.1.1.1.9 : branch +ifHCOutUcastPkts : 1.3.6.1.2.1.31.1.1.1.11 : branch +ifHCOutMulticastPkts : 1.3.6.1.2.1.31.1.1.1.12 : branch +ifHCOutBroadcastPkts : 1.3.6.1.2.1.31.1.1.1.13 : branch Modified: trunk/templates/cisco-asr1000/if_dsc/thresholds =================================================================== --- trunk/templates/cisco-asr1000/if_dsc/thresholds 2015-06-02 15:28:36 UTC (rev 251) +++ trunk/templates/cisco-asr1000/if_dsc/thresholds 2015-09-15 15:18:07 UTC (rev 252) @@ -1,6 +1,6 @@ # Create thresholds for all the error rate counters # oid name : color : limit : Error message -ifInDscPct : yellow : 5 : {ifName}{ifAliasBox} - High input discard rate. ({ifInDscPct}%) -ifInDscPct : red : 10 : {ifName}{ifAliasBox} - Very high input discard rate. ({ifInDscPct}%) -ifOutDscPct : yellow : 5 : {ifName}{ifAliasBox} - High output discard rate ({ifOutDscPct}%) -ifOutDscPct : red : 10 : {ifName}{ifAliasBox} - Very high output discard rate ({ifOutDscPct}%) +ifInDscPct : yellow : 1 : {ifName}{ifAliasBox} - High input discard rate. ({ifInDscPct}%) +ifInDscPct : red : 5 : {ifName}{ifAliasBox} - Very high input discard rate. ({ifInDscPct}%) +ifOutDscPct : yellow : 1 : {ifName}{ifAliasBox} - High output discard rate ({ifOutDscPct}%) +ifOutDscPct : red : 5 : {ifName}{ifAliasBox} - Very high output discard rate ({ifOutDscPct}%) Modified: trunk/templates/cisco-asr1000/if_dsc/transforms =================================================================== --- trunk/templates/cisco-asr1000/if_dsc/transforms 2015-06-02 15:28:36 UTC (rev 251) +++ trunk/templates/cisco-asr1000/if_dsc/transforms 2015-09-15 15:18:07 UTC (rev 252) @@ -1,14 +1,12 @@ -# Get bit speed delta (so we dont have to provide custom delta limit) -ifInOps : DELTA : {ifInOctets} -ifOutOps : DELTA : {ifOutOctets} -# Convert our octets delta into bits per second -ifInBps : MATH : {ifInOps} x 8 -ifOutBps : MATH : {ifOutOps} x 8 +ifHCInPkts : MATH : {ifHCInUcastPkts} + {ifHCInMulticastPkts} + {ifHCInBroadcastPkts} +ifHCOutPkts : MATH : {ifHCOutUcastPkts} + {ifHCOutMulticastPkts} + {ifHCOutBroadcastPkts} # Do delta transform on all error counters +ifInPps : DELTA : {ifHCInPkts} +ifOutPps : DELTA : {ifHCOutPkts} ifInDps : DELTA : {ifInDiscards} ifOutDps : DELTA : {ifOutDiscards} # Perform error to traffic percentage calculations -ifInDscPct : MATH : ({ifInDps} / {ifInBps}) x 100 -ifOutDscPct : MATH : ({ifOutDps} / {ifOutBps}) x 100 +ifInDscPct : MATH : ({ifInDps} / {ifInPps}) x 100 +ifOutDscPct : MATH : ({ifOutDps} / {ifOutPps}) x 100 # Create an alias in a bracketed box, or nothing if alias is blank ifAliasBox : REGSUB : {ifAlias} /(\S+.*)/ [$1]/ Modified: trunk/templates/cisco-asr1000/if_err/oids =================================================================== --- trunk/templates/cisco-asr1000/if_err/oids 2015-06-02 15:28:36 UTC (rev 251) +++ trunk/templates/cisco-asr1000/if_err/oids 2015-09-15 15:18:07 UTC (rev 252) @@ -1,7 +1,12 @@ ifName : .1.3.6.1.2.1.31.1.1.1.1 : branch ifAlias : .1.3.6.1.2.1.31.1.1.1.18 : branch ifSpeed : .1.3.6.1.2.1.2.2.1.5 : branch -ifInOctets : .1.3.6.1.2.1.2.2.1.10 : branch ifInErrors : .1.3.6.1.2.1.2.2.1.14 : branch -ifOutOctets : .1.3.6.1.2.1.2.2.1.16 : branch ifOutErrors : .1.3.6.1.2.1.2.2.1.20 : branch + +ifHCInUcastPkts : .1.3.6.1.2.1.31.1.1.1.7 : branch +ifHCInMulticastPkts : 1.3.6.1.2.1.31.1.1.1.8 : branch +ifHCInBroadcastPkts : .1.3.6.1.2.1.31.1.1.1.9 : branch +ifHCOutUcastPkts : 1.3.6.1.2.1.31.1.1.1.11 : branch +ifHCOutMulticastPkts : 1.3.6.1.2.1.31.1.1.1.12 : branch +ifHCOutBroadcastPkts : 1.3.6.1.2.1.31.1.1.1.13 : branch Modified: trunk/templates/cisco-asr1000/if_err/thresholds =================================================================== --- trunk/templates/cisco-asr1000/if_err/thresholds 2015-06-02 15:28:36 UTC (rev 251) +++ trunk/templates/cisco-asr1000/if_err/thresholds 2015-09-15 15:18:07 UTC (rev 252) @@ -1,7 +1,7 @@ # Create thresholds for all the error rate counters # oid name : color : limit : Error message -ifInErrPct : yellow : 5 : {ifName}{ifAliasBox} - High input error rate ({ifInErrPct}%) -ifInErrPct : red : 10 : {ifName}{ifAliasBox} - Very high input error rate ({ifInErrPct}%) -ifOutErrPct : yellow : 5 : {ifName}{ifAliasBox} - High output error rate ({ifOutErrPct}%) -ifOutErrPct : red : 10 : {ifName}{ifAliasBox} - Very high output error rate ({ifOutErrPct}%) +ifInErrPct : yellow : 1 : {ifName}{ifAliasBox} - High input error rate ({ifInErrPct}%) +ifInErrPct : red : 5 : {ifName}{ifAliasBox} - Very high input error rate ({ifInErrPct}%) +ifOutErrPct : yellow : 1 : {ifName}{ifAliasBox} - High output error rate ({ifOutErrPct}%) +ifOutErrPct : red : 5 : {ifName}{ifAliasBox} - Very high output error rate ({ifOutErrPct}%) Modified: trunk/templates/cisco-asr1000/if_err/transforms =================================================================== --- trunk/templates/cisco-asr1000/if_err/transforms 2015-06-02 15:28:36 UTC (rev 251) +++ trunk/templates/cisco-asr1000/if_err/transforms 2015-09-15 15:18:07 UTC (rev 252) @@ -1,15 +1,13 @@ -# Get bit speed delta (so we dont have to provide custom delta limit) -ifInOps : DELTA : {ifInOctets} -ifOutOps : DELTA : {ifOutOctets} -# Convert our octets delta into bits per second -ifInBps : MATH : {ifInOps} x 8 -ifOutBps : MATH : {ifOutOps} x 8 +ifHCInPkts : MATH : {ifHCInUcastPkts} + {ifHCInMulticastPkts} + {ifHCInBroadcastPkts} +ifHCOutPkts : MATH : {ifHCOutUcastPkts} + {ifHCOutMulticastPkts} + {ifHCOutBroadcastPkts} +ifInPps : DELTA : {ifHCInPkts} +ifOutPps : DELTA : {ifHCOutPkts} # Do delta transform on all error counters ifInEps : DELTA : {ifInErrors} ifOutEps : DELTA : {ifOutErrors} # Perform error to traffic percentage calculations -ifInErrPct : MATH : ({ifInEps} / {ifInBps}) x 100 -ifOutErrPct : MATH : ({ifOutEps} / {ifOutBps}) x 100 +ifInErrPct : MATH : ({ifInEps} / {ifInPps}) x 100 +ifOutErrPct : MATH : ({ifOutEps} / {ifOutPps}) x 100 # Create an alias in a bracketed box, or nothing if alias is blank ifAliasBox : REGSUB : {ifAlias} /(\S+.*)/ [$1]/ Modified: trunk/templates/cisco-asr1000/if_load/message =================================================================== --- trunk/templates/cisco-asr1000/if_load/message 2015-06-02 15:28:36 UTC (rev 251) +++ trunk/templates/cisco-asr1000/if_load/message 2015-09-15 15:18:07 UTC (rev 252) @@ -1,7 +1,7 @@ -<b>Interface error rates:</b> +<b>Interface rates:</b> Input load: yellow={ifInLoad.thresh:yellow}%, red={ifInLoad.thresh:red}% Output load: yellow={ifOutLoad.thresh:yellow}%, red={ifOutLoad.thresh:red}% -TABLE:rrd(DS:ds0:ifInOctets:COUNTER; DS:ds1:ifOutOctets:COUNTER) -Ifc name|Ifc Speed|Rate in (load %)|Rate out (load %) -{ifName}{ifAliasBox}|{ifSpeed}|{ifInLoad.color}{ifInSpeed} ({ifInLoad}%){ifInLoad.errors}|{ifOutLoad.color}{ifOutSpeed} ({ifOutLoad}%){ifOutLoad.errors} +TABLE:rrd(DS:ds0:ifHCInOctets:COUNTER; DS:ds1:ifHCOutOctets:COUNTER) +Ifc name|Ifc Speed|Rate in (load %)|Rate out (load %)|Delta in|Delta out +{ifName}{ifAliasBox}|{ifSpeedDisplay}|{ifInLoad.color}{ifInSpeed} ({ifInLoad}%){ifInLoad.errors}|{ifOutLoad.color}{ifOutSpeed} ({ifOutLoad}%){ifOutLoad.errors}|{ifInOps}|{ifOutOps} Modified: trunk/templates/cisco-asr1000/if_load/oids =================================================================== --- trunk/templates/cisco-asr1000/if_load/oids 2015-06-02 15:28:36 UTC (rev 251) +++ trunk/templates/cisco-asr1000/if_load/oids 2015-09-15 15:18:07 UTC (rev 252) @@ -1,5 +1,5 @@ -ifName : .1.3.6.1.2.1.31.1.1.1.1 : branch +ifNameNative : .1.3.6.1.2.1.31.1.1.1.1 : branch ifAlias : .1.3.6.1.2.1.31.1.1.1.18 : branch -ifBps : .1.3.6.1.2.1.2.2.1.5 : branch -ifInOctets : .1.3.6.1.2.1.2.2.1.10 : branch -ifOutOctets : .1.3.6.1.2.1.2.2.1.16 : branch +ifHighSpeed : .1.3.6.1.2.1.31.1.1.1.15 : branch +ifHCInOctets : 1.3.6.1.2.1.31.1.1.1.6 : branch +ifHCOutOctets : 1.3.6.1.2.1.31.1.1.1.10 : branch Modified: trunk/templates/cisco-asr1000/if_load/thresholds =================================================================== --- trunk/templates/cisco-asr1000/if_load/thresholds 2015-06-02 15:28:36 UTC (rev 251) +++ trunk/templates/cisco-asr1000/if_load/thresholds 2015-09-15 15:18:07 UTC (rev 252) @@ -1,4 +1,4 @@ -ifInLoad : yellow : 75 : {ifName}{ifAliasBox} load is high -ifInLoad : red : 95 : {ifName}{ifAliasBox} load is very high -ifOutLoad : yellow : 75 : {ifName}{ifAliasBox} load is high -ifOutLoad : red : 95 : {ifName}{ifAliasBox} load is very high +ifInLoad : yellow : 75 : {ifName}{ifAliasBox} load is high ({ifInLoad}%) +ifInLoad : red : 95 : {ifName}{ifAliasBox} load is very high ({ifInLoad}%) +ifOutLoad : yellow : 75 : {ifName}{ifAliasBox} load is high ({ifOutLoad}%) +ifOutLoad : red : 95 : {ifName}{ifAliasBox} load is very high ({ifOutLoad}%) Modified: trunk/templates/cisco-asr1000/if_load/transforms =================================================================== --- trunk/templates/cisco-asr1000/if_load/transforms 2015-06-02 15:28:36 UTC (rev 251) +++ trunk/templates/cisco-asr1000/if_load/transforms 2015-09-15 15:18:07 UTC (rev 252) @@ -1,8 +1,9 @@ # Create a human-readable ifc speed -ifSpeed : SPEED : {ifBps} +ifSpeedAcc : MATH : {ifHighSpeed} x 1000000 : 0 +ifSpeedDisplay : SPEED : {ifSpeedAcc} # Get bit speed delta (so we dont have to provide custom delta limit) -ifInOps : DELTA : {ifInOctets} -ifOutOps : DELTA : {ifOutOctets} +ifInOps : DELTA : {ifHCInOctets} +ifOutOps : DELTA : {ifHCOutOctets} # Convert our octets delta into bits per second ifInBps : MATH : {ifInOps} x 8 ifOutBps : MATH : {ifOutOps} x 8 @@ -10,7 +11,8 @@ ifInSpeed : SPEED : {ifInBps} ifOutSpeed : SPEED : {ifOutBps} # Now determine our percentage load, based on traffic and ifc speed -ifInLoad : MATH : ({ifInBps} / {ifBps}) x 100 -ifOutLoad : MATH : ({ifOutBps} / {ifBps}) x 100 +ifInLoad : MATH : ({ifInBps} / {ifSpeedAcc}) x 100 +ifOutLoad : MATH : ({ifOutBps} / {ifSpeedAcc}) x 100 # Create an alias in a bracketed box, or nothing if alias is blank ifAliasBox : REGSUB : {ifAlias} /(\S+.*)/ [$1]/ +ifName : REGSUB : {ifNameNative} /(\S+)(\s*)?(\S+)$/$1$3/ Modified: trunk/templates/cisco-asr1000/if_stat/message =================================================================== --- trunk/templates/cisco-asr1000/if_stat/message 2015-06-02 15:28:36 UTC (rev 251) +++ trunk/templates/cisco-asr1000/if_stat/message 2015-09-15 15:18:07 UTC (rev 252) @@ -1,3 +1,3 @@ TABLE: Ifc name|Ifc speed|Ifc status -{ifName}{ifAliasBox}|{ifSpeed}|{ifStat.color}{ifStat}{ifStat.errors} +{ifName}{ifAliasBox}|{ifSpeedH}|{ifStat.color}{ifStat}{ifStat.errors} Modified: trunk/templates/cisco-asr1000/if_stat/oids =================================================================== --- trunk/templates/cisco-asr1000/if_stat/oids 2015-06-02 15:28:36 UTC (rev 251) +++ trunk/templates/cisco-asr1000/if_stat/oids 2015-09-15 15:18:07 UTC (rev 252) @@ -1,5 +1,6 @@ ifName : .1.3.6.1.2.1.31.1.1.1.1 : branch ifAlias : .1.3.6.1.2.1.31.1.1.1.18 : branch ifBps : .1.3.6.1.2.1.2.2.1.5 : branch +ifHighSpeed : .1.3.6.1.2.1.31.1.1.1.15 : branch ifAdminStatNum : .1.3.6.1.2.1.2.2.1.7 : branch ifOperStatNum : .1.3.6.1.2.1.2.2.1.8 : branch Modified: trunk/templates/cisco-asr1000/if_stat/transforms =================================================================== --- trunk/templates/cisco-asr1000/if_stat/transforms 2015-06-02 15:28:36 UTC (rev 251) +++ trunk/templates/cisco-asr1000/if_stat/transforms 2015-09-15 15:18:07 UTC (rev 252) @@ -1,5 +1,7 @@ ifAdminStatTxt : SWITCH : {ifAdminStatNum} 1=up,2=admin down,3=testing ifOperStatTxt : SWITCH : {ifOperStatNum} 1=up,2=down,3=testing,4=unknown,5=dormant,6=not present,7=lower layer down ifStat : BEST : {ifAdminStatTxt},{ifOperStatTxt} +ifSpeedAcc : MATH : {ifHighSpeed} x 1000000 ifSpeed : SPEED : {ifBps} +ifSpeedH : SPEED : {ifSpeedAcc} ifAliasBox : REGSUB : {ifAlias} /(\S+.*)/ [$1]/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |