diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 09516fe0..0497d778 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -57,8 +57,7 @@ STATUS() { uptime=`uptime -p` echo -e " ${idsST[Bold]}${idsCL[LightCyan]}${NODE_HOSTNAME} (${lip})${idsST[Reset]}${idsCL[LightCyan]} - ${uptime} - localhost${idsCL[Default]}" DIVIDER false green - for srvc in "${LOCAL_SERVICES[@]}" - do + for srvc in "${LOCAL_SERVICES[@]}"; do c=0; cw=22; spc='' spc1=${cw}-${#NM_SERVICES[${srvc}]} until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done @@ -89,7 +88,6 @@ STATUS() { c=0; cw=22; spc='' spc1=${cw}-${#NM_SERVICES[${srvc}]} until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done - echo "${NCMD}" echo -en " ${NM_SERVICES[${srvc}]}$spc: " if [ "$(${NCMD} systemctl is-active ${srvc})" = "active" ]; then echo -e "${idsCL[Green]}Running${idsCL[Default]}" @@ -167,7 +165,6 @@ STATUS() { } STATUS-CHECK(){ - echo "running" start=`date +%s` if [ "${STATUS_CHECK_EMAIL}" != "" ]; then if [ ! -z ${LOCAL_SERVICES+x} ]; then NHCMD='ssh root@10.5.10.51' @@ -187,8 +184,10 @@ STATUS-CHECK(){ lip=$(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) for srvc in "${LOCAL_SERVICES[@]}"; do if [ "$(systemctl is-active ${srvc})" != "active" ]; then - echo "${NM_SERVICES[${srvc}]} is down" | mail -s "${NODE_HOSTNAME}-${nip}" ${STATUS_CHECK_EMAIL} - touch ${FOLDER}/localhost-${srvc}.down + if [ ! -f ${FOLDER}/localhost-${srvc}.down ]; then + echo "${NM_SERVICES[${srvc}]} is down" | mail -s "${NODE_HOSTNAME}-${nip}" ${STATUS_CHECK_EMAIL} + touch ${FOLDER}/localhost-${srvc}.down + fi elif [ -f ${FOLDER}/localhost-${srvc}.down ]; then echo "${NM_SERVICES[${srvc}]} is back UP!" | mail -s "${NODE_HOSTNAME}-${nip}" ${STATUS_CHECK_EMAIL} rm -f ${FOLDER}/localhost-${srvc}.down @@ -198,6 +197,7 @@ STATUS-CHECK(){ if [ -z ${LOCAL_SERVICES+x} ] || [ "${1}" = "all" ]; then nid=1 for nip in "${NODE_HOSTS[@]}"; do + echo "${nip}" checkhost=$(CHECK_HOST ${nip}) if [ "${checkhost}" != "false" ]; then if [ -f ${FOLDER}/${nip}.down ]; then @@ -209,8 +209,10 @@ STATUS-CHECK(){ fi for srvc in "${NODE_SERVICES[@]}"; do if [ "$(${NCMD} systemctl is-active ${srvc})" != "active" ]; then - echo "${NM_SERVICES[${srvc}]} is down" | mail -s "iDS-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL} - touch ${FOLDER}/${nip}-${srvc}.down + if [ ! -f ${FOLDER}/${nip}-${srvc}.down ]; then + echo "${NM_SERVICES[${srvc}]} is down" | mail -s "iDS-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL} + touch ${FOLDER}/${nip}-${srvc}.down + fi elif [ -f ${FOLDER}/${nip}-${srvc}.down ]; then echo "${NM_SERVICES[${srvc}]} is back UP!" | mail -s "iDS-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL} rm -f ${FOLDER}/${nip}-${srvc}.down