voltron/powerwall
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update powerwall.sh

Browse Source
This commit is contained in:
David Schroeder
2023-11-04 09:38:27 -05:00
parent 39e2a2f098
commit f348b6acf8
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
powerwall.sh
View File

@@ -546,14 +546,14 @@ CHECKPOWER(){
start=`date +%s` start=`date +%s`
rm -f ${PW_TMPFOLDER}/*.hostpower* rm -f ${PW_TMPFOLDER}/*.hostpower*
if [ "${1}" == "" ] || [ "${1}" == "hosts" ]; then # if [ "${1}" == "" ] || [ "${1}" == "hosts" ]; then
for SENSOR in ${PW_SENSOR_ORD[@]}; do # for SENSOR in ${PW_SENSOR_ORD[@]}; do
if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then # if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then
GETHOSTPOWER ${PW_HOST_IDRACS[${SENSOR}]} & # GETHOSTPOWER ${PW_HOST_IDRACS[${SENSOR}]} &
fi # fi
done # done
check_GETHOSTPOWER & # check_GETHOSTPOWER &
fi # fi
if [ "${1}" == "" ] || [ "${1}" == "sensors" ]; then if [ "${1}" == "" ] || [ "${1}" == "sensors" ]; then
DIVIDER . yellow 75 DIVIDER . yellow 75
@@ -661,6 +661,17 @@ CHECKPOWER(){
DIVIDER . yellow 75 DIVIDER . yellow 75
if [ "${1}" == "" ] || [ "${1}" == "hosts" ]; then if [ "${1}" == "" ] || [ "${1}" == "hosts" ]; then
for SENSOR in ${PW_SENSOR_ORD[@]}; do
if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ] && [ "$(CHECK_HOST ${PW_HOST_IDRACS[${SENSOR}]})" != "false" ]; then
HOST_WATTS=$(snmpwalk -v 1 -c public ${host} iso.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3 | sed 's/.*: //')
else
HOST_WATTS='Host offline'
fi
echo -e "${idsCL[LightCyan]}${PW_iDRACHOST_SHORTNAMES[${host}]} ${idsCL[Default]}: ${HOST_WATTS}${idsCL[Default]}"
done
finalcheck="" finalcheck=""
until [ "${finalcheck}" != "" ]; do until [ "${finalcheck}" != "" ]; do
for hostfile in ${PW_TMPFOLDER}/*.hostpower; do for hostfile in ${PW_TMPFOLDER}/*.hostpower; do
@@ -678,9 +689,6 @@ CHECKPOWER(){
fi fi
echo -e "${idsCL[LightCyan]}${PW_iDRACHOST_SHORTNAMES[${host}]} ${idsCL[Default]}: ${hostpower}${idsCL[Default]}" echo -e "${idsCL[LightCyan]}${PW_iDRACHOST_SHORTNAMES[${host}]} ${idsCL[Default]}: ${hostpower}${idsCL[Default]}"
# HOST_WATTS=$(snmpwalk -v 1 -c public ${host} iso.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3 | sed 's/.*: //')
# echo -e "${idsCL[LightCyan]}${PW_iDRACHOST_SHORTNAMES[${host}]} SNMP ${idsCL[Default]}: ${HOST_WATTS}${idsCL[Default]}"
mv ${hostfile} ${hostfile}.done mv ${hostfile} ${hostfile}.done
elif [ "${host}" == "done" ]; then elif [ "${host}" == "done" ]; then