diff -ruN templates/cisco-2811/cpu/message templates-trunk/cisco-2811/cpu/message --- templates/cisco-2811/cpu/message 2008-04-03 05:30:39.000000000 -0500 +++ templates-trunk/cisco-2811/cpu/message 2008-01-31 04:05:35.000000000 -0600 @@ -1,10 +1,5 @@ {sysUpTimeSecs.color}: Up for {UpTimeTxt} -{sysUpTimeSecs.color}: Last reboot due to {sysReloadReason} -{CPUTotal5Min.color}: CPU usage: {CPUTotal5Min}% System description: {sysDescr} - diff -ruN templates/cisco-2811/cpu/oids templates-trunk/cisco-2811/cpu/oids --- templates/cisco-2811/cpu/oids 2008-04-03 05:30:39.000000000 -0500 +++ templates-trunk/cisco-2811/cpu/oids 2008-01-31 04:05:35.000000000 -0600 @@ -1,5 +1,2 @@ - sysDescr : .1.3.6.1.2.1.1.1.0 : leaf -sysReloadReason : .1.3.6.1.4.1.9.2.1.2.0 : leaf sysUpTime : .1.3.6.1.2.1.1.3.0 : leaf -CPUTotal5Min : .1.3.6.1.4.1.9.9.109.1.1.1.1.5.1 : leaf diff -ruN templates/cisco-2811/cpu/thresholds templates-trunk/cisco-2811/cpu/thresholds --- templates/cisco-2811/cpu/thresholds 2008-04-03 05:30:39.000000000 -0500 +++ templates-trunk/cisco-2811/cpu/thresholds 2008-01-31 04:05:35.000000000 -0600 @@ -1,8 +1,3 @@ - -CPUTotal5Min : red : >60 : CPU utilization is very high: {CPUTotal5Min}% -CPUTotal5Min : yellow : >40 : CPU utilization is high: {CPUTotal5Min}% -CPUTotal5Min : green : : CPU utilization is nominal: {CPUTotal5Min}% - sysUpTimeSecs : red : <600 : Device rebooted recently. System uptime: {UpTimeTxt} sysUpTimeSecs : yellow : <5000 : Device rebooted recently. System uptime: {UpTimeTxt} sysUpTimeSecs : green : : System uptime: {UpTimeTxt} diff -ruN templates/cisco-2811/if_col/exceptions templates-trunk/cisco-2811/if_col/exceptions --- templates/cisco-2811/if_col/exceptions 2010-03-30 11:43:16.000000000 -0500 +++ templates-trunk/cisco-2811/if_col/exceptions 1969-12-31 18:00:00.000000000 -0600 @@ -1,2 +0,0 @@ -ifName : alarm : .+ -ifName : ignore : Nu.+|Vl.+ diff -ruN templates/cisco-2811/if_col/message templates-trunk/cisco-2811/if_col/message --- templates/cisco-2811/if_col/message 2010-03-30 11:43:16.000000000 -0500 +++ templates-trunk/cisco-2811/if_col/message 1969-12-31 18:00:00.000000000 -0600 @@ -1,9 +0,0 @@ -Collisions: -Collision load: yellow={ifOutColPct.thresh:yellow}%, red={ifOutColPct.thresh:red}% -TABLE: -Ifc name|Collisions|Collisions rate|Collisions load -{ifName}{ifAliasBox}|{ifOutCollisions}|{ifOutCps}|{ifOutColPct.color}{ifOutColPct}%{ifOutColPct.errors} - -Note: -Error rates are per second. -Load percentages are based on an error/packet ratio. diff -ruN templates/cisco-2811/if_col/oids templates-trunk/cisco-2811/if_col/oids --- templates/cisco-2811/if_col/oids 2010-03-30 11:43:16.000000000 -0500 +++ templates-trunk/cisco-2811/if_col/oids 1969-12-31 18:00:00.000000000 -0600 @@ -1,5 +0,0 @@ -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 -ifOutCollisions : .1.3.6.1.4.1.9.2.2.1.1.25 : branch -ifOutPktsSec : .1.3.6.1.4.1.9.2.2.1.1.9 : branch diff -ruN templates/cisco-2811/if_col/thresholds templates-trunk/cisco-2811/if_col/thresholds --- templates/cisco-2811/if_col/thresholds 2010-03-30 11:43:16.000000000 -0500 +++ templates-trunk/cisco-2811/if_col/thresholds 1969-12-31 18:00:00.000000000 -0600 @@ -1,4 +0,0 @@ -# Create thresholds for all the error rate counters -# oid name : color : limit : Error message -ifOutColPct : yellow : 40 : {ifName}{ifAliasBox} - High output collision rate ({ifOutColPct}%) -ifOutColPct : red : 70 : {ifName}{ifAliasBox} - Very high output collision rate ({ifOutColPct}%) diff -ruN templates/cisco-2811/if_col/transforms templates-trunk/cisco-2811/if_col/transforms --- templates/cisco-2811/if_col/transforms 2010-03-30 11:43:16.000000000 -0500 +++ templates-trunk/cisco-2811/if_col/transforms 1969-12-31 18:00:00.000000000 -0600 @@ -1,12 +0,0 @@ -# Convert our total ifc octets(bytes) into bits -ifOutCps : DELTA : {ifOutCollisions} - -# Create our REAL packets per second -ifOutPps : MATH : {ifOutCps} + {ifOutPktsSec} - -# Determine percentage of packets that are collisions -ifOutColPct : MATH : ({ifOutCps} / {ifOutPps}) x 100 - -# Create an alias in a bracketed box, or nothing if alias is blank -ifAliasBox : REGSUB : {ifAlias} /(\S+.*)/ [$1]/ - diff -ruN templates/cisco-2811/if_dsc/oids templates-trunk/cisco-2811/if_dsc/oids --- templates/cisco-2811/if_dsc/oids 2008-04-03 05:30:32.000000000 -0500 +++ templates-trunk/cisco-2811/if_dsc/oids 2008-01-31 04:05:35.000000000 -0600 @@ -1,5 +1,4 @@ -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 +ifName : .1.3.6.1.2.1.2.2.1.2 : 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 ifInDiscards : .1.3.6.1.2.1.2.2.1.13 : branch diff -ruN templates/cisco-2811/if_err/oids templates-trunk/cisco-2811/if_err/oids --- templates/cisco-2811/if_err/oids 2008-04-03 05:30:31.000000000 -0500 +++ templates-trunk/cisco-2811/if_err/oids 2008-01-31 04:05:35.000000000 -0600 @@ -1,5 +1,4 @@ -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 +ifName : .1.3.6.1.2.1.2.2.1.2.1 : 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 diff -ruN templates/cisco-2811/if_load/oids templates-trunk/cisco-2811/if_load/oids --- templates/cisco-2811/if_load/oids 2008-04-03 05:30:32.000000000 -0500 +++ templates-trunk/cisco-2811/if_load/oids 2008-01-31 04:05:35.000000000 -0600 @@ -1,5 +1,4 @@ -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 +ifName : .1.3.6.1.2.1.2.2.1.10 : 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 diff -ruN templates/cisco-2811/if_stat/exceptions templates-trunk/cisco-2811/if_stat/exceptions --- templates/cisco-2811/if_stat/exceptions 2010-10-25 11:55:28.000000000 -0500 +++ templates-trunk/cisco-2811/if_stat/exceptions 2008-01-31 04:05:35.000000000 -0600 @@ -1,2 +1,2 @@ -ifName : alarm : .+ +ifName : alarm : Gi.+ ifName : ignore : Nu.+|Vl.+ diff -ruN templates/cisco-2811/if_stat/oids templates-trunk/cisco-2811/if_stat/oids --- templates/cisco-2811/if_stat/oids 2008-04-03 05:30:32.000000000 -0500 +++ templates-trunk/cisco-2811/if_stat/oids 2008-01-31 04:05:35.000000000 -0600 @@ -1,5 +1,4 @@ -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 +ifName : .1.3.6.1.2.1.2.2.1.10 : branch ifBps : .1.3.6.1.2.1.2.2.1.5 : 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 diff -ruN templates/cisco-2811/memory/message templates-trunk/cisco-2811/memory/message --- templates/cisco-2811/memory/message 2010-03-30 11:43:02.000000000 -0500 +++ templates-trunk/cisco-2811/memory/message 1969-12-31 18:00:00.000000000 -0600 @@ -1,7 +0,0 @@ -Free memory: {mem_free} bytes ({mem_free_per}%) -Used memory: {mem_used} bytes ({mem_used_per}%) -------------- ---------------- -Total memory: {mem_total} bytes (100%) - - diff -ruN templates/cisco-2811/memory/oids templates-trunk/cisco-2811/memory/oids --- templates/cisco-2811/memory/oids 2010-03-30 11:43:02.000000000 -0500 +++ templates-trunk/cisco-2811/memory/oids 1969-12-31 18:00:00.000000000 -0600 @@ -1,3 +0,0 @@ -mem_used : .1.3.6.1.4.1.9.9.48.1.1.1.5.1 : leaf -mem_free : .1.3.6.1.4.1.9.9.48.1.1.1.6.1 : leaf - diff -ruN templates/cisco-2811/memory/thresholds templates-trunk/cisco-2811/memory/thresholds --- templates/cisco-2811/memory/thresholds 2010-03-30 11:43:02.000000000 -0500 +++ templates-trunk/cisco-2811/memory/thresholds 1969-12-31 18:00:00.000000000 -0600 @@ -1,2 +0,0 @@ -mem_used_per : yellow : 75 : Memory load is high -mem_used_per : red : 95 : Memory load is very high diff -ruN templates/cisco-2811/memory/transforms templates-trunk/cisco-2811/memory/transforms --- templates/cisco-2811/memory/transforms 2010-03-30 11:43:02.000000000 -0500 +++ templates-trunk/cisco-2811/memory/transforms 1969-12-31 18:00:00.000000000 -0600 @@ -1,3 +0,0 @@ -mem_total : MATH : {mem_used} + {mem_free} -mem_used_per : MATH : ({mem_used} x 100) / {mem_total} : 0 -mem_free_per : MATH : ({mem_free} x 100) / {mem_total} : 0 diff -ruN templates/cisco-2811/serial/exceptions templates-trunk/cisco-2811/serial/exceptions --- templates/cisco-2811/serial/exceptions 2010-03-30 11:42:55.000000000 -0500 +++ templates-trunk/cisco-2811/serial/exceptions 1969-12-31 18:00:00.000000000 -0600 @@ -1,2 +0,0 @@ -entPhysicalDescr : ignore : Nu.+|Vl.+|Gi.+|.*AIM.*|.*DaughterCard.*|.*Gt96k.* -entPhysicalDescr : alarm : Nothingtoworryabout diff -ruN templates/cisco-2811/serial/message templates-trunk/cisco-2811/serial/message --- templates/cisco-2811/serial/message 2010-03-30 11:42:55.000000000 -0500 +++ templates-trunk/cisco-2811/serial/message 1969-12-31 18:00:00.000000000 -0600 @@ -1,3 +0,0 @@ -TABLE: -Physical Descr | Hardware Rev | Firmware Rev | Software Rev | System serial number | Model Name -{entPhysicalDescr} | {entPhysicalHardwareRev} | {entPhysicalFirmwareRev} | {entPhysicalSoftwareRev} | {entPhysicalSerialNum} | {entPhysicalModelName} diff -ruN templates/cisco-2811/serial/oids templates-trunk/cisco-2811/serial/oids --- templates/cisco-2811/serial/oids 2010-03-30 11:42:55.000000000 -0500 +++ templates-trunk/cisco-2811/serial/oids 1969-12-31 18:00:00.000000000 -0600 @@ -1,6 +0,0 @@ -entPhysicalDescr : .1.3.6.1.2.1.47.1.1.1.1.2 : branch -entPhysicalHardwareRev : .1.3.6.1.2.1.47.1.1.1.1.8 : branch -entPhysicalFirmwareRev : .1.3.6.1.2.1.47.1.1.1.1.9 : branch -entPhysicalSoftwareRev : .1.3.6.1.2.1.47.1.1.1.1.10 : branch -entPhysicalSerialNum : .1.3.6.1.2.1.47.1.1.1.1.11 : branch -entPhysicalModelName : .1.3.6.1.2.1.47.1.1.1.1.13 : branch diff -ruN templates/cisco-2811/specs templates-trunk/cisco-2811/specs --- templates/cisco-2811/specs 2010-03-30 11:44:53.000000000 -0500 +++ templates-trunk/cisco-2811/specs 2008-01-31 04:05:35.000000000 -0600 @@ -1,4 +1,4 @@ vendor : cisco model : 2811 snmpver : 2 -sysdesc : C2811 +sysdesc : C2800NM-ADVIPSERVICESK9-M diff -ruN templates/cisco-2811/temp/message templates-trunk/cisco-2811/temp/message --- templates/cisco-2811/temp/message 2010-03-30 11:47:24.000000000 -0500 +++ templates-trunk/cisco-2811/temp/message 1969-12-31 18:00:00.000000000 -0600 @@ -1,5 +0,0 @@ - -Thermal sensors: -TABLE: noalarmsmsg,rrd(DS:ds0:ciscoEnvMonTemperatureStatusValue:GAUGE; DS:ds1:ciscoEnvMonTemperatureThreshold:GAUGE) -ID|Sensor Location|Temp|Threshold|Condition -{ciscoEnvMonTemperatureId}|{ciscoEnvMonTemperatureStatusDescr}|{ciscoEnvMonTemperatureStatusValue}|{ciscoEnvMonTemperatureThreshold}|{ciscoEnvMonTemperatureState.color}{ciscoEnvMonTemperatureStateTxt} diff -ruN templates/cisco-2811/temp/oids templates-trunk/cisco-2811/temp/oids --- templates/cisco-2811/temp/oids 2010-03-30 11:43:06.000000000 -0500 +++ templates-trunk/cisco-2811/temp/oids 1969-12-31 18:00:00.000000000 -0600 @@ -1,4 +0,0 @@ -ciscoEnvMonTemperatureStatusDescr: 1.3.6.1.4.1.9.9.13.1.3.1.2 : branch -ciscoEnvMonTemperatureStatusValue: 1.3.6.1.4.1.9.9.13.1.3.1.3 : branch -ciscoEnvMonTemperatureThreshold : 1.3.6.1.4.1.9.9.13.1.3.1.4 : branch -ciscoEnvMonTemperatureState: 1.3.6.1.4.1.9.9.13.1.3.1.6 : branch diff -ruN templates/cisco-2811/temp/thresholds templates-trunk/cisco-2811/temp/thresholds --- templates/cisco-2811/temp/thresholds 2010-03-30 11:43:06.000000000 -0500 +++ templates-trunk/cisco-2811/temp/thresholds 1969-12-31 18:00:00.000000000 -0600 @@ -1,4 +0,0 @@ -ciscoEnvMonTemperatureStateTxt : green : normal -ciscoEnvMonTemperatureStateTxt : yellow : warning|shutdown|notFunctioning -ciscoEnvMonTemperatureStateTxt : red : critical -ciscoEnvMonTemperatureStateTxt : clear : nonPresent diff -ruN templates/cisco-2811/temp/transforms templates-trunk/cisco-2811/temp/transforms --- templates/cisco-2811/temp/transforms 2010-10-29 11:19:11.000000000 -0500 +++ templates-trunk/cisco-2811/temp/transforms 1969-12-31 18:00:00.000000000 -0600 @@ -1,2 +0,0 @@ -ciscoEnvMonTemperatureStateTxt : SWITCH : {ciscoEnvMonTemperatureState} 1=normal,2=warning,3=critical,4=shutdown,5=nonPresent,6=notFunctioning -ciscoEnvMonTemperatureId : REGSUB : {ciscoEnvMonTemperatureStatusDescr} /(\S+) (\S+) (\S+)( \((.*)\))?(( (\S+))?)( \(.*\))? temp.*/$1$2$3$8/