This commit is contained in:
2024-01-31 08:50:31 -06:00
parent 07c6e44c3b
commit 5fbc07347a
5 changed files with 33 additions and 32 deletions

View File

@@ -68,13 +68,13 @@ CHECKTEMP(){
fi
if [ "${temptype}" != "esxi" ]; then
DIVIDER . yellow 70
DIVIDER . yellow ${PRI_WIDTH}
if [ "${avgdays}" != "noavg" ]; then
echo -e "${idsCL[LightYellow]}SENSOR TEMPERATURE(S) Current / ${idsCL[LightYellow]}${avgdays_disp}AVG ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[LightRed]}critical${idsCL[Default]}"
else
echo -e "${idsCL[LightYellow]}SENSOR TEMPERATURE(S) Current ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[LightRed]}critical${idsCL[Default]}"
fi
DIVIDER . yellow 70
DIVIDER . yellow ${PRI_WIDTH}
for SENSOR in ${PW_SENSOR_ORD[@]}; do
if ([ "${search}" == "" ] || [[ "${SENSOR,,}" = *"${search,,}"* ]]) && [ "${PW_SENSOR_TYPE[${SENSOR}]}" != "esxi" ] && ([ "${temptype}" != "fans" ] || ([ "${temptype}" == "fans" ] && [[ "${SENSOR}" = *"Room"* ]])); then
[ "${last_sensor}" == "${SENSOR%%-*}" ] && echo -en "\033[1A"
@@ -104,17 +104,17 @@ CHECKTEMP(){
last_sensor=${SENSOR%%-*}
fi
done
DIVIDER . yellow 70
DIVIDER . yellow ${PRI_WIDTH}
fi
if [ "${temptype}" != "sensors" ]; then
DIVIDER . yellow 70
DIVIDER . yellow ${PRI_WIDTH}
if [ "${avgdays}" != "noavg" ]; then
echo -e "${idsCL[LightYellow]}ESXI HOST TEMPERATURE(S) Current / ${idsCL[LightYellow]}${avgdays_disp}AVG ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[LightRed]}critical${idsCL[Default]}"
else
echo -e "${idsCL[LightYellow]}ESXI HOST TEMPERATURE(S) Current ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[LightRed]}critical${idsCL[Default]}"
fi
DIVIDER . yellow 70
DIVIDER . yellow ${PRI_WIDTH}
for SENSOR in ${PW_SENSOR_ORD[@]}; do
if ([ "${search}" == "" ] || [[ "${SENSOR,,}" = *"${search,,}"* ]]) && [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "esxi" ]; then
vHOSTiDRACIP=${PW_HOST_IDRACS[${SENSOR}]}
@@ -151,7 +151,7 @@ CHECKTEMP(){
echo -e "${idsCL[Default]}"
fi
# if [ "${temptype}" != "fans" ]; then
DIVIDER . lightCyan 70
DIVIDER . lightCyan ${PRI_WIDTH}
echo -en "${idsCL[Yellow]}Pulling data for '${SENSOR}' ... "
# if [ ! -f ${PW_TMPFOLDER}/${SENSOR}.down ] && [ "$(CHECK_HOST ${vHOSTIP})" != "false" ]; then
@@ -910,7 +910,7 @@ ESXI_FANSPEED_MGMT(){
fi
echo -e "${idsCL[Yellow]}Setting new FanSpeeds for the following ESXi Hosts:"
DIVIDER . yellow
DIVIDER . yellow ${PRI_WIDTH}
if [ "${PW_iDRACHOST_SHORTNAMES[${HOST}]}" != "" ]; then
tmp=${PW_iDRACHOST_SHORTNAMES[${HOST}]}
@@ -951,7 +951,7 @@ ESXI_FANSPEED_MGMT(){
[ -f ${PW_TMPFOLDER}/${PW_iDRACHOST_SHORTNAMES[${host}]}.down ] && echo " - Offline, skipping" || echo
fi
done
DIVIDER true yellow
DIVIDER true yellow ${PRI_WIDTH}
for host in ${PW_ESXI_FANSPEEDCONTROLHOSTS[@]}; do
tmp=temp