From 20ab585a68982c4635c4e5a1ee5bbcc219feaebc Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Wed, 15 Jan 2025 20:38:43 +0100
Subject: syslog: T6989: move up "global preserve-fqdn" one level in CLI

Move "global preserve-fqdn" one CLI level up, as it relates to all logging
targets (console, global and remote).
---
 interface-definitions/system_syslog.xml.in | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/system_syslog.xml.in b/interface-definitions/system_syslog.xml.in
index f47a95f09..09cfd3dd4 100644
--- a/interface-definitions/system_syslog.xml.in
+++ b/interface-definitions/system_syslog.xml.in
@@ -8,6 +8,14 @@
           <priority>400</priority>
         </properties>
         <children>
+          <node name="console">
+            <properties>
+              <help>Log to system console (/dev/console)</help>
+            </properties>
+            <children>
+              #include <include/syslog-facility.xml.i>
+            </children>
+          </node>
           <tagNode name="remote">
             <properties>
               <help>Log to remote host</help>
@@ -84,22 +92,14 @@
                   </leafNode>
                 </children>
               </node>
-              <leafNode name="preserve-fqdn">
-                <properties>
-                  <help>uses FQDN for logging</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
             </children>
           </node>
-          <node name="console">
+          <leafNode name="preserve-fqdn">
             <properties>
-              <help>Log to system console (/dev/console)</help>
+              <help>Always include domain portion in hostname</help>
+              <valueless/>
             </properties>
-            <children>
-              #include <include/syslog-facility.xml.i>
-            </children>
-          </node>
+          </leafNode>
           #include <include/source-address-ipv4-ipv6.xml.i>
           #include <include/interface/vrf.xml.i>
         </children>
-- 
cgit v1.2.3