diff --git a/ntc_templates/templates/mikrotik_routeros_interface_ethernet_monitor_name_once.textfsm b/ntc_templates/templates/mikrotik_routeros_interface_ethernet_monitor_name_once.textfsm index 0931ad0347..db705d6b0c 100644 --- a/ntc_templates/templates/mikrotik_routeros_interface_ethernet_monitor_name_once.textfsm +++ b/ntc_templates/templates/mikrotik_routeros_interface_ethernet_monitor_name_once.textfsm @@ -18,4 +18,5 @@ Start ^\s*rx-flow-control:\s${rx_flow_control} ^\s*advertising:\s${advertising} ^\s*link-partner-advertising:\s${link_partner_advertising} + ^\s*(?:\d{2}:){2}\d{2}\s+echo:\s*.*$$ -> Next ^. -> Error diff --git a/ntc_templates/templates/mikrotik_routeros_ip_arp_print_without-paging.textfsm b/ntc_templates/templates/mikrotik_routeros_ip_arp_print_without-paging.textfsm index ca469a7578..19ece07517 100644 --- a/ntc_templates/templates/mikrotik_routeros_ip_arp_print_without-paging.textfsm +++ b/ntc_templates/templates/mikrotik_routeros_ip_arp_print_without-paging.textfsm @@ -9,4 +9,5 @@ Start EntriesTable ^\s*${index}\s*(${flags})?\s*${ip}\s*(${mac})?\s+(${interface})?\s+$$ -> Record + ^\s*(?:\d{2}:){2}\d{2}\s+echo:\s*.*$$ -> Next ^. -> Error diff --git a/ntc_templates/templates/mikrotik_routeros_ip_dhcp-server_lease_print_without-paging.textfsm b/ntc_templates/templates/mikrotik_routeros_ip_dhcp-server_lease_print_without-paging.textfsm index b911be2d3c..c4cac701af 100644 --- a/ntc_templates/templates/mikrotik_routeros_ip_dhcp-server_lease_print_without-paging.textfsm +++ b/ntc_templates/templates/mikrotik_routeros_ip_dhcp-server_lease_print_without-paging.textfsm @@ -16,4 +16,5 @@ EntriesTable ^\s*${index}\s(${flags})?\s{,4}${ip}\s+(${rate_limit})?\s+${status}\s+${last_seen}\s+$$ -> Record ^\s*${index}\s(${flags})?\s{,4}(${ip})?\s+${mac}\s+(${rate_limit})?\s+${status}\s+${last_seen}\s+$$ -> Record ^\s*${index}\s(${flags})?\s{,4}(${ip})?\s+(${mac}|\s{17})\s(${hostname})?\s+(${server})?\s+(${rate_limit})?\s+${status}\s+${last_seen}\s+$$ -> Record + ^\s*(?:\d{2}:){2}\d{2}\s+echo:\s*.*$$ -> Next ^. -> Error diff --git a/ntc_templates/templates/mikrotik_routeros_ip_firewall_filter_print_all_without-paging.textfsm b/ntc_templates/templates/mikrotik_routeros_ip_firewall_filter_print_all_without-paging.textfsm index 8e073d75c0..d5c0e0e839 100644 --- a/ntc_templates/templates/mikrotik_routeros_ip_firewall_filter_print_all_without-paging.textfsm +++ b/ntc_templates/templates/mikrotik_routeros_ip_firewall_filter_print_all_without-paging.textfsm @@ -27,4 +27,5 @@ FirewallTable ^\s?${index}\s+(${flags})?\s+;;;\s${comment} ^\s+chain=${chain}\s(action=${action}\s)?(connection-state=${connection_state}\s)?(connection-nat-state=${connection_nat_state}\s)?\s*(protocol=${protocol}\s)?(src-address=${src_address}\s)?(dst-address=${dst_address}\s)?(src-address-list=${src_address_list}\s)?(dst-address-list=${dst_address_list}\s)?(in-interface-list=${in_interface_list}\s)?(out-interface-list=${out_interface_list}\s)?(src-port=${src_port}\s)?(dst-port=${dst_port}\s)?(in-interface=${in_interface}\s)?(out-interface=${out_interface}\s)?(ipsec-policy=${ipsec_policy}\s)?(log=${log}\s)?(log-prefix="${log_prefix}"\s)?$$ -> Record ^\s?${index}\s+(${flags})?\s+chain=${chain}\s(action=${action}\s)?(connection-state=${connection_state}\s)?(connection-nat-state=${connection_nat_state}\s)?(protocol=${protocol}\s)?(src-address=${src_address}\s)?(dst-address=${dst_address}\s)?(src-address-list=${src_address_list}\s)?(dst-address-list=${dst_address_list}\s)?(in-interface-list=${in_interface_list}\s)?(out-interface-list=${out_interface_list}\s)?(src-port=${src_port}\s)?(dst-port=${dst_port}\s)?(in-interface=${in_interface}\s)?(out-interface=${out_interface}\s)?(ipsec-policy=${ipsec_policy}\s)?(log=${log}\s)?(log-prefix="${log_prefix}"\s)?$$ -> Record + ^\s*(?:\d{2}:){2}\d{2}\s+echo:\s*.*$$ -> Next ^. -> Error diff --git a/ntc_templates/templates/mikrotik_routeros_ip_firewall_nat_print_all_without-paging.textfsm b/ntc_templates/templates/mikrotik_routeros_ip_firewall_nat_print_all_without-paging.textfsm index c413c758d9..7cb4389820 100644 --- a/ntc_templates/templates/mikrotik_routeros_ip_firewall_nat_print_all_without-paging.textfsm +++ b/ntc_templates/templates/mikrotik_routeros_ip_firewall_nat_print_all_without-paging.textfsm @@ -27,4 +27,5 @@ NATTable ^\s?${index}\s+(${flags})?\s+;;;\s${comment} ^\s+chain=${chain}\saction=${action}\s(to-addresses=${to_addresses}\s)?(to-ports=${to_ports}\s)?(protocol=${protocol}\s)?(src-address=${src_address}\s)?(dst-address=${dst_address}\s)?(src-address-list=${src_address_list}\s)?(dst-address-list=${dst_address_list}\s)?(in-interface=${in_interface}\s)?(in-interface-list=${in_interface_list}\s)?(out-interface=${out_interface}\s)?(out-interface-list=${out_interface_list}\s)?(src-port=${src_port}\s)?(dst-port=${dst_port}\s)?(log=${log}\s)?(log-prefix="(${log_prefix})?"\s)?(ipsec-policy=${ipsec_policy}\s)?\s*$$ -> Record ^\s?${index}\s+(${flags})?\s+chain=${chain}\saction=${action}\s(to-addresses=${to_addresses}\s)?(to-ports=${to_ports}\s)?(protocol=${protocol}\s)?(src-address=${src_address}\s)?(dst-address=${dst_address}\s)?(src-address-list=${src_address_list}\s)?(dst-address-list=${dst_address_list}\s)?(in-interface=${in_interface}\s)?(in-interface-list=${in_interface_list}\s)?(out-interface=${out_interface}\s)?(out-interface-list=${out_interface_list}\s)?(src-port=${src_port}\s)?(dst-port=${dst_port}\s)?(log=${log}\s)?(log-prefix="(${log_prefix})?"\s)?(ipsec-policy=${ipsec_policy}\s)?\s*$$ -> Record + ^\s*(?:\d{2}:){2}\d{2}\s+echo:\s*.*$$ -> Next ^. -> Error diff --git a/ntc_templates/templates/mikrotik_routeros_ip_route_print_terse.textfsm b/ntc_templates/templates/mikrotik_routeros_ip_route_print_terse.textfsm index 14322970f0..673a844ca9 100644 --- a/ntc_templates/templates/mikrotik_routeros_ip_route_print_terse.textfsm +++ b/ntc_templates/templates/mikrotik_routeros_ip_route_print_terse.textfsm @@ -11,4 +11,5 @@ Value target_scope (\d+) Start ^\s?${index}\s${flags}\s\s(comment=${comment}\s)?dst-address=${dst_address}(\spref-src=${pref_src})?\sgateway=${gateway}\sgateway-status=${gateway_status}\sdistance=${distance}\sscope=${scope}(\starget-scope=${target_scope})?.*$$ -> Record + ^\s*(?:\d{2}:){2}\d{2}\s+echo:\s*.*$$ -> Next ^. -> Error diff --git a/ntc_templates/templates/mikrotik_routeros_snmp_community_print_without-paging.textfsm b/ntc_templates/templates/mikrotik_routeros_snmp_community_print_without-paging.textfsm index 002e0d966a..bbaeb677f2 100644 --- a/ntc_templates/templates/mikrotik_routeros_snmp_community_print_without-paging.textfsm +++ b/ntc_templates/templates/mikrotik_routeros_snmp_community_print_without-paging.textfsm @@ -11,4 +11,5 @@ Start SNMPCommunitiesTable ^\s?${index}\s+(${flags})?\s+${name}\s+${addresses}\s+${security}\s+${read_access}\s+${write_access}\s+$$ -> Record + ^\s*(?:\d{2}:){2}\d{2}\s+echo:\s*.*$$ -> Next ^. -> Error diff --git a/ntc_templates/templates/mikrotik_routeros_system_routerboard_print.textfsm b/ntc_templates/templates/mikrotik_routeros_system_routerboard_print.textfsm index fd55cba099..6d428f40ed 100644 --- a/ntc_templates/templates/mikrotik_routeros_system_routerboard_print.textfsm +++ b/ntc_templates/templates/mikrotik_routeros_system_routerboard_print.textfsm @@ -19,4 +19,5 @@ Start ^\s*factory-firmware:\s${factory_firmware} ^\s*current-firmware:\s${current_firmware} ^\s*upgrade-firmware:\s${upgrade_firmware} + ^\s*(?:\d{2}:){2}\d{2}\s+echo:\s*.*$$ -> Next ^. -> Error diff --git a/tests/mikrotik_routeros/interface_ethernet_monitor_name_once/mikrotik_routeros_interface_ethernet_monitor_name_once.raw b/tests/mikrotik_routeros/interface_ethernet_monitor_name_once/mikrotik_routeros_interface_ethernet_monitor_name_once.raw index a10fed3eaf..b900879782 100644 --- a/tests/mikrotik_routeros/interface_ethernet_monitor_name_once/mikrotik_routeros_interface_ethernet_monitor_name_once.raw +++ b/tests/mikrotik_routeros/interface_ethernet_monitor_name_once/mikrotik_routeros_interface_ethernet_monitor_name_once.raw @@ -3,6 +3,7 @@ auto-negotiation: done rate: 1Gbps full-duplex: yes +17:20:06 echo: system,error,critical login failure for user admin from 65.160.140.13 via ssh tx-flow-control: no rx-flow-control: no advertising: 10M-half,10M-full,100M-half,100M-full,1000M-half,1000M-full diff --git a/tests/mikrotik_routeros/ip_arp_print_without-paging/mikrotik_routeros_ip_arp_print_without-paging.raw b/tests/mikrotik_routeros/ip_arp_print_without-paging/mikrotik_routeros_ip_arp_print_without-paging.raw index 20da8b9a02..6aa6cc906f 100644 --- a/tests/mikrotik_routeros/ip_arp_print_without-paging/mikrotik_routeros_ip_arp_print_without-paging.raw +++ b/tests/mikrotik_routeros/ip_arp_print_without-paging/mikrotik_routeros_ip_arp_print_without-paging.raw @@ -1,4 +1,5 @@ Flags: X - disabled, I - invalid, H - DHCP, D - dynamic, P - published, C - complete # ADDRESS MAC-ADDRESS INTERFACE 0 D 185.163.212.158 dmz-1-vlan +17:20:06 echo: system,error,critical login failure for user admin from 65.160.140.13 via ssh 1 185.163.212.159 AF:D6:C8:F2:36:16 vlan-2 diff --git a/tests/mikrotik_routeros/ip_dhcp-server_lease_print_without-paging/mikrotik_routeros_ip_dhcp-server_lease_print_without-paging.raw b/tests/mikrotik_routeros/ip_dhcp-server_lease_print_without-paging/mikrotik_routeros_ip_dhcp-server_lease_print_without-paging.raw index ca4706840a..0d898266c9 100644 --- a/tests/mikrotik_routeros/ip_dhcp-server_lease_print_without-paging/mikrotik_routeros_ip_dhcp-server_lease_print_without-paging.raw +++ b/tests/mikrotik_routeros/ip_dhcp-server_lease_print_without-paging/mikrotik_routeros_ip_dhcp-server_lease_print_without-paging.raw @@ -1,4 +1,5 @@ Flags: X - disabled, R - radius, D - dynamic, B - blocked # ADDRESS MAC-ADDRESS HOST-NAME SERVER RATE-LIMIT STATUS LAST-SEEN +17:20:06 echo: system,error,critical login failure for user admin from 65.160.140.13 via ssh 0 AF:D6:C8:F2:36:16 waiting never 1 X 192.168.1.56 15 waiting never diff --git a/tests/mikrotik_routeros/ip_firewall_filter_print_all_without-paging/mikrotik_routeros_ip_firewall_filter_print_all_without-paging.raw b/tests/mikrotik_routeros/ip_firewall_filter_print_all_without-paging/mikrotik_routeros_ip_firewall_filter_print_all_without-paging.raw index c27eb503e5..922abfcb8d 100644 --- a/tests/mikrotik_routeros/ip_firewall_filter_print_all_without-paging/mikrotik_routeros_ip_firewall_filter_print_all_without-paging.raw +++ b/tests/mikrotik_routeros/ip_firewall_filter_print_all_without-paging/mikrotik_routeros_ip_firewall_filter_print_all_without-paging.raw @@ -23,6 +23,7 @@ Flags: X - disabled, I - invalid, D - dynamic 8 ;;; Acces WAN SNMP chain=input action=accept protocol=udp src-address-list=Supervision dst-port=161 +17:20:06 echo: system,error,critical login failure for user admin from 65.160.140.13 via ssh 9 ;;; defconf: accept to local loopback (for CAPsMAN) chain=input action=accept dst-address=127.0.0.1 @@ -57,6 +58,7 @@ Flags: X - disabled, I - invalid, D - dynamic 19 chain=forward connection-state=established,related 20 ;;; drop invalid connections +17:20:06 echo: system,error,critical login failure for user admin from 65.160.140.13 via ssh chain=forward action=drop connection-state=invalid protocol=tcp 21 ;;; Block all entrant diff --git a/tests/mikrotik_routeros/ip_firewall_nat_print_all_without-paging/mikrotik_routeros_ip_firewall_nat_print_all_without-paging.raw b/tests/mikrotik_routeros/ip_firewall_nat_print_all_without-paging/mikrotik_routeros_ip_firewall_nat_print_all_without-paging.raw index 3f371a450b..4ce0aa06de 100644 --- a/tests/mikrotik_routeros/ip_firewall_nat_print_all_without-paging/mikrotik_routeros_ip_firewall_nat_print_all_without-paging.raw +++ b/tests/mikrotik_routeros/ip_firewall_nat_print_all_without-paging/mikrotik_routeros_ip_firewall_nat_print_all_without-paging.raw @@ -1,10 +1,12 @@ Flags: X - disabled, I - invalid, D - dynamic +17:20:06 echo: system,error,critical login failure for user admin from 65.160.140.13 via ssh 0 ;;; dmz-1: masquerade chain=srcnat action=masquerade src-address=!185.163.212.156/30 out-interface-list=WAN ipsec-policy=out,none 1 chain=dstnat action=redirect protocol=icmp src-address=192.168.1.16 dst-address=31.31.31.31 in-interface-list=dmz-1 log=no log-prefix="" 2 X ;;; qsdqsdqsd +17:20:06 echo: system,error,critical login failure for user admin from 65.160.140.13 via ssh chain=srcnat action=accept protocol=vmtp in-interface=all-ethernet out-interface=ether4 log=no log-prefix="" 3 X chain=srcnat action=accept protocol=tcp src-address-list=Supervision dst-address-list=Eqinoxe src-port=80 dst-port=8080 log=no log-prefix="" diff --git a/tests/mikrotik_routeros/ip_route_print_terse/mikrotik_routeros_ip_route_print_terseIPv4.raw b/tests/mikrotik_routeros/ip_route_print_terse/mikrotik_routeros_ip_route_print_terseIPv4.raw index 6998594a9c..4ea77e8f86 100644 --- a/tests/mikrotik_routeros/ip_route_print_terse/mikrotik_routeros_ip_route_print_terseIPv4.raw +++ b/tests/mikrotik_routeros/ip_route_print_terse/mikrotik_routeros_ip_route_print_terseIPv4.raw @@ -1,5 +1,6 @@ 0 A S dst-address=0.0.0.0/0 gateway=23.90.232.243 gateway-status=23.90.232.243 reachable via pppoe-out1 distance=10 scope=30 target-scope=10 1 Db dst-address=0.0.0.0/0 gateway=23.90.232.243 gateway-status=23.90.232.243 reachable via pppoe-out1 distance=20 scope=40 target-scope=10 bgp-as-path=57809 bgp-local-pref=300 bgp-origin=incomplete received-from=23.90.232.243-peer +17:20:06 echo: system,error,critical login failure for user admin from 65.160.140.13 via ssh 2 DS dst-address=0.0.0.0/0 gateway=pppoe-out1 gateway-status=pppoe-out1 reachable distance=100 scope=30 target-scope=10 3 ADC dst-address=23.90.232.243/32 pref-src=100.95.1.127 gateway=pppoe-out1 gateway-status=pppoe-out1 reachable distance=0 scope=10 4 ADC dst-address=185.163.212.156/30 pref-src=185.163.212.157 gateway=dmz-1-vlan gateway-status=dmz-1-vlan reachable distance=0 scope=10 diff --git a/tests/mikrotik_routeros/ip_route_print_terse/mikrotik_routeros_ip_route_print_terseIPv6.raw b/tests/mikrotik_routeros/ip_route_print_terse/mikrotik_routeros_ip_route_print_terseIPv6.raw index 53a054ec3a..6e90f67a46 100644 --- a/tests/mikrotik_routeros/ip_route_print_terse/mikrotik_routeros_ip_route_print_terseIPv6.raw +++ b/tests/mikrotik_routeros/ip_route_print_terse/mikrotik_routeros_ip_route_print_terseIPv6.raw @@ -1,5 +1,6 @@ 0 ADS dst-address=::/0 gateway=pppoe-out1 gateway-status=pppoe-out1 reachable distance=100 scope=30 target-scope=10 1 ADC dst-address=2a05:c100:7::/64 gateway=bridge-lan gateway-status=bridge-lan reachable distance=0 scope=10 2 S dst-address=9bb8:baac:d400::/38 gateway=ether4 gateway-status=ether4 unreachable distance=44 scope=30 target-scope=10 +17:20:06 echo: system,error,critical login failure for user admin from 65.160.140.13 via ssh 3 X S dst-address=ec64:a7fd:bc1c:14c:7960:5000::/84 gateway=ether2 gateway-status=ether2 inactive distance=7 scope=30 target-scope=10 4 S dst-address=fd79:f1d4:a400::/39 gateway=ether5 gateway-status=ether5 unreachable distance=24 scope=30 target-scope=10 diff --git a/tests/mikrotik_routeros/snmp_community_print_without-paging/mikrotik_routeros_snmp_community_print_without-paging.raw b/tests/mikrotik_routeros/snmp_community_print_without-paging/mikrotik_routeros_snmp_community_print_without-paging.raw index bc36b9c339..2627e47976 100644 --- a/tests/mikrotik_routeros/snmp_community_print_without-paging/mikrotik_routeros_snmp_community_print_without-paging.raw +++ b/tests/mikrotik_routeros/snmp_community_print_without-paging/mikrotik_routeros_snmp_community_print_without-paging.raw @@ -1,3 +1,5 @@ +17:20:06 echo: system,error,critical login failure for user admin from 65.160.140.13 via ssh Flags: * - default, X - disabled # NAME ADDRESSES SECURITY READ-ACCESS WRITE-ACCESS +17:20:06 echo: system,error,critical login failure for user admin from 65.160.140.13 via ssh 0 * Monitoring ::/0 none yes no