diff -ruN templates/cisco-1600/README templates-trunk/cisco-1600/README
--- templates/cisco-1600/README	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/README	1969-12-31 18:00:00.000000000 -0600
@@ -1,6 +0,0 @@
-This template was created by Eric Schwimmer.
-
-NOTE: This does not imply any support responsibilities, liabiltiy in
-case of this template or devmon causing phsyical, monetary or emotional
-damanges, or any other such obligations.  It is merely to provide 
-credit to the original author of the template. 
diff -ruN templates/cisco-1600/cpu/message templates-trunk/cisco-1600/cpu/message
--- templates/cisco-1600/cpu/message	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/cpu/message	1969-12-31 18:00:00.000000000 -0600
@@ -1,10 +0,0 @@
-
-{sysUpTimeSecs.color}: Up for {UpTimeTxt}
-{sysUpTimeSecs.color}: Last reboot due to {sysReloadReason}
-{CPUTotal5Min.color}: CPU usage: {CPUTotal5Min}%
-
-System description:
-{sysDescr}
-<!--
-<br>CPU 5 min average: {CPUTotal5Min}
--->
diff -ruN templates/cisco-1600/cpu/oids templates-trunk/cisco-1600/cpu/oids
--- templates/cisco-1600/cpu/oids	2009-09-02 13:03:58.000000000 -0500
+++ templates-trunk/cisco-1600/cpu/oids	1969-12-31 18:00:00.000000000 -0600
@@ -1,7 +0,0 @@
-
-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
-CPUTotal5Min	: .1.3.6.1.4.1.9.2.1.58.0		: leaf
-
diff -ruN templates/cisco-1600/cpu/thresholds templates-trunk/cisco-1600/cpu/thresholds
--- templates/cisco-1600/cpu/thresholds	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/cpu/thresholds	1969-12-31 18:00:00.000000000 -0600
@@ -1,8 +0,0 @@
-
-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-1600/cpu/transforms templates-trunk/cisco-1600/cpu/transforms
--- templates/cisco-1600/cpu/transforms	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/cpu/transforms	1969-12-31 18:00:00.000000000 -0600
@@ -1,2 +0,0 @@
-sysUpTimeSecs   : MATH          : {sysUpTime} / 100
-UpTimeTxt	: ELAPSED	: {sysUpTimeSecs}
diff -ruN templates/cisco-1600/if_col/exceptions templates-trunk/cisco-1600/if_col/exceptions
--- templates/cisco-1600/if_col/exceptions	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/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-1600/if_col/message templates-trunk/cisco-1600/if_col/message
--- templates/cisco-1600/if_col/message	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/if_col/message	1969-12-31 18:00:00.000000000 -0600
@@ -1,9 +0,0 @@
-<b>Collisions:</b>
-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-1600/if_col/oids templates-trunk/cisco-1600/if_col/oids
--- templates/cisco-1600/if_col/oids	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/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-1600/if_col/thresholds templates-trunk/cisco-1600/if_col/thresholds
--- templates/cisco-1600/if_col/thresholds	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/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-1600/if_col/transforms templates-trunk/cisco-1600/if_col/transforms
--- templates/cisco-1600/if_col/transforms	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/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-1600/if_dsc/exceptions templates-trunk/cisco-1600/if_dsc/exceptions
--- templates/cisco-1600/if_dsc/exceptions	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/if_dsc/exceptions	1969-12-31 18:00:00.000000000 -0600
@@ -1,2 +0,0 @@
-ifName : alarm  : .+
-ifName : ignore : Nu.+|Vl.+
diff -ruN templates/cisco-1600/if_dsc/message templates-trunk/cisco-1600/if_dsc/message
--- templates/cisco-1600/if_dsc/message	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/if_dsc/message	1969-12-31 18:00:00.000000000 -0600
@@ -1,8 +0,0 @@
-<b>Discards:</b>
-TABLE:
-Ifc name|Discards in|Discard rate in|Discard load in|Discards out|Discard rate out|Discard load out
-{ifName}{ifAliasBox}|{ifInDiscards}|{ifInDps}|{ifInDscPct.color}{ifInDscPct}%{ifInDscPct.errors}|{ifOutDiscards}|{ifOutDps}|{ifOutDscPct.color}{ifOutDscPct}%{ifOutDscPct.errors}
-
-Note: 
-Error rates are per second.
-Load percentages are based on error/bit ratio.
diff -ruN templates/cisco-1600/if_dsc/oids templates-trunk/cisco-1600/if_dsc/oids
--- templates/cisco-1600/if_dsc/oids	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/if_dsc/oids	1969-12-31 18:00:00.000000000 -0600
@@ -1,7 +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
-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
diff -ruN templates/cisco-1600/if_dsc/thresholds templates-trunk/cisco-1600/if_dsc/thresholds
--- templates/cisco-1600/if_dsc/thresholds	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/if_dsc/thresholds	1969-12-31 18:00:00.000000000 -0600
@@ -1,6 +0,0 @@
-# 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}%)
diff -ruN templates/cisco-1600/if_dsc/transforms templates-trunk/cisco-1600/if_dsc/transforms
--- templates/cisco-1600/if_dsc/transforms	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/if_dsc/transforms	1969-12-31 18:00:00.000000000 -0600
@@ -1,14 +0,0 @@
-# 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
-# Do delta transform on all error counters
-ifInDps		: DELTA		: {ifInDiscards}
-ifOutDps	: DELTA		: {ifOutDiscards}
-# Perform error to traffic percentage calculations
-ifInDscPct	: MATH		: ({ifInDps} / {ifInBps}) x 100
-ifOutDscPct	: MATH		: ({ifOutDps} / {ifOutBps}) x 100
-# Create an alias in a bracketed box, or nothing if alias is blank
-ifAliasBox      : REGSUB        : {ifAlias} /(\S+.*)/ [$1]/
diff -ruN templates/cisco-1600/if_err/exceptions templates-trunk/cisco-1600/if_err/exceptions
--- templates/cisco-1600/if_err/exceptions	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/if_err/exceptions	1969-12-31 18:00:00.000000000 -0600
@@ -1,2 +0,0 @@
-ifName : alarm  : .+
-ifName : ignore : Nu.+|Vl.+
diff -ruN templates/cisco-1600/if_err/message templates-trunk/cisco-1600/if_err/message
--- templates/cisco-1600/if_err/message	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/if_err/message	1969-12-31 18:00:00.000000000 -0600
@@ -1,11 +0,0 @@
-<b>Errors:</b>
-Input errors:  yellow={ifInErrPct.thresh:yellow}%, red={ifInErrPct.thresh:red}%
-Output errors: yellow={ifOutErrPct.thresh:yellow}%, red={ifOutErrPct.thresh:red}%
-
-TABLE:
-Ifc name|Errors in|Error rate in|Error load in|Errors out|Error rate out|Error load out
-{ifName}{ifAliasBox}|{ifInErrors}|{ifInEps}|{ifInErrPct.color}{ifInErrPct}%{ifInErrPct.errors}|{ifOutErrors}|{ifOutEps}|{ifOutErrPct.color}{ifOutErrPct}%{ifOutErrPct.errors}
-
-Note: 
-Error rates are per second, averaged over a 60 second interval.
-Load percentages are based on error/bit ratio.
diff -ruN templates/cisco-1600/if_err/oids templates-trunk/cisco-1600/if_err/oids
--- templates/cisco-1600/if_err/oids	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/if_err/oids	1969-12-31 18:00:00.000000000 -0600
@@ -1,7 +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
-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
diff -ruN templates/cisco-1600/if_err/thresholds templates-trunk/cisco-1600/if_err/thresholds
--- templates/cisco-1600/if_err/thresholds	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/if_err/thresholds	1969-12-31 18:00:00.000000000 -0600
@@ -1,7 +0,0 @@
-# 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}%)
diff -ruN templates/cisco-1600/if_err/transforms templates-trunk/cisco-1600/if_err/transforms
--- templates/cisco-1600/if_err/transforms	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/if_err/transforms	1969-12-31 18:00:00.000000000 -0600
@@ -1,15 +0,0 @@
-# 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
-# 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
-# Create an alias in a bracketed box, or nothing if alias is blank
-ifAliasBox      : REGSUB        : {ifAlias} /(\S+.*)/ [$1]/
-
diff -ruN templates/cisco-1600/if_load/exceptions templates-trunk/cisco-1600/if_load/exceptions
--- templates/cisco-1600/if_load/exceptions	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/if_load/exceptions	1969-12-31 18:00:00.000000000 -0600
@@ -1,2 +0,0 @@
-ifName : alarm  : .+
-ifName : ignore : Nu.+|Vl.+
diff -ruN templates/cisco-1600/if_load/message templates-trunk/cisco-1600/if_load/message
--- templates/cisco-1600/if_load/message	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/if_load/message	1969-12-31 18:00:00.000000000 -0600
@@ -1,7 +0,0 @@
-
-<b>Interface error 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}
diff -ruN templates/cisco-1600/if_load/oids templates-trunk/cisco-1600/if_load/oids
--- templates/cisco-1600/if_load/oids	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/if_load/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
-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-1600/if_load/thresholds templates-trunk/cisco-1600/if_load/thresholds
--- templates/cisco-1600/if_load/thresholds	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/if_load/thresholds	1969-12-31 18:00:00.000000000 -0600
@@ -1,4 +0,0 @@
-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
diff -ruN templates/cisco-1600/if_load/transforms templates-trunk/cisco-1600/if_load/transforms
--- templates/cisco-1600/if_load/transforms	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/if_load/transforms	1969-12-31 18:00:00.000000000 -0600
@@ -1,16 +0,0 @@
-# Create a human-readable ifc speed
-ifSpeed		: SPEED		: {ifBps}
-# 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
-# Make some easily readable speed variables
-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
-# Create an alias in a bracketed box, or nothing if alias is blank
-ifAliasBox      : REGSUB        : {ifAlias} /(\S+.*)/ [$1]/
diff -ruN templates/cisco-1600/if_stat/exceptions templates-trunk/cisco-1600/if_stat/exceptions
--- templates/cisco-1600/if_stat/exceptions	2010-10-25 12:05:34.000000000 -0500
+++ templates-trunk/cisco-1600/if_stat/exceptions	1969-12-31 18:00:00.000000000 -0600
@@ -1,2 +0,0 @@
-ifName : alarm  : .+
-ifName : ignore : Nu.+|Vl.+
diff -ruN templates/cisco-1600/if_stat/message templates-trunk/cisco-1600/if_stat/message
--- templates/cisco-1600/if_stat/message	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/if_stat/message	1969-12-31 18:00:00.000000000 -0600
@@ -1,3 +0,0 @@
-TABLE:
-Ifc name|Ifc speed|Ifc status
-{ifName}{ifAliasBox}|{ifSpeed}|{ifStat.color}{ifStat}{ifStat.errors}
diff -ruN templates/cisco-1600/if_stat/oids templates-trunk/cisco-1600/if_stat/oids
--- templates/cisco-1600/if_stat/oids	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/if_stat/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
-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-1600/if_stat/thresholds templates-trunk/cisco-1600/if_stat/thresholds
--- templates/cisco-1600/if_stat/thresholds	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/if_stat/thresholds	1969-12-31 18:00:00.000000000 -0600
@@ -1,6 +0,0 @@
-ifAdminStatTxt	: green		: admin down					: Interface {ifName}{ifAliasBox} is {ifAdminStatTxt}
-ifAdminStatTxt	: yellow	: testing					: Interface {ifName}{ifAliasBox} is {ifAdminStatTxt}
-ifAdminStatTxt	: red		: up						: Interface {ifName}{ifAliasBox} is {ifAdminStatTxt}
-ifOperStatTxt	: green		: up 						: Interface {ifName}{ifAliasBox} is {ifOperStatTxt}
-ifOperStatTxt	: yellow	: dormant|testing|yellow|not present|layer down : Interface {ifName}{ifAliasBox} is {ifOperStatTxt}
-ifOperStatTxt	: red		: down                                          : Interface {ifName}{ifAliasBox} is {ifOperStatTxt}
diff -ruN templates/cisco-1600/if_stat/transforms templates-trunk/cisco-1600/if_stat/transforms
--- templates/cisco-1600/if_stat/transforms	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/cisco-1600/if_stat/transforms	1969-12-31 18:00:00.000000000 -0600
@@ -1,5 +0,0 @@
-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}
-ifSpeed		: SPEED		: {ifBps}
-ifAliasBox	: REGSUB	: {ifAlias} /(\S+.*)/ [$1]/
diff -ruN templates/cisco-1600/specs templates-trunk/cisco-1600/specs
--- templates/cisco-1600/specs	2009-09-02 13:04:27.000000000 -0500
+++ templates-trunk/cisco-1600/specs	1969-12-31 18:00:00.000000000 -0600
@@ -1,4 +0,0 @@
-vendor	: cisco
-model	: 1600
-snmpver	: 2
-sysdesc : C1600
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}
-<!--
-<br>CPU 5 min average: {CPUTotal5Min}
--->
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 @@
-<b>Collisions:</b>
-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%)
-
-<!-- DEVMON to RRD Physical {mem_used_per}%
--->
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/
diff -ruN templates/cisco-3640/if_stat/exceptions templates-trunk/cisco-3640/if_stat/exceptions
--- templates/cisco-3640/if_stat/exceptions	2010-10-25 11:55:17.000000000 -0500
+++ templates-trunk/cisco-3640/if_stat/exceptions	2008-01-31 04:09:20.000000000 -0600
@@ -1,2 +1,2 @@
-ifName : alarm  : .+
+ifName : alarm  : Gi.+
 ifName : ignore : Nu.+|Vl.+
