diff --git a/defaults.inc b/defaults.inc index bf95d049..2d3f75fc 100755 --- a/defaults.inc +++ b/defaults.inc @@ -79,7 +79,6 @@ ${2/\%/\%25} $(date)" "${1}" ${3} & else - echo "HERE: ${2/\%/\%25}" PUSH_TO_MOBILE "${2/\%/\%25} $(date)" "${1}" ${3} & diff --git a/inc/power.inc.sh b/inc/power.inc.sh index cdeb4be2..c52fc35e 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -548,7 +548,7 @@ Shutting down main servers" 1 # # if [ ! -f ${PW_TMPFOLDER}/power.offsite.ac.low ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.offsite.ac.low)) -ge 240 ]; then # SENDNOTICE "OFFSITE POWER ALERT - POWER OFF/LOW!!" "Power off or low voltage detected -# BATT CAPACITY: ${OFFSITE_BATT_CAP}'%25 +# BATT CAPACITY: ${OFFSITE_BATT_CAP}'% # BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'Mins" 1 # touch ${PW_TMPFOLDER}/power.offsite.ac.low # fi @@ -865,9 +865,6 @@ PDUCONTROL(){ } SENDPOWER(){ - SENDNOTICE "TEST 2" "TESTING - -TESTING" & st_power=`${PW_SCRIPT} check power -p -r` SENDNOTICE "${1}" "${st_power}" } diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 07d57be2..e294b45c 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -304,7 +304,7 @@ CHECKTEMP_SERVICE(){ fi done end=`date +%s`; runtime=$((end-start)) - # echo -e "Runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s" + echo -e "Runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s" [ ${runtime} -lt ${runEvery} ] && sleep $(expr ${runEvery} - ${runtime})s done # & } @@ -492,7 +492,7 @@ CHECKTEMP_SERVICE_RUNSENSOR(){ if [ "${PW_HOST_IDRACS[${SENSORa}]}" == "10.2.1.21" ] && [ "${FanSpeed}" != "" ]; then if [ ${FanSpeed} -lt 26 ] || [ ${FanSpeed} -gt 34 ]; then # if [ ${FanSpeed} -ne 30 ]; then - SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} Fan Issue" "Settings fans back to normal 30%25" + SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} Fan Issue" "Settings fans back to normal 30%" ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" raw 0x30 0x30 0x01 0x00 >/dev/null 2>&1 ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" raw 0x30 0x30 0x02 0xff 0x1E >/dev/null 2>&1 echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${FanSpeed}% - ${SENSOR} - Resetting FanSpeed back to 30%" >> ${logtemp} @@ -518,7 +518,7 @@ CHECKTEMP_SERVICE_RUNSENSOR(){ # iDS-vMS-Offsite Fan Issue Workaround if [ "${PW_HOST_IDRACS[${SENSORa}]}" == "10.2.1.21" ] && [ ${FanSpeed} -ne 80 ]; then - SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} SERVER WARM" "Setting fan speeds to 80%25" 1 + SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} SERVER WARM" "Setting fan speeds to 80%" 1 ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" raw 0x30 0x30 0x01 0x00 >/dev/null 2>&1 ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" raw 0x30 0x30 0x02 0xff 0x50 >/dev/null 2>&1 echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${temp_f}${GAUGESH} - ${SENSOR} - Server Warm, setting FanSpeed to 80%" >> ${logtemp} @@ -654,7 +654,7 @@ SENDTEMP(){ SENSORS_CHECK=(${SENSORa}) for SENSOR in "${SENSORS_CHECK[@]}"; do if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "cpu" ]; then - GAUGESH="'%25" + GAUGESH="'%" elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]]; then GAUGESH="'R" else diff --git a/offsite-power-check.sh b/offsite-power-check.sh index ebb5db15..fa5694f9 100755 --- a/offsite-power-check.sh +++ b/offsite-power-check.sh @@ -44,7 +44,7 @@ PWO_START(){ SENDNOTICE(){ MESSAGE="${TESTMODE}${2} -BATTERY CHARGE: ${OFFSITE_BATT_CAP}'%25 +BATTERY CHARGE: ${OFFSITE_BATT_CAP}'% BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'mins AC VOLTAGE: ${OFFSITE_VOLTIN}'volts