router: check all gateways in group for health, not just first

router/route-health.sh

@@ -84,16 +84,39 @@ gw_monitor_tag()
     echo "$tag"
 }
 
-# Get monitor tag for a group directory
-# Usage: group_monitor_tag GWDIR ROUTES_DIR
-group_monitor_tag()
+# Evaluate health of all gateways in a group
+# Sets: group_status (healthy/degraded/dead), group_detail (display string)
+# Usage: eval_group_health GWDIR ROUTES_DIR
+eval_group_health()
 {
     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"
+    group_status="" ; group_detail=""
+    [ -f "$gwdir/gateway" ] || return 1
+    local any_healthy="" all_dead=1 checked=0
+    while IFS= read -r line ; do
+        [ -z "$line" ] && continue
+        echo "$line" | grep -q '^#' && continue
+        parse_gw_line "$line" "$ipcmd"
+        [ -n "$gw_ip" ] || continue
+        local tag=$(find_gw_monitor "$routes_dir" "$gw_ip" "$ipcmd")
+        [ -n "$tag" ] || continue
+        checked=$((checked + 1))
+        local st=$(get_health "$tag")
+        local loss=$(grep "^${tag} " "$HEALTH_DATA" | awk '{print $2}')
+        local ld="${loss:-no_data}%" ; [ -z "$loss" ] && ld="no_data"
+        group_detail="${group_detail:+$group_detail, }$tag=$ld($st)"
+        [ "$st" = "healthy" ] && any_healthy=1
+        [ "$st" != "dead" ] && all_dead=""
+    done < "$gwdir/gateway"
+    [ "$checked" -eq 0 ] && return 1
+    if [ -n "$any_healthy" ] ; then
+        group_status="healthy"
+    elif [ -n "$all_dead" ] ; then
+        group_status="dead"
+    else
+        group_status="degraded"
+    fi
 }
 
 # Find monitor tag for a gateway IP: first check group monitor files,
@@ -157,19 +180,13 @@ for routes_dir in "$ROUTES_DIR" "$ROUTES6_DIR" ; do
         [ -d "$gwdir" ] || continue
         name=$(basename "$gwdir")
 
-        tag=$(group_monitor_tag "$gwdir" "$routes_dir")
-        [ -n "$tag" ] || continue
-
-        status=$(get_health "$tag")
-        loss=$(grep "^${tag} " "$HEALTH_DATA" | awk '{print $2}')
-        loss_display="${loss:-no_data}%"
-        [ -z "$loss" ] && loss_display="no_data"
+        eval_group_health "$gwdir" "$routes_dir" || continue
 
         state_path="$routes_dir/$name"
 
-        [ -n "$SHOW" ] && log "[$name] $tag: loss=$loss_display -> $status"
+        [ -n "$SHOW" ] && log "[$name] $group_detail -> $group_status"
 
-        case "$status" in
+        case "$group_status" in
             healthy)
                 healthy_count=$((healthy_count + 1))
                 healthy_groups="${healthy_groups:+$healthy_groups }$state_path"