diff --git a/op-mode-definitions/show-console-server.xml.in b/op-mode-definitions/show-console-server.xml.in index 77a7f3376..253d15498 100644 --- a/op-mode-definitions/show-console-server.xml.in +++ b/op-mode-definitions/show-console-server.xml.in @@ -1,36 +1,36 @@ <?xml version="1.0"?> <interfaceDefinition> <node name="show"> <children> <node name="log"> <children> <leafNode name="console-server"> <properties> <help>Show log for serial console server</help> </properties> - <command>/usr/bin/journalctl -u conserver-server.service</command> + <command>/usr/bin/journalctl --unit conserver-server.service</command> </leafNode> </children> </node> <node name="console-server"> <properties> <help>Show Console-Server information</help> </properties> <children> <leafNode name="ports"> <properties> <help>Examine console ports and configured baud rates</help> </properties> <command>/usr/bin/console -x</command> </leafNode> <leafNode name="user"> <properties> <help>Show users on various consoles</help> </properties> <command>/usr/bin/console -u</command> </leafNode> </children> </node> </children> </node> </interfaceDefinition> diff --git a/op-mode-definitions/show-interfaces-pppoe.xml.in b/op-mode-definitions/show-interfaces-pppoe.xml.in index 393ca912f..18697a275 100644 --- a/op-mode-definitions/show-interfaces-pppoe.xml.in +++ b/op-mode-definitions/show-interfaces-pppoe.xml.in @@ -1,51 +1,51 @@ <?xml version="1.0"?> <interfaceDefinition> <node name="show"> <children> <node name="interfaces"> <children> <tagNode name="pppoe"> <properties> <help>Show PPPoE interface information</help> <completionHelp> <path>interfaces pppoe</path> </completionHelp> </properties> <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command> <children> <leafNode name="log"> <properties> <help>Show specified PPPoE interface log</help> </properties> - <command>/usr/bin/journalctl -u "ppp@$4".service</command> + <command>/usr/bin/journalctl --unit "ppp@$4".service</command> </leafNode> <leafNode name="statistics"> <properties> <help>Show specified PPPoE interface statistics</help> <completionHelp> <path>interfaces pppoe</path> </completionHelp> </properties> <command>if [ -d "/sys/class/net/$4" ]; then /usr/sbin/pppstats "$4"; fi</command> </leafNode> </children> </tagNode> <node name="pppoe"> <properties> <help>Show PPPoE interface information</help> </properties> <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=pppoe --action=show-brief</command> <children> <leafNode name="detail"> <properties> <help>Show detailed PPPoE interface information</help> </properties> <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=pppoe --action=show</command> </leafNode> </children> </node> </children> </node> </children> </node> </interfaceDefinition> diff --git a/op-mode-definitions/show-interfaces-wirelessmodem.xml.in b/op-mode-definitions/show-interfaces-wirelessmodem.xml.in index c0ab9c66f..18b1e55c7 100644 --- a/op-mode-definitions/show-interfaces-wirelessmodem.xml.in +++ b/op-mode-definitions/show-interfaces-wirelessmodem.xml.in @@ -1,51 +1,51 @@ <?xml version="1.0"?> <interfaceDefinition> <node name="show"> <children> <node name="interfaces"> <children> <tagNode name="wirelessmodem"> <properties> <help>Show Wireless Modem (WWAN) interface information</help> <completionHelp> <path>interfaces wirelessmodem</path> </completionHelp> </properties> <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command> <children> <leafNode name="log"> <properties> <help>Show specified WWAN interface log</help> </properties> - <command>/usr/bin/journalctl -u "ppp@$4".service</command> + <command>/usr/bin/journalctl --unit "ppp@$4".service</command> </leafNode> <leafNode name="statistics"> <properties> <help>Show specified WWAN interface statistics</help> <completionHelp> <path>interfaces wirelessmodem</path> </completionHelp> </properties> <command>if [ -d "/sys/class/net/$4" ]; then /usr/sbin/pppstats "$4"; fi</command> </leafNode> </children> </tagNode> <node name="wirelessmodem"> <properties> <help>Show Wireless Modem (WWAN) interface information</help> </properties> <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wirelessmodem --action=show-brief</command> <children> <leafNode name="detail"> <properties> <help>Show detailed Wireless Modem (WWAN( interface information</help> </properties> <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wirelessmodem --action=show</command> </leafNode> </children> </node> </children> </node> </children> </node> </interfaceDefinition> diff --git a/op-mode-definitions/show-log.xml.in b/op-mode-definitions/show-log.xml.in index 58216bfd1..bb2de1580 100644 --- a/op-mode-definitions/show-log.xml.in +++ b/op-mode-definitions/show-log.xml.in @@ -1,218 +1,218 @@ <?xml version="1.0"?> <interfaceDefinition> <node name="show"> <children> <node name="log"> <properties> <help>Show contents of current master log file</help> </properties> <command>/bin/journalctl</command> <children> <leafNode name="all"> <properties> <help>Show contents of all master log files</help> </properties> <command>sudo bash -c 'eval $(lesspipe); less $_vyatta_less_options --prompt=".logm, file %i of %m., page %dt of %D" -- `printf "%s\n" /var/log/messages* | sort -nr`'</command> </leafNode> <leafNode name="authorization"> <properties> <help>Show listing of authorization attempts</help> </properties> - <command>/bin/journalctl -q SYSLOG_FACILITY=10 SYSLOG_FACILITY=4</command> + <command>/bin/journalctl --quiet SYSLOG_FACILITY=10 SYSLOG_FACILITY=4</command> </leafNode> <leafNode name="cluster"> <properties> <help>Show log for Cluster</help> </properties> <command>cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e heartbeat -e cl_status -e mach_down -e ha_log</command> </leafNode> <leafNode name="conntrack-sync"> <properties> <help>Show log for Conntrack-sync</help> </properties> <command>cat $(printf "%s\n" /var/log/messages* | sort -nr ) | grep -e conntrackd</command> </leafNode> <leafNode name="dhcp"> <properties> <help>Show log for Dynamic Host Control Protocol (DHCP)</help> </properties> <command>cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep dhcpd</command> </leafNode> <node name="firewall"> <properties> <help>Show log for Firewall</help> </properties> <children> <tagNode name="ipv6-name"> <properties> <help>Show log for a specified firewall (IPv6)</help> <completionHelp> <path>firewall ipv6-name</path> </completionHelp> </properties> <command>cat $(printf "%s\n" /var/log/messages* | sort -nr ) | egrep "\[$5-([0-9]+|default)-[ADR]\]"</command> <children> <tagNode name="rule"> <properties> <help>Show log for a rule in the specified firewall</help> <completionHelp> <path>firewall ipv6-name ${COMP_WORDS[4]} rule</path> </completionHelp> </properties> <command>cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e "\[$5-$7-[ADR]\]"</command> </tagNode> </children> </tagNode> <tagNode name="name"> <properties> <help>Show log for a specified firewall (IPv4)</help> <completionHelp> <path>firewall name</path> </completionHelp> </properties> <command>cat $(printf "%s\n" /var/log/messages* | sort -nr ) | egrep "\[$5-([0-9]+|default)-[ADR]\]"</command> <children> <tagNode name="rule"> <properties> <help>Show log for a rule in the specified firewall</help> <completionHelp> <path>firewall name ${COMP_WORDS[4]} rule</path> </completionHelp> </properties> <command>cat $(printf "%s\n" /var/log/messages* | sort -nr) | egrep "\[$5-$7-[ADR]\]"</command> </tagNode> </children> </tagNode> </children> </node> <leafNode name="https"> <properties> <help>Show log for HTTPs</help> </properties> <command>cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e nginx</command> </leafNode> <tagNode name="image"> <properties> <help>Show contents of master log file for image</help> <completionHelp> <script>compgen -f /lib/live/mount/persistence/boot/ | grep -v grub | sed -e s@/lib/live/mount/persistence/boot/@@</script> </completionHelp> </properties> <command>less $_vyatta_less_options --prompt=".log, page %dt of %D" -- /lib/live/mount/persistence/boot/$4/rw/var/log/messages</command> <children> <leafNode name="all"> <properties> <help>Show contents of all master log files for image</help> </properties> <command>eval $(lesspipe); less $_vyatta_less_options --prompt=".log?m, file %i of %m., page %dt of %D" -- `printf "%s\n" /lib/live/mount/persistence/boot/$4/rw/var/log/messages* | sort -nr`</command> </leafNode> <leafNode name="authorization"> <properties> <help>Show listing of authorization attempts for image</help> </properties> <command>less $_vyatta_less_options --prompt=".log, page %dt of %D" -- /lib/live/mount/persistence/boot/$4/rw/var/log/auth.log</command> </leafNode> <tagNode name="tail"> <properties> <help>Show last changes to messages</help> <completionHelp> <list><NUMBER></list> </completionHelp> </properties> <command>tail -n "$6" /lib/live/mount/persistence/boot/$4/rw/var/log/messages | ${VYATTA_PAGER:-cat}</command> </tagNode> </children> </tagNode> <leafNode name="lldp"> <properties> <help>Show log for LLDP</help> </properties> <command>cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e lldpd</command> </leafNode> <leafNode name="nat"> <properties> <help>Show log for Network Address Translation (NAT)</help> </properties> <command>egrep -i "kernel:.*\[NAT-[A-Z]{3,}-[0-9]+(-MASQ)?\]" $(find /var/log -maxdepth 1 -type f -name messages\* | sort -t. -k2nr)</command> </leafNode> <leafNode name="openvpn"> <properties> <help>Show log for OpenVPN</help> </properties> <command>cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e openvpn</command> </leafNode> <leafNode name="snmp"> <properties> <help>Show log for Simple Network Monitoring Protocol (SNMP)</help> </properties> <command>cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e snmpd</command> </leafNode> <tagNode name="tail"> <properties> <help>Show last n changes to messages</help> <completionHelp> <list><NUMBER></list> </completionHelp> </properties> <command>tail -n "$4" /var/log/messages | ${VYATTA_PAGER:-cat}</command> </tagNode> <node name="tail"> <properties> <help>Show last 10 lines of /var/log/messages file</help> </properties> <command>tail -n 10 /var/log/messages</command> </node> <node name="vpn"> <properties> <help>Show log for Virtual Private Network (VPN)</help> </properties> <children> <leafNode name="all"> <properties> <help>Show log for ALL</help> </properties> <command>cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e charon -e accel -e pptpd -e ppp</command> </leafNode> <leafNode name="ipsec"> <properties> <help>Show log for IPSec</help> </properties> <command>cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e charon</command> </leafNode> <leafNode name="l2tp"> <properties> <help>Show log for L2TP</help> </properties> <command>cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e remote-access-aaa-win -e remote-access-zzz-mac -e accel-l2tp -e ppp</command> </leafNode> <leafNode name="pptp"> <properties> <help>Show log for PPTP</help> </properties> <command>cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e accel-pptp -e ppp</command> </leafNode> <leafNode name="sstp"> <properties> <help>Show log for SSTP</help> </properties> <command>cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e accel-sstp -e ppp</command> </leafNode> </children> </node> <leafNode name="vrrp"> <properties> <help>Show log for Virtual Router Redundancy Protocol (VRRP)</help> </properties> <command>cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e Keepalived_vrrp</command> </leafNode> <leafNode name="webproxy"> <properties> <help>Show log for Webproxy</help> </properties> <command>cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e "squid"</command> </leafNode> </children> </node> </children> </node> </interfaceDefinition>