diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 3f184ab6..d52d6ae2 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -402,7 +402,7 @@ CHECKPOWER(){ [ "${PS2}" != "0.0" ] && PS2=`echo "scale=1; ${PS2}/10" | bc` && (( $(bc <<<"${PS2} < 1") )) && [[ "${PS2}" = *"."* ]] && PS2="0${PS2}" HOST_AMPS=`echo "scale=1; ${PS1}+${PS2}" | bc` AD=${HOST_AMPS}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD} - 2`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done - HOST_WATTS_disp="${idsCL[Green]}${AD}'amps${spc}`IDS_NUMBER_FORMAT ${HOST_WATTS} 0`'watts" + HOST_WATTS_disp="${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${HOST_WATTS} 0`'W" elif [ "$(ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSOR}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power status | grep off)" != "" ]; then HOST_WATTS_disp="${idsCL[LightRed]}Host powered down " @@ -431,7 +431,7 @@ CHECKPOWER(){ average_amp=$(echo ${average} | cut -d'~' -f 1) average_watt=$(echo ${average} | cut -d'~' -f 2) AD=${average_amp}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD} - 2`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done - average_disp=" ${AD}'amps${spc}`IDS_NUMBER_FORMAT ${average_watt} 0`'watts" + average_disp=" ${AD}'A${spc}`IDS_NUMBER_FORMAT ${average_watt} 0`'W" echo -en "\r\033[K" echo -e "${MSG}${idsCL[LightYellow]}${average_disp}${idsCL[Default]}" @@ -469,12 +469,14 @@ CHECKPOWER(){ if [ "${STYPE}" = "" ] || [ "${STYPE}" = "mainsite" ]; then AD=${SENSOR_TOTAL_AMPS_MAINSITE}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD} - 2`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done echo -en "${idsCL[LightCyan]}Mainsite ESXi Total ${idsCL[Default]}: ${idsCL[LightGreen]}${AD}'amps${spc}`IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_MAINSITE} 0`'watts " - [ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} ${AVERAGE_AMPS_MAINSITE}'amps - `IDS_NUMBER_FORMAT ${AVERAGE_WATTS_MAINSITE} 0`'watts" || echo + AD=${AVERAGE_AMPS_MAINSITE}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD} - 2`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done + [ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${AVERAGE_WATTS_MAINSITE} 0`'W" || echo fi if [ "${STYPE}" = "" ] || [ "${STYPE}" = "offsite" ]; then AD=${SENSOR_TOTAL_AMPS_OFFSITE}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD} - 2`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done - echo -en "${idsCL[LightCyan]}Offsite ESXi Total ${idsCL[Default]}: ${idsCL[LightGreen]}${AD}'amps${spc}`IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_OFFSITE} 0`'watts " - [ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} ${AVERAGE_AMPS_OFFSITE}'amps - `IDS_NUMBER_FORMAT ${AVERAGE_WATTS_OFFSITE} 0`'watts" || echo + echo -en "${idsCL[LightCyan]}Offsite ESXi Total ${idsCL[Default]}: ${idsCL[LightGreen]}${AD}'amps${spc}`IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_OFFSITE} 0`'W " + AD=${AVERAGE_AMPS_OFFSITE}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD} - 2`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done + [ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${AVERAGE_WATTS_OFFSITE} 0`'W" || echo fi fi if [ ${REPORT} -eq 0 ]; then