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

update

Browse Source
This commit is contained in:
David Schroeder
2023-11-06 21:57:14 -06:00
parent 383b5094a7
commit 2050e9487f
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
defaults.inc
View File

@@ -65,10 +65,11 @@ PW_SENSOR_ID['Powerwall-CPU']='6'
PW_SENSOR_ID['OctoPI-CPU']='7' PW_SENSOR_ID['OctoPI-CPU']='7'
PW_SENSOR_ID['iDS-vMS-Host0']='8' PW_SENSOR_ID['iDS-vMS-Host0']='8'
PW_SENSOR_ID['iDS-vMS-Host1']='9' PW_SENSOR_ID['iDS-vMS-Host1']='9'
# PW_SENSOR_ID['iDS-vMS-Host2']='10'
PW_SENSOR_ID['OFF-vMS-Host1']='10'
PW_SENSOR_ID['iDS-vMS-Host6']='13' PW_SENSOR_ID['iDS-vMS-Host6']='13'
PW_SENSOR_ID['iDS-vMS-Host7']='11' PW_SENSOR_ID['iDS-vMS-Host7']='11'
PW_SENSOR_ID['OFF-vMS-Host1']='10'
# PW_SENSOR_ID['iDS-vMS-Host2']='10'
# PW_SENSOR_ID['vMS-iDrac8']='12' # PW_SENSOR_ID['vMS-iDrac8']='12'
declare -A PW_HOST_IDRACS declare -A PW_HOST_IDRACS

26
powerwall.sh
View File

@@ -652,8 +652,8 @@ CHECKPOWER(){
gochk=1 gochk=1
fi fi
if [ ${gochk} -eq 1 ]; then if [ ${gochk} -eq 1 ]; then
HOST_WATTS=$(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.6.1.3 | sed 's/.*: //') # HOST_WATTS=$(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.6.1.3 | sed 's/.*: //')
if [ "${HOST_WATTS}" = "" ]; then # if [ "${HOST_WATTS}" = "" ]; then
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 | sed -e 's/"//g') 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 | sed -e 's/"//g')
IFS=$'\n' IFS=$'\n'
read -rd '' -a HOST_WATT_SENSORS <<<"${HOST_WATT_SENSORS}" read -rd '' -a HOST_WATT_SENSORS <<<"${HOST_WATT_SENSORS}"
@@ -663,7 +663,7 @@ CHECKPOWER(){
[[ "${ss}" = *"System Board"* ]] && break || ((s++)) [[ "${ss}" = *"System Board"* ]] && break || ((s++))
done done
HOST_WATTS=$(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.6.1.${s} | sed 's/.*: //') HOST_WATTS=$(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.6.1.${s} | sed 's/.*: //')
fi # fi
[[ "${HOST_WATTS}" = *"Timeout"* ]] && HOST_WATTS_disp="${idsCL[LightRed]}Host Offline" || HOST_WATTS_disp="${idsCL[Green]}${HOST_WATTS}'watts" [[ "${HOST_WATTS}" = *"Timeout"* ]] && HOST_WATTS_disp="${idsCL[LightRed]}Host Offline" || HOST_WATTS_disp="${idsCL[Green]}${HOST_WATTS}'watts"
echo -e "${idsCL[LightCyan]}${SENSOR} ${idsCL[Default]}: ${HOST_WATTS_disp}${idsCL[Default]}" echo -e "${idsCL[LightCyan]}${SENSOR} ${idsCL[Default]}: ${HOST_WATTS_disp}${idsCL[Default]}"
fi fi
@@ -911,6 +911,26 @@ POWERLOGGER_SERVICE(){
${mysql_conn} -e "USE servermonitor; ${QRY}" ${mysql_conn} -e "USE servermonitor; ${QRY}"
fi fi
for SENSOR in ${PW_SENSOR_ORD[@]}; do
if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then
# HOST_WATTS=$(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.6.1.3 | sed 's/.*: //')
# if [ "${HOST_WATTS}" = "" ]; then
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 | sed -e 's/"//g')
IFS=$'\n'
read -rd '' -a HOST_WATT_SENSORS <<<"${HOST_WATT_SENSORS}"
unset IFS
s=1
for ss in "${HOST_WATT_SENSORS[@]}"; do
[[ "${ss}" = *"System Board"* ]] && break || ((s++))
done
HOST_WATTS=$(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.6.1.${s} | sed 's/.*: //')
# fi
[[ "${HOST_WATTS}" = *"Timeout"* ]] && HOST_WATTS_disp="${idsCL[LightRed]}Host Offline" || HOST_WATTS_disp="${idsCL[Green]}${HOST_WATTS}'watts"
echo -e "${idsCL[LightCyan]}${SENSOR} ${idsCL[Default]}: ${HOST_WATTS_disp}${idsCL[Default]}"
fi
done
if [ "$(compgen -G "${PW_TMPFOLDER}/temp.*")" != "" ] || [ "$(compgen -G "${PW_TMPFOLDER}/power.*")" != "" ]; then if [ "$(compgen -G "${PW_TMPFOLDER}/temp.*")" != "" ] || [ "$(compgen -G "${PW_TMPFOLDER}/power.*")" != "" ]; then
sleep 1m sleep 1m
else else