Update temp.inc.sh

This commit is contained in:
2023-12-30 12:48:33 -06:00
parent f6f174ec68
commit 1e6f692317

View File

@@ -272,7 +272,7 @@ CHECKTEMP_SERVICE(){
declare -A last_temp declare -A last_temp
runEvery=10 #SECONDS runEvery=10 #SECONDS
echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - 'Check Temp' Service Startup" >> ${PW_LOGFILE} echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - 'Check Temp' Service Startup" >> ${PW_LOGFILE}
SENDTEMPS "TEMP Service Startup" & SENDTEMPS "TEMP Service Startup" ###&
while true; do while true; do
start=$(date +%s) start=$(date +%s)
source ${PW_FOLDER}/defaults.inc source ${PW_FOLDER}/defaults.inc
@@ -286,7 +286,7 @@ CHECKTEMP_SERVICE(){
# fi # fi
SENSORS_CHECKED=() SENSORS_CHECKED=()
for SENSORa in ${PW_SENSOR_ORD[@]}; do for SENSORa in ${PW_SENSOR_ORD[@]}; do
CHECKTEMP_SERVICE_RUNSENSOR ${SENSORa} ###& CHECKTEMP_SERVICE_RUNSENSOR ${SENSORa} &
SENSORS_CHECKED+=(${SENSORa}) SENSORS_CHECKED+=(${SENSORa})
done done
s_count=0; completed=false; scanstart=$(date +%s) s_count=0; completed=false; scanstart=$(date +%s)
@@ -310,7 +310,6 @@ CHECKTEMP_SERVICE(){
${PW_TMPFOLDER}/zservicerun.${SENSORa}.done ${PW_TMPFOLDER}/zservicerun.${SENSORa}.done
} }
CHECKTEMP_SERVICE_RUNSENSOR(){ CHECKTEMP_SERVICE_RUNSENSOR(){
echo "checking ${1}"
SENSORa=${1} SENSORa=${1}
logtemp=${PW_LOGFOLDER}/log-temp-${SENSORa} logtemp=${PW_LOGFOLDER}/log-temp-${SENSORa}
[ ! -f ${logtemp} ] && touch ${logtemp} [ ! -f ${logtemp} ] && touch ${logtemp}
@@ -642,16 +641,8 @@ SENDTEMP(){
DIVIDER . . 40 DIVIDER . . 40
for SENSORa in ${PW_SENSOR_ORD[@]}; do for SENSORa in ${PW_SENSOR_ORD[@]}; do
([[ "${SENSORa}" = *"-Probe"* ]] || [[ "${SENSORa}" = *"-Usage"* ]]) && cw=25 || cw=30 ([[ "${SENSORa}" = *"-Probe"* ]] || [[ "${SENSORa}" = *"-Usage"* ]]) && cw=25 || cw=30
if [ "${PW_SENSOR_TYPE[${SENSORa}]}" != "esxi" ]; then if [ "${PW_SENSOR_TYPE[${SENSORa}]}" != "esxi" ] && ([ "${PW_SENSOR_TYPE[${SENSORa}]}" == "lacrosse" ] || ([ "${PW_REMOTE_SENSORS[${SENSORa}]}" != "" ] && [ "$(CHECK_HOST ${PW_REMOTE_SENSORS[${SENSORa}]})" != "false" ])); 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}) SENSORS_CHECK=(${SENSORa})
# fi
for SENSOR in "${SENSORS_CHECK[@]}"; do for SENSOR in "${SENSORS_CHECK[@]}"; do
if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "cpu" ]; then if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "cpu" ]; then
GAUGESH="'%25" GAUGESH="'%25"