From 2e4edfd3f0f9eb306e42f119f73347deaecb7c47 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 23 Jan 2023 07:38:22 +0100
Subject: op-mode: T4949: backport "monitor log" commands from current

---
 op-mode-definitions/monitor-log.xml.in | 107 +++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)

diff --git a/op-mode-definitions/monitor-log.xml.in b/op-mode-definitions/monitor-log.xml.in
index 352c84ff1..c14afc559 100644
--- a/op-mode-definitions/monitor-log.xml.in
+++ b/op-mode-definitions/monitor-log.xml.in
@@ -14,6 +14,113 @@
             </properties>
             <command>grc tail --follow=name /var/log/messages</command>
           </node>
+          <node name="dhcp">
+            <properties>
+              <help>Show log for Dynamic Host Control Protocol (DHCP)</help>
+            </properties>
+            <children>
+              <node name="server">
+                <properties>
+                  <help>Show log for DHCP server</help>
+                </properties>
+                <command>journalctl --no-hostname --boot --follow --unit isc-dhcp-server.service</command>
+              </node>
+              <node name="client">
+                <properties>
+                  <help>Show DHCP client logs</help>
+                </properties>
+                <command>journalctl --no-hostname --boot --follow --unit "dhclient@*.service"</command>
+                <children>
+                  <tagNode name="interface">
+                    <properties>
+                      <help>Show DHCP client log on specific interface</help>
+                      <completionHelp>
+                        <script>${vyos_completion_dir}/list_interfaces.py --broadcast</script>
+                      </completionHelp>
+                    </properties>
+                    <command>journalctl --no-hostname --boot --follow --unit "dhclient@$6.service"</command>
+                  </tagNode>
+                </children>
+              </node>
+            </children>
+          </node>
+          <node name="dhcpv6">
+            <properties>
+              <help>Show log for Dynamic Host Control Protocol IPv6 (DHCPv6)</help>
+            </properties>
+            <children>
+              <node name="server">
+                <properties>
+                  <help>Show log for DHCPv6 server</help>
+                </properties>
+                <command>journalctl --no-hostname --boot --follow --unit isc-dhcp-server6.service</command>
+              </node>
+              <node name="client">
+                <properties>
+                  <help>Show DHCPv6 client logs</help>
+                </properties>
+                <command>journalctl --no-hostname --boot --follow --unit "dhcp6c@*.service"</command>
+                <children>
+                  <tagNode name="interface">
+                    <properties>
+                      <help>Show DHCPv6 client log on specific interface</help>
+                      <completionHelp>
+                        <script>${vyos_completion_dir}/list_interfaces.py</script>
+                      </completionHelp>
+                    </properties>
+                    <command>journalctl --no-hostname --boot --follow --unit "dhcp6c@$6.service"</command>
+                  </tagNode>
+                </children>
+              </node>
+            </children>
+          </node>
+          <leafNode name="https">
+            <properties>
+              <help>Show log for HTTPs</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --follow --unit nginx.service</command>
+          </leafNode>
+          <leafNode name="lldp">
+            <properties>
+              <help>Show log for LLDP</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --follow --unit lldpd.service</command>
+          </leafNode>
+          <node name="openvpn">
+            <properties>
+              <help>Show log for OpenVPN</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --follow --unit openvpn@*.service</command>
+            <children>
+              <tagNode name="interface">
+                <properties>
+                  <help>Show OpenVPN log on specific interface</help>
+                  <completionHelp>
+                    <path>interfaces openvpn</path>
+                  </completionHelp>
+                </properties>
+                <command>journalctl --no-hostname --boot --follow --unit openvpn@$5.service</command>
+              </tagNode>
+            </children>
+          </node>
+          <leafNode name="snmp">
+            <properties>
+              <help>Show log for Simple Network Monitoring Protocol (SNMP)</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --follow --unit snmpd.service</command>
+          </leafNode>
+          <leafNode name="vrrp">
+            <properties>
+              <help>Show log for Virtual Router Redundancy Protocol (VRRP)</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --follow --unit keepalived.service</command>
+          </leafNode>
+          <leafNode name="webproxy">
+            <properties>
+              <help>Show log for Webproxy</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --follow --unit squid.service</command>
+          </leafNode>
         </children>
       </node>
     </children>
-- 
cgit v1.2.3


From 17f6027f318b3edb0087ecfa15755bc474ea8319 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 23 Jan 2023 06:33:45 +0100
Subject: op-mode: T4949: add "show|monitor log ipoe-server" command

