Update powerwall.sh

This commit is contained in:
2023-11-29 21:57:17 -06:00
parent 9fe0224733
commit f3551d5786

View File

@@ -551,7 +551,6 @@ CHECKPOWER(){
OUTPUTA=`echo ${INVSTATSINFO} | jq '.outputs .outA'` OUTPUTA=`echo ${INVSTATSINFO} | jq '.outputs .outA'`
OUTPUTA2=`echo "scale=2; ${OUTPUTA}*2" | bc` OUTPUTA2=`echo "scale=2; ${OUTPUTA}*2" | bc`
OUTPUTW=`echo ${INVSTATSINFO} | jq '.outputs .outW'` OUTPUTW=`echo ${INVSTATSINFO} | jq '.outputs .outW'`
# [[ "${OUTPUTW}" == *"."* ]] && [[ "${OUTPUTW}" != *".0"* ]] && OUTPUTW=`printf "%'.2f\n" ${OUTPUTW}` || OUTPUTW=`printf "%'.0f\n" ${OUTPUTW}`
BATTV=`echo ${INVSTATSINFO} | jq '.inputs .battV'` BATTV=`echo ${INVSTATSINFO} | jq '.inputs .battV'`
BATTA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'` BATTA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'`
BATTLIFE=`echo "scale=2; (${BATTV}*100)/54.6" | bc` BATTLIFE=`echo "scale=2; (${BATTV}*100)/54.6" | bc`
@@ -584,7 +583,6 @@ CHECKPOWER(){
SVRRM_VOLT=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.2.1.1 | sed 's/.*: //') SVRRM_VOLT=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.2.1.1 | sed 's/.*: //')
SVRRM_VOLT=`echo "scale=2; ${SVRRM_VOLT}/10" | bc` SVRRM_VOLT=`echo "scale=2; ${SVRRM_VOLT}/10" | bc`
SVRRM_WATT=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.4.1.1 | sed 's/.*: //') SVRRM_WATT=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.4.1.1 | sed 's/.*: //')
# [[ "${SVRRM_WATT}" == *"."* ]] && [[ "${SVRRM_WATT}" != *".0"* ]] && SVRRM_WATT_disp=`printf "%'.2f\n" ${SVRRM_WATT}` || SVRRM_WATT_disp=`printf "%'.0f\n" ${SVRRM_WATT}`
SVRRM_AMP=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.3.1.1 | sed 's/.*: //') SVRRM_AMP=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.3.1.1 | sed 's/.*: //')
SVRRM_AMP=`echo "scale=2; ${SVRRM_AMP}/100" | bc` SVRRM_AMP=`echo "scale=2; ${SVRRM_AMP}/100" | bc`
# fi # fi
@@ -594,13 +592,11 @@ CHECKPOWER(){
APCPDU_AMP=`echo "scale=2; ${APCPDU_AMP}/10" | bc` APCPDU_AMP=`echo "scale=2; ${APCPDU_AMP}/10" | bc`
APCPDU_WATT2=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.1.16.0 | sed 's/.*: //') APCPDU_WATT2=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.1.16.0 | sed 's/.*: //')
APCPDU_WATT=`echo "scale=2; ${APCPDU_AMP}*${SVRRM_VOLT}" | bc` APCPDU_WATT=`echo "scale=2; ${APCPDU_AMP}*${SVRRM_VOLT}" | bc`
# [[ "${APCPDU_WATT}" == *"."* ]] && [[ "${APCPDU_WATT}" != *".0"* ]] && APCPDU_WATT_disp=`printf "%'.2f\n" ${APCPDU_WATT}` || APCPDU_WATT_disp=`printf "%'.0f\n" ${APCPDU_WATT}`
# fi # fi
echo -e "${idsCL[White]}ServerRack Amps ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_AMP}'amps${idsCL[Default]}" echo -e "${idsCL[White]}ServerRack Amps ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_AMP}'amps${idsCL[Default]}"
if [ "${avgdays}" != "" ]; then if [ "${avgdays}" != "" ]; then
average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays}) average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays})
# [[ "${average}" == *"."* ]] && [[ "${average}" != *".0"* ]] && average=`printf "%'.2f\n" ${average}` || average=`printf "%'.0f\n" ${average}`
average_disp="${idsCL[LightYellow]} `printf "%'.1f\n" ${average}`'watts" average_disp="${idsCL[LightYellow]} `printf "%'.1f\n" ${average}`'watts"
else else
average_disp="" average_disp=""
@@ -613,7 +609,6 @@ CHECKPOWER(){
NETRK_AMP=`echo "scale=2; ${SVRRM_AMP}-${APCPDU_AMP}" | bc` NETRK_AMP=`echo "scale=2; ${SVRRM_AMP}-${APCPDU_AMP}" | bc`
NETRK_WATT=`echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT}" | bc` NETRK_WATT=`echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT}" | bc`
NETRK_WATT2=`echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT2}" | bc` NETRK_WATT2=`echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT2}" | bc`
# [[ "${NETRK_WATT}" == *"."* ]] && [[ "${NETRK_WATT}" != *".0"* ]] && NETRK_WATT=`printf "%'.2f\n" ${NETRK_WATT}` || NETRK_WATT=`printf "%'.0f\n" ${NETRK_WATT}`
fi fi
VOLT_DROP=`echo "scale=1; ${OUTPUTV2}-${SVRRM_VOLT}" | bc` VOLT_DROP=`echo "scale=1; ${OUTPUTV2}-${SVRRM_VOLT}" | bc`
fi fi
@@ -621,7 +616,6 @@ CHECKPOWER(){
echo -e "${idsCL[White]}NetworkRack Amps ${idsCL[Default]}: ${idsCL[Green]}${NETRK_AMP}'amps ~ estimate${idsCL[Default]}" echo -e "${idsCL[White]}NetworkRack Amps ${idsCL[Default]}: ${idsCL[Green]}${NETRK_AMP}'amps ~ estimate${idsCL[Default]}"
if [ "${avgdays}" != "" ]; then if [ "${avgdays}" != "" ]; then
average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays}) average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays})
# [[ "${average}" == *"."* ]] && [[ "${average}" != *".0"* ]] && average=`printf "%'.2f\n" ${average}` || average=`printf "%'.0f\n" ${average}`
average_disp="${idsCL[LightYellow]} `printf "%'.1f\n" ${average}`'watts" average_disp="${idsCL[LightYellow]} `printf "%'.1f\n" ${average}`'watts"
else else
average_disp="" average_disp=""
@@ -634,7 +628,6 @@ CHECKPOWER(){
echo -e "${idsCL[White]}Total Amps ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'amps${idsCL[Default]}" echo -e "${idsCL[White]}Total Amps ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'amps${idsCL[Default]}"
if [ "${avgdays}" != "" ]; then if [ "${avgdays}" != "" ]; then
average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total']} ${avgdays}) average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total']} ${avgdays})
# [[ "${average}" == *"."* ]] && [[ "${average}" != *".0"* ]] && average=`printf "%'.2f\n" ${average}` || average=`printf "%'.0f\n" ${average}`
average_disp="${idsCL[LightYellow]} `printf "%'.1f\n" ${average}`'watts" average_disp="${idsCL[LightYellow]} `printf "%'.1f\n" ${average}`'watts"
else else
average_disp="" average_disp=""
@@ -687,8 +680,7 @@ CHECKPOWER(){
echo -e "${idsCL[White]}Total Amps ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_AMPS}'amps ~ estimate${idsCL[Default]}" echo -e "${idsCL[White]}Total Amps ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_AMPS}'amps ~ estimate${idsCL[Default]}"
if [ "${avgdays}" != "" ]; then if [ "${avgdays}" != "" ]; then
average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['offsite-ups']} ${avgdays}) average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['offsite-ups']} ${avgdays})
[[ "${average}" == *"."* ]] && [[ "${average}" != *".0"* ]] && average=`printf "%'.2f\n" ${average}` || average=`printf "%'.0f\n" ${average}` average_disp="${idsCL[LightYellow]} `printf "%'.2f\n" ${average}`'watts"
average_disp="${idsCL[LightYellow]} ${average}'watts"
else else
average_disp="" average_disp=""
fi fi