diff -ruN templates/cisco-3640/if_stat/thresholds templates-trunk/cisco-3640/if_stat/thresholds
--- templates/cisco-3640/if_stat/thresholds	2008-04-03 05:30:32.000000000 -0500
+++ templates-trunk/cisco-3640/if_stat/thresholds	2008-01-31 04:09:20.000000000 -0600
@@ -3,4 +3,4 @@
 ifAdminStatTxt	: yellow	: up						: Interface {ifName}{ifAliasBox} is {ifAdminStatTxt}
 ifOperStatTxt	: green		: up 						: Interface {ifName}{ifAliasBox} is {ifOperStatTxt}
 ifOperStatTxt	: yellow	: dormant|testing|yellow|not present|layer down : Interface {ifName}{ifAliasBox} is {ifOperStatTxt}
-ifOperStatTxt	: red		: down                                          : Interface {ifName}{ifAliasBox} is {ifOperStatTxt}
+ifOperStatTxt	: yellow	: down                                          : Interface {ifName}{ifAliasBox} is {ifOperStatTxt}
diff -ruN templates/cisco-3640/memory/message templates-trunk/cisco-3640/memory/message
--- templates/cisco-3640/memory/message	2008-04-03 05:30:32.000000000 -0500
+++ templates-trunk/cisco-3640/memory/message	2009-05-07 02:42:01.000000000 -0500
@@ -1,7 +1,10 @@
+{mem_used_per.errors}
+
 Free memory:       {mem_free} bytes ({mem_free_per}%)
