From 2015717bdc879e2a598984f60835d8e5710d721e Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Thu, 27 Jul 2023 21:58:39 +0200 Subject: [PATCH] T5411: add additional monitor log targets --- Makefile | 3 - op-mode-definitions/monitor-bridge.xml.in | 4 +- op-mode-definitions/monitor-log.xml.in | 107 +++++++++++++--------- op-mode-definitions/monitor-ndp.xml.in | 8 +- op-mode-definitions/show-log.xml.in | 102 ++++++++++----------- 5 files changed, 118 insertions(+), 106 deletions(-) diff --git a/Makefile b/Makefile index 25f2c96d25..fe17ce9941 100644 --- a/Makefile +++ b/Makefile @@ -61,10 +61,7 @@ op_mode_definitions: $(op_xml_obj) rm -f $(OP_TMPL_DIR)/clear/node.def rm -f $(OP_TMPL_DIR)/delete/node.def rm -f $(OP_TMPL_DIR)/generate/node.def - rm -f $(OP_TMPL_DIR)/monitor/node.def rm -f $(OP_TMPL_DIR)/set/node.def - rm -f $(OP_TMPL_DIR)/show/node.def - rm -f $(OP_TMPL_DIR)/show/system/node.def rm -f $(OP_TMPL_DIR)/show/tech-support/node.def # XXX: ping and traceroute must be able to recursivly call itself as the diff --git a/op-mode-definitions/monitor-bridge.xml.in b/op-mode-definitions/monitor-bridge.xml.in index 712a924f1f..a43fa6dd9f 100644 --- a/op-mode-definitions/monitor-bridge.xml.in +++ b/op-mode-definitions/monitor-bridge.xml.in @@ -4,14 +4,14 @@ - Monitoring bridge database generated objects and address changes + Monitor bridge database changes sudo bridge monitor all sudo bridge monitor link - Monitoring bridge database generated connection interface changes + Monitor bridge database generated connection interface changes diff --git a/op-mode-definitions/monitor-log.xml.in b/op-mode-definitions/monitor-log.xml.in index 8f3f734780..c7be07aa88 100644 --- a/op-mode-definitions/monitor-log.xml.in +++ b/op-mode-definitions/monitor-log.xml.in @@ -1,6 +1,9 @@ + + Monitor system information + @@ -27,6 +30,12 @@ + + + Monitor last lines of conntrack-sync log + + journalctl --no-hostname --follow --boot --unit conntrackd.service + Monitor last lines of Dynamic Host Control Protocol log @@ -117,6 +126,23 @@ journalctl --no-hostname --boot --follow --unit chrony.service + + + Monitor last lines of OpenVPN log + + journalctl --no-hostname --boot --follow --unit openvpn@*.service + + + + Monitor last lines of specific OpenVPN interface log + + interfaces openvpn + + + journalctl --no-hostname --boot --unit openvpn@$5.service + + + Monitor last lines of PPPoE interface log @@ -248,9 +274,45 @@ journalctl --no-hostname --boot --follow --unit ssh.service + + + Monitor last lines of ALL Virtual Private Network services + + journalctl --no-hostname --boot --follow --unit strongswan.service --unit accel-ppp@*.service --unit ocserv.service + + + + Monitor last lines of IPsec log + + journalctl --no-hostname --boot --follow --unit strongswan.service + + + + Monitor last lines of L2TP log + + journalctl --no-hostname --boot --follow --unit accel-ppp@l2tp.service + + + + Monitor last lines of OpenConnect log + + journalctl --no-hostname --boot --follow --unit ocserv.service + + + + Monitor last lines of PPTP log + + journalctl --no-hostname --boot --follow --unit accel-ppp@pptp.service + + + + Monitor last lines of Secure Socket Tunneling Protocol server + + journalctl --no-hostname --boot --follow --unit accel-ppp@sstp.service + - Monitor last lines of Secure Socket Tunneling Protocol log + Monitor last lines of Secure Socket Tunneling Protocol client journalctl --no-hostname --boot --follow --unit "ppp@sstpc*.service" @@ -265,49 +327,6 @@ - - - Monitor Virtual Private Network services - - - - - Monitor last lines of ALL VPNs - - journalctl --no-hostname --boot --follow --unit strongswan.service --unit accel-ppp@*.service --unit ocserv.service - - - - Monitor last lines of IPsec log - - journalctl --no-hostname --boot --follow --unit strongswan.service - - - - Monitor last lines of L2TP log - - journalctl --no-hostname --boot --follow --unit accel-ppp@l2tp.service - - - - Monitor last lines of OpenConnect log - - journalctl --no-hostname --boot --follow --unit ocserv.service - - - - Monitor last lines of PPTP log - - journalctl --no-hostname --boot --follow --unit accel-ppp@pptp.service - - - - Monitor last lines of SSTP log - - journalctl --no-hostname --boot --follow --unit accel-ppp@sstp.service - - - Monitor last lines of Vector Packet Processor log diff --git a/op-mode-definitions/monitor-ndp.xml.in b/op-mode-definitions/monitor-ndp.xml.in index 26d881f1ac..3b08f3d733 100644 --- a/op-mode-definitions/monitor-ndp.xml.in +++ b/op-mode-definitions/monitor-ndp.xml.in @@ -4,14 +4,14 @@ - Monitor the NDP information received by the router through the device + Monitor Neighbor Discovery Protocol (NDP) information sudo ndptool monitor sudo ndptool monitor --ifname=$4 - Monitor ndp protocol on specified interface + Monitor Neighbor Discovery Protocol on specified interface @@ -20,7 +20,7 @@ sudo ndptool monitor --ifname=$4 --msg-type=$6 - Monitor specific types of NDP protocols + Monitor specific Neighbor Discovery Protocol type rs ra ns na @@ -31,7 +31,7 @@ sudo ndptool monitor --msg-type=$4 - Monitor specific types of NDP protocols + Monitor specific Neighbor Discovery Protocol type rs ra ns na diff --git a/op-mode-definitions/show-log.xml.in b/op-mode-definitions/show-log.xml.in index 579e348f74..925a780acf 100644 --- a/op-mode-definitions/show-log.xml.in +++ b/op-mode-definitions/show-log.xml.in @@ -1,6 +1,9 @@ + + Show system information + @@ -395,23 +398,6 @@ journalctl --no-hostname --boot --unit ssh.service - - - Show log for SSTP client - - journalctl --no-hostname --boot --unit "ppp@sstpc*.service" - - - - Show SSTP client log on specific interface - - interfaces sstpc - - - journalctl --no-hostname --boot --unit "ppp@$5.service" - - - Show last n changes to messages @@ -427,47 +413,57 @@ tail -n 10 /var/log/messages - + + + Monitor last lines of ALL Virtual Private Network services + + journalctl --no-hostname --boot --unit strongswan.service --unit accel-ppp@*.service --unit ocserv.service + + + + Show log for IPsec + + journalctl --no-hostname --boot --unit strongswan.service + + + + Show log for L2TP + + journalctl --no-hostname --boot --unit accel-ppp@l2tp.service + + + + Show log for OpenConnect + + journalctl --no-hostname --boot --unit ocserv.service + + + + Show log for PPTP + + journalctl --no-hostname --boot --unit accel-ppp@pptp.service + + + + Show log for Secure Socket Tunneling Protocol (SSTP) server + + journalctl --no-hostname --boot --unit accel-ppp@sstp.service + + - Show log for Virtual Private Network (VPN) + Show log for Secure Socket Tunneling Protocol (SSTP) client + journalctl --no-hostname --boot --unit "ppp@sstpc*.service" - - - Show log for ALL - - journalctl --no-hostname --boot --unit strongswan.service --unit accel-ppp@*.service --unit ocserv.service - - - - Show log for IPsec - - journalctl --no-hostname --boot --unit strongswan.service - - - - Show log for L2TP - - journalctl --no-hostname --boot --unit accel-ppp@l2tp.service - - - - Show log for OpenConnect - - journalctl --no-hostname --boot --unit ocserv.service - - - - Show log for PPTP - - journalctl --no-hostname --boot --unit accel-ppp@pptp.service - - + - Show log for SSTP + Show SSTP client log on specific interface + + interfaces sstpc + - journalctl --no-hostname --boot --unit accel-ppp@sstp.service - + journalctl --no-hostname --boot --unit "ppp@$5.service" +