From e89c92145a16457c7b3e0ebc4a5e900cb9edcc36 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Sat, 10 Apr 2021 10:12:23 +0200
Subject: [PATCH] net/chrony: add diagnostics (#2220)

---
 net/chrony/Makefile                           |  3 +-
 net/chrony/pkg-descr                          |  4 ++
 .../OPNsense/Chrony/Api/ServiceController.php | 48 ++++++++++++-
 .../app/views/OPNsense/Chrony/general.volt    | 71 +++++++++++++++++--
 .../conf/actions.d/actions_chrony.conf        | 24 +++++++
 5 files changed, 140 insertions(+), 10 deletions(-)

diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index a905579e2..4bfc40a55 100644
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		chrony
-PLUGIN_VERSION=		1.1
-PLUGIN_REVISION=	1
+PLUGIN_VERSION=		1.2
 PLUGIN_COMMENT=		Chrony time synchronisation
 PLUGIN_DEPENDS=		chrony
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net/chrony/pkg-descr b/net/chrony/pkg-descr
index 4464c2fa7..c273e6581 100644
--- a/net/chrony/pkg-descr
+++ b/net/chrony/pkg-descr
@@ -4,6 +4,10 @@ better in virtual environments.
 Plugin Changelog
 ----------------
 
+1.2
+
+* Add Diagnostics
+
 1.1
 
 * Add NTS support
diff --git a/net/chrony/src/opnsense/mvc/app/controllers/OPNsense/Chrony/Api/ServiceController.php b/net/chrony/src/opnsense/mvc/app/controllers/OPNsense/Chrony/Api/ServiceController.php
index d441d9dc6..e3a681390 100644
--- a/net/chrony/src/opnsense/mvc/app/controllers/OPNsense/Chrony/Api/ServiceController.php
+++ b/net/chrony/src/opnsense/mvc/app/controllers/OPNsense/Chrony/Api/ServiceController.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (C) 2020 Michael Muenz <m.muenz@gmail.com>
+ * Copyright (C) 2020-2021 Michael Muenz <m.muenz@gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,6 +29,8 @@
 namespace OPNsense\Chrony\Api;
 
 use OPNsense\Base\ApiMutableServiceControllerBase;
+use OPNsense\Core\Backend;
+use OPNsense\Chrony\General;
 
 class ServiceController extends ApiMutableServiceControllerBase
 {
@@ -36,4 +38,48 @@ class ServiceController extends ApiMutableServiceControllerBase
     protected static $internalServiceTemplate = 'OPNsense/Chrony';
     protected static $internalServiceEnabled = 'enabled';
     protected static $internalServiceName = 'chrony';
+
+    /**
+     * show chrony sources
+     * @return array
+     */
+    public function chronysourcesAction()
+    {
+        $backend = new Backend();
+        $response = $backend->configdRun("chrony chronysources");
+        return array("response" => $response);
+    }
+
+    /**
+     * show chrony stats
+     * @return array
+     */
+    public function chronysourcestatsAction()
+    {
+        $backend = new Backend();
+        $response = $backend->configdRun("chrony chronysourcestats");
+        return array("response" => $response);
+    }
+
+    /**
+     * show chrony tracking
+     * @return array
+     */
+    public function chronytrackingAction()
+    {
+        $backend = new Backend();
+        $response = $backend->configdRun("chrony chronytracking");
+        return array("response" => $response);
+    }
+
+    /**
+     * show chrony authdata
+     * @return array
+     */
+    public function chronyauthdataAction()
+    {
+        $backend = new Backend();
+        $response = $backend->configdRun("chrony chronyauthdata");
+        return array("response" => $response);
+    }
 }
diff --git a/net/chrony/src/opnsense/mvc/app/views/OPNsense/Chrony/general.volt b/net/chrony/src/opnsense/mvc/app/views/OPNsense/Chrony/general.volt
index be8b75de2..00ba99420 100644
--- a/net/chrony/src/opnsense/mvc/app/views/OPNsense/Chrony/general.volt
+++ b/net/chrony/src/opnsense/mvc/app/views/OPNsense/Chrony/general.volt
@@ -1,6 +1,6 @@
 {#
  # Copyright (c) 2019 Deciso B.V.
- # Copyright (c) 2020 Michael Muenz <m.muenz@gmail.com>
+ # Copyright (c) 2020-2021 Michael Muenz <m.muenz@gmail.com>
  # All rights reserved.
  #
  # Redistribution and use in source and binary forms, with or without modification,
@@ -25,15 +25,66 @@
  # POSSIBILITY OF SUCH DAMAGE.
  #}
 
-<div class="content-box" style="padding-bottom: 1.5em;">
-    {{ partial("layout_partials/base_form",['fields':generalForm,'id':'frm_general_settings'])}}
-    <div class="col-md-12">
-        <hr />
-        <button class="btn btn-primary" id="saveAct" type="button"><b>{{ lang._('Save') }}</b> <i id="saveAct_progress"></i></button>
+<ul class="nav nav-tabs" data-tabs="tabs" id="maintabs">
+    <li class="active"><a data-toggle="tab" href="#general">{{ lang._('General') }}</a></li>
+    <li><a data-toggle="tab" href="#chronysources">{{ lang._('Sources') }}</a></li>
+    <li><a data-toggle="tab" href="#chronysourcestats">{{ lang._('Source Stats') }}</a></li>
+    <li><a data-toggle="tab" href="#chronytracking">{{ lang._('Tracking') }}</a></li>
+    <li><a data-toggle="tab" href="#chronyauthdata">{{ lang._('Auth Data') }}</a></li>
+</ul>
+
+<div class="tab-content content-box tab-content">
+    <div id="general" class="tab-pane fade in active">
+        <div class="content-box" style="padding-bottom: 1.5em;">
+            {{ partial("layout_partials/base_form",['fields':generalForm,'id':'frm_general_settings'])}}
+            <div class="col-md-12">
+                <hr />
+                <button class="btn btn-primary" id="saveAct" type="button"><b>{{ lang._('Save') }}</b> <i id="saveAct_progress"></i></button>
+            </div>
+        </div>
+    </div>
+    <div id="chronysources" class="tab-pane fade in">
+        <pre id="listchronysources"></pre>
+    </div>
+    <div id="chronysourcestats" class="tab-pane fade in">
+        <pre id="listchronysourcestats"></pre>
+    </div>
+    <div id="chronytracking" class="tab-pane fade in">
+        <pre id="listchronytracking"></pre>
+    </div>
+    <div id="chronyauthdata" class="tab-pane fade in">
+        <pre id="listchronyauthdata"></pre>
     </div>
 </div>
 
 <script>
+
+// Put API call into a function, needed for auto-refresh
+function update_chronysources() {
+    ajaxCall(url="/api/chrony/service/chronysources", sendData={}, callback=function(data,status) {
+        $("#listchronysources").text(data['response']);
+    });
+}
+
+function update_chronysourcestats() {
+    ajaxCall(url="/api/chrony/service/chronysourcestats", sendData={}, callback=function(data,status) {
+        $("#listchronysourcestats").text(data['response']);
+    });
+}
+
+// Put API call into a function, needed for auto-refresh
+function update_chronytracking() {
+    ajaxCall(url="/api/chrony/service/chronytracking", sendData={}, callback=function(data,status) {
+        $("#listchronytracking").text(data['response']);
+    });
+}
+
+function update_chronyauthdata() {
+    ajaxCall(url="/api/chrony/service/chronyauthdata", sendData={}, callback=function(data,status) {
+        $("#listchronyauthdata").text(data['response']);
+    });
+}
+
     $(function() {
         var data_get_map = {'frm_general_settings':"/api/chrony/general/get"};
         mapDataToFormUI(data_get_map).done(function(data){
@@ -41,8 +92,14 @@
             $('.selectpicker').selectpicker('refresh');
         });
 
-     updateServiceControlUI('chrony');
+    updateServiceControlUI('chrony');
 
+    // Call function update_neighbor with a auto-refresh of 5 seconds
+    setInterval(update_chronysources, 5000);
+    setInterval(update_chronysourcestats, 5000);
+    setInterval(update_chronytracking, 5000);
+    setInterval(update_chronyauthdata, 5000);
+ 
         // link save button to API set action
         $("#saveAct").click(function(){
             saveFormToEndpoint(url="/api/chrony/general/set", formid='frm_general_settings',callback_ok=function(){
diff --git a/net/chrony/src/opnsense/service/conf/actions.d/actions_chrony.conf b/net/chrony/src/opnsense/service/conf/actions.d/actions_chrony.conf
index dd50d41c4..10b185b46 100644
--- a/net/chrony/src/opnsense/service/conf/actions.d/actions_chrony.conf
+++ b/net/chrony/src/opnsense/service/conf/actions.d/actions_chrony.conf
@@ -21,3 +21,27 @@ command:/usr/local/etc/rc.d/chronyd status;exit 0
 parameters:
 type:script_output
 message:request chrony status
+
+[chronysources]
+command:/usr/local/bin/chronyc sources
+parameters:
+type:script_output
+message:show chrony sources
+
+[chronysourcestats]
+command:/usr/local/bin/chronyc sourcestats
+parameters:
+type:script_output
+message:show chrony sourcestats
+
+[chronytracking]
+command:/usr/local/bin/chronyc tracking
+parameters:
+type:script_output
+message:show chrony tracking
+
+[chronyauthdata]
+command:/usr/local/bin/chronyc -N authdata
+parameters:
+type:script_output
+message:show chrony authdata