From b7189cd1df327621a304ca65626a517223db6432 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 4 Oct 2021 19:49:07 +0200
Subject: op-mode: dhcpv(v6): T3890: retrieve both server and client logfiles

* rename: "show log dhcp" will become "show log dhcp server"

* add: "show log dhcp client" to display logs from ALL DHCP client processes
* add: "show log dhcp client interface <name>" to display logs from individual
  DHCP client processes
* add: "show log dhcpv6 server" to display infos about running DHCPv6 server
* add: "show log dhcpv6 client" to display logs from ALL DHCPv6 client processes
* add: "show log dhcpv6 client interface <name>" to display logs from individual
  DHCPv6 client processes

(cherry picked from commit ffd73958e42c20f69ded64393491966e0c9230c6)
---
 op-mode-definitions/show-log.xml.in | 60 +++++++++++++++++++++++++++++++++++--
 1 file changed, 57 insertions(+), 3 deletions(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/show-log.xml.in b/op-mode-definitions/show-log.xml.in
index f31c85245..3156d822a 100644
--- a/op-mode-definitions/show-log.xml.in
+++ b/op-mode-definitions/show-log.xml.in
@@ -32,12 +32,66 @@
             </properties>
             <command>journalctl --boot --unit conntrackd.service</command>
           </leafNode>
-          <leafNode name="dhcp">
+          <node 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>
+            <children>
+              <node name="server">
+                <properties>
+                  <help>Show log for DHCP server</help>
+                </properties>
+                <command>journalctl --boot --unit isc-dhcp-server.service</command>
+              </node>
+              <node name="client">
+                <properties>
+                  <help>Show DHCP client logs</help>
+                </properties>
+                <command>journalctl --boot --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 --boot --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 --boot --unit isc-dhcp-server6.service</command>
+              </node>
+              <node name="client">
+                <properties>
+                  <help>Show DHCPv6 client logs</help>
+                </properties>
+                <command>journalctl --boot --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 --boot --unit "dhcp6c@$6.service"</command>
+                  </tagNode>
+                </children>
+              </node>
+            </children>
+          </node>
           <node name="firewall">
             <properties>
               <help>Show log for Firewall</help>
-- 
cgit v1.2.3