From f0a6d6c04273b4474f1b4f6052fcb1e3e106a125 Mon Sep 17 00:00:00 2001 From: iris Date: Sun, 18 Oct 2026 13:17:35 +0200 Subject: [PATCH] swarm-ui: add a button to the alerts page that shows the pending, no-data and error instances The page opens on the firing ones. The button lists every instance again, with the state filter and the tones back, so the table's filtering is visible. The saved-filters key goes back to its original name, since the state column is a filter again. --- docs/swarm/ui.md | 2 +- .../swarm-ui/src/pages/AlertsPage.tsx | 55 ++++++++++++------- .../packages/swarm-ui/src/pages/alerts.ts | 6 ++ .../packages/swarm-ui/test/alerts.test.mjs | 23 +++++++- 4 files changed, 64 insertions(+), 22 deletions(-) diff --git a/docs/swarm/ui.md b/docs/swarm/ui.md index 566a5f6b..0bf00d7d 100644 --- a/docs/swarm/ui.md +++ b/docs/swarm/ui.md @@ -14,7 +14,7 @@ domain, covers host-level detail for one hive. | `/agents` | every agent: status, config PR, wanted state, inference settings, resource caps; create agents (with their permissions, optionally from an [archetype](archetypes.md)), link forge, matrix and GitHub accounts | | `/agents//terminal` | one agent's live terminal | | `/agents//subagents//terminal` | one of that agent's subagents' live terminal | -| `/alerts` | the alerts of the swarm's Grafana that are firing now, with a link to Grafana's full alert list for the pending, no-data and error ones; read through the controller with a Viewer service-account token | +| `/alerts` | the alerts the swarm's Grafana holds now: the firing ones, with a button for the pending, no-data and error ones and a link to Grafana's own alert list; read through the controller with a Viewer service-account token | | `/jobs` | the controller's job graph — where agent creation and credential mints show progress | | `/schedules` | the scheduled prompts: add, edit, pause, resume and remove | | `/broadcast` | send one message to several agents at once, picked from a grid of their icons | diff --git a/frontend/packages/swarm-ui/src/pages/AlertsPage.tsx b/frontend/packages/swarm-ui/src/pages/AlertsPage.tsx index 9778b0ea..a0c23add 100644 --- a/frontend/packages/swarm-ui/src/pages/AlertsPage.tsx +++ b/frontend/packages/swarm-ui/src/pages/AlertsPage.tsx @@ -1,12 +1,13 @@ -// — `/alerts`' content: the alerts of the swarm's Grafana that -// are firing now, from swarm-controller's `GET /api/alerts` (which also lists -// pending, no-data and errored instances; those stay in Grafana). Same shape -// as `HivesPage`: one fetch on a `RefreshIntervalPicker` cadence, rendered as -// a `Table`. +// — `/alerts`' content: the alerts the swarm's Grafana holds +// now, from swarm-controller's `GET /api/alerts`. Only the firing ones show at +// first; a button in the header adds the pending, no-data and errored ones. +// Same shape as `HivesPage`: one fetch on a `RefreshIntervalPicker` cadence, +// rendered as a `Table`. import { useState } from "preact/hooks"; import { ApiErrorPanel } from "@hive/shared/api-error-panel.js"; import { readApiError, type ProblemDetails } from "@hive/shared/api-error.js"; -import { Badge } from "@hive/shared/badge.js"; +import { Badge, type BadgeTone } from "@hive/shared/badge.js"; +import { Button } from "../ui/button/Button.js"; import { Panel } from "../ui/panel/Panel.js"; import { RelativeTime } from "../ui/relative-time/RelativeTime.js"; import { @@ -15,16 +16,19 @@ import { type RefreshIntervalMs, } from "../ui/refresh-interval/RefreshInterval.js"; import { Table, type TableColumn } from "../ui/table/Table.js"; -import { activeSinceMs, alertKey, firingAlerts, type Alert } from "./alerts.js"; +import { activeSinceMs, alertKey, listedAlerts, type Alert } from "./alerts.js"; -// Grafana's alert-groups view, where the instances this page leaves out are. +const STATE_TONE: Record = { + Alerting: "negative", + Error: "negative", + NoData: "warning", + Pending: "warning", +}; + +// Grafana's own alert list, for what this page does not show. const GRAFANA_ALERTS_URL = "https://grafana.constellation.darkest.space/alerting/groups"; -// Versioned: the state column used to be a filter, and a saved "not Pending" -// selection under the old key would now hide every row. -const FILTERS_STORAGE_KEY = "swarm-ui:alerts:table-filters:v2"; - const COLUMNS: TableColumn[] = [ { key: "name", @@ -40,7 +44,7 @@ const COLUMNS: TableColumn[] = [ const since = activeSinceMs(a); return ( @@ -53,7 +57,9 @@ const COLUMNS: TableColumn[] = [ /> ); }, - sortBy: (a) => activeSinceMs(a) ?? 0, + sortBy: (a) => a.state, + filterValues: (a) => [a.state], + filterMode: "multiselect", }, { key: "summary", @@ -69,9 +75,11 @@ const DEFAULT_INTERVAL_MS: RefreshIntervalMs = 30_000; export function AlertsPage() { const [alerts, setAlerts] = useState(null); const [error, setError] = useState(null); - const firing = alerts ? firingAlerts(alerts) : null; + const [showAll, setShowAll] = useState(false); const [intervalMs, setIntervalMs] = useState(DEFAULT_INTERVAL_MS); + const listed = alerts ? listedAlerts(alerts, showAll) : null; + const hidden = alerts && listed ? alerts.length - listed.length : 0; useRefreshInterval(intervalMs, () => { (async () => { @@ -96,8 +104,13 @@ export function AlertsPage() { target="_blank" rel="noopener noreferrer" > - all alerts in Grafana + Grafana's alert list + {showAll || hidden > 0 ? ( + + ) : null} ) : null} {!error && alerts === null ?

loading…

: null} - {firing && firing.length === 0 ?

nothing is alerting.

: null} - {firing && firing.length > 0 ? ( + {listed && listed.length === 0 ? ( +

{showAll ? "no alerts." : "nothing is alerting."}

+ ) : null} + {listed && listed.length > 0 ? ( ) : null} diff --git a/frontend/packages/swarm-ui/src/pages/alerts.ts b/frontend/packages/swarm-ui/src/pages/alerts.ts index 5bbce7a2..3161e2d0 100644 --- a/frontend/packages/swarm-ui/src/pages/alerts.ts +++ b/frontend/packages/swarm-ui/src/pages/alerts.ts @@ -20,6 +20,12 @@ export function firingAlerts(alerts: Alert[]): Alert[] { return alerts.filter((a) => a.state === FIRING); } +// What the page lists: the firing ones, or every instance once the operator +// asks for the rest. +export function listedAlerts(alerts: Alert[], showAll: boolean): Alert[] { + return showAll ? alerts : firingAlerts(alerts); +} + // Grafana reports an instance that never became active with the zero time, // which `Date.parse` reads as year 1. export function activeSinceMs(a: Alert): number | null { diff --git a/frontend/packages/swarm-ui/test/alerts.test.mjs b/frontend/packages/swarm-ui/test/alerts.test.mjs index 24050725..e68e8e4d 100644 --- a/frontend/packages/swarm-ui/test/alerts.test.mjs +++ b/frontend/packages/swarm-ui/test/alerts.test.mjs @@ -3,7 +3,12 @@ // is imported as it is. import assert from "node:assert/strict"; import { test } from "node:test"; -import { activeSinceMs, alertKey, firingAlerts } from "../src/pages/alerts.ts"; +import { + activeSinceMs, + alertKey, + firingAlerts, + listedAlerts, +} from "../src/pages/alerts.ts"; const alert = (name, state, extra = {}) => ({ name, @@ -28,6 +33,22 @@ test("only instances in the Alerting state are listed", () => { ); }); +test("asking for the rest lists every instance, in order", () => { + const all = [ + alert("a", "Pending"), + alert("b", "Alerting"), + alert("c", "Error"), + ]; + assert.deepEqual( + listedAlerts(all, true).map((a) => a.name), + ["a", "b", "c"], + ); + assert.deepEqual( + listedAlerts(all, false).map((a) => a.name), + ["b"], + ); +}); + test("nothing firing leaves the list empty, and the input is not changed", () => { const all = [alert("a", "Pending"), alert("b", "Error")]; assert.deepEqual(firingAlerts(all), []);