Skip to content

Feat: Add disk utilization column to webUI #2375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DerekChan65535 wants to merge 4 commits into
base: master
Choose a base branch
from
+31 −23
Open

Feat: Add disk utilization column to webUI #2375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e45054e
Feat: Add disk utilization column to webUI
DerekChan65535 Sep 17, 2025
9f80d45
Refactor: Simplify and standardize code formatting in `device_list` m…
DerekChan65535 Sep 17, 2025
746547f
Refactor: Simplify and standardize code formatting in `device_list` m…
DerekChan65535 Sep 17, 2025
190c0f6
Refactor: Simplify and standardize code formatting in `device_list` m…
DerekChan65535 Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions emhttp/plugins/dynamix/nchan/device_list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,19 +216,19 @@ function array_offline(&$disk, $pool='') {
case 'DISK_NP':
$echo[] = "<td>".device_info($disk,false)."</td>";
$echo[] = "<td>".assignment($disk)."</td>";
$echo[] = "<td colspan='8'></td>";
$echo[] = "<td colspan='9'></td>";
break;
case 'DISK_NP_MISSING':
$echo[] = "<td>".device_info($disk,false)."<br><span class='diskinfo'><em>"._('Missing')."</em></span></td>";
$echo[] = "<td>".assignment($disk)."<em>{$disk['idSb']}</em></td>";
$echo[] = "<td colspan='4'></td>";
$echo[] = "<td colspan='5'></td>";
$echo[] = "<td>".vfs_type($disk,false)."</td>";
$echo[] = "<td colspan='3'></td>";
break;
case 'DISK_NP_DSBL':
$echo[] = "<td>".device_info($disk,false)."</td>";
$echo[] = "<td>".assignment($disk)."</td>";
$echo[] = "<td colspan='4'></td>";
$echo[] = "<td colspan='5'></td>";
$echo[] = "<td>".vfs_type($disk,false)."</td>";
$echo[] = "<td colspan='3'></td>";
break;
Expand All @@ -241,9 +241,9 @@ function array_offline(&$disk, $pool='') {
$echo[] = "<td>".assignment($disk)."</td>";
$echo[] = "<td>".my_power($disk['power']).my_temp(_var($disk,'temp','*'))."</td>";
if ($warning) {
$echo[] = "<td colspan='7'>$warning</td>";
$echo[] = "<td colspan='8'>$warning</td>";
} else {
$echo[] = "<td colspan='3'></td>";
$echo[] = "<td colspan='4'></td>";
$echo[] = "<td>".vfs_type($disk,false)."</td>";
$echo[] = "<td colspan='3'></td>";
}
Expand All @@ -253,9 +253,9 @@ function array_offline(&$disk, $pool='') {
$echo[] = "<td>".assignment($disk)."<em>{$disk['idSb']}</em></td>";
$echo[] = "<td>".my_temp(_var($disk,'temp','*'))."</td>";
if ($warning) {
$echo[] = "<td colspan='7'>$warning</td>";
$echo[] = "<td colspan='8'>$warning</td>";
} else {
$echo[] = "<td colspan='3'></td>";
$echo[] = "<td colspan='4'></td>";
$echo[] = "<td>".vfs_type($disk,false)."</td>";
$echo[] = "<td colspan='3'></td>";
}
Expand All @@ -269,10 +269,10 @@ function array_online(&$disk, $fstype='') {
global $pools, $sum, $diskio;
$disk['power'] ??= (_var($disk,'transport')=='nvme' ? get_nvme_info(_var($disk,'device'),'power') : 0);
$echo = [];
$data = [0,0];
$data = [0,0,0];
if (_var($disk,'device')) {
$dev = $disk['device'];
$data = explode(' ',$diskio[$dev] ?? '0 0');
$data = explode(' ',$diskio[$dev] ?? '0 0 0 0 0');
$sum['ioReads'] += $data[0];
$sum['ioWrites'] += $data[1];
}
Expand All @@ -295,7 +295,7 @@ function array_online(&$disk, $fstype='') {
if (in_array(_var($disk,'name'),$pools) || $fstype=='zfs') {
$echo[] = "<td>".device_info($disk,true)."</td>";
$echo[] = "<td><a class='static'><i class='icon-disk icon'></i><span></span></a><em>".($fstype=='zfs' ? _('Not present') : _('Not installed'))."</em></td>";
$echo[] = "<td colspan='4'></td>";
$echo[] = "<td colspan='5'></td>";
$echo[] = fs_info($disk,true);
}
break;
Expand All @@ -312,6 +312,7 @@ function array_online(&$disk, $fstype='') {
$echo[] = "<td>".my_power($disk['power']).my_temp(_var($disk,'temp','*'))."</td>";
$echo[] = "<td><span class='diskio'>".my_diskio($data[0])."</span><span class='number'>".my_number(_var($disk,'numReads',0))."</span></td>";
$echo[] = "<td><span class='diskio'>".my_diskio($data[1])."</span><span class='number'>".my_number(_var($disk,'numWrites',0))."</span></td>";
$echo[] = "<td>" . (_var($data, 4, 0)) . " %</td>";
$echo[] = "<td>".my_number(_var($disk,'numErrors',0))."</td>";
$echo[] = fs_info($disk,true);
break;
Expand All @@ -334,6 +335,7 @@ function show_totals($text,$array,$name) {
$echo[] = "<td>".my_power($sum['power']).($sum['count']>0 ? my_temp(round($sum['temp']/$sum['count'])) : '*')."</td>";
$echo[] = "<td><span class='diskio'>".my_diskio($sum['ioReads'])."</span><span class='number'>".my_number($sum['numReads'])."</span></td>";
$echo[] = "<td><span class='diskio'>".my_diskio($sum['ioWrites'])."</span><span class='number'>".my_number($sum['numWrites'])."</span></td>";
$echo[] = "<td>-</td>";
$echo[] = "<td>".my_number($sum['numErrors'])."</td>";
$echo[] = "<td></td>";
if ($array && _var($var,'startMode')=='Normal') {
Expand All @@ -351,7 +353,7 @@ function show_totals($text,$array,$name) {
$echo[] = "<td><div class='usage-disk'><span style='width:$free%' class='".usage_color($display,$free,true)."'></span><span>".my_scale($sum['fsFree']*1024,$unit)." $unit</span></div></td>";
}
} else {
$echo[] = "<td colspan='3'></td>";
$echo[] = "<td colspan='4'></td>";
}
$echo[] = "</tr>";
return implode($echo);
Expand Down Expand Up @@ -468,7 +470,7 @@ while (true) {
$echo[$a][] = "<tr class='tr_last'><td colspan='10'></td></tr>";
foreach ($Data as $disk) $echo[$a][] = array_offline($disk);
}
$echo[$a][] = "<tr class='tr_last'><td>"._('Slots').":</td><td colspan='8'>".array_slots()."</td><td></td></tr>";
$echo[$a][] = "<tr class='tr_last'><td>"._('Slots').":</td><td colspan='9'>".array_slots()."</td><td></td></tr>";
} else {
if (!$poolsOnly) {
foreach ($Parity as $disk) if ($disk['status']!='DISK_NP_DSBL') $echo[$a][] = array_online($disk);
Expand All @@ -480,7 +482,7 @@ while (true) {

$a = 'boot_device';
$echo[$a] = [];
$data = explode(' ',$diskio[_var($Flash,'device')] ?? '0 0');
$data = explode(' ',$diskio[_var($Flash,'device')] ?? '0 0 0 0 0');
$flash = &$sec['flash'];
$share = (_var($var,'shareSMBEnabled')=='yes' && _var($flash,'export')=='e' && _var($flash,'security')=='public')
? "&nbsp;<a class='info'><i class='fa fa-warning fa-fw orange-text'></i><span>"._('Flash device is set as public share')."<br>"._('Please change share SMB security')."<br>"._('Click on **FLASH** above this message')."</span></a>"
Expand All @@ -491,6 +493,7 @@ while (true) {
$echo[$a][] = "<td>*</td>";
$echo[$a][] = "<td><span class='diskio'>".my_diskio($data[0])."</span><span class='number'>".my_number(_var($Flash,'numReads',0))."</span></td>";
$echo[$a][] = "<td><span class='diskio'>".my_diskio($data[1])."</span><span class='number'>".my_number(_var($Flash,'numWrites',0))."</span></td>";
$echo[$a][] = "<td>" . (_var($data, 4, 0)) . " %</td>";
$echo[$a][] = "<td>".my_number(_var($Flash,'numErrors',0))."</td>";
$echo[$a][] = fs_info($Flash,true);
$echo[$a][] = "</tr>";
Expand All @@ -516,7 +519,7 @@ while (true) {
$data = []; foreach ($log as $key => $value) $data[] = "$key=\"$value\"";
$off &= !empty(_var($Cache[$root],'uuid'));
file_put_contents($pool_log,implode("\n",$data));
$echo[$a][] = "<tr class='tr_last'><td>"._('Slots').":</td><td colspan='8'><span class='slots'><span class='slots-left'>".cache_slots($off,$pool,_var($Cache[$pool],'devicesSb'),_var($Cache[$pool],'slots',0))."</span>";
$echo[$a][] = "<tr class='tr_last'><td>"._('Slots').":</td><td colspan='9'><span class='slots'><span class='slots-left'>".cache_slots($off,$pool,_var($Cache[$pool],'devicesSb'),_var($Cache[$pool],'slots',0))."</span>";
$zfsPool = strstr(_var($Cache[$pool],'fsType'),'zfs') && !isSubpool($pool);
if ($zfsPool) {
$current_subpools = array_filter($pools, function($element) use ($pool,$_tilde_) {return str_contains($element,"{$pool}{$_tilde_}");});
Expand All @@ -543,7 +546,7 @@ while (true) {
$echo[$a] = [];
foreach ($devs as $disk) {
$dev = _var($disk,'device');
$data = explode(' ',$diskio[$dev] ?? '0 0 0 0');
$data = explode(' ', $diskio[$dev] ?? '0 0 0 0 0');
$disk['type'] = 'New';
$disk['color'] = $disk['spundown']=="0" ? 'blue-on' : 'blue-blink';
$echo[$a][] = "<tr>";
Expand All @@ -552,13 +555,14 @@ while (true) {
$echo[$a][] = "<td>".my_temp($disk['temp'])."</td>";
$echo[$a][] = "<td><span class='diskio'>".my_diskio($data[0])."</span><span class='number'>".my_number(_var($disk,'numReads',0))."</span></td>";
$echo[$a][] = "<td><span class='diskio'>".my_diskio($data[1])."</span><span class='number'>".my_number(_var($disk,'numWrites',0))."</span></td>";
$echo[$a][] = "<td>" . (_var($data, 4, 0)) . " %</td>";
$echo[$a][] = "<td>".my_number(_var($disk,'numErrors',0))."</td>";
if (file_exists("/tmp/preclear_stat_$dev")) {
$text = exec("cut -d'|' -f3 /tmp/preclear_stat_$dev|sed 's:\^n:\<br\>:g'");
if (!str_contains($text,'Total time')) $text = _('Preclear in progress').'... '.$text;
$echo[$a][] = "<td colspan='4'><em>$text</em></td>";
$echo[$a][] = "<td colspan='5'><em>$text</em></td>";
} else {
$echo[$a][] = "<td colspan='4'></td>";
$echo[$a][] = "<td colspan='5'></td>";
}
Comment on lines 564 to 566
Copy link
Contributor

@coderabbitai coderabbitai bot Sep 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Open devices preclear/info colspans should be 4, not 5.

Row now has 7 cells before the filler. To reach 11, use colspan='4'.

-      $echo[$a][] = "<td colspan='5'><em>$text</em></td>";
+      $echo[$a][] = "<td colspan='4'><em>$text</em></td>";
 ...
-      $echo[$a][] = "<td colspan='5'></td>";
+      $echo[$a][] = "<td colspan='4'></td>";
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
} else {
$echo[$a][] = "<td colspan='4'></td>";
$echo[$a][] = "<td colspan='5'></td>";
}
} else {
$echo[$a][] = "<td colspan='4'></td>";
}
🤖 Prompt for AI Agents 
In emhttp/plugins/dynamix/nchan/device_list around lines 564 to 566, the filler
cell uses colspan='5' but the row already contains 7 cells before the filler so
the filler should be colspan='4' to make the total 11; change the hardcoded
colspan value from 5 to 4 in that else branch so the table layout aligns
correctly.

$echo[$a][] = "</tr>";
}
Expand Down
16 changes: 10 additions & 6 deletions emhttp/plugins/dynamix/nchan/disk_load
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,34 @@
#!/bin/bash
ini=/var/local/emhttp/diskload.ini
tmp=/var/local/emhttp/diskload.tmp
declare -a reads writes
declare -a reads writes use_time

# t = poll interval in seconds
t=2

# initialize array values upon first start
stats=($(awk '/(sd[a-z]*|nvme[0-9]*n1|vd[a-z]*) /{print $3,$6,$10,$4,$8}' /proc/diskstats))
stats=($(awk '/(sd[a-z]*|nvme[0-9]*n1|vd[a-z]*) /{print $3,$6,$10,$4,$8,$13}' /proc/diskstats))
c=0; s=${#stats[@]}
for ((i=0;i<s;i+=5)); do
for ((i=0;i<s;i+=6)); do
reads[c]=${stats[i+1]}
writes[c]=${stats[i+2]}
use_time[c]=${stats[i+5]}
((c++))
done
sleep $t

while :; do
stats=($(awk '/(sd[a-z]*|nvme[0-9]*n1|vd[a-z]*) /{print $3,$6,$10,$4,$8}' /proc/diskstats))
stats=($(awk '/(sd[a-z]*|nvme[0-9]*n1|vd[a-z]*) /{print $3,$6,$10,$4,$8,$13}' /proc/diskstats))
c=0; s=${#stats[@]}
for ((i=0;i<s;i+=5)); do
for ((i=0;i<s;i+=6)); do
reads[c]=$((stats[i+1]-reads[c]))
writes[c]=$((stats[i+2]-writes[c]))
echo ${stats[i]}=$((reads[c]*512/t)) $((writes[c]*512/t)) ${stats[i+3]} ${stats[i+4]} >>$tmp
util=$((((stats[i+5]-use_time[c])*100)/(t*1000)))
if [ $util -gt 100 ]; then util=100; fi
echo ${stats[i]}=$((reads[c]*512/t)) $((writes[c]*512/t)) ${stats[i+3]} ${stats[i+4]} $util >>$tmp
reads[c]=${stats[i+1]}
writes[c]=${stats[i+2]}
use_time[c]=${stats[i+5]}
((c++))
done
mv -f $tmp $ini
Expand Down
Loading