This commit is contained in:
2023-12-04 09:08:48 -06:00
parent ee0e299bdf
commit d32afe4b1a
3 changed files with 22 additions and 22 deletions

View File

@@ -92,14 +92,6 @@ CHECKTEMP(){
[ "${avgdays}" != "noavg" ] && echo -en "Pulling data and calculating ${avgdays} Day average ... " || echo -en "Pulling data ... "
reading=$(CHECKTEMPSENSOR ${SENSOR} . . . . ${avgdays})
echo -e "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading}"
# if [ "${SENSOR}" == "Powerwall-CPU" ] || [ "${SENSOR}" == "OctoPi-CPU" ]; then
# SENSOR="${SENSOR}-Usage"
# echo -en "${idsCL[Yellow]}Pulling data for '${SENSOR}' ... "
# reading=$(CHECKTEMPSENSOR ${SENSOR})
# c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done
# echo -e "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading}"
# fi
fi
echo
fi
@@ -763,7 +755,7 @@ CHECKPOWER(){
fi
echo -e "${idsCL[Default]}\n"
# echo -e "${idsCL[LightCyan]}Current Fan Speed ${idsCL[Default]}: ${idsCL[Green]}${FanSpeed}%${idsCL[Default]}"
# echo -e "${idsCL[LightCyan]}Current Fan Speed ${idsCL[Default]}: ${idsCL[Green]}${FanSpeed}'%${idsCL[Default]}"
# echo
fi
@@ -817,6 +809,8 @@ CHECKPOWER(){
fi
else
HOST_WATTS_disp="${idsCL[LightRed]}Host offline"
fi
@@ -830,7 +824,13 @@ CHECKPOWER(){
echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}"
elif [ "${HOST_WATTS}" != "0" ]; then
echo -en "${idsCL[LightCyan]} [PS1=${PS1}'A, PS2=${PS2}'A]"
fi
fi
if [ "${PW_HOST_IDRACS[${SENSOR}]}" == "10.2.1.21" ]; then
vHOSTFAN=$(ssh root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${SENSOR}]} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep "System Board Fan1" 2>&1)
FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g')
echo -en "${idsCL[LightCyan]} [FanSpeed=${FanSpeed}'%]"
fi
echo -e "${idsCL[Default]}"
fi
fi