-Used memory:       {mem_used} bytes ({mem_used_per}%)
+Used memory:       {mem_used} bytes ({mem_used_per}%) {mem_used_per.color}
 -------------     ----------------
 Total memory:      {mem_total} bytes (100%)
 
+Alarm threshold:  yellow={mem_used_per.thresh:yellow}%, red={mem_used_per.thresh:red}%
 <!-- DEVMON to RRD Physical {mem_used_per}%
 -->
diff -ruN templates/cisco-4500/if_stat/exceptions templates-trunk/cisco-4500/if_stat/exceptions
--- templates/cisco-4500/if_stat/exceptions	2010-10-25 12:02:07.000000000 -0500
+++ templates-trunk/cisco-4500/if_stat/exceptions	2008-01-31 03:53:52.000000000 -0600
@@ -1,2 +1,2 @@
-ifName : alarm  : .+
+ifName : alarm  : Gi.+
 ifName : ignore : Nu.+|Vl.+|VLAN.+
diff -ruN templates/cisco-4500/memory/message templates-trunk/cisco-4500/memory/message
--- templates/cisco-4500/memory/message	2008-04-03 05:30:39.000000000 -0500
+++ templates-trunk/cisco-4500/memory/message	2009-05-07 02:42:01.000000000 -0500
@@ -1,7 +1,10 @@
+{mem_used_per.errors}
+
 Free memory:       {mem_free} bytes ({mem_free_per}%)
