From 97eb86c4866d5f7777e525f5eba1c1c3da3b67c8 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 7 Jul 2022 12:37:45 +0200
Subject: dns: op-mode: T2488: retrieve log info from journalctl

---
 op-mode-definitions/dns-forwarding.xml.in | 43 ++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/op-mode-definitions/dns-forwarding.xml.in b/op-mode-definitions/dns-forwarding.xml.in
index 6574f2319..baf60efbd 100644
--- a/op-mode-definitions/dns-forwarding.xml.in
+++ b/op-mode-definitions/dns-forwarding.xml.in
@@ -1,5 +1,46 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
+  <node name="monitor">
+    <children>
+      <node name="log">
+        <children>
+          <node name="dns">
+            <properties>
+              <help>Monitor last lines of Domain Name Service (DNS)</help>
+            </properties>
+            <children>
+              <node name="forwarding">
+                <properties>
+                  <help>Monitor last lines of DNS forwarding</help>
+                </properties>
+                <command>journalctl --no-hostname --follow --boot --unit pdns-recursor.service</command>
+              </node>
+            </children>
+          </node>
+        </children>
+      </node>
+      <node name="dns">
+        <properties>
+          <help>Show DNS information</help>
+        </properties>
+        <children>
+          <node name="forwarding">
+            <properties>
+              <help>Show DNS forwarding information</help>
+            </properties>
+            <children>
+              <leafNode name="statistics">
+                <properties>
+                  <help>Show DNS forwarding statistics</help>
+                </properties>
+                <command>sudo ${vyos_op_scripts_dir}/dns_forwarding_statistics.py</command>
+              </leafNode>
+            </children>
+          </node>
+        </children>
+      </node>
+    </children>
+  </node>
   <node name="show">
     <children>
       <node name="log">
@@ -13,7 +54,7 @@
                 <properties>
                   <help>Show log for DNS Forwarding</help>
                 </properties>
-                <command>cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e "pdns_recursor"</command>
+                <command>journalctl --no-hostname --boot --unit pdns-recursor.service</command>
               </node>
             </children>
           </node>
-- 
cgit v1.2.3