From 2955463f70cb533f36788fbd6a4bcc673b5f0ede Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 26 Dec 2023 21:01:52 -0600
Subject: [PATCH] Update temp.inc.sh

---
 inc/temp.inc.sh | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index cc6811bd..82f96599 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -288,15 +288,16 @@ AVERAGETEMP(){
 	# echo ${logsfound}
 }
 
-SENDDAILY(){
-	dailtemp=$(DAILYTEMP)
-	SENDNOTICE "Daily Temp Readings" "${dailtemp}"
+SENDTEMPS(){
+	st_temps=$(DAILYTEMP)
+	SENDNOTICE "${1}" "${st_temps}"
 }
 
 CHECKTEMP_SERVICE(){
 	cw=20
 	declare -A last_temp
 	echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - 'Check Temp' Service Startup" >> ${PW_LOGFILE}
+	SENDTEMPS "TEMP Service Startup"
 	while true; do
 		source ${PW_FOLDER}/defaults.inc
 		
@@ -304,7 +305,7 @@ CHECKTEMP_SERVICE(){
 		# if [ ! -f ${PW_TMPFOLDER}/temp.* ] && [ $(date +%H)$(date +%M) -ge 0700 ] && [ $(date +%H)$(date +%M) -lt 0705 ]; then
 		# 	if [ ! -f ${PW_TMPFOLDER}/.sentdaily ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.sentdaily)) -gt 600 ]; then
 		# 		touch ${PW_TMPFOLDER}/.sentdaily
-		# 		SENDDAILY &
+		# 		SENDTEMPS "Daily Temp Readings" &
 		# 	fi
 		# fi
 		SENSORS_CHECKED=()
@@ -650,15 +651,15 @@ DAILYTEMP(){
 	echo -e "Sensor Temperature(s)              Now / 1DayAVG / 7DayAVG"
 	DIVIDER . . 60
 	for SENSORa in ${PW_SENSOR_ORD[@]}; do
-		if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ]; then
-			vHOST_TEMPNAMES=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSORa}]} .1.3.6.1.4.1.674.10892.5.4.700.20.1.8 -O vq | sed -e 's/"//g' | sed -e 's/ Temp//g')
-			IFS=$'\n'
-			read -rd '' -a SENSORS_CHECK <<<"${vHOST_TEMPNAMES}"
-			unset IFS
-			t=1
-		else
+		if [ "${PW_SENSOR_TYPE[${SENSORa}]}" != "esxi" ]; then
+		# 	vHOST_TEMPNAMES=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSORa}]} .1.3.6.1.4.1.674.10892.5.4.700.20.1.8 -O vq | sed -e 's/"//g' | sed -e 's/ Temp//g')
+		# 	IFS=$'\n'
+		# 	read -rd '' -a SENSORS_CHECK <<<"${vHOST_TEMPNAMES}"
+		# 	unset IFS
+		# 	t=1
+		# else
 			SENSORS_CHECK=(${SENSORa})
-		fi
+		# fi
 		
 		for SENSOR in "${SENSORS_CHECK[@]}"; do
 						
@@ -703,6 +704,9 @@ DAILYTEMP(){
 			fi
 		done
 		[ "${temp_c}" != "null" ] && [ "${temp_c}" != "" ] && echo
+		
+		fi
+		
 	done
 }