Merge pull request #1758 from c-po/t3008-chrony

ntp: T3008: migrate from ntpd to chrony

4 files changed, 16 insertions, 35 deletions

diff --git a/op-mode-definitions/date.xml.in b/op-mode-definitions/date.xml.in
index 15a69dbd9..6d8586025 100644
--- a/op-mode-definitions/date.xml.in
+++ b/op-mode-definitions/date.xml.in
@@ -37,28 +37,6 @@
         </properties>
         <command>/bin/date "$3"</command>
       </tagNode>
-      <node name="date">
-        <properties>
-          <help>Set system date and time</help>
-        </properties>
-        <children>
-          <node name="ntp">
-            <properties>
-              <help>Set system date and time from NTP server (default: 0.pool.ntp.org)</help>
-            </properties>
-            <command>/usr/sbin/ntpdate -u 0.pool.ntp.org</command>
-          </node>
-          <tagNode name="ntp">
-            <properties>
-              <help>Set system date and time from NTP server</help>
-              <completionHelp>
-                <script>${vyos_completion_dir}/list_ntp_servers.sh</script>
-              </completionHelp>
-            </properties>
-            <command>/usr/sbin/ntpdate -u "$4"</command>
-          </tagNode>
-        </children>
-      </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/monitor-log.xml.in b/op-mode-definitions/monitor-log.xml.in
index 95d5ecf96..d616bfc08 100644
--- a/op-mode-definitions/monitor-log.xml.in
+++ b/op-mode-definitions/monitor-log.xml.in
@@ -105,6 +105,12 @@
             </properties>
             <command>journalctl --no-hostname --boot --follow --unit opennhrp.service</command>
           </leafNode>
+          <leafNode name="ntp">
+            <properties>
+              <help>Monitor last lines of Network Time Protocol (NTP) log</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --follow --unit chrony.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 2984c467c..6608ea0d8 100644
--- a/op-mode-definitions/show-log.xml.in
+++ b/op-mode-definitions/show-log.xml.in
@@ -220,6 +220,12 @@
             </properties>
             <command>journalctl --no-hostname --boot --unit opennhrp.service</command>
           </leafNode>
+          <leafNode name="ntp">
+            <properties>
+              <help>Show log for Network Time Protocol (NTP)</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --unit chrony.service</command>
+          </leafNode>
           <node name="macsec">
             <properties>
               <help>Show log for MACsec</help>
diff --git a/op-mode-definitions/show-ntp.xml.in b/op-mode-definitions/show-ntp.xml.in
index 01f4477d8..0907722af 100644
--- a/op-mode-definitions/show-ntp.xml.in
+++ b/op-mode-definitions/show-ntp.xml.in
@@ -6,22 +6,13 @@
         <properties>
           <help>Show peer status of NTP daemon</help>
         </properties>
-        <command>${vyos_op_scripts_dir}/show_ntp.sh --basic</command>
+        <command>${vyos_op_scripts_dir}/show_ntp.sh --sourcestats</command>
         <children>
-          <tagNode name="server">
+          <node name="system">
             <properties>
-              <help>Show date and time of specified NTP server</help>
-              <completionHelp>
-                <script>${vyos_completion_dir}/list_ntp_servers.sh</script>
-              </completionHelp>
+              <help>Show parameters about the system clock performance</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_ntp.sh --server "$4"</command>
-          </tagNode>
-          <node name="info">
-            <properties>
-              <help>Show NTP operational summary</help>
-            </properties>
-            <command>${vyos_op_scripts_dir}/show_ntp.sh --info</command>
+            <command>${vyos_op_scripts_dir}/show_ntp.sh --tracking</command>
           </node>
         </children>
       </node>