From 4585a6f8c7b44fc20adf88f7d7ca5333d1d772d9 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Fri, 18 Aug 2023 18:21:20 -0500
Subject: [PATCH] update

---
 defaults.inc |  2 +-
 powerwall.sh | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 3ebee894..4380d5ff 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='2.2.20-08142023'
+VERS='2.2.40-08182023'
 
 noheader=' update service dailytemp '
 
diff --git a/powerwall.sh b/powerwall.sh
index 31be9a4a..2bf69f89 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -306,12 +306,21 @@ NORMAL TEMP: ${temp_f}'F"
 							wait=300
 						fi
 						if [ ${lastinsert} -ge ${wait} ]; then
-							if [ "${temp_h}" != "" ]; then
-								QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`, \`hum\`) VALUES ('${PW_SENSOR_ID[${SENSOR}]}','${datetime}','${temp_f}','${temp_h}')"
+							if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ]; then
+								entityid=($(${mysql_conn} -e "SELECT id FROM servermonitor.entities WHERE BINARY name='${vSENSOR// /_}' AND sensorid='${PW_SENSOR_ID[${SENSORa}]}'"))
+								if [ "${entity[1]}" == "" ]; then
+									${mysql_conn} -e "USE servermonitor; INSERT INTO entities (\`sensorid\`, \`name\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${vSENSOR// /_}')"
+									entityid=($(${mysql_conn} -e "SELECT id FROM servermonitor.entities WHERE BINARY name='${vSENSOR// /_}' AND sensorid='${PW_SENSOR_ID[${SENSORa}]}'"))
+								fi
+								entityid=${entityid[1]}
+								
+								QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`entity\`, \`date\`, \`temp\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${entityid}','${datetime}','${temp_f}')"
+							elif [ "${temp_h}" != "" ]; then
+								QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`, \`hum\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${datetime}','${temp_f}','${temp_h}')"
 							else
-								QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`) VALUES ('${PW_SENSOR_ID[${SENSOR}]}','${datetime}','${temp_f}')"
+								QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${datetime}','${temp_f}')"
 							fi
-							# ${mysql_conn} -e "${QRY}"
+							${mysql_conn} -e "${QRY}"
 							touch ${PW_TMPFOLDER}/${SENSOR}.insert
 						fi
 					else