From 3ee8e128702de0111574e13819e614ec410cdb63 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 21 May 2022 21:45:52 +0200
Subject: op-mode: T4390: add nhrp and flow-accounting logging

---
 op-mode-definitions/monitor-log.xml.in | 24 ++++++++++++++++++------
 op-mode-definitions/show-log.xml.in    | 12 ++++++++++++
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/op-mode-definitions/monitor-log.xml.in b/op-mode-definitions/monitor-log.xml.in
index 6f82ce611..7ecce4f78 100644
--- a/op-mode-definitions/monitor-log.xml.in
+++ b/op-mode-definitions/monitor-log.xml.in
@@ -16,18 +16,18 @@
           </node>
           <node name="dhcp">
             <properties>
-              <help>Show log for Dynamic Host Control Protocol (DHCP)</help>
+              <help>Monitor last lines of Dynamic Host Control Protocol (DHCP)</help>
             </properties>
             <children>
               <node name="server">
                 <properties>
-                  <help>Show log for DHCP server</help>
+                  <help>Monitor last lines of DHCP server</help>
                 </properties>
                 <command>journalctl --no-hostname --follow --boot --unit isc-dhcp-server.service</command>
               </node>
               <node name="client">
                 <properties>
-                  <help>Show DHCP client logs</help>
+                  <help>Monitor last lines of DHCP client</help>
                 </properties>
                 <command>journalctl --no-hostname --follow --boot --unit "dhclient@*.service"</command>
                 <children>
@@ -46,18 +46,18 @@
           </node>
           <node name="dhcpv6">
             <properties>
-              <help>Show log for Dynamic Host Control Protocol IPv6 (DHCPv6)</help>
+              <help>Monitor last lines of Dynamic Host Control Protocol IPv6 (DHCPv6)</help>
             </properties>
             <children>
               <node name="server">
                 <properties>
-                  <help>Show log for DHCPv6 server</help>
+                  <help>Monitor last lines of DHCPv6 server</help>
                 </properties>
                 <command>journalctl --no-hostname --follow --boot --unit isc-dhcp-server6.service</command>
               </node>
               <node name="client">
                 <properties>
-                  <help>Show DHCPv6 client logs</help>
+                  <help>Monitor last lines of DHCPv6 client</help>
                 </properties>
                 <command>journalctl --no-hostname --follow --boot --unit "dhcp6c@*.service"</command>
                 <children>
@@ -74,12 +74,24 @@
               </node>
             </children>
           </node>
+          <leafNode name="flow-accounting">
+            <properties>
+              <help>Monitor last lines of flow-accounting log</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --follow --unit uacctd.service</command>
+          </leafNode>
           <leafNode name="kernel">
             <properties>
               <help>Monitor last lines of Linux Kernel log</help>
             </properties>
             <command>journalctl --no-hostname --boot --follow --dmesg</command>
           </leafNode>
+          <leafNode name="nhrp">
+            <properties>
+              <help>Monitor last lines of NHRP log</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --unit opennhrp.service</command>
+          </leafNode>
           <node name="pppoe">
             <properties>
               <help>Monitor last lines of PPPoE log</help>
diff --git a/op-mode-definitions/show-log.xml.in b/op-mode-definitions/show-log.xml.in
index 954369712..76879e5d6 100644
--- a/op-mode-definitions/show-log.xml.in
+++ b/op-mode-definitions/show-log.xml.in
@@ -139,6 +139,12 @@
               </tagNode>
             </children>
           </node>
+          <leafNode name="flow-accounting">
+            <properties>
+              <help>Show log for flow-accounting</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --unit uacctd.service</command>
+          </leafNode>
           <leafNode name="https">
             <properties>
               <help>Show log for HTTPs</help>
@@ -195,6 +201,12 @@
             </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="nhrp">
+            <properties>
+              <help>Show log for NHRP</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --unit opennhrp.service</command>
+          </leafNode>
           <node name="openvpn">
             <properties>
               <help>Show log for OpenVPN</help>
-- 
cgit v1.2.3