From 2015717bdc879e2a598984f60835d8e5710d721e Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Thu, 27 Jul 2023 21:58:39 +0200
Subject: T5411: add additional monitor log targets

---
 op-mode-definitions/show-log.xml.in | 102 +++++++++++++++++-------------------
 1 file changed, 49 insertions(+), 53 deletions(-)

(limited to 'op-mode-definitions/show-log.xml.in')

diff --git a/op-mode-definitions/show-log.xml.in b/op-mode-definitions/show-log.xml.in
index 579e348f7..925a780ac 100644
--- a/op-mode-definitions/show-log.xml.in
+++ b/op-mode-definitions/show-log.xml.in
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
+    <properties>
+      <help>Show system information</help>
+    </properties>
     <children>
       <tagNode name="log">
         <properties>
@@ -395,23 +398,6 @@
             </properties>
             <command>journalctl --no-hostname --boot --unit ssh.service</command>
           </leafNode>
-          <node name="sstpc">
-            <properties>
-              <help>Show log for SSTP client</help>
-            </properties>
-            <command>journalctl --no-hostname --boot --unit "ppp@sstpc*.service"</command>
-            <children>
-              <tagNode name="interface">
-                <properties>
-                  <help>Show SSTP client log on specific interface</help>
-                  <completionHelp>
-                    <path>interfaces sstpc</path>
-                  </completionHelp>
-                </properties>
-                <command>journalctl --no-hostname --boot --unit "ppp@$5.service"</command>
-              </tagNode>
-            </children>
-          </node>
           <tagNode name="tail">
             <properties>
               <help>Show last n changes to messages</help>
@@ -427,47 +413,57 @@
             </properties>
             <command>tail -n 10 /var/log/messages</command>
           </node>
-          <node name="vpn">
+          <leafNode name="vpn">
+            <properties>
+              <help>Monitor last lines of ALL Virtual Private Network services</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --unit strongswan.service --unit accel-ppp@*.service --unit ocserv.service</command>
+          </leafNode>
+          <leafNode name="ipsec">
+            <properties>
+              <help>Show log for IPsec</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --unit strongswan.service</command>
+          </leafNode>
+          <leafNode name="l2tp">
+            <properties>
+              <help>Show log for L2TP</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --unit accel-ppp@l2tp.service</command>
+          </leafNode>
+          <leafNode name="openconnect">
+            <properties>
+              <help>Show log for OpenConnect</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --unit ocserv.service</command>
+          </leafNode>
+          <leafNode name="pptp">
+            <properties>
+              <help>Show log for PPTP</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --unit accel-ppp@pptp.service</command>
+          </leafNode>
+          <leafNode name="sstp">
+            <properties>
+              <help>Show log for Secure Socket Tunneling Protocol (SSTP) server</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --unit accel-ppp@sstp.service</command>
+          </leafNode>
+          <node name="sstpc">
             <properties>
-              <help>Show log for Virtual Private Network (VPN)</help>
+              <help>Show log for Secure Socket Tunneling Protocol (SSTP) client</help>
             </properties>
+            <command>journalctl --no-hostname --boot --unit "ppp@sstpc*.service"</command>
             <children>
-              <leafNode name="all">
-                <properties>
-                  <help>Show log for ALL</help>
-                </properties>
-                <command>journalctl --no-hostname --boot --unit strongswan.service --unit accel-ppp@*.service --unit ocserv.service</command>
-              </leafNode>
-              <leafNode name="ipsec">
-                <properties>
-                  <help>Show log for IPsec</help>
-                </properties>
-                <command>journalctl --no-hostname --boot --unit strongswan.service</command>
-              </leafNode>
-              <leafNode name="l2tp">
-                <properties>
-                  <help>Show log for L2TP</help>
-                </properties>
-                <command>journalctl --no-hostname --boot --unit accel-ppp@l2tp.service</command>
-              </leafNode>
-              <leafNode name="openconnect">
-                <properties>
-                  <help>Show log for OpenConnect</help>
-                </properties>
-                <command>journalctl --no-hostname --boot --unit ocserv.service</command>
-              </leafNode>
-              <leafNode name="pptp">
-                <properties>
-                  <help>Show log for PPTP</help>
-                </properties>
-                <command>journalctl --no-hostname --boot --unit accel-ppp@pptp.service</command>
-              </leafNode>
-              <leafNode name="sstp">
+              <tagNode name="interface">
                 <properties>
-                  <help>Show log for SSTP</help>
+                  <help>Show SSTP client log on specific interface</help>
+                  <completionHelp>
+                    <path>interfaces sstpc</path>
+                  </completionHelp>
                 </properties>
-                <command>journalctl --no-hostname --boot --unit accel-ppp@sstp.service</command>
-              </leafNode>
+                <command>journalctl --no-hostname --boot --unit "ppp@$5.service"</command>
+              </tagNode>
             </children>
           </node>
           <leafNode name="vpp">
-- 
cgit v1.2.3