Update temp.inc.sh
This commit is contained in:
@@ -44,11 +44,13 @@ CHECKTEMP(){
|
||||
fi
|
||||
echo
|
||||
if [ "${avgdays}" != "" ]; then
|
||||
if [ $(bc -l <<< "${avgdays} < 1") -eq 1 ]; then
|
||||
avgdays_disp="$(ROUND_NUMBER $(bc <<< "scale=2; ${avgdays}*24*60") 0)Min"
|
||||
elif [ $(bc -l <<< "${avgdays} < 10") -eq 1 ]; then
|
||||
avgdays_disp=" ${avgdays}Day"
|
||||
else
|
||||
if [[ "${avgdays^^}" = *"M"* ]]; then
|
||||
avgdays_disp="${avgdays::-1}Min"
|
||||
elif [[ "${avgdays^^}" = *"H"* ]]; then
|
||||
avgdays_disp="${avgdays::-1}Hrs"
|
||||
elif [[ "${avgdays^^}" = *"D"* ]]; then
|
||||
avgdays_disp="${avgdays::-1}Day"
|
||||
elif [[ "${avgdays}" =~ ^[0-9]+$ ]]; then
|
||||
avgdays_disp="${avgdays}Day"
|
||||
fi
|
||||
echo -e "${idsCL[Cyan]}Sensor Temperature(s) Current / ${idsCL[LightYellow]}${avgdays_disp}AVG ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[LightRed]}critical${idsCL[Default]}"
|
||||
@@ -139,10 +141,14 @@ CHECKTEMP(){
|
||||
if [ ! -f ${PW_TMPFOLDER}/${SENSOR}.down ]; then
|
||||
echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${idsCL[Yellow]}"
|
||||
if [ "${avgdays}" != "noavg" ]; then
|
||||
if [ $(bc -l <<< "${avgdays} < 1") -eq 1 ]; then
|
||||
avgdays_disp="$(ROUND_NUMBER $(bc <<< "scale=2; ${avgdays}*24*60") 0) Minute"
|
||||
else
|
||||
avgdays_disp="${avgdays} Day"
|
||||
if [[ "${avgdays^^}" = *"M"* ]]; then
|
||||
avgdays_disp="${avgdays::-1} Minute"
|
||||
elif [[ "${avgdays^^}" = *"H"* ]]; then
|
||||
avgdays_disp="${avgdays::-1} Hour"
|
||||
elif [[ "${avgdays^^}" = *"D"* ]]; then
|
||||
avgdays_disp="${avgdays::-1} Day"
|
||||
elif [[ "${avgdays}" =~ ^[0-9]+$ ]]; then
|
||||
avgdays_disp="${avgdays::-1} Day"
|
||||
fi
|
||||
echo -en "Pulling data and calculating ${avgdays_disp} average ... "
|
||||
else
|
||||
@@ -314,8 +320,19 @@ AVERAGETEMP(){
|
||||
WHERE="sensorid=${sensorid} AND entity=${entityid}"
|
||||
else
|
||||
WHERE="sensorid=${sensorid}"
|
||||
fi
|
||||
|
||||
if [[ "${daysback^^}" = *"M"* ]]; then
|
||||
interval="${avgdays::-1} MINUTE"
|
||||
elif [[ "${daysback^^}" = *"H"* ]]; then
|
||||
interval="${avgdays::-1} HOUR"
|
||||
elif [[ "${daysback^^}" = *"D"* ]]; then
|
||||
interval="${avgdays::-1} DAY"
|
||||
elif [[ "${daysback}" =~ ^[0-9]+$ ]]; then
|
||||
interval="${avgdays} DAY"
|
||||
fi
|
||||
[ $(bc -l <<< "${daysback} < 1") -eq 1 ] && interval="$(ROUND_NUMBER $(bc <<< "scale=2; ${daysback}*24*60")) HOUR" || interval="${daysback} MINUTE"
|
||||
|
||||
|
||||
while IFS=$'\t' read date temp hum speed ;do
|
||||
if [ "${3}" == "FanSpeed" ] && [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${sensor}]}"* ]]; then
|
||||
temptotal=$(bc <<< "scale=2; ${temptotal}+${speed}")
|
||||
|
||||
Reference in New Issue
Block a user