BugFix: IOS - Add capturing of timestamp data for vty lines that auto…

… print one (#525)
networktocode · Oct 30, 2019 · b6c2add · b6c2add
1 parent f1f1678
commit b6c2add
Show file tree

Hide file tree

Showing 64 changed files with 204 additions and 12 deletions.
diff --git a/templates/cisco_ios_dir.template b/templates/cisco_ios_dir.template
@@ -11,5 +11,8 @@ Start
   ^\s*${ID}\s+${PERMISSIONS}\s+${SIZE}\s+${DATE_TIME}\s+${NAME}\s*$$ -> Record
   ^Directory of\s+${FILE_SYSTEM}
   ^${TOTAL_SIZE}\s+\S+\s+\S+\s\(${TOTAL_FREE} bytes free\)
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
 
 EOF
diff --git a/templates/cisco_ios_show_access-list.template b/templates/cisco_ios_show_access-list.template
@@ -33,4 +33,7 @@ Start
   ^.*list\s+${NAME}
   ^\s+${SN}\s+${ACTION}\s+${PROTOCOL}\s+${SOURCE}(\s+${PORT})*(\s${RANGE})*\s+${DESTINATION}(\s+${MODIFIER})* -> Record
   ^\s+${SN}\s+${ACTION}\s+${SOURCE}(\s+${MODIFIER})* -> Record
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
 
diff --git a/templates/cisco_ios_show_aliases.template b/templates/cisco_ios_show_aliases.template
@@ -4,6 +4,9 @@ Value COMMAND ((\w+(\s|\S))+)
 
 Start
   ^${MODE}\saliases: -> ALIAS
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
 
 ALIAS
   ^${MODE}\saliases: -> ALIAS  

diff --git a/templates/cisco_ios_show_archive.template b/templates/cisco_ios_show_archive.template
@@ -1,4 +1,7 @@
 Value STATE (\w+\s\w+)
 
 Start
-  ^\sArchive feature ${STATE} -> Record
+  ^\sArchive feature ${STATE} -> Record
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
diff --git a/templates/cisco_ios_show_authentication_sessions.template b/templates/cisco_ios_show_authentication_sessions.template
@@ -7,6 +7,9 @@ Value SESSION (\w+?)
 
 Start
   ^Interface\s+MAC Address\s+Method\s+Domain -> Catch
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
 
 Catch
   ^-+$$

diff --git a/templates/cisco_ios_show_boot.template b/templates/cisco_ios_show_boot.template
@@ -28,5 +28,8 @@ Start
   ^\s+Download:\s+${TIMEOUT_CONFIG_DOWNLOAD}
   ^Config\s+Download
   ^\s+via\s+DHCP:\s+${CONFIG_DOWNLOAD_DHCP}
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
   ^\s*$$
   ^. -> Error
diff --git a/templates/cisco_ios_show_capability_feature_routing.template b/templates/cisco_ios_show_capability_feature_routing.template
@@ -4,3 +4,6 @@ Value STATE (\w+)
 Start
   ^Displaying capability information for all available features: 
   ^${FEATURE}:\s${STATE} -> Record
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
diff --git a/templates/cisco_ios_show_cdp_neighbors.template b/templates/cisco_ios_show_cdp_neighbors.template
@@ -6,6 +6,9 @@ Value NEIGHBOR_INTERFACE ([a-zA-Z]\S+(?:\s\S+)?)
 
 Start
   ^Device.*ID -> CDP
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
 
 CDP
   ^${NEIGHBOR}$$

diff --git a/templates/cisco_ios_show_cdp_neighbors_detail.template b/templates/cisco_ios_show_cdp_neighbors_detail.template
@@ -12,6 +12,9 @@ Start
   ^Platform\s*:\s*${PLATFORM}\s*,\s*Capabilities\s*:\s*${CAPABILITIES}
   ^Interface: ${LOCAL_PORT},  Port ID \(outgoing port\): ${REMOTE_PORT}
   ^Version : -> GetVersion
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
 
 ParseIP
   ^.*IP address: ${MANAGEMENT_IP} -> Start

diff --git a/templates/cisco_ios_show_clock.template b/templates/cisco_ios_show_clock.template
@@ -7,4 +7,6 @@ Value YEAR (\d+)
 
 Start
   ^[\*]?${TIME}\s${TIMEZONE}\s${DAYWEEK}\s${MONTH}\s${DAY}\s${YEAR} -> Record
-
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
diff --git a/templates/cisco_ios_show_controller_t1.template b/templates/cisco_ios_show_controller_t1.template
@@ -33,6 +33,9 @@ Start
   ^\s+AIS\sState:${AIS_STATE}\s+LOS\sState:${LOS_STATE}\s+LOF\sState:${LOF_STATE}
   ^\s+Framing\sis\s${FRAMING},\sLine\sCode\sis\s${LINE_CODE},\sClock\sSource\sis\s${CLOCK_SOURCE}. 
   ^\s+Data\sin\scurrent\sinterval\s\(${CURR_INTERVAL_ELAPSED_SECONDS}\sseconds\selapsed\): -> ParseCurrentCounters
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
 
 ParseCurrentCounters
   ^\s+${CURR_LINE_CODE_VIOLATIONS}\sLine\sCode\sViolations,\s${CURR_PATH_CODE_VIOLATIONS}\sPath\sCode\sViolations

diff --git a/templates/cisco_ios_show_dmvpn.template b/templates/cisco_ios_show_dmvpn.template
@@ -11,6 +11,9 @@ Start
   ^=*$$
   ^Interface.*$$
   ^Type.*$$
-  ^\s+|\s*$$
+  ^\s*$$
   ^\s+#\s+Ent\s+Peer\s+NBMA\s+Addr\s+Peer\s+Tunnel\s+Add\s+State\s+UpDn\s+Tm\s+Attrb
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
   ^. -> Error
diff --git a/templates/cisco_ios_show_dot1x_all.template b/templates/cisco_ios_show_dot1x_all.template
@@ -23,6 +23,9 @@ Start
   ^Critical Recovery Delay\s+${CRITICAL_RECOVERY_DELAY}
   ^Critical EAPOL\s+${CRITICAL_EAPOL}
   ^$$ -> Interfaces
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
 
 Interfaces
   ^Dot1x Info for\s -> Continue.Record

diff --git a/templates/cisco_ios_show_environment_power_all.template b/templates/cisco_ios_show_environment_power_all.template
@@ -11,3 +11,6 @@ Value WATTS (\w+)
 
 Start
   ^${PS_MODULE}\s+${PID}\s+${SERIAL}\s+${STATUS}\s+${SYS_PWR}\s+${POE_PWR}\s+${WATTS} -> Record
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
diff --git a/templates/cisco_ios_show_hosts_summary.template b/templates/cisco_ios_show_hosts_summary.template
@@ -8,5 +8,8 @@ Start
   ^Name\s*servers\s*are\s*${NAME_SERVERS}
   ^Local\s*cache\s*entries:\s*${LOCAL_CACHE_ENTRIES}
   ^Dynamic\s*cache\s*entries:\s*${DYNAMIC_CACHE_ENTRIES}
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
   ^\s*$$
   ^. -> Error
diff --git a/templates/cisco_ios_show_interface_transceiver.template b/templates/cisco_ios_show_interface_transceiver.template
@@ -6,3 +6,6 @@ Value RX_PWR (\S+)
 
 Start
   ^${IFACE}\s+${TEMPERATURE}\s+${VOLTAGE}\s+${TX_PWR}\s+${RX_PWR}\s+ -> Record
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
diff --git a/templates/cisco_ios_show_interfaces.template b/templates/cisco_ios_show_interfaces.template
@@ -41,3 +41,6 @@ Start
   ^\s+${INPUT_ERRORS}\s+input\s+errors,\s+\d+\s+CRC,\s+\d+\s+frame,\s+\d+\s+overrun,\s+\d+\s+ignored\s*$$
   ^\s+${OUTPUT_PACKETS}\s+packets\s+output,\s+\d+\s+bytes,\s+\d+\s+underruns\s*$$
   ^\s+${OUTPUT_ERRORS}\s+output\s+errors,\s+\d+\s+collisions,\s+\d+\s+interface\s+resets\s*$$
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
diff --git a/templates/cisco_ios_show_interfaces_description.template b/templates/cisco_ios_show_interfaces_description.template
@@ -6,6 +6,9 @@ Value DESCRIP (\S.*?)
 Start
   ^Interface\s+Status\s+Protocol\s+Description\s*$$ -> Begin
   ^\s*$$
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
   ^. -> Error
 
 Begin

diff --git a/templates/cisco_ios_show_interfaces_status.template b/templates/cisco_ios_show_interfaces_status.template
@@ -8,6 +8,9 @@ Value TYPE (.*)
 
 Start
   ^Port -> Begin
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
 
 Begin
   ^(?=\s{0,9}${PORT}).{9}\s{20}${STATUS}\s+${VLAN}\s+${DUPLEX}\s+${SPEED}\s*${TYPE}$$ -> Record

diff --git a/templates/cisco_ios_show_interfaces_switchport.template b/templates/cisco_ios_show_interfaces_switchport.template
@@ -16,5 +16,15 @@ Start
   ^\s*Access\s+Mode\s+VLAN:\s+${ACCESS_VLAN}
   ^\s*Trunking\s+Native\s+Mode\s+VLAN:\s+${NATIVE_VLAN}
   ^\s*Trunking\s+VLANs\s+Enabled:\s+${TRUNKING_VLANS} -> Record
-  ^.+$$
+  ^\s*Administrative\s+Mode
+  ^\s*(?:Operational|Administrative)\s+(?:Trunking|Native\s+VLAN|private-vlan)
+  ^\s*Voice\s+VLAN:
+  ^\s*Pruning\s+VLANs
+  ^\s*Capture\s+(?:Mode|VLANs)
+  ^\s*Protected
+  ^\s*Appliance\s+trust
+  ^\s*$$
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
   ^. -> Error
diff --git a/templates/cisco_ios_show_inventory.template b/templates/cisco_ios_show_inventory.template
@@ -14,4 +14,6 @@ Start
   ^PID:\s+,.*VID:\s+${VID}.*
   ^.*SN:\s+${SN} -> Record
   ^.*SN: -> Record
-
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
diff --git a/templates/cisco_ios_show_ip_access-lists.template b/templates/cisco_ios_show_ip_access-lists.template
@@ -31,6 +31,10 @@ Start
   ^${ACL_TYPE}\s+IP\s+access\s+list\s+${ACL_NAME}\s* -> Record
   ^\s+${LINE_NUM}\s+${ACTION}\s+${PROTOCOL}\s+(host\s+${SRC_HOST}|${SRC_ANY}|${SRC_NETWORK}\s+${SRC_WILDCARD})(\s+${SRC_PORT_MATCH}\s+|)(${SRC_PORT_RANGE_START}\s+${SRC_PORT_RANGE_END}|${SRC_PORT}|)\s+(host\s+${DST_HOST}|${DST_ANY}|${DST_NETWORK}\s+${DST_WILDCARD})(\s+${DST_PORT_MATCH}\s+(${DST_PORT_RANGE_START}\s+${DST_PORT_RANGE_END}|${DST_PORT}|)|\s+(${FLAGS_MATCH}\s+|)${TCP_FLAG}|)(\s+${LOG}|)(\s+time-range\s+${TIME}\s+\(${STATE}\)|)\s*$$ -> Record
   ^\s+${LINE_NUM}\s+${ACTION}\s+(${SRC_NETWORK},\s+wildcard\s+bits\s+${SRC_WILDCARD}|${SRC_HOST}|${SRC_ANY})(\s+${LOG}|)(\s+time-range\s+${TIME}\s+\(${STATE}\)|)(?:\s+\(${MATCHES}\s+matches\)|)\s*$$ -> Record
+  ^\s*$$
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
   ^.* -> Error "Could not parse line:"
 
 EOF
diff --git a/templates/cisco_ios_show_ip_arp.template b/templates/cisco_ios_show_ip_arp.template
@@ -9,5 +9,7 @@ Start
   ^Protocol\s+Address\s+Age\s*\(min\)\s+Hardware Addr\s+Type\s+Interface
   ^${PROTOCOL}\s+${ADDRESS}\s+${AGE}\s+${MAC}\s+${TYPE}\s+${INTERFACE} -> Record
   ^${PROTOCOL}\s+${ADDRESS}\s+${AGE}\s+${MAC}\s+${TYPE} -> Record
-  ^. -> Error
-
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
+  ^. -> Error  
diff --git a/templates/cisco_ios_show_ip_bgp.template b/templates/cisco_ios_show_ip_bgp.template
@@ -12,6 +12,9 @@ Value ORIGIN ([ie\?])
 Start
   # Since using mostly position, play it safe and ensure we see header first
   ^\s+Network\s+Next Hop\s+Metric\s+LocPrf\s+Weight\s+Path -> Bgp_table
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
 
 Bgp_table
   #

diff --git a/templates/cisco_ios_show_ip_bgp_summary.template b/templates/cisco_ios_show_ip_bgp_summary.template
@@ -8,5 +8,8 @@ Value STATE_PFXRCD (\S+?\s+\S+?|\S+?)
 Start
   ^BGP\s+router\s+identifier\s+${ROUTER_ID},\s+local\s+AS\s+number\s+${LOCAL_AS}\s*$$
   ^${BGP_NEIGH}\s+\S+\s+${NEIGH_AS}(\s+\d+?){5}\s+${UP_DOWN}\s+${STATE_PFXRCD}\s*$$ -> Record
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
 
 EOF
diff --git a/templates/cisco_ios_show_ip_device_tracking_all.template b/templates/cisco_ios_show_ip_device_tracking_all.template
@@ -17,4 +17,7 @@ Start
   ^\s*\^\s*$$
   ^.*Invalid input detected.*
   ^\s*$$
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
   ^.* -> Error
diff --git a/templates/cisco_ios_show_ip_eigrp_neighbors.template b/templates/cisco_ios_show_ip_eigrp_neighbors.template
@@ -14,6 +14,7 @@ Start
   ^\s*$$
   ^\s*H\s+Address\s+Interface\s+Hold\s+Uptime\s+SRTT\s+RTO\s+Q\s+Seq\s*$$
   ^\s+\(sec\)\s+\(ms\)\s+Cnt\s+Num\s*$$
+  # Capture time-stamp if vty line has command time-stamping turned on
   ^\s*Load\s+for
   ^Time\s+source\s+is
   ^. -> Error

diff --git a/templates/cisco_ios_show_ip_eigrp_topology.template b/templates/cisco_ios_show_ip_eigrp_topology.template
@@ -46,5 +46,8 @@ Gateway
   # If it doesn't match anything above, this just acknowledges a new line
   ^\s*$$
   # This will throw an error if there are no matches
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
   ^. -> Error
 
diff --git a/templates/cisco_ios_show_ip_flow_toptalkers.template b/templates/cisco_ios_show_ip_flow_toptalkers.template
@@ -8,4 +8,7 @@ Value DST_PORT ([A-Z0-9]+)
 Value PKT ([0-9]+)
 
 Start
-  ^${SRC_INTF}\s+${SRC_IPADDR}\s+${DST_INTF}\s+${DST_IPADDR}\s+${PROTO}\s+${SRC_PORT}\s+${DST_PORT}\s+${PKT} -> Record
+  ^${SRC_INTF}\s+${SRC_IPADDR}\s+${DST_INTF}\s+${DST_IPADDR}\s+${PROTO}\s+${SRC_PORT}\s+${DST_PORT}\s+${PKT} -> Record
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
diff --git a/templates/cisco_ios_show_ip_interface.template b/templates/cisco_ios_show_ip_interface.template
@@ -57,6 +57,9 @@ Start
   ^\s+(Input|Output|Post)\s+.*features
   ^\s+(IPv4\s+)?WCCP
   ^\s*$$
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
   ^. -> Error
 
 HELPERS

diff --git a/templates/cisco_ios_show_ip_interface_brief.template b/templates/cisco_ios_show_ip_interface_brief.template
@@ -5,3 +5,6 @@ Value PROTO (up|down)
 
 Start
   ^${INTF}\s+${IPADDR}\s+\w+\s+\w+\s+${STATUS}\s+${PROTO} -> Record
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
diff --git a/templates/cisco_ios_show_ip_mroute.template b/templates/cisco_ios_show_ip_mroute.template
@@ -23,4 +23,7 @@ Start
   ^.*[Ff]lags
   ^\s+\S+\s+-\s+
   ^\s+(?:Timers|Interface\s+state):
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
   ^. -> Error
diff --git a/templates/cisco_ios_show_ip_ospf_database.template b/templates/cisco_ios_show_ip_ospf_database.template
@@ -13,6 +13,9 @@ Start
   ^${LINK_ID}\s+${ADV_ROUTER}\s+${AGE}\s+\S+\s+\S+\s+${LINK_COUNT} -> Record
   ^${LINK_ID}\s+${ADV_ROUTER}\s+${AGE}\s+\S+\s+\S+ -> Record
   ^\s+Type-5 AS External Link States -> Tag
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
 
 Tag
   ^Link ID\s+ADV Router\s+Age\s+Seq#\s+Checksum\s+Tag -> Next.Clearall

diff --git a/templates/cisco_ios_show_ip_ospf_interface_brief.template b/templates/cisco_ios_show_ip_ospf_interface_brief.template
@@ -7,3 +7,6 @@ Value NEIGHBORS_FC (\d+/\d+)
 
 Start
   ^${INTERFACE}\s+\d+\s+${AREA}\s+${IP_ADDRESS_MASK}\s+${COST}\s+${STATE}\s+${NEIGHBORS_FC} -> Record
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
diff --git a/templates/cisco_ios_show_ip_ospf_neighbor.template b/templates/cisco_ios_show_ip_ospf_neighbor.template
@@ -7,3 +7,6 @@ Value INTERFACE (\S+)
 
 Start
   ^${NEIGHBOR_ID}\s+${PRIORITY}\s+${STATE}\s+${DEAD_TIME}\s+${ADDRESS}\s+${INTERFACE} -> Record
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
diff --git a/templates/cisco_ios_show_ip_prefix-list.template b/templates/cisco_ios_show_ip_prefix-list.template
@@ -10,4 +10,7 @@ Start
   ^ip\s+prefix-list\s+${NAME}:
   ^\s+seq\s+${SEQ}\s+${ACTION}\s+${NETWORK}/${NETMASK}(?:\s+ge\s+${GE}|)(?:\s+le\s+${LE}|)\s*$$ -> Record
   ^\s*$$
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
   ^.+ -> Error
diff --git a/templates/cisco_ios_show_ip_route.template b/templates/cisco_ios_show_ip_route.template
@@ -10,6 +10,9 @@ Value UPTIME (\d[\w:\.]+)
 
 Start
   ^Gateway.* -> Routes
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
 
 Routes
   # For "is (variably )subnetted" line, capture mask, clear all values.

diff --git a/templates/cisco_ios_show_ip_source_binding.template b/templates/cisco_ios_show_ip_source_binding.template
@@ -11,4 +11,7 @@ Start
   ^${MAC}\s+${IP}\s+${LEASE}\s+${TYPE}\s+${VLAN}\s+${INTERFACE} -> Record
   ^Total number of bindings
   ^\s*$$
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
   ^.*$$ -> Error
diff --git a/templates/cisco_ios_show_ipv6_interface_brief.template b/templates/cisco_ios_show_ipv6_interface_brief.template
@@ -6,6 +6,9 @@ Value PROTOCOL (\S+|\S+\s\S+)
 
 Start
   ^${INTF}\s+\[${ADMIN}/${PROTOCOL}\] -> Interfaces
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
 
 Interfaces
   ^(\S+)\s+\[(\S+|\S+\s\S+)/(\S+|\S+\s\S+)\] -> Continue.Record

diff --git a/templates/cisco_ios_show_ipv6_neighbors.template b/templates/cisco_ios_show_ipv6_neighbors.template
@@ -7,5 +7,8 @@ Value INTERFACE (\S+)
 Start
   ^IPv6\s+Address\s+Age\s+Link-layer\s+Addr\s+State\s+Interface\s*$$
   ^${ADDRESS}\s+${AGE}\s+${MAC}\s+${TYPE}\s+${INTERFACE} -> Record
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
   ^\s*$$
   ^. -> Error
diff --git a/templates/cisco_ios_show_isdn_status.template b/templates/cisco_ios_show_isdn_status.template
@@ -24,4 +24,6 @@ Start
   ^\s+Active dsl \d+ CCBs =\s+${ACTIVE_DSL_CCBS}
   ^\s+The Free Channel Mask:\s+${FREE_CHANNEL_MASK}
   ^\s+Number of L2 Discards =\s+${L2_DISCARDS}, L2 Session ID =\s+${L2_SESSION_ID} -> Record
-
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
diff --git a/templates/cisco_ios_show_isis_neighbors.template b/templates/cisco_ios_show_isis_neighbors.template
@@ -8,3 +8,6 @@ Value CIRCUIT_ID (\S+)
 
 Start
   ^${SYSTEM_ID}\s+${TYPE}\s+${INTERFACE}\s+${IP_ADDRESS}\s+${STATE}\s+${HOLD_TIME}\s+${CIRCUIT_ID} -> Record
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
diff --git a/templates/cisco_ios_show_lldp_neighbors.template b/templates/cisco_ios_show_lldp_neighbors.template
@@ -4,6 +4,9 @@ Value Required NEIGHBOR_INTERFACE (\S+)
 
 Start
   ^Device.*ID -> LLDP
+  # Capture time-stamp if vty line has command time-stamping turned on
+  ^Load\s+for\s+
+  ^Time\s+source\s+is
 
 LLDP
   ^${NEIGHBOR}\s*${LOCAL_INTERFACE}\s+\d+\s+(\S+)*\s+${NEIGHBOR_INTERFACE} -> Record