diff --git a/defaults.inc b/defaults.inc index ec7b6845..f439b247 100755 --- a/defaults.inc +++ b/defaults.inc @@ -145,7 +145,7 @@ else done done fi -# echo "HERE: RUN_NODE_TYPE=$RUN_NODE_TYPE RUN_NODE_IP=$RUN_NODE_IP RUN_NODE_TSIP=$RUN_NODE_TSIP (RNIP=$RNIP TSI=$TSI)" +echo "HERE: RUN_NODE_TYPE=$RUN_NODE_TYPE RUN_NODE_IP=$RUN_NODE_IP RUN_NODE_TSIP=$RUN_NODE_TSIP (RNIP=$RNIP TSI=$TSI)" [ "${NM_REPL_NGINX_PATHS}" != "" ] && [ "${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}" != "" ] && NM_NGINXPATH=${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]} || NM_NGINXPATH=/etc/nginx if [ "${NM_CERTPATHS}" != "" ]; then if [ "${NM_CERTPATHS[${RUN_NODE_TYPE}]}" != "" ]; then diff --git a/inc/status.inc b/inc/status.inc index 1215dbc4..7b30dc60 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -481,7 +481,7 @@ STATUS_NODE(){ checkhostssl=ok fi if [ "${checkhost}" != "false" ] && [ "${checkhostssl}" == "ok" ]; then - [ "${NODETYPE}" != "OFW" ] && cpu_usage=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} "/opt/idssys/defaults/get-data.sh cpu-usage") || cpu_usage="" + [ "${NODETYPE}" != "OFW" ] && cpu_usage=$(${NCMD} "/opt/idssys/defaults/get-data.sh cpu-usage") || cpu_usage="" if [ "${cpu_usage}" != "" ]; then if [ "${NM_HOST_CPULEVELS[${nip}]}" != "" ]; then cpu_warn=$(echo ${NM_HOST_CPULEVELS[${nip}]} | cut -d',' -f 1)