mostly improvements

[distro-setup] / system-status

diff --git a/system-status b/system-status
index 7f3edf2411c08872f0a69febfb2b119ab61ff402..dd327bb0836979310df0476389df5d4971a106dc 100755 (executable)
--- a/system-status
+++ b/system-status
@@ -13,7 +13,7 @@ if [[ $EUID != 1000 ]]; then
   exit 1
 fi
 
-source /a/bin/errhandle/err
+source /a/bin/bash-bear-trap/bash-bear
 status_file=/dev/shm/iank-status
 
 shopt -s nullglob
@@ -389,6 +389,20 @@ write-status() {
     # leave it up to epanic-clean to send email notification
   fi
 
+  mprom=/var/lib/prometheus/node-exporter/mailtest-check.prom
+  if grep -qE 'mailtest_check_(unexpected|missing).*[^ ][^0]$' $mprom; then
+    chars+=("MTEST_SPAM")
+  fi
+  mtest_found=false
+  for t in $(grep -E ^mailtest_check_last_usec $mprom | awk '{print $NF}'); do
+    if (( t + 60 * 20 < EPOCHSECONDS )); then
+      mtest_found=true
+    fi
+  done
+  if $mtest_found; then
+    chars+=("MTEST_AGE")
+  fi
+
   if [[ ! -e $status_file || -w $status_file ]]; then
     if [[ -e /a/bin/bash_unpublished/source-state ]]; then
       cat /a/bin/bash_unpublished/source-state >$status_file
@@ -461,6 +475,7 @@ main-loop() {
         fi
         case $bat in
           100|9?)
+          :
           bitcoinon &
           ;;
         esac