diff --git a/offsite-power-check.sh b/offsite-power-check.sh index c04848fc..a47a37fb 100755 --- a/offsite-power-check.sh +++ b/offsite-power-check.sh @@ -13,7 +13,7 @@ PW_TMPFOLDER=${PW_FOLDER}/.tmp SHUTDOWNSERVERS_AT_LOAD=80 #percent WAIT_TO_POWER_SERVERS=5 #minutes LOG_INTERVAL_NORMAL=60 #minutes -LOG_INTERVAL_ABNORMAL=5 #minutes +LOG_INTERVAL_ABNORMAL=30 #seconds # TEST=true #full if [ "$TEST" != "" ]; then @@ -39,12 +39,12 @@ PWO_START(){ OFFSITE_BATT_CAP=$(echo "${upsinfo}" | grep 'battery.charge:' | sed 's/.*: //') SENDNOTICE(){ MESSAGE="${TESTMODE}${2} - - BATTERY CHARGE: ${OFFSITE_BATT_CAP}%25 - BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'Mins - AC VOLTAGE: ${OFFSITE_VOLTIN}'Volts - - $(date)" + +BATTERY CHARGE: ${OFFSITE_BATT_CAP}%25 +BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'Mins +AC VOLTAGE: ${OFFSITE_VOLTIN}'Volts + +$(date)" if [ "${3}" = "1" ]; then PRIORITY="${3}"; MSGSOUND=siren; elif [ "${3}" != "" ]; then PRIORITY=${3}; else PRIORITY=0; fi curl -sd "token=${PUSHOVER_APP_TOKEN}&user=${PUSHOVER_USER_TOKEN}&message=${MESSAGE}&title=${1}&priority=${PRIORITY}&sound=cosmic" https://api.pushover.net/1/messages.json >/dev/null 2>&1 } @@ -75,7 +75,7 @@ PWO_START(){ fi fi logtime=$(expr `date +%s` - $(stat -f %m ${PW_LOGPOWER})) - if [ ${logtime} -gt $(echo "scale=2; ${LOG_INTERVAL_NORMAL}*60" | bc) ] || ([ ${OFFSITE_BATT_CAP%.*} -lt 100 ] && [ ${logtime} -gt $(echo "scale=2; ${LOG_INTERVAL_ABNORMAL}*60" | bc) ]); then + if [ ${logtime} -gt $(echo "scale=2; ${LOG_INTERVAL_NORMAL}*60" | bc) ] || ([ ${OFFSITE_BATT_CAP%.*} -lt 100 ] && [ ${logtime} -gt $(echo "scale=2; ${LOG_INTERVAL_ABNORMAL}" | bc) ]); then echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - ${OFFSITE_BATT_CAP}% Battery - Normal" >> ${PW_LOGPOWER} fi else @@ -91,7 +91,7 @@ PWO_START(){ touch ${PW_TMPFOLDER}/power.offsite.off ([ "$TEST" = "" ] || [ "$TEST" = "full" ]) && ssh root@10.2.1.11 /vmfs/volumes/652c94ef-ee49895b-365d-00109b3fea40/.SCRIPTS/esxi-shutdown2.sh & fi - [ $(expr `date +%s` - $(stat -f %m ${PW_LOGPOWER})) -gt $(echo "scale=2; ${LOG_INTERVAL_ABNORMAL}*60" | bc) ] && echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - ${OFFSITE_BATT_CAP}% Battery - OFF/LOW POWER!!" >> ${PW_LOGPOWER} + [ $(expr `date +%s` - $(stat -f %m ${PW_LOGPOWER})) -gt $(echo "scale=2; ${LOG_INTERVAL_ABNORMAL}" | bc) ] && echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - ${OFFSITE_BATT_CAP}% Battery - OFF/LOW POWER!!" >> ${PW_LOGPOWER} fi else