(cherry picked from commit 68a8cd2612cb1b00d381059747de8107f38e8c96)
---
 op-mode-definitions/monitor-log.xml.in | 6 ++++++
 op-mode-definitions/show-log.xml.in    | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/op-mode-definitions/monitor-log.xml.in b/op-mode-definitions/monitor-log.xml.in
index c14afc559..e06516ee7 100644
--- a/op-mode-definitions/monitor-log.xml.in
+++ b/op-mode-definitions/monitor-log.xml.in
@@ -80,6 +80,12 @@
             </properties>
             <command>journalctl --no-hostname --boot --follow --unit nginx.service</command>
           </leafNode>
+          <leafNode name="ipoe-server">
+            <properties>
+              <help>Monitor last lines of IPoE server log</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --follow --unit accel-ppp@ipoe.service</command>
+          </leafNode>
           <leafNode name="lldp">
             <properties>
               <help>Show log for LLDP</help>
diff --git a/op-mode-definitions/show-log.xml.in b/op-mode-definitions/show-log.xml.in
index 4c0a7913b..ec3d8cbbf 100644
--- a/op-mode-definitions/show-log.xml.in
+++ b/op-mode-definitions/show-log.xml.in
@@ -177,6 +177,12 @@
               </tagNode>
             </children>
           </tagNode>
+          <leafNode name="ipoe-server">
+            <properties>
+              <help>Show log for IPoE server</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --unit accel-ppp@ipoe.service</command>
+          </leafNode>
           <leafNode name="kernel">
             <properties>
               <help>Show messages in kernel ring buffer</help>
-- 
cgit v1.2.3


From a383ba561b5709fb0686576a6946218eccf9f4f1 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 23 Jan 2023 06:33:53 +0100
Subject: op-mode: add "show|monitor log pppoe-server" command

(cherry picked from commit 1bd69a81dc32fdaa62be27e4f5ae3cfe333f2a26)
---
 op-mode-definitions/monitor-log.xml.in | 23 +++++++++++++++++++++++
 op-mode-definitions/show-log.xml.in    | 23 +++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/op-mode-definitions/monitor-log.xml.in b/op-mode-definitions/monitor-log.xml.in
index e06516ee7..7af9f9431 100644
--- a/op-mode-definitions/monitor-log.xml.in
+++ b/op-mode-definitions/monitor-log.xml.in
@@ -109,6 +109,29 @@
               </tagNode>
             </children>
           </node>
+          <node name="pppoe">
+            <properties>
+              <help>Monitor last lines of PPPoE interface log</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --follow --unit "ppp@pppoe*.service"</command>
+            <children>
+              <tagNode name="interface">
+                <properties>
+                  <help>Monitor last lines of PPPoE log for specific interface</help>
+                  <completionHelp>
+                    <path>interfaces pppoe</path>
+                  </completionHelp>
+                </properties>
+                <command>journalctl --no-hostname --boot --follow --unit "ppp@$5.service"</command>
+              </tagNode>
+            </children>
+          </node>
+          <leafNode name="pppoe-server">
+            <properties>
+              <help>Monitor last lines of PPPoE server log</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --follow --unit accel-ppp@pppoe.service</command>
+          </leafNode>
           <leafNode name="snmp">
             <properties>
               <help>Show log for Simple Network Monitoring Protocol (SNMP)</help>
diff --git a/op-mode-definitions/show-log.xml.in b/op-mode-definitions/show-log.xml.in
index ec3d8cbbf..9a8145f10 100644
--- a/op-mode-definitions/show-log.xml.in
+++ b/op-mode-definitions/show-log.xml.in
@@ -218,6 +218,29 @@
               </tagNode>
             </children>
           </node>
+          <node name="pppoe">
+            <properties>
+              <help>Show log for PPPoE interface</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --unit "ppp@pppoe*.service"</command>
+            <children>
+              <tagNode name="interface">
+                <properties>
+                  <help>Show PPPoE log on specific interface</help>
+                  <completionHelp>
+                    <path>interfaces pppoe</path>
+                  </completionHelp>
+                </properties>
+                <command>journalctl --no-hostname --boot --unit "ppp@$5.service"</command>
+              </tagNode>
+            </children>
+          </node>
+          <leafNode name="pppoe-server">
+            <properties>
+              <help>Show log for PPPoE server</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --unit accel-ppp@pppoe.service</command>
+          </leafNode>
           <leafNode name="snmp">
             <properties>
               <help>Show log for Simple Network Monitoring Protocol (SNMP)</help>
-- 
cgit v1.2.3