-Used memory:       {mem_used} bytes ({mem_used_per}%)
+Used memory:       {mem_used} bytes ({mem_used_per}%) {mem_used_per.color}
 -------------     ----------------
 Total memory:      {mem_total} bytes (100%)
 
+Alarm threshold:  yellow={mem_used_per.thresh:yellow}%, red={mem_used_per.thresh:red}%
 <!-- DEVMON to RRD Physical {mem_used_per}%
 -->
diff -ruN templates/cisco-5500/if_stat/exceptions templates-trunk/cisco-5500/if_stat/exceptions
--- templates/cisco-5500/if_stat/exceptions	2010-10-25 12:02:23.000000000 -0500
+++ templates-trunk/cisco-5500/if_stat/exceptions	2008-01-31 03:56:11.000000000 -0600
@@ -1,2 +1,2 @@
-ifName : alarm  : .+
+ifName : alarm  : Gi.+
 ifName : ignore : Nu.+|Vl.+|VLAN.+
diff -ruN templates/cisco-5500/memory/message templates-trunk/cisco-5500/memory/message
--- templates/cisco-5500/memory/message	2008-04-03 05:30:31.000000000 -0500
+++ templates-trunk/cisco-5500/memory/message	2009-05-07 02:42:01.000000000 -0500
@@ -1,7 +1,10 @@
+{mem_used_per.errors}
+
 Free memory:       {mem_free} bytes ({mem_free_per}%)
