diff --git a/inc/power.inc.sh b/inc/power.inc.sh index c52fc35e..0a13eabb 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -22,6 +22,7 @@ GET_OFFSITEHOST_FANSPEED(){ CHECKPOWER(){ start=`date +%s` rm -f ${PW_TMPFOLDER}/*.hostpower* + REPORT=0 while [ $# -gt 0 ]; do case "$1" in -a|-avg) avgdays=${2};; @@ -30,6 +31,7 @@ CHECKPOWER(){ -e|-esxi) PTYPE=esxi;; -p|-power) PTYPE=power;; -r|-report) + REPORT=1 unset idsCL idsBG idsST idsCL=('') idsBG=('') @@ -48,7 +50,7 @@ CHECKPOWER(){ echo -e "${idsCL[Yellow]}Mainsite Power Information ${idsCL[LightYellow]}${avgdayshdr}" DIVIDER . yellow 75 - echo -en "${idsCL[Yellow]}Pulling data from 'Powerwall' ... " + [ ${REPORT} -eq 0 ] && echo -en "${idsCL[Yellow]}Pulling data from 'Powerwall' ... " INVSTATSINFO=$(curl -s "http://${PW_INVERTER_IP}/stats.json") if [ "${INVSTATSINFO}" != "" ]; then @@ -83,7 +85,7 @@ CHECKPOWER(){ fi fi - echo -en "\r\033[K" + [ ${REPORT} -eq 0 ] && echo -en "\r\033[K" echo -e "${idsCL[White]}Inverter State ${idsCL[Default]}: ${INV_STATE_disp}" echo -e "${idsCL[White]}Inverter Mode ${idsCL[Default]}: ${INV_MODE_disp}" echo -e "${idsCL[White]}Inverter Alarms ${idsCL[Default]}: ${INV_ALARM_disp}" @@ -104,7 +106,7 @@ CHECKPOWER(){ # echo DIVIDER . lightCyan 75 - echo -en "${idsCL[Yellow]}Pulling data from 'ServerRoom' ... " + [ ${REPORT} -eq 0 ] && echo -en "${idsCL[Yellow]}Pulling data from 'ServerRoom' ... " # if [ "$(CHECK_HOST ${PW_UPS_IP})" != "false" ]; then SVRRM_VOLTIN=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.2.2.1.3.1.1 | sed 's/.*: //') @@ -133,7 +135,7 @@ CHECKPOWER(){ VOLT_DROP=`echo "scale=1; ${OUTPUTV2}-${SVRRM_VOLTIN}" | bc` fi - echo -en "\r\033[K" + [ ${REPORT} -eq 0 ] && echo -en "\r\033[K" echo -e "${idsCL[White]}ServerRack Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_AMP}`'amps${idsCL[Default]}" MSG="${idsCL[White]}ServerRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT}`'watts ${idsCL[Default]}~ estimate" @@ -188,7 +190,7 @@ CHECKPOWER(){ echo -e "${idsCL[Yellow]}Offsite Power Information ${idsCL[LightYellow]}${avgdayshdr}" DIVIDER . yellow 75 - echo -en "${idsCL[Yellow]}Pulling data from 'Offsite' ... " + [ ${REPORT} -eq 0 ] && echo -en "${idsCL[Yellow]}Pulling data from 'Offsite' ... " upsinfo=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 admin@10.2.1.1 'upsc CP1500PFCLCD') if [ "$(echo "${upsinfo}" | grep 'input.voltage:')" != "" ]; then @@ -219,7 +221,7 @@ CHECKPOWER(){ fi - echo -en "\r\033[K" + [ ${REPORT} -eq 0 ] && echo -en "\r\033[K" echo -e "${idsCL[White]}UPS Voltage In ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_VOLTIN}`'volts${idsCL[Default]}" echo -e "${idsCL[White]}UPS Voltage Out ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_VOLTOUT}`'volts${idsCL[Default]}" echo @@ -254,7 +256,7 @@ CHECKPOWER(){ gochk=1 fi if [ ${gochk} -eq 1 ]; then - echo -en "${idsCL[Yellow]}Pulling data for '${SENSOR}' ... " + [ ${REPORT} -eq 0 ] && echo -en "${idsCL[Yellow]}Pulling data for '${SENSOR}' ... " HOST_WATT_SENSORS=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_HOST_IDRACS[${SENSOR}]} iso.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 -O vq 2> /dev/null | sed -e 's/"//g') IFS=$'\n' @@ -300,7 +302,8 @@ CHECKPOWER(){ fi MSG="${idsCL[White]}${SENSOR} ${idsCL[Default]}: ${HOST_WATTS_disp}" - echo -en "\r\033[K${MSG}" + [ ${REPORT} -eq 0 ] && echo -en "\r\033[K" + echo -en "${MSG}" if [ "${HOST_WATT_SENSORS}" != "" ]; then if [ "${avgdays}" != "" ] && [ ${HOST_WATTS} -gt 0 ]; then