From f74540a7e26a86f9d929d4c616e0a77a79867654 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 27 Nov 2024 18:30:44 -0600
Subject: [PATCH] Update storage-test.sh

---
 storage-test.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/storage-test.sh b/storage-test.sh
index 6790056..6e30491 100755
--- a/storage-test.sh
+++ b/storage-test.sh
@@ -902,15 +902,15 @@ Print_Style "Enter a description or note" $GREEN
 read -r -t 0.001 </dev/tty
 read -r -p 'Description: ' Brand </dev/tty
 
+if [ -f /opt/idssys/dsmon/config.settings.inc ]; then
+	source /opt/idssys/dsmon/config.settings.inc
+	hostid=${SERVERMON_ID}
+else
+	hostid=''
+fi
+
 # Submit results
-tmpUdev=$(echo -e "$Test_udevadm" >tmpudev)
-tmpInxi=$(echo -e "$Test_inxi" >tmpinxi)
-tmpHwinfo=$(echo -e "$Test_hwinfo" >tmphwinfo)
-tmpDmi=$(echo -e "$Test_dmidecode" >tmpdmi)
-tmpDmesg=$(echo -e "$Test_dmesg" >tmpdmesg)
-tmpSmart=$(echo -e "$Test_smartctl" >tmpsmart)
-Submit=$(curl -s -k -L --form "DDWriteSpeed=$DDWriteResult" --form "HDParmDisk=$HDParmDisk" --form "HDParmCached=$HDParmCached" --form "fio4kRandWriteIOPS=$fio4kRandWriteIOPS" --form "fio4kRandReadIOPS=$fio4kRandReadIOPS" --form "fio4kRandWriteSpeed=$fio4kRandWriteSpeed" --form "fio4kRandReadSpeed=$fio4kRandReadSpeed" --form "IO4kRandRead=$IO4kRandRead" --form "IO4kRandWrite=$IO4kRandWrite" --form "IO4kRead=$IO4kRead" --form "IO4kWrite=$IO4kWrite" --form "Drive=$BootDrive" --form "Model=$Model" --form "Capacity=$Capacity" --form "Manufacturer=$Manufacturer" --form "Product=$Product" --form "Note=$Brand" --form "HostModel=$HostModel" --form "HostCPUClock=$HostCPUClock" --form "HostCoreClock=$HostCoreClock" --form "HostRAMClock=$HostRAMClock" --form "HostArchitecture=$HostArchitecture" --form "HostOS=$HostOS" --form "HostManufacturer=$HostManufacturer" https://www.scity.us/storage_process.php)
-rm -rf tmpudev tmpinxi tmplshw tmphwinfo tmpdmi tmpdmsg tmpsmart tmpparm
+Submit=$(curl -s -k -L --form "DDWriteSpeed=$DDWriteResult" --form "host=$hostid" --form "HDParmDisk=$HDParmDisk" --form "HDParmCached=$HDParmCached" --form "fio4kRandWriteIOPS=$fio4kRandWriteIOPS" --form "fio4kRandReadIOPS=$fio4kRandReadIOPS" --form "fio4kRandWriteSpeed=$fio4kRandWriteSpeed" --form "fio4kRandReadSpeed=$fio4kRandReadSpeed" --form "IO4kRandRead=$IO4kRandRead" --form "IO4kRandWrite=$IO4kRandWrite" --form "IO4kRead=$IO4kRead" --form "IO4kWrite=$IO4kWrite" --form "Drive=$BootDrive" --form "Model=$Model" --form "Capacity=$Capacity" --form "Manufacturer=$Manufacturer" --form "Product=$Product" --form "Note=$Brand" --form "HostModel=$HostModel" --form "HostCPUClock=$HostCPUClock" --form "HostCoreClock=$HostCoreClock" --form "HostRAMClock=$HostRAMClock" --form "HostArchitecture=$HostArchitecture" --form "HostOS=$HostOS" --form "HostManufacturer=$HostManufacturer" https://www.scity.us/storage_process.php)
 SubmitResult=""
 SubmitResult=$(echo "$Submit" | grep submission)
 if [ -n "$SubmitResult" ]; then