-Used memory:       {mem_used} bytes ({mem_used_per}%)
+Used memory:       {mem_used} bytes ({mem_used_per}%) {mem_used_per.color}
 -------------     ----------------
 Total memory:      {mem_total} bytes (100%)
 
+Alarm threshold:  yellow={mem_used_per.thresh:yellow}%, red={mem_used_per.thresh:red}%
 <!-- DEVMON to RRD Physical {mem_used_per}%
 -->
diff -ruN templates/cisco-6506/if_stat/exceptions templates-trunk/cisco-6506/if_stat/exceptions
--- templates/cisco-6506/if_stat/exceptions	2010-10-25 12:02:50.000000000 -0500
+++ templates-trunk/cisco-6506/if_stat/exceptions	2008-01-31 03:59:01.000000000 -0600
@@ -1,2 +1,2 @@
-ifName : alarm  : .+
+#ifName : alarm  : Gi.+
 ifName : ignore : Nu.+|Vl.+|VLAN.+|Lo.+|EO.+
diff -ruN templates/cisco-6506/memory/message templates-trunk/cisco-6506/memory/message
--- templates/cisco-6506/memory/message	2008-04-03 05:30:40.000000000 -0500
+++ templates-trunk/cisco-6506/memory/message	2009-05-07 02:42:01.000000000 -0500
@@ -1,7 +1,10 @@
+{mem_used_per.errors}
+
 Free memory:       {mem_free} bytes ({mem_free_per}%)
-Used memory:       {mem_used} bytes ({mem_used_per}%)
+Used memory:       {mem_used} bytes ({mem_used_per}%) {mem_used_per.color}
 -------------     ----------------
 Total memory:      {mem_total} bytes (100%)
 
+Alarm threshold:  yellow={mem_used_per.thresh:yellow}%, red={mem_used_per.thresh:red}%
 <!-- DEVMON to RRD Physical {mem_used_per}%
 -->
