From aa5760ae84068af1305a427cc72832302cfb801e Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Wed, 25 Apr 2018 11:24:38 +0200
Subject: [PATCH] WIP: sysutils/nut: Add diagnostics (#657)

---
 sysutils/nut/Makefile                            |  2 +-
 .../OPNsense/Nut/Api/ServiceController.php       | 16 ++++++++++++++--
 .../mvc/app/models/OPNsense/Nut/Menu/Menu.xml    |  5 +----
 .../mvc/app/views/OPNsense/Nut/index.volt        | 15 +++++++++++++++
 .../service/conf/actions.d/actions_nut.conf      |  2 +-
 5 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 9a21905ea..65c28e040 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		nut
-PLUGIN_VERSION=		0.4
+PLUGIN_VERSION=		0.5
 PLUGIN_COMMENT=		Network UPS Tools
 PLUGIN_DEPENDS=		nut
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/sysutils/nut/src/opnsense/mvc/app/controllers/OPNsense/Nut/Api/ServiceController.php b/sysutils/nut/src/opnsense/mvc/app/controllers/OPNsense/Nut/Api/ServiceController.php
index f96ad5b74..89bf1c414 100644
--- a/sysutils/nut/src/opnsense/mvc/app/controllers/OPNsense/Nut/Api/ServiceController.php
+++ b/sysutils/nut/src/opnsense/mvc/app/controllers/OPNsense/Nut/Api/ServiceController.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- *    Copyright (C) 2017 Michael Muenz
+ *    Copyright (C) 2017-2018 Michael Muenz
  *    All rights reserved.
  *
  *    Redistribution and use in source and binary forms, with or without
@@ -29,6 +29,7 @@
 namespace OPNsense\Nut\Api;
 
 use OPNsense\Base\ApiMutableServiceControllerBase;
+use OPNsense\Core\Backend;
 
 class ServiceController extends ApiMutableServiceControllerBase
 {
@@ -39,8 +40,19 @@ class ServiceController extends ApiMutableServiceControllerBase
 
     public function upsstatusAction()
     {
+        $model = new Nut();
+        $cnf = Config::getInstance()->object();
+        $host = "127.0.0.1";
+        if (!empty((string)$cnf->netclient->address)) {
+          $host = (string)$cnf->netclient->address;
+        }
+        $upsname = "UPSName";
+        if (!empty((string)$cnf->general->name)) {
+          $upsname = (string)$cnf->general->name;
+        }
+        $ups = $upsname . '@' . $host;
         $backend = new Backend();
-        $response = $backend->configdRun("nut upsstatus");
+        $response = $backend->configdpRun("nut upsstatus", array($ups));
         return array("response" => $response);
     }
 }
diff --git a/sysutils/nut/src/opnsense/mvc/app/models/OPNsense/Nut/Menu/Menu.xml b/sysutils/nut/src/opnsense/mvc/app/models/OPNsense/Nut/Menu/Menu.xml
index 0f9883948..aa44febc2 100644
--- a/sysutils/nut/src/opnsense/mvc/app/models/OPNsense/Nut/Menu/Menu.xml
+++ b/sysutils/nut/src/opnsense/mvc/app/models/OPNsense/Nut/Menu/Menu.xml
@@ -1,8 +1,5 @@
 <menu>
   <Services>
-    <Nut cssClass="fa fa-battery-full fa-fw">
-      <Configuration order="10" url="/ui/nut/"/>
-      <Diagnostics order="20" url="/ui/nut/diagnostics"/>
-    </Nut>
+    <Nut cssClass="fa fa-battery-full fa-fw" url="/ui/nut/"/>
   </Services>
 </menu>
diff --git a/sysutils/nut/src/opnsense/mvc/app/views/OPNsense/Nut/index.volt b/sysutils/nut/src/opnsense/mvc/app/views/OPNsense/Nut/index.volt
index a820004b0..b7caa9482 100644
--- a/sysutils/nut/src/opnsense/mvc/app/views/OPNsense/Nut/index.volt
+++ b/sysutils/nut/src/opnsense/mvc/app/views/OPNsense/Nut/index.volt
@@ -26,6 +26,14 @@
  #}
 
 <script>
+
+    // Put API call into a function, needed for auto-refresh
+    function update_diagnostics() {
+        ajaxCall(url="/api/nut/service/upsstatus", sendData={}, callback=function(data,status) {
+            $("#listdiagnostics").text(data['response']);
+        });
+    }
+ 
     $( document ).ready(function() {
 
         var data_get_map = {'frm_nut':'/api/nut/settings/get'};
@@ -38,6 +46,9 @@
 
         updateServiceControlUI('nut');
 
+        // call function update_diagnostics with a auto-refresh of 3 seconds
+        setInterval(update_diagnostics, 10000);
+
         // update history on tab state and implement navigation
         if(window.location.hash != "") {
             $('a[href="' + window.location.hash + '"]').click()
@@ -71,8 +82,12 @@
 
 <ul class="nav nav-tabs" role="tablist"  id="maintabs">
     {{ partial("layout_partials/base_tabs_header",['formData':settings]) }}
+     <li><a data-toggle="tab" href="#diagnostics">{{ lang._('Diagnostics') }}</a></li>
 </ul>
 
 <div class="content-box tab-content">
     {{ partial("layout_partials/base_tabs_content",['formData':settings]) }}
+    <div id="diagnostics" class="tab-pane fade in">
+      <pre id="listdiagnostics"></pre>
+    </div>
 </div>
diff --git a/sysutils/nut/src/opnsense/service/conf/actions.d/actions_nut.conf b/sysutils/nut/src/opnsense/service/conf/actions.d/actions_nut.conf
index c43b77296..daae2997c 100644
--- a/sysutils/nut/src/opnsense/service/conf/actions.d/actions_nut.conf
+++ b/sysutils/nut/src/opnsense/service/conf/actions.d/actions_nut.conf
@@ -23,7 +23,7 @@ type:script_output
 message:request nut status
 
 [upsstatus]
-command:/usr/local/bin/upsc -l
+command:/usr/local/bin/upsc
 parameters: %s
 type:script_output
 message:retrieve ups status