From c4beabc659ab09e253331b5a4ceb29fac3e1d54a Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Tue, 15 Dec 2015 18:26:37 +0100 Subject: [PATCH] (diagnostics) add system activity --- .../Diagnostics/ActivityController.php | 44 ++++++ .../Diagnostics/Api/ActivityController.php | 54 +++++++ .../OPNsense/Diagnostics/systemactivity.volt | 138 ++++++++++++++++++ 3 files changed, 236 insertions(+) create mode 100644 src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/ActivityController.php create mode 100644 src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/ActivityController.php create mode 100644 src/opnsense/mvc/app/views/OPNsense/Diagnostics/systemactivity.volt diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/ActivityController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/ActivityController.php new file mode 100644 index 000000000..64cc3bc04 --- /dev/null +++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/ActivityController.php @@ -0,0 +1,44 @@ +view->title = "System Activity"; + $this->view->pick('OPNsense/Diagnostics/systemactivity'); + } +} diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/ActivityController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/ActivityController.php new file mode 100644 index 000000000..78ab8e237 --- /dev/null +++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/ActivityController.php @@ -0,0 +1,54 @@ +configdpRun("system diag activity json"); + $activity = json_decode($response, true); + + return $activity; + } +} diff --git a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/systemactivity.volt b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/systemactivity.volt new file mode 100644 index 000000000..4e566f606 --- /dev/null +++ b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/systemactivity.volt @@ -0,0 +1,138 @@ +{# + +OPNsense® is Copyright © 2014 – 2015 by Deciso B.V. +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, +OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +#} + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + +
{{ lang._('PID') }}{{ lang._('USERNAME') }}{{ lang._('PRI') }}{{ lang._('NICE') }}{{ lang._('SIZE') }}{{ lang._('RES') }}{{ lang._('STATE') }}{{ lang._('C') }}{{ lang._('TIME') }}{{ lang._('WCPU') }}{{ lang._('COMMAND') }}
+
+
+
+
+
+ +
+
+ + +
+
+
+
+
+
+
+