diff --git a/plugins/dynamix/DashStats.page b/plugins/dynamix/DashStats.page index 26fc8bdcf..afb8aabc2 100644 --- a/plugins/dynamix/DashStats.page +++ b/plugins/dynamix/DashStats.page @@ -69,6 +69,7 @@ $parity = $var['mdResync']; $mover = file_exists('/var/run/mover.pid'); $btrfs = exec('pgrep -cf /sbin/btrfs'); $dot = $display['number'][0]; +$zfs = false; foreach ($disks as $disk) { switch ($disk['type']) { @@ -86,6 +87,7 @@ foreach ($disks as $disk) { $cache_type[$name] = $disk['rotational'] ? ($disk['luksState'] ? 'disk-encrypted' : 'disk') : 'nvme'; $cache_rate[$name] = number_format(100*$cache_used[$name]/($cache_size[$name] ?: 1),1,$dot,''); if (!$disks[$name]['devices']) unset($pools[array_search($name,$pools)]); + if (isset($disks[$name]['fsType']) && strpos($disks[$name]['fsType'],'zfs')!==false) $zfs = true; } break; } @@ -214,7 +216,7 @@ 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#cpu_chart,.cpu_open{display:none} +tr#zfs,tr#cpu_chart,.cpu_open{display:none} 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} @@ -309,10 +311,11 @@ foreach ($cpus as $pair) { _(Usable size)_: _(Maximum size)_: _(RAM)_0%
-_(Flash)_0%
-_(Log)_0%
+_(ZFS)_0%
+_(Flash)_0%
+_(Log)_0%
-_(Docker)_0%
+_(Docker)_0%
@@ -1317,6 +1320,9 @@ $(function() { cpuchart.render(); netchart.render(); addProperties(); + + $('tr#zfs').show(); + dropdown('enter_share'); diff --git a/plugins/dynamix/nchan/update_1 b/plugins/dynamix/nchan/update_1 index 19f427afb..95c960e80 100755 --- a/plugins/dynamix/nchan/update_1 +++ b/plugins/dynamix/nchan/update_1 @@ -1,7 +1,7 @@ #!/usr/bin/php -q /dev/null|grep -Po 'fan\d_input: \K\d+'",$rpms); - $info = max(round((1-$memory[1]/$memory[0])*100),0)."%\0".implode("\0",$sys); + [$total,$free] = $memory; + $used = $total-$free; + $zfs = (exec("awk '/^size/{print \$3}' /proc/spl/kstat/zfs/arcstats 2>/dev/null")?:0)/1024; + $info = max(round(100*(1-$free/$total)),0)."%\0".round(100*$zfs/$used)."%\0".implode("\0",$sys); $rpms = count($rpms) ? implode(" RPM\0",$rpms).' RPM' : ''; $names = array_keys((array)parse_ini_file("$varroot/shares.ini"));