Make ID optional to signal deleted fleet/collector (#25560)

Author: thll

graylog2-server/src/main/java/org/graylog/collectors/rest/CollectorsActivityResource.java

@@ -135,22 +135,34 @@ private RecentActivityResponse.ActivityEntry toActivityEntry(
         // Resolve targets
         final List<RecentActivityResponse.TargetInfo> targets = new ArrayList<>();
         for (final var targetId : marker.targetIds()) {
+            final String id;
             final String name;
             if (TransactionMarker.TARGET_FLEET.equals(marker.target())) {
-                // skip the target if it's a fleet we have no permission to
-                if (!isPermitted(CollectorsPermissions.FLEET_READ, targetId)) {
-                    continue;
+                if (fleetNames.containsKey(targetId)) {
+                    // skip the target if it's a fleet we have no permission to
+                    if (!isPermitted(CollectorsPermissions.FLEET_READ, targetId)) {
+                        continue;
+                    }
+                    id = targetId;
+                    name = fleetNames.get(targetId);
+                } else {
+                    id = null;
+                    name = "[deleted]";
                 }
-                name = fleetNames.getOrDefault(targetId, targetId);
             } else {
-                // skip the target if the user cannot see the target's fleet
-                if (instances.containsKey(targetId)
-                        && !isPermitted(CollectorsPermissions.FLEET_READ, instances.get(targetId).fleetId())) {
-                    continue;
+                if (instances.containsKey(targetId)) {
+                    // skip the target if the user cannot see the target's fleet
+                    if (!isPermitted(CollectorsPermissions.FLEET_READ, instances.get(targetId).fleetId())) {
+                        continue;
+                    }
+                    id = targetId;
+                    name = resolveInstanceHostname(instances, targetId);
+                } else {
+                    id = null;
+                    name = "[deleted]";
                 }
-                name = resolveInstanceHostname(instances, targetId);
             }
-            targets.add(new RecentActivityResponse.TargetInfo(targetId, name, marker.target()));
+            targets.add(new RecentActivityResponse.TargetInfo(id, name, marker.target()));
         }
 
         // Resolve details
@@ -180,10 +192,16 @@ private String resolveInstanceHostname(Map<String, CollectorInstanceDTO> instanc
     private Map<String, String> resolveDetails(TransactionMarker marker, Map<String, String> fleetNames) {
         if (marker.type() == MarkerType.FLEET_REASSIGNED && marker.payload() != null) {
             final String newFleetId = marker.payload().getString("new_fleet_id");
-            if (newFleetId != null && isPermitted(CollectorsPermissions.FLEET_READ, newFleetId)) {
-                return Map.of(
-                        "new_fleet_id", newFleetId,
-                        "new_fleet_name", fleetNames.getOrDefault(newFleetId, newFleetId));
+            if (newFleetId != null) {
+                if (fleetNames.containsKey(newFleetId)) {
+                    if (isPermitted(CollectorsPermissions.FLEET_READ, newFleetId)) {
+                        return Map.of(
+                                "new_fleet_id", newFleetId,
+                                "new_fleet_name", fleetNames.get(newFleetId));
+                    }
+                    return Map.of();
+                }
+                return Map.of("new_fleet_name", "[deleted]");
             }
         }
         return Map.of();

graylog2-server/src/main/java/org/graylog/collectors/rest/RecentActivityResponse.java

@@ -41,7 +41,7 @@ public record ActorInfo(
     }
 
     public record TargetInfo(
-            @JsonProperty("id") String id,
+            @JsonProperty("id") @Nullable String id,
             @JsonProperty("name") String name,
             @JsonProperty("type") String type) {
     }

graylog2-web-interface/src/components/collectors/overview/RecentActivity.tsx

@@ -81,6 +81,10 @@ const ICON_MAP: Record<ActivityEntry['type'], IconName> = {
 };
 
 const targetLink = (target: TargetInfo) => {
+  if (!target.id) {
+    return <MutedText>[deleted]</MutedText>;
+  }
+
   if (target.type === 'fleet') {
     return <Link to={Routes.SYSTEM.COLLECTORS.FLEET(target.id)}>{target.name}</Link>;
   }
@@ -127,7 +131,9 @@ const renderDescription = (entry: ActivityEntry) => {
       return (
         <span>
           Collector {targetLink(target)} reassigned to fleet{' '}
-          {newFleetId ? <Link to={Routes.SYSTEM.COLLECTORS.FLEET(newFleetId)}>{newFleetName}</Link> : 'unknown'}
+          {newFleetId
+            ? <Link to={Routes.SYSTEM.COLLECTORS.FLEET(newFleetId)}>{newFleetName}</Link>
+            : <MutedText>[deleted]</MutedText>}
         </span>
       );
     }

graylog2-web-interface/src/components/collectors/types.ts

@@ -162,7 +162,7 @@ export type ActorInfo = {
 };
 
 export type TargetInfo = {
-  id: string;
+  id: string | null;
   name: string;
   type: 'fleet' | 'collector';
 };