diff --git a/src/freedombone-installer b/src/freedombone-installer index be5bbe44484596bdc479e8ce33ff091e239c9361..9bcc7ebf15c2bc25455156135aa61ae4a0f174ec 100755 --- a/src/freedombone-installer +++ b/src/freedombone-installer @@ -1509,6 +1509,25 @@ function update_system_monitor { cpu_temperature=$((cpu_temp / 1000)) fi + test_drive=/dev/sda1 + if ! ls $test_drive; then + if ls /dev/mmcblk0p2; then + test_drive=/dev/mmcblk0p2 + else + test_drive= + fi + fi + if [ "$test_drive" ]; then + disk_io_speed_percent=0 + disk_io_speed=$(hdparm -t $test_drive | awk -F '= ' '{print $2}' | awk -F ' ' '{print $1}') + if [ "$disk_io_speed" ]; then + disk_io_speed_percent=$((disk_io_speed * 100 / 500)) + if [ $disk_io_speed_percent -gt 100 ]; then + disk_io_speed_percent=100 + fi + fi + fi + local_hostname=$(grep 'host-name' /etc/avahi/avahi-daemon.conf | awk -F '=' '{print $2}').local webadmin_install_dir="/var/www/${local_hostname}/htdocs/admin" if [ -f "$webadmin_install_dir/system_monitor_template.html" ]; then @@ -1522,6 +1541,8 @@ function update_system_monitor { sed -i "s|<div name=\"cputemp\" class=\"w3-container.*|<div name=\"cputemp\" class=\"w3-container w3-blue w3-round-xlarge\" style=\"width:${cpu_temperature}%\">${cpu_temperature}C</div>|g" "$webadmin_install_dir/system_monitor.html" + sed -i "s|<div name=\"diskio\" class=\"w3-container.*|<div name=\"diskio\" class=\"w3-container w3-blue w3-round-xlarge\" style=\"width:${disk_io_speed_percent}%\">${disk_io_speed} MB/s</div>|g" "$webadmin_install_dir/system_monitor.html" + chown www-data:www-data "$webadmin_install_dir/system_monitor.html" fi fi diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin index ceaf0da6b3ea62d5a6165d278d1965d1b16525b9..bf2f167bfa46ec7b163101b98b4318bc805a0cba 100755 --- a/src/freedombone-utils-webadmin +++ b/src/freedombone-utils-webadmin @@ -758,6 +758,25 @@ function webadmin_update_system_monitor { cpu_temperature=$((cpu_temp / 1000)) fi + test_drive=/dev/sda1 + if ! ls $test_drive; then + if ls /dev/mmcblk0p2; then + test_drive=/dev/mmcblk0p2 + else + test_drive= + fi + fi + if [ "$test_drive" ]; then + disk_io_speed_percent=0 + disk_io_speed=$(hdparm -t $test_drive | awk -F '= ' '{print $2}' | awk -F ' ' '{print $1}') + if [ "$disk_io_speed" ]; then + disk_io_speed_percent=$((disk_io_speed * 100 / 500)) + if [ $disk_io_speed_percent -gt 100 ]; then + disk_io_speed_percent=100 + fi + fi + fi + local_hostname=$(grep 'host-name' /etc/avahi/avahi-daemon.conf | awk -F '=' '{print $2}').local webadmin_install_dir="/var/www/${local_hostname}/htdocs/admin" if [ -f "$webadmin_install_dir/system_monitor_template.html" ]; then @@ -771,6 +790,8 @@ function webadmin_update_system_monitor { sed -i "s|<div name=\"cputemp\" class=\"w3-container.*|<div name=\"cputemp\" class=\"w3-container w3-blue w3-round-xlarge\" style=\"width:${cpu_temperature}%\">${cpu_temperature}C</div>|g" "$webadmin_install_dir/system_monitor.html" + sed -i "s|<div name=\"diskio\" class=\"w3-container.*|<div name=\"diskio\" class=\"w3-container w3-blue w3-round-xlarge\" style=\"width:${disk_io_speed_percent}%\">${disk_io_speed} MB/s</div>|g" "$webadmin_install_dir/system_monitor.html" + chown www-data:www-data "$webadmin_install_dir/system_monitor.html" fi } diff --git a/webadmin/EN/system_monitor_template.html b/webadmin/EN/system_monitor_template.html index 6f8b8fe35f3b596428a4d8d2e6eb034c70d4a4dd..59c34249a5aaa0f5d851316d50fbd1394e63648e 100644 --- a/webadmin/EN/system_monitor_template.html +++ b/webadmin/EN/system_monitor_template.html @@ -96,6 +96,11 @@ <div name="cputemp" class="w3-container w3-blue w3-round-xlarge" style="width:40%">40°C</div> </div> + <p class="titletext">Disk I/O Speed</p> + <div class="w3-light-grey w3-round-xlarge"> + <div name="diskio" class="w3-container w3-blue w3-round-xlarge" style="width:10%">20 MB/s</div> + </div> + <br><br> <form action="systemmonitor.php" method="post">