router: derive health monitor tag from gateway PTR for all groups

router/route-health.sh

@@ -84,6 +84,18 @@ gw_monitor_tag()
     echo "$tag"
 }
 
+# Get monitor tag for a group directory
+# Usage: group_monitor_tag GWDIR ROUTES_DIR
+group_monitor_tag()
+{
+    local gwdir="$1" routes_dir="$2"
+    local ipcmd=$(ipcmd_for "$routes_dir")
+    [ -f "$gwdir/gateway" ] || return
+    parse_gw_line "$(read_value "$gwdir/gateway")" "$ipcmd"
+    [ -n "$gw_ip" ] || return
+    find_gw_monitor "$routes_dir" "$gw_ip" "$ipcmd"
+}
+
 # Find monitor tag for a gateway IP: first check group monitor files,
 # then derive from PTR record
 # Usage: find_gw_monitor ROUTES_DIR GW_IP IPCMD
@@ -145,8 +157,7 @@ for routes_dir in "$ROUTES_DIR" "$ROUTES6_DIR" ; do
         [ -d "$gwdir" ] || continue
         name=$(basename "$gwdir")
 
-        [ -f "$gwdir/monitor" ] || continue
-        tag=$(read_value "$gwdir/monitor")
+        tag=$(group_monitor_tag "$gwdir" "$routes_dir")
         [ -n "$tag" ] || continue
 
         status=$(get_health "$tag")