4 files changed, 77 insertions, 26 deletions
diff --git a/statuspage/checks/jail-cgit.sh b/statuspage/checks/jail-cgit.sh
deleted file mode 100755
index aabeacf..0000000
--- a/statuspage/checks/jail-cgit.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# checks/jail-cgit.sh
-# cgit VNET jail: jail-up check, then nginx-inside-jail http check.
-set -eu
-
-DIR=$(dirname "$0")
-. "$DIR/../lib/common.sh"
-
-JAIL_STATUS=$(jail_status cgit)
-json_line "jails" "cgit jail" "" "$JAIL_STATUS"
-
-HTTP_STATUS=$(port_check 192.168.100.10 80)
-json_line "jails" "  -> http :80" "" "$HTTP_STATUS"
diff --git a/statuspage/checks/jail-www.sh b/statuspage/checks/jail-www.sh
deleted file mode 100755
index 7b6274e..0000000
--- a/statuspage/checks/jail-www.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# checks/jail-www.sh
-# www VNET jail: jail-up check, then nginx-inside-jail http check.
-set -eu
-
-DIR=$(dirname "$0")
-. "$DIR/../lib/common.sh"
-
-JAIL_STATUS=$(jail_status www)
-json_line "jails" "www jail" "" "$JAIL_STATUS"
-
-HTTP_STATUS=$(port_check 192.168.100.20 80)
-json_line "jails" "  -> http :80" "" "$HTTP_STATUS"
diff --git a/statuspage/checks/jails.sh b/statuspage/checks/jails.sh
new file mode 100755
index 0000000..71024cc
--- /dev/null
+++ b/statuspage/checks/jails.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+# checks/jails.sh
+# Discovers every currently running jail via jls - no separate script or
+# hardcoded name/IP needed per jail. Roll a new jail and it shows up on
+# the next render with no changes here.
+#
+# Trade-off: since jls only lists running jails, a jail that's supposed
+# to exist but isn't running just doesn't appear on the page - it won't
+# show as "down". If you need to detect an unexpectedly-stopped jail,
+# that needs an explicit expected-jails list (not implemented here).
+set -eu
+
+DIR=$(dirname "$0")
+. "$DIR/../lib/common.sh"
+
+# jail_ip4 NAME
+# Prints the jail's IPv4 address, or nothing if none could be found.
+jail_ip4() {
+    ip=$(jls -j "$1" -n ip4.addr 2>/dev/null | sed -n 's/.*ip4\.addr=\([^ ]*\).*/\1/p')
+    case "$ip" in
+        ""|-|0.0.0.0) ;;
+        *) printf '%s' "$ip"; return ;;
+    esac
+    # VNET jails run their own network stack, so ip4.addr (a classic-jail
+    # restriction parameter) is usually unset. Ask the jail directly for
+    # the first non-loopback address it sees instead.
+    jexec "$1" ifconfig -f inet:cidr 2>/dev/null \
+        | awk '/inet /{split($2,a,"/"); if (a[1] !~ /^127\./) {print a[1]; exit}}'
+}
+
+jls -n name 2>/dev/null | sed -n 's/.*name=\([^ ]*\).*/\1/p' | while IFS= read -r name; do
+    [ -n "$name" ] || continue
+
+    ip=$(jail_ip4 "$name")
+    json_line "jails" "$name jail" "$ip" "ok"
+
+    if [ -n "$ip" ]; then
+        http_status=$(port_check "$ip" 80)
+        json_line "jails" "  -> http :80" "" "$http_status"
+    fi
+done
diff --git a/statuspage/checks/wireguard.sh b/statuspage/checks/wireguard.sh
index 3a899e5..2928e3e 100755
--- a/statuspage/checks/wireguard.sh
+++ b/statuspage/checks/wireguard.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 # checks/wireguard.sh
 # wg0 interface: at least one recent handshake means the tunnel is alive.
+# Also lists each configured peer with time since its last handshake.
 set -eu
 
 DIR=$(dirname "$0")
@@ -8,3 +9,38 @@ DIR=$(dirname "$0")
 
 STATUS=$(wg_status wg0)
 json_line "host services" "wireguard (wg0)" "" "$STATUS"
+
+NOW=$(date +%s)
+TAB=$(printf '\t')
+
+wg show wg0 dump 2>/dev/null | tail -n +2 | while IFS="$TAB" read -r pubkey psk endpoint allowedips handshake rx tx keepalive; do
+    [ -n "$pubkey" ] || continue
+    peer_id=$(printf '%s' "$pubkey" | cut -c1-8)
+    label="peer $peer_id ($allowedips)"
+
+    if [ "$handshake" = "0" ]; then
+        json_line "wireguard peers" "$label" "never" "down"
+        continue
+    fi
+
+    age=$((NOW - handshake))
+    if [ "$age" -lt 180 ]; then
+        pstatus="ok"
+    elif [ "$age" -lt 600 ]; then
+        pstatus="warn"
+    else
+        pstatus="down"
+    fi
+
+    if [ "$age" -lt 60 ]; then
+        rel="${age}s ago"
+    elif [ "$age" -lt 3600 ]; then
+        rel="$((age / 60))m ago"
+    elif [ "$age" -lt 86400 ]; then
+        rel="$((age / 3600))h ago"
+    else
+        rel="$((age / 86400))d ago"
+    fi
+
+    json_line "wireguard peers" "$label" "$rel" "$pstatus"
+done