diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 3c3efd02d..fe53ffc18 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -218,7 +218,8 @@ i[class^="icon-u-"]{font-size:inherit}
i#mycase[class^="case-"]{font-size:128px}
i#mycase[class^="fa "]{font-size:96px}
a.cpu_close,span.hand{cursor:pointer;z-index:1001}
-tr#zfs,tr#cpu_chart,.cpu_open{display:none}
+tr#var1,tr#var4,tr#cpu_chart,.cpu_open{display:none}
+tr#var0,tr#var1,tr#var2,tr#var3,tr#var4{cursor:alias}
td.none{text-align:center;padding-top:12px}
input[value=Edit]{margin:12px 0 0 0;padding:5px 10px}
.share1,.share3,.user1,.user3,.view1,.view2,.view3,.view4{display:none}
@@ -312,13 +313,11 @@ foreach ($cpus as $pair) {
| _(Usable size)_: _(Maximum size)_: |
-| _(RAM)_0%
|
-| _(ZFS)_0%
|
-| _(Flash)_0%
|
-| _(Log)_0%
|
-
-| _(Docker)_0%
|
-
+| _(RAM)_0%
|
+| _(ZFS)_0%
|
+| _(Flash)_0%
|
+| _(Log)_0%
|
+| _(Docker)_0%
|
@@ -1052,11 +1051,21 @@ function sortTables() {
});
}
function addProperties() {
- $('tbody.system').addClass('sortable').attr('sort','_system_information_');
- $('tbody').not('.system').each(function(){
+ $('div.frame tbody.system').addClass('sortable').attr('sort','_system_information_');
+ $('div.frame tbody').not('.system').each(function(){
$(this).addClass('sortable').attr('sort',$(this).attr('title').marker());
$(this).find('td:first').prepend("");
});
+ $('div.frame tr').attr('title','');
+ $('tr#var0').hover(function(){$.post('/webGui/include/DashboardApps.php',{sys:0},function(val){$('.sys0').text(val);})});
+
+ $('tr#var1').show().hover(function(){$.post('/webGui/include/DashboardApps.php',{sys:1},function(val){$('.sys1').text(val);})});
+
+ $('tr#var2').hover(function(){$.post('/webGui/include/DashboardApps.php',{sys:2},function(val){$('.sys2').text(val);})});
+ $('tr#var3').hover(function(){$.post('/webGui/include/DashboardApps.php',{sys:3},function(val){$('.sys3').text(val);})});
+
+ $('tr#var4').show().hover(function(){$.post('/webGui/include/DashboardApps.php',{sys:4},function(val){$('.sys4').text(val);})});
+
}
function showContent() {
var count = {'db-box1':$('table#db-box1 tbody').length, 'db-box2':$('table#db-box2 tbody').length, 'db-box3':$('table#db-box3 tbody').length}
@@ -1311,9 +1320,6 @@ $(function() {
cpuchart.render();
netchart.render();
addProperties();
-
- $('tr#zfs').show();
-
dropdown('enter_share');
diff --git a/emhttp/plugins/dynamix/include/DashboardApps.php b/emhttp/plugins/dynamix/include/DashboardApps.php
index 3fc8d8706..61b6cc00f 100644
--- a/emhttp/plugins/dynamix/include/DashboardApps.php
+++ b/emhttp/plugins/dynamix/include/DashboardApps.php
@@ -20,6 +20,17 @@ require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
require_once "$docroot/webGui/include/Helpers.php";
+if (isset($_POST['sys'])) {
+ extract(parse_plugin_cfg('dynamix',true));
+ switch ($_POST['sys']) {
+ case 0: die(my_scale(exec("awk '/^MemTotal/{t=$2}/^MemAvailable/{a=$2}END{print (t-a)*1024}' /proc/meminfo 2>/dev/null"),$unit,null,-1,1024)." $unit");
+ case 1: die(my_scale(exec("awk '/^size/{print \$3;exit}' /proc/spl/kstat/zfs/arcstats 2>/dev/null")?:0,$unit,null,-1,1024)." $unit");
+ case 2: die(my_scale(exec("df --output=used /boot 2>/dev/null|awk '$1!=\"Used\" {print $1*1024}'"),$unit,null,-1,1024)." $unit");
+ case 3: die(my_scale(exec("df --output=used /var/log 2>/dev/null|awk '$1!=\"Used\" {print $1*1024}'"),$unit,null,-1,1024)." $unit");
+ case 4: die(my_scale(exec("df --output=used /var/lib/docker 2>/dev/null|awk '$1!=\"Used\" {print $1*1024}'"),$unit,null,-1,1024)." $unit");
+ }
+}
+
$display = $_POST['display'];
if ($_POST['docker'] && ($display=='icons' || $display=='docker')) {