voltron/NodeMgmt
1
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

update

Browse Source
This commit is contained in:
David Schroeder
2023-05-22 22:44:33 -05:00
parent 0e4a1b73da
commit 6c3d8df441
2 changed files with 56 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
defaults.inc
View File

@@ -167,6 +167,7 @@ NM_SERVICES['monitor-temp']='Server Temp Monitor'
declare -A NM_DOCKERS declare -A NM_DOCKERS
NM_DOCKERS['phpmyadmin']='phpMyAdmin' NM_DOCKERS['phpmyadmin']='phpMyAdmin'
NM_DOCKERS['phppgadmin']='phpPgAdmin' NM_DOCKERS['phppgadmin']='phpPgAdmin'
NM_DOCKERS['vaultwarden']='VaultWarden'
NM_DOCKERS['uptime-kuma']='Uptime-Kuma' NM_DOCKERS['uptime-kuma']='Uptime-Kuma'
NM_DOCKERS['nginx-proxy_manager']='Nginx Proxy Manager' NM_DOCKERS['nginx-proxy_manager']='Nginx Proxy Manager'

107
inc/status.inc
View File

@@ -328,62 +328,65 @@ STATUS(){
fi fi
for docker in "${!dockers}"; do for docker in "${!dockers}"; do
if [ "${ST_ACTION}" != "check" ]; then [ "${docker}" == "vaultwarden" ] && [ "${NTYPE}" == "WEB" ] && [[ $($NCMD /sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *${WEB_HOSTS[0]}* ]] && NOGOCHK=false || NOGOCHK=true
if [ "${ST_ACTION}" != "report" ]; then if [ ${NOGOCHK} == true ]; then
c=0; cw=30; spc='' if [ "${ST_ACTION}" != "check" ]; then
spc1=`expr ${cw} - ${#NM_DOCKERS[${docker}]}` if [ "${ST_ACTION}" != "report" ]; then
until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done c=0; cw=30; spc=''
else spc1=`expr ${cw} - ${#NM_DOCKERS[${docker}]}`
spc=' ' until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
fi else
echo -en " ${NM_DOCKERS[${docker}]}$spc: " spc=' '
fi fi
echo -en " ${NM_DOCKERS[${docker}]}$spc: "
if [ ! "$(${NCMD} docker ps -q -f name=${docker})" ]; then fi
if [ "$(${NCMD} docker ps -aq -f status=exited -f name=${docker})" ]; then
${NCMD} docker rm ${docker} >/dev/null 2>&1 if [ ! "$(${NCMD} docker ps -q -f name=${docker})" ]; then
fi if [ "$(${NCMD} docker ps -aq -f status=exited -f name=${docker})" ]; then
${NCMD} docker-compose -f ${NM_DOCKER_COMPOSE[${docker}]}/docker-compose.yml up -d >/dev/null 2>&1 ${NCMD} docker rm ${docker} >/dev/null 2>&1
sleep 10s fi
if [ "$(${NCMD} docker ps -q -f name=${docker})" ]; then ${NCMD} docker-compose -f ${NM_DOCKER_COMPOSE[${docker}]}/docker-compose.yml up -d >/dev/null 2>&1
if [ "${ST_ACTION}" != "check" ]; then sleep 10s
echo -e "${idsCL[Green]}Running - Fixed${idsCL[Default]}" 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"
rm -f ${TMPFOLDER}/${nip}-${docker}.down
rm -f ${TMPFOLDER}/${nip}-${docker}.errtime
echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${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" 1
touch ${TMPFOLDER}/${nip}-${docker}.down
echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_DOCKERS[${docker}]} (docker) is down" >> ${LOGFILE}
else
errtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}-${docker}.down)
if [ $errtime -gt ${RENOTIFY} ]; then
if [ ! -f ${TMPFOLDER}/${nip}-${docker}.errtime ]; then
mv ${TMPFOLDER}/${nip}-${docker}.down ${TMPFOLDER}/${nip}-${docker}.errtime
fi
toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}-${docker}.errtime)
if [ "${ST_ACTION}" != "check" ]; then
echo -e "${idsCL[Red]}Not running for $(SHOW_TIME ${toterrtime})${idsCL[Default]}"
fi
touch ${TMPFOLDER}/${nip}-${docker}.down
fi
fi
fi
fi
else
if [ "${ST_ACTION}" != "check" ]; then
echo -e "${idsCL[Green]}Running${idsCL[Default]}"
fi fi
SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_DOCKERS[${docker}]} is fixed"
rm -f ${TMPFOLDER}/${nip}-${docker}.down rm -f ${TMPFOLDER}/${nip}-${docker}.down
rm -f ${TMPFOLDER}/${nip}-${docker}.errtime rm -f ${TMPFOLDER}/${nip}-${docker}.errtime
echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${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" 1
touch ${TMPFOLDER}/${nip}-${docker}.down
echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_DOCKERS[${docker}]} (docker) is down" >> ${LOGFILE}
else
errtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}-${docker}.down)
if [ $errtime -gt ${RENOTIFY} ]; then
if [ ! -f ${TMPFOLDER}/${nip}-${docker}.errtime ]; then
mv ${TMPFOLDER}/${nip}-${docker}.down ${TMPFOLDER}/${nip}-${docker}.errtime
fi
toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}-${docker}.errtime)
if [ "${ST_ACTION}" != "check" ]; then
echo -e "${idsCL[Red]}Not running for $(SHOW_TIME ${toterrtime})${idsCL[Default]}"
fi
touch ${TMPFOLDER}/${nip}-${docker}.down
fi
fi
fi
fi fi
else
if [ "${ST_ACTION}" != "check" ]; then
echo -e "${idsCL[Green]}Running${idsCL[Default]}"
fi
rm -f ${TMPFOLDER}/${nip}-${docker}.down
rm -f ${TMPFOLDER}/${nip}-${docker}.errtime
fi fi
done done
fi fi