diff -ruN templates/mikrotik-rb400/README templates-trunk/mikrotik-rb400/README
--- templates/mikrotik-rb400/README	2010-04-30 07:34:34.000000000 -0500
+++ templates-trunk/mikrotik-rb400/README	1969-12-31 18:00:00.000000000 -0600
@@ -1,6 +0,0 @@
-This template was created by Eric Schwimmer, copied by Chris Wopat
-
-NOTE: This does not imply any support responsibilities, liabiltiy in
-case of this template or devmon causing phsyical, monetary or emotional
-damanges, or any other such obligations.  It is merely to provide 
-credit to the original author of the template. 
diff -ruN templates/mikrotik-rb400/cpu/message templates-trunk/mikrotik-rb400/cpu/message
--- templates/mikrotik-rb400/cpu/message	2010-04-30 07:54:47.000000000 -0500
+++ templates-trunk/mikrotik-rb400/cpu/message	1969-12-31 18:00:00.000000000 -0600
@@ -1,9 +0,0 @@
-
-{sysUpTimeSecs.color}: Up for {UpTimeTxt}
-{CPUTotal5Min.color}: CPU usage: {CPUTotal5Min}%
-
-System description:
-{sysDescr}
-<!--
-<br>CPU 5 min average: {CPUTotal5Min}
--->
diff -ruN templates/mikrotik-rb400/cpu/oids templates-trunk/mikrotik-rb400/cpu/oids
--- templates/mikrotik-rb400/cpu/oids	2010-10-29 11:46:55.000000000 -0500
+++ templates-trunk/mikrotik-rb400/cpu/oids	1969-12-31 18:00:00.000000000 -0600
@@ -1,4 +0,0 @@
-sysDescr        : .1.3.6.1.2.1.1.1.0			: leaf
-sysUpTime	: .1.3.6.1.2.1.1.3.0			: leaf
-CPUTotal5Min	: .1.3.6.1.2.1.25.3.3.1.2.1		: leaf
-
diff -ruN templates/mikrotik-rb400/cpu/thresholds templates-trunk/mikrotik-rb400/cpu/thresholds
--- templates/mikrotik-rb400/cpu/thresholds	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/mikrotik-rb400/cpu/thresholds	1969-12-31 18:00:00.000000000 -0600
@@ -1,8 +0,0 @@
-
-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/mikrotik-rb400/cpu/transforms templates-trunk/mikrotik-rb400/cpu/transforms
--- templates/mikrotik-rb400/cpu/transforms	2008-04-03 05:30:38.000000000 -0500
+++ templates-trunk/mikrotik-rb400/cpu/transforms	1969-12-31 18:00:00.000000000 -0600
@@ -1,2 +0,0 @@
-sysUpTimeSecs   : MATH          : {sysUpTime} / 100
-UpTimeTxt	: ELAPSED	: {sysUpTimeSecs}
diff -ruN templates/mikrotik-rb400/memory/message templates-trunk/mikrotik-rb400/memory/message
--- templates/mikrotik-rb400/memory/message	2010-04-30 08:58:55.000000000 -0500
+++ templates-trunk/mikrotik-rb400/memory/message	1969-12-31 18:00:00.000000000 -0600
@@ -1,3 +0,0 @@
-Memory		Used	Total	Percentage
-Physical	{MemSizeUsed}kB	{MemSize}kB	{MemPerUse}% {MemPerUse.color}
-
diff -ruN templates/mikrotik-rb400/memory/oids templates-trunk/mikrotik-rb400/memory/oids
--- templates/mikrotik-rb400/memory/oids	2010-04-30 08:58:49.000000000 -0500
+++ templates-trunk/mikrotik-rb400/memory/oids	1969-12-31 18:00:00.000000000 -0600
@@ -1,3 +0,0 @@
-MemBlocks	: .1.3.6.1.2.1.25.2.3.1.5.2	: leaf
-MemBlocksUsed	: .1.3.6.1.2.1.25.2.3.1.6.2	: leaf
-MemBlockSize	: .1.3.6.1.2.1.25.2.3.1.4.2	: leaf
diff -ruN templates/mikrotik-rb400/memory/thresholds templates-trunk/mikrotik-rb400/memory/thresholds
--- templates/mikrotik-rb400/memory/thresholds	2010-04-30 08:59:07.000000000 -0500
+++ templates-trunk/mikrotik-rb400/memory/thresholds	1969-12-31 18:00:00.000000000 -0600
@@ -1,2 +0,0 @@
-MemPerUse    : red           : >99   : Memory utilization is critical
-MemPerUse    : yellow        : >95   : Memory utilization is high
diff -ruN templates/mikrotik-rb400/memory/transforms templates-trunk/mikrotik-rb400/memory/transforms
--- templates/mikrotik-rb400/memory/transforms	2010-04-30 08:59:02.000000000 -0500
+++ templates-trunk/mikrotik-rb400/memory/transforms	1969-12-31 18:00:00.000000000 -0600
@@ -1,4 +0,0 @@
-MemSize : MATH	: {MemBlocks} x {MemBlockSize} / 1024 : 0
-MemSizeUsed : MATH	: {MemBlocksUsed} x {MemBlockSize} / 1024 : 0
-MemAvail : MATH	: {MemSize} - {MemSizeUsed} : 0
-MemPerUse : MATH	: ({MemSizeUsed} x 100) / {MemSize} : 0
diff -ruN templates/mikrotik-rb400/specs templates-trunk/mikrotik-rb400/specs
--- templates/mikrotik-rb400/specs	2010-04-30 07:35:45.000000000 -0500
+++ templates-trunk/mikrotik-rb400/specs	1969-12-31 18:00:00.000000000 -0600
@@ -1,4 +0,0 @@
-vendor	: mikrotik
-model	: rb400
-snmpver	: 2
-sysdesc : RouterBoard 400 Series
