shared
/
mikrus-installer
2
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Extended watchdog

Browse Source
previous
Dominik Dzienia 7 months ago committed by dominik
parent e8e3575c01
commit 7a4d9ad8d0
3 changed files with 105 additions and 67 deletions
Show Stats Download Patch File Download Diff File

85
install.sh
Unescape Escape View File

@ -534,23 +534,23 @@ check_diceware() {
setup_provisional_key() { setup_provisional_key() {
ohai "Generating provisional log encryption key" ohai "Generating provisional log encryption key"
local randPass=$(openssl rand -base64 30) local randPass=$(openssl rand -base64 30)
local fixedPass=$(echo "$randPass" | sed -e 's/[+\/]/-/g') local fixedPass=$(echo "$randPass" | sed -e 's/[+\/]/-/g')
echo "tymczasowe-${fixedPass}" >$LOG_ENCRYPTION_KEY_FILE echo "tymczasowe-${fixedPass}" >$LOG_ENCRYPTION_KEY_FILE
msgcheck "Provisional key generated" msgcheck "Provisional key generated"
} }
setup_security() { setup_security() {
if [[ -f $LOG_ENCRYPTION_KEY_FILE ]]; then if [[ -f $LOG_ENCRYPTION_KEY_FILE ]]; then
# -------------------- # --------------------
# JAKIŚ klucz istnieje # JAKIŚ klucz istnieje
# -------------------- # --------------------
local logKey=$(<$LOG_ENCRYPTION_KEY_FILE) local logKey=$(<$LOG_ENCRYPTION_KEY_FILE)
local regexTemp='tymczasowe-' local regexTemp='tymczasowe-'
# ----------------------- # -----------------------
# ...ale jest tymczasowy # ...ale jest tymczasowy
# ----------------------- # -----------------------
if [[ "$logKey" =~ $regexTemp ]]; then if [[ "$logKey" =~ $regexTemp ]]; then
msgerr "Using provisional key" msgerr "Using provisional key"
test_diceware test_diceware
@ -560,15 +560,15 @@ setup_security() {
diceware -n 5 -d - >$LOG_ENCRYPTION_KEY_FILE diceware -n 5 -d - >$LOG_ENCRYPTION_KEY_FILE
msgcheck "Key generated" msgcheck "Key generated"
else else
msgerr "Required tool (diceware) still cannot be installed - apt is locked!" msgerr "Required tool (diceware) still cannot be installed - apt is locked!"
msgnote "Zrestartuj serwer mikr.us i sprawdź czy ten błąd nadal występuje - wtedy odbokuj apt-get i zainstaluj diceware (apt-get install diceware)" msgnote "Zrestartuj serwer mikr.us i sprawdź czy ten błąd nadal występuje - wtedy odbokuj apt-get i zainstaluj diceware (apt-get install diceware)"
fi fi
else else
local keySize=${#logKey} local keySize=${#logKey}
# ---------------------- # ----------------------
# ...ale jest za krótki # ...ale jest za krótki
# ---------------------- # ----------------------
if ((keySize < 12)); then if ((keySize < 12)); then
msgerr "Encryption key empty or too short, generating better one" msgerr "Encryption key empty or too short, generating better one"
test_diceware test_diceware
@ -586,10 +586,10 @@ setup_security() {
fi fi
fi fi
else else
# --------------------- # ---------------------
# jescze nie ma klucza # jescze nie ma klucza
# --------------------- # ---------------------
test_diceware test_diceware
local RESULT=$? local RESULT=$?
@ -1310,9 +1310,9 @@ get_watchdog_status_code_live() {
status="crashed" status="crashed"
fi fi
regex3='MIKR.US - coś poszło nie tak' regex3='coś poszło nie tak'
if [[ "$html" =~ $regex3 ]]; then if [[ "$html" =~ $regex3 ]]; then
status="restarting" status="awaiting"
fi fi
else else
@ -1321,7 +1321,7 @@ get_watchdog_status_code_live() {
else else
if [ "$NS_STATUS" = "restarting" ] || [ "$DB_STATUS" = "restarting" ]; then if [ "$NS_STATUS" = "restarting" ] || [ "$DB_STATUS" = "restarting" ]; then
status="restarting" status="awaiting"
else else
status="not_running" status="not_running"
fi fi
@ -1339,9 +1339,15 @@ get_watchdog_status() {
"restart") "restart")
printf "\U1F680 wymuszono restart NS" printf "\U1F680 wymuszono restart NS"
;; ;;
"restarting") "awaiting")
printf "\U23F3 uruchamia się" printf "\U23F3 uruchamia się"
;; ;;
"restart_failed")
printf "\U1F680 restart NS to za mało"
;;
"full_restart")
printf "\U1F680 restart NS i DB"
;;
"unknown") "unknown")
printf "\U1F4A4 brak statusu" printf "\U1F4A4 brak statusu"
;; ;;
@ -1944,7 +1950,7 @@ retry_diagnostics() {
send_diagnostics() { send_diagnostics() {
setup_security setup_security
LOG_KEY=$(<$LOG_ENCRYPTION_KEY_FILE) LOG_KEY=$(<$LOG_ENCRYPTION_KEY_FILE)
@ -2152,18 +2158,31 @@ watchdog_check() {
fi fi
if [[ "$html" =~ 'MongoDB connection failed' ]]; then if [[ "$html" =~ 'MongoDB connection failed' ]]; then
echo "Nightscout is crashed, restarting..." echo "Nightscout crash detected"
WATCHDOG_STATUS="restart" WATCHDOG_STATUS="restart"
if [ "$WATCHDOG_LAST_STATUS" != "restart" ]; then if [ "$WATCHDOG_LAST_STATUS" == "restart_failed" ]; then
echo "Restarting DB first..."
docker restart 'ns-database'
echo "Then, restarting Nightscout..."
docker restart 'ns-server' docker restart 'ns-server'
echo "...done" echo "...done"
WATCHDOG_STATUS="full_restart"
else
if [ "$WATCHDOG_LAST_STATUS" != "restart" ]; then
echo "Restarting only Nightscout..."
docker restart 'ns-server'
echo "...done"
else
echo "Restart was tried but NS still crashed, will retry restart next time"
WATCHDOG_STATUS="restart_failed"
fi
fi
else
regex3='coś poszło nie tak'
if [[ "$html" =~ $regex3 ]]; then
echo "Nightscout is still restarting..."
WATCHDOG_STATUS="awaiting"
fi fi
fi
regex3='MIKR.US - coś poszło nie tak'
if [[ "$html" =~ $regex3 ]]; then
echo "Nightscout is still restarting..."
WATCHDOG_STATUS="restarting"
fi fi
if [ "$WATCHDOG_STATUS" = "detection_failed" ]; then if [ "$WATCHDOG_STATUS" = "detection_failed" ]; then
@ -2183,7 +2202,7 @@ watchdog_check() {
else else
if [ "$NS_STATUS" = "restarting" ] || [ "$DB_STATUS" = "restarting" ]; then if [ "$NS_STATUS" = "restarting" ] || [ "$DB_STATUS" = "restarting" ]; then
WATCHDOG_STATUS="restarting" WATCHDOG_STATUS="awaiting"
else else
WATCHDOG_STATUS="not_running" WATCHDOG_STATUS="not_running"
fi fi

85
src/lib.sh
Unescape Escape View File

@ -518,23 +518,23 @@ check_diceware() {
setup_provisional_key() { setup_provisional_key() {
ohai "Generating provisional log encryption key" ohai "Generating provisional log encryption key"
local randPass=$(openssl rand -base64 30) local randPass=$(openssl rand -base64 30)
local fixedPass=$(echo "$randPass" | sed -e 's/[+\/]/-/g') local fixedPass=$(echo "$randPass" | sed -e 's/[+\/]/-/g')
echo "tymczasowe-${fixedPass}" >$LOG_ENCRYPTION_KEY_FILE echo "tymczasowe-${fixedPass}" >$LOG_ENCRYPTION_KEY_FILE
msgcheck "Provisional key generated" msgcheck "Provisional key generated"
} }
setup_security() { setup_security() {
if [[ -f $LOG_ENCRYPTION_KEY_FILE ]]; then if [[ -f $LOG_ENCRYPTION_KEY_FILE ]]; then
# -------------------- # --------------------
# JAKIŚ klucz istnieje # JAKIŚ klucz istnieje
# -------------------- # --------------------
local logKey=$(<$LOG_ENCRYPTION_KEY_FILE) local logKey=$(<$LOG_ENCRYPTION_KEY_FILE)
local regexTemp='tymczasowe-' local regexTemp='tymczasowe-'
# ----------------------- # -----------------------
# ...ale jest tymczasowy # ...ale jest tymczasowy
# ----------------------- # -----------------------
if [[ "$logKey" =~ $regexTemp ]]; then if [[ "$logKey" =~ $regexTemp ]]; then
msgerr "Using provisional key" msgerr "Using provisional key"
test_diceware test_diceware
@ -544,15 +544,15 @@ setup_security() {
diceware -n 5 -d - >$LOG_ENCRYPTION_KEY_FILE diceware -n 5 -d - >$LOG_ENCRYPTION_KEY_FILE
msgcheck "Key generated" msgcheck "Key generated"
else else
msgerr "Required tool (diceware) still cannot be installed - apt is locked!" msgerr "Required tool (diceware) still cannot be installed - apt is locked!"
msgnote "Zrestartuj serwer mikr.us i sprawdź czy ten błąd nadal występuje - wtedy odbokuj apt-get i zainstaluj diceware (apt-get install diceware)" msgnote "Zrestartuj serwer mikr.us i sprawdź czy ten błąd nadal występuje - wtedy odbokuj apt-get i zainstaluj diceware (apt-get install diceware)"
fi fi
else else
local keySize=${#logKey} local keySize=${#logKey}
# ---------------------- # ----------------------
# ...ale jest za krótki # ...ale jest za krótki
# ---------------------- # ----------------------
if ((keySize < 12)); then if ((keySize < 12)); then
msgerr "Encryption key empty or too short, generating better one" msgerr "Encryption key empty or too short, generating better one"
test_diceware test_diceware
@ -570,10 +570,10 @@ setup_security() {
fi fi
fi fi
else else
# --------------------- # ---------------------
# jescze nie ma klucza # jescze nie ma klucza
# --------------------- # ---------------------
test_diceware test_diceware
local RESULT=$? local RESULT=$?
@ -1294,9 +1294,9 @@ get_watchdog_status_code_live() {
status="crashed" status="crashed"
fi fi
regex3='MIKR.US - coś poszło nie tak' regex3='coś poszło nie tak'
if [[ "$html" =~ $regex3 ]]; then if [[ "$html" =~ $regex3 ]]; then
status="restarting" status="awaiting"
fi fi
else else
@ -1305,7 +1305,7 @@ get_watchdog_status_code_live() {
else else
if [ "$NS_STATUS" = "restarting" ] || [ "$DB_STATUS" = "restarting" ]; then if [ "$NS_STATUS" = "restarting" ] || [ "$DB_STATUS" = "restarting" ]; then
status="restarting" status="awaiting"
else else
status="not_running" status="not_running"
fi fi
@ -1323,9 +1323,15 @@ get_watchdog_status() {
"restart") "restart")
printf "\U1F680 wymuszono restart NS" printf "\U1F680 wymuszono restart NS"
;; ;;
"restarting") "awaiting")
printf "\U23F3 uruchamia się" printf "\U23F3 uruchamia się"
;; ;;
"restart_failed")
printf "\U1F680 restart NS to za mało"
;;
"full_restart")
printf "\U1F680 restart NS i DB"
;;
"unknown") "unknown")
printf "\U1F4A4 brak statusu" printf "\U1F4A4 brak statusu"
;; ;;
@ -1928,7 +1934,7 @@ retry_diagnostics() {
send_diagnostics() { send_diagnostics() {
setup_security setup_security
LOG_KEY=$(<$LOG_ENCRYPTION_KEY_FILE) LOG_KEY=$(<$LOG_ENCRYPTION_KEY_FILE)
@ -2136,18 +2142,31 @@ watchdog_check() {
fi fi
if [[ "$html" =~ 'MongoDB connection failed' ]]; then if [[ "$html" =~ 'MongoDB connection failed' ]]; then
echo "Nightscout is crashed, restarting..." echo "Nightscout crash detected"
WATCHDOG_STATUS="restart" WATCHDOG_STATUS="restart"
if [ "$WATCHDOG_LAST_STATUS" != "restart" ]; then if [ "$WATCHDOG_LAST_STATUS" == "restart_failed" ]; then
echo "Restarting DB first..."
docker restart 'ns-database'
echo "Then, restarting Nightscout..."
docker restart 'ns-server' docker restart 'ns-server'
echo "...done" echo "...done"
WATCHDOG_STATUS="full_restart"
else
if [ "$WATCHDOG_LAST_STATUS" != "restart" ]; then
echo "Restarting only Nightscout..."
docker restart 'ns-server'
echo "...done"
else
echo "Restart was tried but NS still crashed, will retry restart next time"
WATCHDOG_STATUS="restart_failed"
fi
fi
else
regex3='coś poszło nie tak'
if [[ "$html" =~ $regex3 ]]; then
echo "Nightscout is still restarting..."
WATCHDOG_STATUS="awaiting"
fi fi
fi
regex3='MIKR.US - coś poszło nie tak'
if [[ "$html" =~ $regex3 ]]; then
echo "Nightscout is still restarting..."
WATCHDOG_STATUS="restarting"
fi fi
if [ "$WATCHDOG_STATUS" = "detection_failed" ]; then if [ "$WATCHDOG_STATUS" = "detection_failed" ]; then
@ -2167,7 +2186,7 @@ watchdog_check() {
else else
if [ "$NS_STATUS" = "restarting" ] || [ "$DB_STATUS" = "restarting" ]; then if [ "$NS_STATUS" = "restarting" ] || [ "$DB_STATUS" = "restarting" ]; then
WATCHDOG_STATUS="restarting" WATCHDOG_STATUS="awaiting"
else else
WATCHDOG_STATUS="not_running" WATCHDOG_STATUS="not_running"
fi fi

2
updated
Unescape Escape View File

@ -1 +1 @@
2024-10-06T12:43:24.897Z 2024-10-06T20:32:19.387Z
Write Preview
Loading…
Cancel
Save