diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 17b12c1c..efc90881 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -916,7 +916,7 @@ POWERLOGGER_SERVICE(){ while true; do LogDataTime=`date +'%Y-%m-%d %H:%M:%S'` source ${PW_FOLDER}/defaults.inc - + echo 1 INVSTATSINFO=$(curl -m 3 -s "http://${PW_INVERTER_IP}/stats.json") if [ "${INVSTATSINFO}" != "" ]; then INPUTV=`echo ${INVSTATSINFO} | jq '.inputs .inV'` @@ -937,7 +937,7 @@ POWERLOGGER_SERVICE(){ QRY="INSERT INTO inv_jsonstats (\`date\`, \`data\`) VALUES ('${LogDataTime}','${INVSTATSINFO}')" ${mysql_conn} -e "USE servermonitor; ${QRY}" fi - + echo 2 if [ "$(CHECK_HOST ${PW_UPS_IP})" != "false" ]; then SVRRM_VOLT=$(snmpwalk -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=1; ${SVRRM_VOLT}/10" | bc` @@ -947,7 +947,7 @@ POWERLOGGER_SERVICE(){ QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['total']}','${LogDataTime}','${SVRRM_VOLT}','${SVRRM_AMP}','${SVRRM_WATT}')" ${mysql_conn} -e "USE servermonitor; ${QRY}" fi - + e ho 3 if [ "$(CHECK_HOST ${PW_APCPDU_IP})" != "false" ]; then APCPDU_AMP=$(snmpwalk -v 1 -c public ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.2.3.1.1.2.1 | sed 's/.*: //') APCPDU_AMP=`echo "scale=1; ${APCPDU_AMP}/10" | bc` @@ -959,7 +959,7 @@ POWERLOGGER_SERVICE(){ fi ${mysql_conn} -e "USE servermonitor; ${QRY}" fi - + echo 4 if [ "${SVRRM_VOLT}" != "" ] && [ "${APCPDU_AMP}" != "" ]; then NETRK_AMP=`echo "scale=2; ${SVRRM_AMP}-${APCPDU_AMP}" | bc` NETRK_WATT=$(ROUND_NUMBER `echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT}" | bc` 0) @@ -984,7 +984,7 @@ POWERLOGGER_SERVICE(){ AIRCON_WATT=0 AIRCON_AMP=0 fi - + echo 5 if [ "${SVRRM_WATT}" != "" ]; then SVRRM_AMP_WAC=$(echo "scale=2; ${SVRRM_AMP}+${AIRCON_AMP}" | bc -l) SVRRM_WATT_WAC=$(echo "scale=2; ${SVRRM_WATT}+${AIRCON_WATT}" | bc -l) @@ -1027,7 +1027,7 @@ POWERLOGGER_SERVICE(){ ${mysql_conn} -e "USE servermonitor; ${QRY}" fi done - + echo 6 for SENSOR in ${PW_SENSOR_ORD[@]}; do [[ "${SENSOR}" = "KP-"* ]] && ESXI_PASS=${PW_ESXI_PASS_KP} || ESXI_PASS=${PW_ESXI_PASS} if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ] && [ "$(ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSOR}]} -U ${PW_ESXI_USER} -P "${ESXI_PASS}" chassis power status | grep 'Power is on')" != "" ]; then @@ -1070,7 +1070,7 @@ POWERLOGGER_SERVICE(){ fi fi done - + echo 7 if ([ "$(compgen -G "${PW_TMPFOLDER}/temp.*")" != "" ] && [ "$(compgen -G "${PW_TMPFOLDER}/temp.*CPU*")" = "" ]) || [ "$(compgen -G "${PW_TMPFOLDER}/power.*.low")" != "" ]; then sleep ${PW_MYSQL_LOG_INTERVAL_ABNORMAL}m