From db76d5f6fd7ce9e3c53e72314fdcb95a2044030e Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 23 Oct 2023 08:55:23 -0500 Subject: [PATCH] update --- defaults.inc | 6 +++--- powerwall.sh | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/defaults.inc b/defaults.inc index a6b65786..50d066c9 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.3.10-10232023' +VERS='2.3.12-10232023' noheader=' update service dailytemp ' @@ -58,8 +58,8 @@ PW_REMOTE_SENSORS['Powerwall-CPU']='127.0.0.1' PW_REMOTE_SENSORS['ServerRoomTH']='10.10.20.10' PW_REMOTE_SENSORS['OctoPI-CPU']='10.10.1.80' -# PW_SENSOR_ORD=(vMS-iDrac0 vMS-iDrac1 vMS-iDrac6 vMS-iDrac7 vMS-Offsite-iDrac1 ServerRoomTH Powerwall-CPU OctoPI-CPU) -PW_SENSOR_ORD=(vMS-Offsite-iDrac1) +PW_SENSOR_ORD=(vMS-iDrac0 vMS-iDrac1 vMS-iDrac6 vMS-iDrac7 vMS-Offsite-iDrac1 ServerRoomTH Powerwall-CPU OctoPI-CPU) +# PW_SENSOR_ORD=(vMS-Offsite-iDrac1) declare -A PW_SENSOR_ID PW_SENSOR_ID['ServerRoomTH']='2' diff --git a/powerwall.sh b/powerwall.sh index b0be3d65..ed80ebb0 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -387,7 +387,6 @@ Previous Temp: ${last_temp[${SENSOR}]}'F" entityid=${entityid[1]} QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`entity\`, \`date\`, \`temp\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${entityid}','${datetime}','${temp_f}')" - echo "HERE: $QRY" if [ "${PW_HOST_IDRACS[${SENSORa}]}" == "10.2.1.21" ] && [ "${vSENSOR// /_}" == "System_Board_Inlet" ]; then QRY2="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`speed\`) VALUES ('14','${datetime}','${FanSpeed}')" ${mysql_conn} -e "${QRY2}"