From 81a07b20b3f2f6b3a4545c9dff0dc8fb5c5fdbdb Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 19 Jun 2023 20:23:18 -0500 Subject: [PATCH] update --- defaults.inc | 3 +- inc/status.inc | 72 ++++++++++++++++++++++----------------------- nodemgmt-scripts.sh | 12 ++++---- 3 files changed, 44 insertions(+), 43 deletions(-) diff --git a/defaults.inc b/defaults.inc index 9e4ca3ac..5f7ecdd7 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='4.7.117-06192023' +VERS='4.7.118-06192023' # NODETYPES=WEB NODETYPES=LB,LPD,MM,MYSQL,NC,PW,WPD,WM,WEB @@ -73,6 +73,7 @@ NM_HOSTNAMES['10.10.10.81']='LoadBalancer-Node1' NM_HOSTNAMES['10.10.10.82']='LoadBalancer-Node2' NM_HOSTNAMES['10.10.10.10']='LAN-DNS-Node1' NM_HOSTNAMES['10.10.10.11']='LAN-DNS-Node2' +NM_HOSTNAMES['10.2.1.2']='LAN-DNS-Offsite' NM_HOSTNAMES['10.10.10.42']='Nextcloud-Server' NM_HOSTNAMES['10.10.10.50']='MySQL-Manager' NM_HOSTNAMES['10.10.0.240']='PowerWall-Server' diff --git a/inc/status.inc b/inc/status.inc index 0da75c77..83c3906f 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -142,7 +142,7 @@ STATUS(){ DIVIDER; echo -e "${idsST[Reset]}" fi for nip in "${!var}"; do - [ "${ST_ACTION}" != "check" ] && echo -en " ${idsST[Bold]}${idsCL[LightCyan]}${NM_NODETYPES[$NTYPE]}-Node${nid} (${nip})${idsST[Reset]}" + [ "${ST_ACTION}" != "check" ] && echo -en " ${idsST[Bold]}${idsCL[LightCyan]}${NM_HOSTNAMES[${nip}]} (${nip})${idsST[Reset]}" if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then NCMD=''; LH='- localhost' else NCMD="ssh root@${nip}"; LH='' @@ -152,7 +152,7 @@ STATUS(){ fi if [ "${checkhost}" != "false" ]; then if [ "${ST_ACTION}" != "check" ]; then - #echo -en " ${idsST[Bold]}${idsCL[LightCyan]}${NM_NODETYPES[$NTYPE]}-Node${nid} (${nip})${idsST[Reset]}" + #echo -en " ${idsST[Bold]}${idsCL[LightCyan]}${NM_HOSTNAMES[${nip}]} (${nip})${idsST[Reset]}" if ([ "${ST_ACTION}" == "report" ] && [ "${2}" == "email" ]) || [ "${ST_ACTION}" != "report" ]; then uptime=`${NCMD} uptime -p` echo -e "${idsCL[LightCyan]} - ${uptime} ${idsCL[LightYello]}${LH}${idsCL[Default]}" @@ -169,7 +169,7 @@ STATUS(){ toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}.down) fi rm -f ${TMPFOLDER}/${nip}.* - SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}-UP" "${NM_NODETYPES[$NTYPE]}-Node${nid} is back UP! It was down for $(SHOW_TIME ${toterrtime})" + SENDNOTICE "${NM_HOSTNAMES[${nip}]}-${nip}-UP" "${NM_HOSTNAMES[${nip}]} is back UP! It was down for $(SHOW_TIME ${toterrtime})" fi if [ "${ST_ACTION}" != "dockers" ]; then @@ -201,19 +201,19 @@ STATUS(){ if [ ! -f ${TMPFOLDER}/${nip}~${srvc}.down ]; then [ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Red]}Not Running${idsCL[Default]}" touch ${TMPFOLDER}/${nip}~${srvc}.down - # SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_SERVICES[${srvc}]} is down" 1 - echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_SERVICES[${srvc}]} is down" >> ${LOGFILE} + # SENDNOTICE "${NM_HOSTNAMES[${nip}]}-${nip}" "${NM_SERVICES[${srvc}]} is down" 1 + echo "$(date) - ${nip} - ${NM_HOSTNAMES[${nip}]} - ${NM_SERVICES[${srvc}]} is down" >> ${LOGFILE} else errtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}~${srvc}.down) if [ $errtime -gt ${RENOTIFY} ]; then [ ! -f ${TMPFOLDER}/${nip}~${srvc}.errtime ] && mv ${TMPFOLDER}/${nip}~${srvc}.down ${TMPFOLDER}/${nip}~${srvc}.errtime toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}~${srvc}.errtime) touch ${TMPFOLDER}/${nip}~${srvc}.down - SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_SERVICES[${srvc}]} is down" 1 + SENDNOTICE "${NM_HOSTNAMES[${nip}]}-${nip}" "${NM_SERVICES[${srvc}]} is down" 1 # ([ "${srvc}" == "mysql" ] || [ "${srvc}" == "mariadb" ]) && ${NCMD} systemctl restart ${srvc} & elif [ $errtime -gt 60 ] && [ $errtime -lt 180 ] && [ ! -f ${TMPFOLDER}/${nip}~${srvc}.errtime ]; then - SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_SERVICES[${srvc}]} is down" 1 + SENDNOTICE "${NM_HOSTNAMES[${nip}]}-${nip}" "${NM_SERVICES[${srvc}]} is down" 1 fi [ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Red]}Not running for $(SHOW_TIME ${toterrtime})${idsCL[Default]}" @@ -222,8 +222,8 @@ STATUS(){ [ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Green]}Running${idsCL[Default]}" if [ -f ${TMPFOLDER}/${nip}~${srvc}.down ]; then [ -f ${TMPFOLDER}/${nip}~${srvc}.errtime ] && toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}~${srvc}.errtime) || toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}~${srvc}.down) - SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_SERVICES[${srvc}]} is back UP! It was down for $(SHOW_TIME ${toterrtime})" - echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_SERVICES[${srvc}]} is back up, it was down for $(SHOW_TIME ${toterrtime})" >> ${LOGFILE} + SENDNOTICE "${NM_HOSTNAMES[${nip}]}-${nip}" "${NM_SERVICES[${srvc}]} is back UP! It was down for $(SHOW_TIME ${toterrtime})" + echo "$(date) - ${nip} - ${NM_HOSTNAMES[${nip}]} - ${NM_SERVICES[${srvc}]} is back up, it was down for $(SHOW_TIME ${toterrtime})" >> ${LOGFILE} rm -f ${TMPFOLDER}/${nip}~${srvc}.* @@ -272,9 +272,9 @@ STATUS(){ # if [ "${ST_ACTION}" != "check" ]; then # echo -e "${idsCL[Red]}Not Running${idsCL[Default]}" # fi - # SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_SERVICES[${srvc}]} is down" 1 + # SENDNOTICE "${NM_HOSTNAMES[${nip}]}-${nip}" "${NM_SERVICES[${srvc}]} is down" 1 # touch ${TMPFOLDER}/${nip}~${srvc}.down - # echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_SERVICES[${srvc}]} is down" >> ${LOGFILE} + # echo "$(date) - ${nip} - ${NM_HOSTNAMES[${nip}]} - ${NM_SERVICES[${srvc}]} is down" >> ${LOGFILE} # # else # errtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}~${srvc}.down) @@ -302,8 +302,8 @@ STATUS(){ # else # toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}~${srvc}.down) # fi - # SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_SERVICES[${srvc}]} is back UP! It was down for $(SHOW_TIME ${toterrtime})" - # echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_SERVICES[${srvc}]} is back up, it was down for $(SHOW_TIME ${toterrtime})" >> ${LOGFILE} + # SENDNOTICE "${NM_HOSTNAMES[${nip}]}-${nip}" "${NM_SERVICES[${srvc}]} is back UP! It was down for $(SHOW_TIME ${toterrtime})" + # echo "$(date) - ${nip} - ${NM_HOSTNAMES[${nip}]} - ${NM_SERVICES[${srvc}]} is back up, it was down for $(SHOW_TIME ${toterrtime})" >> ${LOGFILE} # # rm -f ${TMPFOLDER}/${nip}~${srvc}.down # rm -f ${TMPFOLDER}/${nip}~${srvc}.errtime @@ -344,28 +344,28 @@ STATUS(){ if [ ! "$(${NCMD} docker ps -q -f name=${docker})" ]; then if [ "$(${NCMD} docker ps -a | grep ${docker})" ]; then ${NCMD} docker start ${docker} >/dev/null 2>&1 - echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_DOCKERS[${docker}]} (docker) is not running, starting now" >> ${LOGFILE} + echo "$(date) - ${nip} - ${NM_HOSTNAMES[${nip}]} - ${NM_DOCKERS[${docker}]} (docker) is not running, starting now" >> ${LOGFILE} else ${NCMD} /usr/local/bin/docker-compose -f ${NM_DOCKER_COMPOSE[${docker}]}/docker-compose.yml up -d >/dev/null 2>&1 - echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_DOCKERS[${docker}]} (docker) is not found, creating and starting now" >> ${LOGFILE} + echo "$(date) - ${nip} - ${NM_HOSTNAMES[${nip}]} - ${NM_DOCKERS[${docker}]} (docker) is not found, creating and starting now" >> ${LOGFILE} fi sleep 10s if [ "$(${NCMD} docker ps -q -f name=${docker})" ]; then if [ "${ST_ACTION}" != "check" ]; then echo -e "${idsCL[Green]}Running - Fixed${idsCL[Default]}" fi - SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_DOCKERS[${docker}]} is fixed" + SENDNOTICE "${NM_HOSTNAMES[${nip}]}-${nip}" "${NM_DOCKERS[${docker}]} is fixed" rm -f ${TMPFOLDER}/${nip}~${docker}.* - echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_DOCKERS[${docker}]} (docker) is fixed" >> ${LOGFILE} + echo "$(date) - ${nip} - ${NM_HOSTNAMES[${nip}]} - ${NM_DOCKERS[${docker}]} (docker) is fixed" >> ${LOGFILE} else if [ "${ST_ACTION}" != "check" ]; then echo -e "${idsCL[Red]}Not Running - Could Not Fix!${idsCL[Default]}" if [ ! -f ${TMPFOLDER}/${nip}~${docker}.down ]; then - SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_DOCKERS[${docker}]} is down, could not fix" 1 + SENDNOTICE "${NM_HOSTNAMES[${nip}]}-${nip}" "${NM_DOCKERS[${docker}]} is down, could not fix" 1 touch ${TMPFOLDER}/${nip}~${docker}.down - echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_DOCKERS[${docker}]} (docker) is down, could not fix" >> ${LOGFILE} + echo "$(date) - ${nip} - ${NM_HOSTNAMES[${nip}]} - ${NM_DOCKERS[${docker}]} (docker) is down, could not fix" >> ${LOGFILE} else errtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}~${docker}.down) if [ $errtime -gt ${RENOTIFY} ]; then @@ -402,8 +402,8 @@ STATUS(){ toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}.errtime) echo -e "${idsCL[Red]} - Node is down!${idsCL[Default]}" fi - # SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_NODETYPES[$NTYPE]}-Node${nid} is down" 1 - echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - Node is down" >> ${LOGFILE} + # SENDNOTICE "${NM_HOSTNAMES[${nip}]}-${nip}" "${NM_HOSTNAMES[${nip}]} is down" 1 + echo "$(date) - ${nip} - ${NM_HOSTNAMES[${nip}]} - Node is down" >> ${LOGFILE} else toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}.errtime) errtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}.down) @@ -412,12 +412,12 @@ STATUS(){ fi if [ $errtime -gt ${RENOTIFY} ]; then touch ${TMPFOLDER}/${nip}.down - SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_NODETYPES[$NTYPE]}-Node${nid} has been down for $(SHOW_TIME ${toterrtime})" 1 + SENDNOTICE "${NM_HOSTNAMES[${nip}]}-${nip}" "${NM_HOSTNAMES[${nip}]} has been down for $(SHOW_TIME ${toterrtime})" 1 elif [ $errtime -gt 60 ] && [ $errtime -lt 180 ] && [ ! -f ${TMPFOLDER}/${nip}.errtime ]; then - SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_NODETYPES[$NTYPE]}-Node${nid} is down" 1 + SENDNOTICE "${NM_HOSTNAMES[${nip}]}-${nip}" "${NM_HOSTNAMES[${nip}]} is down" 1 fi # if [ $errtime -gt ${RENOTIFY} ] && [ "${EMAIL_NOTICE}" != "" ]; then - # echo "${NM_NODETYPES[$NTYPE]}-Node${nid} has been down for $(SHOW_TIME ${toterrtime})" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${EMAIL_NOTICE} + # echo "${NM_HOSTNAMES[${nip}]} has been down for $(SHOW_TIME ${toterrtime})" | mail -s "${NM_HOSTNAMES[${nip}]}-${nip}" ${EMAIL_NOTICE} # fi fi @@ -471,7 +471,7 @@ STATUS(){ for nip in "${!var}"; do if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *"${nip}"* ]] && [ "${nip}" != "${!PH}" ]; then if [ "${ST_ACTION}" != "check" ]; then - echo -e " ${idsCL[LightCyan]}${NM_NODETYPES[$NTYPE]}-Node1 (${!PH}) <--> ${idsST[Bold]}${NM_NODETYPES[$NTYPE]}-Node${nid} (${nip})${idsST[Reset]}${idsCL[Default]}" + echo -e " ${idsCL[LightCyan]}${NM_HOSTNAMES[${!PH}]} (${!PH}) <--> ${idsST[Bold]}${NM_HOSTNAMES[${nip}]} (${nip})${idsST[Reset]}${idsCL[Default]}" DIVIDER false green fi if [ ! -f ${FOLDER}/${!PH}.down ] && [ ! -f ${TMPFOLDER}/${nip}.down ]; then @@ -501,22 +501,22 @@ STATUS(){ [ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Red]}Timeout${idsCL[Default]}" if [ ! -f ${TMPFOLDER}/${nip}~${rcheck}.down ]; then touch ${TMPFOLDER}/${nip}~${rcheck}.down - SENDNOTICE "Repl-Timeout-'${NM_NODETYPES[$NTYPE]}-Node${nid}'" "${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})" 1 - echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - (${REPL_DESC[${rcheck}]}) Replicated folder timeout, it is not syncing" >> ${LOGFILE} + SENDNOTICE "Repl-Timeout-'${NM_HOSTNAMES[${nip}]}'" "${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})" 1 + echo "$(date) - ${nip} - ${NM_HOSTNAMES[${nip}]} - (${REPL_DESC[${rcheck}]}) Replicated folder timeout, it is not syncing" >> ${LOGFILE} fi else [ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Green]}Good${idsCL[Default]}" if [ -f ${TMPFOLDER}/${nip}~${rcheck}.down ]; then rm -f ${TMPFOLDER}/${nip}~${rcheck}.down - SENDNOTICE "Repl-Timeout-'${NM_NODETYPES[$NTYPE]}-Node${nid}'" "Replicated folder is back up!\n${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})" - echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - (${REPL_DESC[${rcheck}]}) Replicated folder is back up" >> ${LOGFILE} + SENDNOTICE "Repl-Timeout-'${NM_HOSTNAMES[${nip}]}'" "Replicated folder is back up!\n${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})" + echo "$(date) - ${nip} - ${NM_HOSTNAMES[${nip}]} - (${REPL_DESC[${rcheck}]}) Replicated folder is back up" >> ${LOGFILE} fi fi done else if [ "${ST_ACTION}" != "check" ]; then - [ -f ${FOLDER}/${!PH}.down ] && echo -e "${idsCL[Red]}${NM_NODETYPES[$NTYPE]}-Node1 (${!PH}) is offline${idsCL[Default]}" - [ -f ${TMPFOLDER}/${nip}.down ] && echo -e "${idsCL[Red]}${NM_NODETYPES[$NTYPE]}-Node${nip: -1} (${nip}) is offline${idsCL[Default]}" + [ -f ${FOLDER}/${!PH}.down ] && echo -e "${idsCL[Red]}${NM_HOSTNAMES[${!PH}]} (${!PH}) is offline${idsCL[Default]}" + [ -f ${TMPFOLDER}/${nip}.down ] && echo -e "${idsCL[Red]}${NM_HOSTNAMES[${nip}]} (${nip}) is offline${idsCL[Default]}" fi fi if [ "${ST_ACTION}" != "check" ]; then echo; fi @@ -581,7 +581,7 @@ STATUS(){ else NCMD="ssh root@${nip}"; LH='' fi if [ "${ST_ACTION}" != "check" ]; then - echo -e " ${idsST[Bold]}${idsCL[LightCyan]}${NM_NODETYPES[$NTYPE]}-Node${nid} (${nip})${idsST[Reset]}${idsCL[LightCyan]} ${idsCL[LightYello]}${LH}${idsCL[Default]}" + echo -e " ${idsST[Bold]}${idsCL[LightCyan]}${NM_HOSTNAMES[${nip}]} (${nip})${idsST[Reset]}${idsCL[LightCyan]} ${idsCL[LightYello]}${LH}${idsCL[Default]}" DIVIDER false green fi @@ -614,11 +614,11 @@ STATUS(){ if [ "${freespace}" -le "1024" ]; then fs_status='error' fs_status_color='Red' - SENDNOTICE "Free Space Critical: '${NM_NODETYPES[$NTYPE]}-Node${nid}'" "${partition} : ${fsdsp} free" 1 + SENDNOTICE "Free Space Critical: '${NM_HOSTNAMES[${nip}]}'" "${partition} : ${fsdsp} free" 1 elif [ "${freespace}" -le "5120" ]; then fs_status='warn' fs_status_color='Yellow' - SENDNOTICE "Free Space Warning: '${NM_NODETYPES[$NTYPE]}-Node${nid}'" "${partition} : ${fsdsp} free" + SENDNOTICE "Free Space Warning: '${NM_HOSTNAMES[${nip}]}'" "${partition} : ${fsdsp} free" else fs_status='' fs_status_color='Green' @@ -644,12 +644,12 @@ STATUS(){ # if [ "${freespace}" -le "1000" ]; then # fs_status='error' # fs_status_color='Red' - # SENDNOTICE "Free Space Critical: '${NM_NODETYPES[$NTYPE]}-Node${nid}'" "${partition} : ${freespace} MB free" 1 + # SENDNOTICE "Free Space Critical: '${NM_HOSTNAMES[${nip}]}'" "${partition} : ${freespace} MB free" 1 # # elif [ "${freespace}" -le "5000" ]; then # fs_status='warn' # fs_status_color='Yellow' - # SENDNOTICE "Free Space Warning: '${NM_NODETYPES[$NTYPE]}-Node${nid}'" "${partition} : ${freespace} MB free" + # SENDNOTICE "Free Space Warning: '${NM_HOSTNAMES[${nip}]}'" "${partition} : ${freespace} MB free" # # else # fs_status='' diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 3f6b10ab..25dd7415 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -35,7 +35,7 @@ CHECK_DOCKER_SERVICES(){ fi if [ "${checkhost}" != "false" ]; then if [ "${ST_ACTION}" != "check" ]; then - echo -en " ${idsST[Bold]}${idsCL[LightCyan]}${NM_NODETYPES[$NTYPE]}-Node${nid} (${nip})${idsST[Reset]}" + echo -en " ${idsST[Bold]}${idsCL[LightCyan]}${NM_HOSTNAMES[${nip}]} (${nip})${idsST[Reset]}" uptime=`${NCMD} uptime -p` echo -e "${idsCL[LightCyan]} - ${uptime} ${idsCL[LightYello]}${LH}${idsCL[Default]}" DIVIDER false green @@ -48,7 +48,7 @@ CHECK_DOCKER_SERVICES(){ fi rm -f ${TMPFOLDER}/${nip}.down rm -f ${TMPFOLDER}/${nip}.errtime - SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}-UP" "${NM_NODETYPES[$NTYPE]}-Node${nid} is back UP! It was down for $(SHOW_TIME ${toterrtime})" + SENDNOTICE "${NM_HOSTNAMES[${nip}]}-${nip}-UP" "${NM_HOSTNAMES[${nip}]} is back UP! It was down for $(SHOW_TIME ${toterrtime})" fi for docker in "${!dockers}"; do @@ -90,7 +90,7 @@ CHECK_DOCKER_SERVICES(){ fi if [ "${ST_ACTION}" != "check" ]; then toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}.errtime) - echo -e " ${idsST[Bold]}${idsCL[LightCyan]}${NM_NODETYPES[$NTYPE]}-Node${nid} (${nip})${idsST[Reset]}${idsCL[Red]} - Node has been down for $(SHOW_TIME ${toterrtime}) ${idsCL[LightYello]}${LH}${idsCL[Default]}" + echo -e " ${idsST[Bold]}${idsCL[LightCyan]}${NM_HOSTNAMES[${nip}]} (${nip})${idsST[Reset]}${idsCL[Red]} - Node has been down for $(SHOW_TIME ${toterrtime}) ${idsCL[LightYello]}${LH}${idsCL[Default]}" fi fi if [ "${ST_ACTION}" != "check" ]; then echo; fi @@ -603,7 +603,7 @@ SERVICE(){ if [ $sethost == true ]; then nodename=${NM_HOSTNAMES[${3}]} else - nodename="${NM_NODETYPES[$NTYPE]}-Node${nid}" + nodename="${NM_HOSTNAMES[${nip}]}" fi if [[ "${MIP}" == *"${nip}"* ]]; then nip='localhost ' @@ -880,7 +880,7 @@ NODEUPDATE() { c=0; cw=15; spcb='' spc1=${cw}-${#nip} until [ $c = ${spc1} ]; do spcb="${spcb} "; c=`expr $c + 1`; done - echo -en "Updating ${NM_NODETYPES[$NTYPE]}-Node${nid}${spca}($nip)${spcb}... ${idsCL[LightCyan]}NodeMGMT${idsCL[Default]} : " + echo -en "Updating ${NM_HOSTNAMES[${nip}]}${spca}($nip)${spcb}... ${idsCL[LightCyan]}NodeMGMT${idsCL[Default]} : " ${NCMD} "nodemgmt update q" echo -en "${idsCL[Green]}COMPLETE${idsCL[Default]} ... ${idsCL[LightCyan]}LinUPx${idsCL[Default]} : " ${NCMD} "runup runup" @@ -1062,7 +1062,7 @@ RUN_COMMAND(){ if [[ $(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) == *"${nip}"* ]]; then NCMD=''; LH='- localhost' else NCMD="ssh root@${nip}"; LH='' fi - echo -e " ${idsST[Bold]}${idsCL[LightCyan]}${NM_NODETYPES[$NTYPE]}-Node${nid} (${nip})${idsST[Reset]}${idsCL[LightCyan]} ${idsCL[LightYello]}${LH}${idsCL[Default]}" + echo -e " ${idsST[Bold]}${idsCL[LightCyan]}${NM_HOSTNAMES[${nip}]} (${nip})${idsST[Reset]}${idsCL[LightCyan]} ${idsCL[LightYello]}${LH}${idsCL[Default]}" DIVIDER false green #echo "Running command: ${NCMD} ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14}" ${NCMD} ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14}