Compare commits

..
Author SHA1 Message Date
jaredandClaude Opus 5.5 abac6983b2 Calmer dashboard and navigation, short page intros
Lint / JS (eslint) (push) Successful in 27s
Lint / Python (flake8) (push) Successful in 2m30s
Lint / Notify on failure (push) Skipped
Lint / Deploy (push) Skipped
Security / Python Security (bandit) (push) Successful in 2m0s
Test / Python Tests (pytest) (push) Successful in 1m46s
Lint / Python (flake8) (pull_request) Successful in 1m43s
Lint / JS (eslint) (pull_request) Successful in 11s
Lint / Notify on failure (pull_request) Skipped
Lint / Deploy (pull_request) Skipped
Security / Python Security (bandit) (pull_request) Successful in 1m7s
Test / Python Tests (pytest) (pull_request) Successful in 1m10s
Dashboard: the stat cards are gone (Needs attention says it better); host cards
fold unused NICs into one line and move Suppress to a small icon; UniFi devices
become a compact list; recently resolved alerts fold. Navigation keeps Dashboard,
Topology, Rack and Cutsheet in view with Alert history and Suppressions under More;
the phone drawer groups them the same way and gains Start maintenance, and the
phone header hides the user name and the Ctrl+K hint so GANDALF fits. Rack and
topology intros are one line with the how-to behind a ?; the topology problem
bar is one line until opened. README updated.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-15 15:04:34 -05:00
jaredandClaude Opus 5.5 4646d9be90 Cutsheet: tabs for Cables, To do, Patch panels, Inventory and History
The 9-section page becomes five tabs; counts sit on the tabs instead of a row of
chips. To do holds undocumented links, UniFi port names and labels to make. The
text-only rack list is gone (the rack page draws it). Patch panels list only ports
with a cable or label, with a Show all toggle. Links to a section, cable or item
open the tab that holds it, so dashboard and rack links still land. ?problems=1
ticks Problems only. Printing still prints every tab, or just the labels.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-15 14:59:15 -05:00
jaredandClaude Opus 5.5 c535bfd9fb Dashboard: one Needs attention list from every page; say what GANDALF stands for
attention.build gathers alerts, power faults, cutsheet mismatches, UniFi port names,
undocumented links, labels to print and rack overlaps into Broken now and Tidy up,
each linking to where it is fixed. /api/attention serves it; the dashboard renders it
and refreshes it with everything else. The header, help dialog, footer and page
description spell out Global Advanced Network Detection And Link Facilitator.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-15 14:56:13 -05:00
jared a90ce44c80 Merge pull request 'Cutsheet: port names in UniFi that no longer fit, document a cable from topology' (#44) from port-name-report into main
Lint / JS (eslint) (push) Successful in 16s
Lint / Python (flake8) (push) Successful in 2m2s
Lint / Notify on failure (push) Skipped
Security / Python Security (bandit) (push) Successful in 1m44s
Lint / Deploy (push) Successful in 5s
Test / Python Tests (pytest) (push) Successful in 45s
2026-11-15 14:21:20 -05:00
jaredandClaude Opus 5.5 4dfabce2fb Cutsheet: port names in UniFi that no longer fit, document a cable from topology
Lint / JS (eslint) (push) Successful in 23s
Lint / Python (flake8) (push) Successful in 1m10s
Lint / Notify on failure (push) Skipped
Lint / Deploy (push) Skipped
Lint / Python (flake8) (pull_request) Successful in 53s
Lint / JS (eslint) (pull_request) Successful in 11s
Lint / Notify on failure (pull_request) Skipped
Lint / Deploy (pull_request) Skipped
Security / Python Security (bandit) (push) Successful in 1m26s
Test / Python Tests (pytest) (push) Successful in 1m49s
Security / Python Security (bandit) (pull_request) Successful in 2m17s
Test / Python Tests (pytest) (pull_request) Successful in 2m12s
- topology.port_name_report: switch port names that no longer fit what is
  plugged in, as a checklist with suggested names: named after the wrong
  device, named after a device that moved to another port, named with nothing
  plugged in (and who was last seen there), and still "Port N" with a known
  device on it. Ports named after a device that is only off are left alone.
  Gandalf only reports; it never renames anything in UniFi.
- /api/cutsheet returns it as port_names; the cutsheet page shows it as
  "Port names in UniFi", grouped, with a summary chip.
- The topology cable panel's "not documented" gets a "document it" link that
  opens the cutsheet's new-cable form with both ends, the NIC and DAC filled
  in; /cutsheet?... now takes b_device, b_port and cable_type.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-15 13:48:52 -05:00
jared d6fcddb6fc Merge pull request 'README: patch panel ends, tap to trace, stale outlet watts, SmartPower Strip' (#43) from readme-power-polish into main
Lint / JS (eslint) (push) Successful in 1m26s
Lint / Python (flake8) (push) Successful in 3m9s
Lint / Notify on failure (push) Skipped
Security / Python Security (bandit) (push) Successful in 1m40s
Lint / Deploy (push) Successful in 4s
Test / Python Tests (pytest) (push) Successful in 45s
2026-11-15 13:48:40 -05:00
jaredandClaude Opus 5.5 ce68d592c3 README: patch panel ends, tap to trace, stale outlet watts, SmartPower Strip
Lint / JS (eslint) (push) Successful in 8s
Lint / Python (flake8) (push) Successful in 1m21s
Lint / Notify on failure (push) Skipped
Lint / Deploy (push) Skipped
Security / Python Security (bandit) (push) Successful in 1m45s
Test / Python Tests (pytest) (push) Successful in 2m24s
Lint / Python (flake8) (pull_request) Successful in 2m14s
Lint / JS (eslint) (pull_request) Successful in 9s
Lint / Notify on failure (pull_request) Skipped
Lint / Deploy (pull_request) Skipped
Security / Python Security (bandit) (pull_request) Successful in 1m56s
Test / Python Tests (pytest) (pull_request) Successful in 2m0s
Documents #41 and #42 in the Topology and Device pages sections and the
faceplate list, and refreshes the topology gallery image (patch panel end and
the new strip drawing).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-15 01:24:53 -05:00
jared 3a1371e8b7 Merge pull request 'Power: flag frozen outlet watts, draw the SmartPower Strip' (#42) from stale-outlet-watts into main
Lint / JS (eslint) (push) Successful in 17s
Lint / Python (flake8) (push) Successful in 1m48s
Lint / Notify on failure (push) Skipped
Security / Python Security (bandit) (push) Successful in 1m35s
Lint / Deploy (push) Successful in 6s
Test / Python Tests (pytest) (push) Successful in 1m3s
2026-11-15 00:24:23 -05:00
jaredandClaude Opus 5.5 60d892badb Power: flag frozen outlet watts, draw the SmartPower Strip
Lint / JS (eslint) (push) Successful in 14s
Lint / Python (flake8) (push) Successful in 1m3s
Lint / Notify on failure (push) Skipped
Lint / Deploy (push) Skipped
Security / Python Security (bandit) (push) Successful in 1m9s
Test / Python Tests (pytest) (push) Successful in 1m29s
Lint / Python (flake8) (pull_request) Successful in 1m9s
Lint / JS (eslint) (pull_request) Successful in 14s
Lint / Notify on failure (pull_request) Skipped
Lint / Deploy (pull_request) Skipped
Security / Python Security (bandit) (pull_request) Successful in 1m26s
Test / Python Tests (pytest) (pull_request) Successful in 1m48s
UniFi can keep serving one frozen set of USP PDU Pro outlet readings for hours
while the unit's total stays live (seen on prod: every outlet at 120.661 V with
the same watts all session, summing to 321 W of a live 593 W total). The monitor
now notices when a power unit's loaded outlet readings have not changed for 15
minutes and marks them stale. The topology page shows "stale" instead of watts,
the power badge says "fed", and a "to look at" chip says since when; the device
page marks the readings too.

Adds a UP6 (USP-Strip) faceplate traced from Ubiquiti's datasheet render: three
facing pairs of US outlets, four USB-C ports (outlet 7), the LED and the cord.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-14 22:46:04 -05:00
jared 206175df39 Merge pull request 'Topology: tap to trace on phones, name cables into a patch panel' (#41) from topology-polish into main
Lint / JS (eslint) (push) Successful in 24s
Security / Python Security (bandit) (push) Successful in 2m56s
Test / Python Tests (pytest) (push) Successful in 2m40s
Lint / Python (flake8) (push) Successful in 1m0s
Lint / Notify on failure (push) Skipped
Lint / Deploy (push) Successful in 4s
2026-11-14 22:22:45 -05:00
jaredandClaude Opus 5.5 b9e008bc2b Topology: tap to trace on phones, name cables into a patch panel
Lint / JS (eslint) (push) Successful in 19s
Lint / Python (flake8) (push) Successful in 1m20s
Lint / Notify on failure (push) Skipped
Lint / Deploy (push) Skipped
Lint / JS (eslint) (pull_request) Successful in 27s
Lint / Python (flake8) (pull_request) Successful in 1m46s
Lint / Notify on failure (pull_request) Skipped
Lint / Deploy (pull_request) Skipped
Security / Python Security (bandit) (pull_request) Successful in 1m9s
Test / Python Tests (pytest) (pull_request) Successful in 1m23s
Security / Python Security (bandit) (push) Successful in 1m10s
Test / Python Tests (pytest) (push) Successful in 1m18s
- Touch screens have no hover, so the first tap on a device traces its path to
  the internet and its power feeds; a second tap opens it. Tapping empty canvas
  clears it, and the trace survives the 30 s refresh.
- A cutsheet cable now carries where its other end goes. An unknown device on a
  cable documented into a patch panel is drawn as that panel's jacks, named
  "Patch panel port N"; a named stub notes "via Patch panel port N". The cable
  panel shows the far end of the cutsheet cable.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-14 22:16:16 -05:00
jared ab59b42bea Merge pull request 'Topology: power map, what each outlet feeds' (#40) from power-map into main
Lint / JS (eslint) (push) Successful in 26s
Security / Python Security (bandit) (push) Successful in 2m15s
Test / Python Tests (pytest) (push) Successful in 2m19s
Lint / Python (flake8) (push) Successful in 1m58s
Lint / Notify on failure (push) Skipped
Lint / Deploy (push) Successful in 5s
2026-11-14 20:51:13 -05:00
jaredandClaude Opus 5.5 415d2222e7 Topology: power map, what each outlet feeds
Lint / JS (eslint) (push) Successful in 21s
Lint / Python (flake8) (push) Successful in 2m36s
Lint / Notify on failure (push) Skipped
Lint / Deploy (push) Skipped
Test / Python Tests (pytest) (push) Successful in 2m46s
Lint / JS (eslint) (pull_request) Successful in 15s
Lint / Python (flake8) (pull_request) Successful in 2m14s
Lint / Notify on failure (pull_request) Skipped
Lint / Deploy (pull_request) Skipped
Security / Python Security (bandit) (push) Successful in 1m33s
Security / Python Security (bandit) (pull_request) Successful in 54s
Test / Python Tests (pytest) (pull_request) Successful in 1m3s
- Each PDU, UPS and power strip card lists its outlets that feed
  something, draw power or are off, with live watts. Each device fed
  gets a power badge with what it draws. Hovering a power card or a
  device draws its feeds as dotted lines and keeps both ends lit.
- What an outlet feeds: a saved assignment, else the outlet's UniFi name
  when it names a device (or the modem), else a MAC in its name that
  belongs to a host NIC (the monitor's host_macs) or UniFi device.
- Admins click an outlet to set what it feeds, nothing, or automatic.
  Saved in a new power_feeds table (created with the cutsheet tables);
  PUT /api/topology/power/<device>/<outlet>, admin and JSON only, with
  the device, outlet and target checked. UniFi is never changed.
- An outlet that is off but feeds something is listed under "to look at".
- Power gear is shown by default again, now that it has something to say.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-14 20:28:13 -05:00
jared dcf5fdf4cc Merge pull request 'Topology: a live page drawn from the real gear' (#39) from topology into main
Lint / JS (eslint) (push) Successful in 17s
Lint / Python (flake8) (push) Successful in 1m10s
Lint / Notify on failure (push) Skipped
Security / Python Security (bandit) (push) Successful in 1m1s
Lint / Deploy (push) Successful in 4s
Test / Python Tests (pytest) (push) Successful in 51s
2026-11-14 20:10:19 -05:00
25 changed files with 1836 additions and 402 deletions

No files matched your search

+68 -17
View File
@@ -106,17 +106,30 @@ Ping-only (no node_exporter): **pbs** (10.10.10.3)
## Pages
### Dashboard (`/`)
- **Needs attention** at the top gathers what every page would flag into two lists, each line linking to
where it is fixed:
- *Broken now*: active alerts (one line, with the devices), an outlet that is off but feeds a device,
frozen outlet readings, and cables not where the cutsheet says.
- *Tidy up*: UniFi port names pointing at the wrong device or at an empty port, live links not on the
cutsheet, labels to print, powered outlets with no device assigned, and rack items that overlap or sit
outside the rack.
Served by `GET /api/attention` (`attention.py`) and refreshed with the rest of the page.
- Device search (see Device pages below)
- Active alerts first, then the WAN / Fiber panel, hosts, UniFi devices, and recently resolved alerts
- Real-time host status grid with per-NIC link state (UP / DOWN / degraded)
- WAN / Fiber panel: WAN and PON state, Rx/Tx power, optics temperature, throughput, errors, gateway uptime and last restart, 7-day Rx trend, recent WAN outages
- UniFi device table (switches, APs, gateway)
- Active alerts table with severity, target, consecutive failures, ticket link
- WAN / Fiber panel: WAN and PON state, Rx/Tx power, optics temperature, throughput, errors, gateway uptime and last restart, 7-day Rx trend, recent WAN outages
- Hosts with per-NIC link state; NICs marked unused fold into a "+N unused" line
- UniFi devices as a compact list (name and model; offline ones turn red with a suppress button)
- Recently resolved alerts, folded until opened
- Follow-up flags (see Follow-up below): a ⏳ badge on alerts active for days, a "ticket closed" badge when the
ticket was closed but the alert is still active, and a Needs Follow-up panel of tickets left open after their
alert cleared. A "TO FOLLOW UP" chip in the status bar counts them all.
- Quick-suppress modal: apply timed or manual suppression from any alert row
- Auto-refreshes every 30 seconds via `/api/status` + `/api/network`
- Quick-suppress modal: apply timed or manual suppression from any alert row or host card
- Auto-refreshes every 30 seconds via `/api/status` + `/api/network` + `/api/attention`
The header spells out the name; the navigation keeps Dashboard, Topology, Rack and Cutsheet in view, with
Alert history and Suppressions under **More** (and in the command palette, Ctrl+K). On a phone the drawer
holds every page and Start maintenance.
### Alert history (`/events`)
Every alert Gandalf raised in the last 24 hours to 90 days, including ones that cleared before anyone
@@ -185,9 +198,11 @@ The rack front, drawn from the rack units set on cutsheet items, top first.
The whole network as the switches see it now, top down: the internet, the modem, the gateway, then
each switch by how many hops it is from the gateway, the gear and unknown devices below them, and the
servers along the bottom. Power gear (PDU, UPS, power strip) sits in a rail on the right.
- **What needs a look** is listed above the diagram: devices down, degraded or with active alerts,
cables down or last seen elsewhere, ports named after the wrong device, and cables with errors.
Click one to jump to it. With nothing to report it says all clear. Problem cables are drawn in full
- **What needs a look** sits above the diagram as one line ("7 to look at" and the first two):
devices down, degraded or with active alerts, cables down or last seen elsewhere, ports named after
the wrong device, and cables with errors. Open it to list them all and click one to jump to it; it
remembers whether it was open. With nothing to report it says all clear. The how-to hides behind the
**?** next to the page intro. Problem cables are drawn in full
colour with a glow and always shown, whatever the filters; healthy cables are drawn quietly.
- **A card per device**, all the same height so the whole network reads at a glance: name, state
(coloured edge and dot), and a picture: UniFi gear shows its real faceplate (the same drawings as the
@@ -206,21 +221,40 @@ servers along the bottom. Power gear (PDU, UPS, power strip) sits in a rail on t
- **Unknown devices**: something plugged into a switch port that Gandalf can't name is a grey stub,
labelled with the port name (or its address), linking to that port. By default each switch's unknown
devices are one block with one bundled cable ("10 unknown devices"); click it to show them one by
one, or pick "one by one" or "hidden" in the toolbar.
one, or pick "one by one" or "hidden" in the toolbar. When the cutsheet records the cable going into
a patch panel, the far end is drawn as that panel's 24 jacks with the cable on its documented port,
named "Patch panel port 1" (the device beyond the panel is unknown); a stub that already has a name
keeps it and adds "via Patch panel port 2". The cable details show where the cutsheet cable goes.
- **Port names**: a ⚠ marks a port named after one device with a different one plugged in (a port
called "Large1 Management" with the AP on it). Generic names ("Port 4", "SFP+ 2", "Uplink") and
"Downlink to X" with X on the other end never flag.
- **Alerts**: a device with active alerts (not suppressed) gets a ring and a count in its worst
severity colour, and the NIC it is about is marked.
- **Power**: each PDU, UPS and power strip card lists its outlets that feed something, draw power or
are off, with live watts; each device it feeds shows a ⚡ badge with what it draws. Hover a power
card or a device to draw its feeds. The SmartPower Strip has no metering, so it never shows watts. An outlet that is off but feeds something is listed above the
diagram. What an outlet feeds comes from, in order: an assignment saved here, the outlet's name in
UniFi when it names a device ("storage-01", "Dream Machine Pro", "AT&T Modem" for the modem), or a
MAC in its name that belongs to a host NIC or UniFi device. Admins click an outlet to set what it
feeds, set it to nothing, or go back to automatic. Assignments are kept in Gandalf (table
`power_feeds`); Gandalf never renames outlets in UniFi. API: `PUT /api/topology/power/<device>/<outlet>`
with `{"target": "<device>"}`, `""` for nothing or `null` for automatic.
- **Stale outlet watts**: UniFi can keep serving one frozen set of USP PDU Pro outlet readings for hours
while the unit's total stays live. When a unit's loaded outlets have not changed at all for 15 minutes,
the monitor marks them stale: the outlet rows say "stale" instead of watts, ⚡ badges say "fed", and
the list above the diagram says since when (`outlets_stale_since` in `link_stats.unifi_devices`). The
marks clear on the next poll after the readings move. The 15 minutes start again when the monitor
restarts. Restarting the PDU or updating its firmware in UniFi is the usual cure.
- Click a device for its page, or a port on a faceplate for that port. Click a cable for its details:
both ends, speed, cable type and module, traffic each way and how busy it is, errors and drops, and
its cutsheet record. Hovering a device traces its path to the internet.
its cutsheet record. Hovering a device traces its path to the internet. On a touch screen, which
has no hover, the first tap on a device traces it (path and power feeds) and a second tap opens it;
tapping empty canvas clears it.
- Drag to pan, scroll or pinch to zoom, **Fit** (or `0`) to see everything, `+` and `-` to zoom. Show
unknown devices grouped, one by one or not at all. **Server 1G links** (off by default) adds each
server's slower second cable, its management link; **Power gear** (off by default) adds the PDU, UPS
and power strip. Traffic labels and dimming everything without an alert can be switched too. The
server's slower second cable, its management link; **Power gear** shows or hides the power rail. Traffic labels and dimming everything without an alert can be switched too. The
filters are remembered per browser. Refreshes every 30 seconds without moving the view.
- API: `GET /api/topology` returns `{nodes, links, warnings, updated}` (see `topology.py`).
- API: `GET /api/topology` returns `{nodes, links, power, warnings, updated}` (see `topology.py`).
### Health check (`/health`)
No login needed. Returns 200 when the database answers and the monitor has completed a check recently,
@@ -237,7 +271,8 @@ interface and port names, and LLDP neighbors.
- **Alerts**: active and past alerts for this device
- **WAN** (routers): connection state, speed, latency, availability
- **Connected to** (hosts): switch ports that see this host over LLDP
- **Outlets** (PDUs): per-outlet state, power, and auto power-cycle setting
- **Outlets** (PDUs, UPS, power strip): per-outlet state, power, and auto power-cycle setting; readings
UniFi has frozen are marked stale (see Topology)
- **Port inspector** (switches, routers): see below
- **Interfaces / Ports**: one row each with state, speed, RX/TX rate, and neighbor, filterable.
Expanding a host's row shows duplex, auto-negotiation, carrier changes, error and drop rates,
@@ -310,6 +345,7 @@ neighbors that can't be matched show their MAC. Bonded NICs share a MAC, so only
| `USMINI` | USW Flex Mini | 5×RJ45, PoE in on port 1 |
| `USPPDUP` | USP PDU Pro | 20 outlets (4 USB-C, 16 AC), management port 21, surge pass-through ports 22-23 |
| `USPDA2B` | UPS 2U Pro | Front with touchscreen outlet tiles; rear with 8 outlets, EPO, surge and MGMT ports |
| `UP6` | SmartPower Strip | Top face: 6 AC outlets in facing pairs, 4 USB-C (switched together as outlet 7) |
Port LEDs use the colors from each model's quick start guide. Other models use plain blocks until they get an
entry in `FACEPLATES`.
@@ -318,8 +354,13 @@ entry in `FACEPLATES`.
Where every cable is meant to go, checked against what Gandalf actually sees. Anyone who can log in
can view it; only the `admin` group can edit, and every change is logged with who made it and when.
The page has five tabs, each with its count: **Cables**, **To do** (undocumented links, port names
in UniFi, labels to make), **Patch panels**, **Inventory** and **History**. A link to a section, cable
or item (`/cutsheet#cable-7`, `#cs-portnames-section`) opens the tab that holds it, and
`/cutsheet?problems=1` opens the cables with problems. Printing prints every tab.
- **Inventory**: things discovery can't see: patch panels, wall jacks, shelves, and rack positions
for devices (use a device's exact Gandalf name). Panels and jacks are passive: a cable on a
for devices (use a device's exact Gandalf name). The rack page draws them. Panels and jacks are passive: a cable on a
port's front continues through the same port's rear.
- **Cables**: two endpoints each (device or item, port, and front/rear for panels and jacks), plus
ID, type, length, color, status (`planned`, `installed`, `dark`, `retired`) and notes. Leave the
@@ -332,7 +373,16 @@ can view it; only the `admin` group can edit, and every change is logged with wh
cables in one port). Runs that end at a jack are *unverified* while linked and *idle* when not.
Planned, dark and retired cables aren't checked.
- **Undocumented links**: live switch ports no cable mentions, with an Add button that pre-fills
what Gandalf knows. Each switch port panel also shows its planned cable, or links to add one.
what Gandalf knows. Each switch port panel also shows its planned cable, or links to add one. On
the topology page, a cable with no record has a **document it** link that opens this form with both
ends (and the NIC, and DAC when it is one) filled in. `/cutsheet?a_device=&a_port=&b_device=&b_port=&cable_type=`
opens it the same way.
- **Port names in UniFi**: a checklist of switch port names that no longer fit what is plugged in:
named after the wrong device, named after a device that has moved to another port, named but with
nothing plugged in (with who was last seen there), and still "Port N" with a known device on it
(folded). Each comes with a suggested name: the device, the device and NIC for a server with two
cables, "Uplink" or "Downlink to X" between switches. A port named after a device that is only
switched off is left alone. Rename them in UniFi yourself; Gandalf never changes UniFi.
- **Labels to make**: cable IDs (one per cord end) and panel-port labels not yet stuck on, sized for
typing on a handheld label maker. Tick each off once it's applied; **Print list** prints just this.
- **CSV**: export, and import that adds or updates cables by ID. A file with any invalid row imports
@@ -825,6 +875,7 @@ gandalf/
UniFi gear drawn with live ports: UDM Pro (`UDMPRO`), USW Pro 24 PoE (`US24PRO`), USW Aggregation
(`USL8A`), USW Flex (`USF5P`), USW Flex Mini (`USMINI`), USP PDU Pro (`USPPDUP`), UPS 2U Pro (`USPDA2B`),
SmartPower Strip (`UP6`, outlets only),
USW Pro Max 24 PoE (`USPM24P`, also `USPM24`) and USW Pro Max 48 PoE (`USPM48P`, also `USPM48`), plus the
UniFi NVR Pro (`UNVRPRO`), which UniFi Network doesn't report and so is picked by Front drawing. The Pro
Max switches also have Front drawing options, so a new switch draws correctly on the rack before it is
+70 -5
View File
@@ -22,6 +22,7 @@ from urllib.parse import quote, urlparse
from flask import Flask, jsonify, make_response, redirect, render_template, request, send_file, url_for
import attention
import cutsheet
import db
import devices
@@ -1032,6 +1033,9 @@ def _cutsheet_view() -> dict:
snapshot = _state_json('network_snapshot')
data['devices'] = sorted(set(switches) | set(snapshot.get('hosts') or {})
| {u['name'] for u in snapshot.get('unifi') or [] if u.get('name')}, key=str.lower)
# UniFi port names that no longer fit what is plugged in (Gandalf never renames them)
data['port_names'] = topology.port_name_report(
snapshot, link_stats, _state_json('modem_stats'), _state_json('known_uplinks'))
data['verdicts'] = cutsheet.VERDICTS
data['chassis'] = cutsheet.CHASSIS
data['options'] = {'kinds': cutsheet.ITEM_KINDS, 'passive_kinds': cutsheet.PASSIVE_KINDS,
@@ -1312,7 +1316,8 @@ def api_rack():
@app.route('/topology')
@require_auth
def topology_page():
return render_template('topology.html', user=_get_user())
user = _get_user()
return render_template('topology.html', user=user, can_edit='admin' in user['groups'])
@app.route('/api/topology')
@@ -1324,14 +1329,74 @@ def api_topology():
try:
_ensure_cutsheet_schema()
sheet = db.cutsheet_load()
feeds = db.get_power_feeds()
except Exception as e:
logger.error(f'Cutsheet unavailable for topology: {e}')
sheet = {'items': [], 'cables': []}
graph = topology.build_graph(
sheet, feeds = {'items': [], 'cables': []}, []
return jsonify(_topology_graph(events, sheet, feeds))
@app.route('/api/attention')
@require_auth
def api_attention():
"""Everything that needs looking at, from every page, for the dashboard (see attention.build)."""
return jsonify(_attention())
def _attention() -> dict:
events = db.get_active_events(limit=_PAGE_LIMIT)
_annotate_suppressions(events, db.get_active_suppressions())
view, racks, feeds = None, {}, []
try:
view = _cutsheet_view()
feeds = db.get_power_feeds()
all_racks = _racks(view['items'])
for rack in all_racks:
here = [i for i in view['items'] if not i.get('shelf')
and (i.get('rack') or all_racks[0]['name']) == rack['name']]
racks[rack['name']] = cutsheet.rack_layout(here, rack['units'])
except Exception as e:
logger.error(f'Cutsheet unavailable for the attention list: {e}')
sheet = {'items': (view or {}).get('items') or [], 'cables': (view or {}).get('cables') or []}
power = _topology_graph(events, sheet, feeds).get('power') or []
return attention.build(events, power, view, racks)
def _topology_graph(events: list, sheet: dict, feeds: list) -> dict:
return topology.build_graph(
_state_json('network_snapshot'), _state_json('link_stats'), _state_json('modem_stats'),
events, sheet['items'], sheet['cables'], _state_json('known_uplinks'),
events, sheet['items'], sheet['cables'], _state_json('known_uplinks'), feeds,
)
return jsonify(graph)
@app.route('/api/topology/power/<path:source>/<int:outlet>', methods=['PUT'])
@require_auth
@require_admin
@_cutsheet_write
def api_topology_power(source: str, outlet: int):
"""Say what a power outlet feeds. Body: {"target": "<device>"} or "" for nothing, or
null to go back to the guess from the outlet's name."""
body = _json_body()
if 'target' not in body:
raise cutsheet.ValidationError('Send target: a device name, "" for nothing, or null for automatic')
target = body['target']
if target is not None and not isinstance(target, str):
raise cutsheet.ValidationError('target must be a device name, "" or null')
graph = _topology_graph([], {'items': [], 'cables': []}, [])
src = next((p for p in graph['power'] if p['node'] == source), None)
if src is None:
return jsonify({'error': f'No power device named "{source}"'}), 404
if not any(o['index'] == outlet for o in src['outlets']):
return jsonify({'error': f'{source} has no outlet {outlet}'}), 404
names = {n['name'] for n in graph['nodes'] if n['kind'] not in ('stub', 'internet')}
if target and target.strip() not in names:
raise cutsheet.ValidationError(f'No device named "{target}"')
target = target.strip() if target else target
user = _get_user()['username']
db.set_power_feed(source, outlet, target, user)
shown = '(automatic)' if target is None else (target or '(nothing)')
logger.info(f'{user} set {source} outlet {outlet} to feed {shown}')
return jsonify({'success': True, 'source': source, 'outlet': outlet, 'target': target})
@app.route('/api/cutsheet/racks', methods=['POST'])
+122
View File
@@ -0,0 +1,122 @@
"""What needs looking at, gathered from every page into one list for the dashboard.
Two groups: 'broken' is something not working right now; 'tidy' is housekeeping, where
the network works but the records or names don't match it. Each entry links to the page
where it is fixed. Pure functions, so the rules are easy to test.
"""
from typing import Dict, List, Optional
GROUPS = ('broken', 'tidy')
def _plural(n: int, one: str, many: Optional[str] = None) -> str:
return f'{n} {one if n == 1 else (many or one + "s")}'
def _entry(group: str, severity: str, text: str, href: str, detail: str = '') -> dict:
return {'group': group, 'severity': severity, 'text': text, 'href': href, 'detail': detail}
def _alerts(events: List[dict]) -> List[dict]:
live = [e for e in events if not e.get('is_suppressed') and e.get('severity') != 'info']
if not live:
return []
critical = sum(1 for e in live if e.get('severity') == 'critical')
targets = sorted({str(e.get('target_name') or '') for e in live if e.get('target_name')}, key=str.lower)
text = _plural(len(live), 'active alert')
if critical:
text += f' ({critical} critical)'
shown = ', '.join(targets[:4]) + (f' and {len(targets) - 4} more' if len(targets) > 4 else '')
return [_entry('broken', 'bad' if critical else 'warn', text, '#events-table-wrap', shown)]
def _power(power: List[dict]) -> List[dict]:
out = []
for src in power or []:
name = src.get('node') or ''
if src.get('stale_since'):
out.append(_entry('broken', 'warn', f'{name}: outlet watts are frozen', '/topology',
'UniFi keeps sending the same per-outlet readings; the total is still live. '
'Restarting the unit usually clears it.'))
for o in src.get('outlets') or []:
if not o.get('on') and o.get('target'):
out.append(_entry('broken', 'bad', f'{name} outlet {o.get("index")} is off, and it feeds {o["target"]}',
'/topology'))
idle = []
for src in power or []:
for o in src.get('outlets') or []:
# Drawing real power, but nothing in Gandalf says what is plugged in
if o.get('on') and not o.get('target') and o.get('match') != 'cleared' and (o.get('power_w') or 0) >= 5:
idle.append(f'{src.get("node")} {o.get("index")}')
if idle:
out.append(_entry('tidy', 'info', f'{_plural(len(idle), "powered outlet")} with no device assigned',
'/topology', ', '.join(idle[:6]) + (' ...' if len(idle) > 6 else '')))
return out
def _cutsheet(view: dict) -> List[dict]:
out = []
cables = [c for c in view.get('cables') or [] if c.get('status') != 'retired']
bad = [c for c in cables if c.get('problem')]
if bad:
names = ', '.join(c.get('label') or f'#{c["id"]}' for c in bad[:5])
out.append(_entry('broken', 'bad', f'{_plural(len(bad), "cable")} not where the cutsheet says',
'/cutsheet?problems=1#cs-cables-section', names))
names = view.get('port_names') or []
wrong = [r for r in names if r.get('kind') in ('wrong', 'moved')]
if wrong:
out.append(_entry('tidy', 'warn', f'{_plural(len(wrong), "UniFi port name")} pointing at the wrong device',
'/cutsheet#cs-portnames-section',
', '.join(f'{r["switch"]} port {r["port_idx"]} "{r["port_name"]}"' for r in wrong[:3])))
empty = [r for r in names if r.get('kind') == 'empty']
if empty:
out.append(_entry('tidy', 'info', f'{_plural(len(empty), "named port")} with nothing plugged in',
'/cutsheet#cs-portnames-section',
', '.join(f'"{r["port_name"]}"' for r in empty[:4])))
missing = view.get('suggestions') or []
if missing:
out.append(_entry('tidy', 'info', f'{_plural(len(missing), "live link")} not on the cutsheet',
'/cutsheet#cs-suggest-section'))
labels = view.get('labels') or {}
todo = len(labels.get('cables') or []) + len(labels.get('ports') or [])
if todo:
out.append(_entry('tidy', 'info', f'{_plural(todo, "label")} to print and stick on',
'/cutsheet#cs-labels-section'))
return out
def _rack(issues: Dict[str, dict]) -> List[dict]:
out = []
for rack, r in (issues or {}).items():
for o in r.get('overlaps') or []:
out.append(_entry('tidy', 'warn', f'{o["name"]} overlaps {", ".join(o["with"])} at {o["units"]}',
'/cutsheet#cs-items-section', rack))
for o in r.get('outside') or []:
out.append(_entry('tidy', 'warn', f'{o["name"]} at {o["units"]} is outside {rack}',
'/cutsheet#cs-items-section'))
return out
def build(events: List[dict], power: List[dict], cutsheet_view: Optional[dict],
rack_issues: Optional[Dict[str, dict]] = None) -> dict:
"""{'broken': [entry], 'tidy': [entry]}, worst first within each group.
events: active alerts, annotated with 'is_suppressed'. power: topology.build_power output.
cutsheet_view: the cutsheet API view (cables with 'problem', suggestions, port_names,
labels), or None when the cutsheet couldn't be loaded. rack_issues: {rack: rack_layout()}.
Entry: {group, severity: bad|warn|info, text, href, detail}.
"""
entries = _alerts(events) + _power(power)
if cutsheet_view is not None:
entries += _cutsheet(cutsheet_view)
entries += _rack(rack_issues or {})
rank = {'bad': 0, 'warn': 1, 'info': 2}
out = {g: [] for g in GROUPS}
for e in entries:
out[e['group']].append(e)
for g in GROUPS:
out[g].sort(key=lambda e: rank[e['severity']])
return out
+35
View File
@@ -826,9 +826,44 @@ _CUTSHEET_SCHEMA = (
updated_by VARCHAR(255) NOT NULL,
updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
) ENGINE=InnoDB""",
# What each PDU, UPS or power strip outlet feeds, set by hand on the topology page. An empty
# target means "nothing": it overrides a guess from the outlet's name. Gandalf never renames
# outlets in UniFi.
"""CREATE TABLE IF NOT EXISTS power_feeds (
source VARCHAR(255) NOT NULL,
outlet SMALLINT NOT NULL,
target VARCHAR(255) NOT NULL DEFAULT '',
updated_by VARCHAR(255) NOT NULL,
updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (source, outlet)
) ENGINE=InnoDB""",
)
def get_power_feeds() -> list:
"""Every outlet assignment: [{source, outlet, target, updated_by, updated_at}]."""
with get_conn() as conn:
with conn.cursor() as cur:
cur.execute('SELECT source, outlet, target, updated_by, updated_at FROM power_feeds')
rows = cur.fetchall()
return [dict(r, updated_at=r['updated_at'].isoformat() + 'Z' if hasattr(r['updated_at'], 'isoformat')
else r['updated_at']) for r in rows]
def set_power_feed(source: str, outlet: int, target: Optional[str], user: str) -> None:
"""Say what an outlet feeds: a device name, '' for nothing, or None to go back to the guess."""
with get_conn() as conn:
with conn.cursor() as cur:
if target is None:
cur.execute('DELETE FROM power_feeds WHERE source=%s AND outlet=%s', (source, outlet))
return
cur.execute(
"""INSERT INTO power_feeds (source, outlet, target, updated_by) VALUES (%s, %s, %s, %s)
ON DUPLICATE KEY UPDATE target=VALUES(target), updated_by=VALUES(updated_by)""",
(source, outlet, target, user),
)
def get_device_link(name: str) -> str:
"""The device's inventory URL, or ''."""
with get_conn() as conn:
Binary file not shown.

Before

Width:  |  Height:  |  Size: 163 KiB

After

Width:  |  Height:  |  Size: 161 KiB

+27
View File
@@ -659,6 +659,32 @@ class LinkStatsCollector:
# State for UniFi rate calculation (previous snapshot + timestamp)
self._prev_unifi: Dict[str, dict] = {}
self._prev_unifi_time: float = 0.0
# Per power unit: (its outlets' last readings, when they last changed)
self._outlet_readings: Dict[str, tuple] = {}
# Live readings from a loaded outlet change every poll (watts and amps to three decimals).
# When none of them has moved for this long, UniFi is serving a frozen snapshot: the USP PDU
# Pro can keep reporting one set of outlet readings for hours while its total stays live.
OUTLET_STALE_AFTER_S = 15 * 60
def _mark_stale_outlets(self, devices: Dict[str, dict], now: float) -> None:
"""Mark each metered outlet 'stale' and set the device's 'outlets_stale_since' (UTC)
when a power unit's outlet readings have not changed for OUTLET_STALE_AFTER_S."""
for name, info in devices.items():
metered = [o for o in info.get('outlets') or [] if o.get('power_w') is not None]
if not metered:
continue
readings = tuple((o.get('index'), o.get('power_w'), o.get('current_a')) for o in metered)
prev = self._outlet_readings.get(name)
since = prev[1] if prev and prev[0] == readings else now
self._outlet_readings[name] = (readings, since)
# All-zero outlets legitimately read the same every time
loaded = any(o.get('power_w') for o in metered)
if loaded and now - since >= self.OUTLET_STALE_AFTER_S:
stamp = datetime.fromtimestamp(since, timezone.utc)
info['outlets_stale_since'] = stamp.strftime('%Y-%m-%d %H:%M:%S UTC')
for o in metered:
o['stale'] = True
# ------------------------------------------------------------------
# SSH collection (via Pulse worker)
@@ -929,6 +955,7 @@ class LinkStatsCollector:
logger.warning(f'UniFi switch port collection failed: {e}')
unifi_devices = (self.unifi.get_device_details() or {}) if self.unifi else {}
self._mark_stale_outlets(unifi_devices, time.time())
host_macs = self._resolve_neighbors(unifi_switches, unifi_devices, instance_map)
return {
+55 -43
View File
@@ -43,6 +43,7 @@ async function refreshAll() {
lt.api.get('/api/network'),
lt.api.get('/api/status'),
refreshModem(),
refreshAttention(),
]);
if (netResult.status === 'fulfilled') {
const net = netResult.value;
@@ -68,6 +69,40 @@ async function refreshAll() {
}
}
// ── Needs attention ───────────────────────────────────────────────────
const ATTENTION_GROUPS = [
{ key: 'broken', title: 'Broken now', clear: 'Nothing broken' },
{ key: 'tidy', title: 'Tidy up', clear: 'Records match the network' },
];
async function refreshAttention() {
const body = document.getElementById('attention-body');
if (!body) return;
try {
renderAttention(body, await lt.api.get('/api/attention'));
} catch (e) {
body.innerHTML = `<p class="attention-empty">Couldn't gather the list: ${lt.escHtml(e.message || e)}</p>`;
}
}
function renderAttention(body, data) {
const esc = lt.escHtml;
body.innerHTML = ATTENTION_GROUPS.map(g => {
const rows = data[g.key] || [];
const list = rows.length
? `<ul class="attention-list">${rows.map(r => `
<li class="attention-item attention-${esc(r.severity)}">
<a class="attention-link" href="${esc(r.href)}">${esc(r.text)}</a>
${r.detail ? `<span class="attention-detail">${esc(r.detail)}</span>` : ''}
</li>`).join('')}</ul>`
: `<p class="attention-clear">✓ ${g.clear}</p>`;
return `<div class="attention-group attention-group-${g.key}">
<h3 class="attention-group-title">${g.title}${rows.length ? ` <span class="attention-count">${rows.length}</span>` : ''}</h3>
${list}
</div>`;
}).join('');
}
// Active alerts flagged stale or with a closed ticket, plus tickets left open after clearing
function followUpCount(events, staleTickets) {
const flagged = events.filter(e => e.severity !== 'info' &&
@@ -105,16 +140,6 @@ function updateStatusBar(summary, lastCheck, daemonOk, followUps = 0, hasStaleTi
alertBadge.style.display = total ? '' : 'none';
}
// Update stat cards
const scCrit = document.getElementById('stat-critical-val');
const scWarn = document.getElementById('stat-warning-val');
const scRes = document.getElementById('stat-resolved-val');
if (scCrit) scCrit.textContent = critCount;
if (scWarn) scWarn.textContent = warnCount;
if (scRes && summary.resolved_24h !== null && summary.resolved_24h !== undefined) scRes.textContent = summary.resolved_24h;
const statCritCard = document.getElementById('stat-critical');
if (statCritCard) statCritCard.classList.toggle('lt-stat-card--alert', critCount > 0);
// Stale data banner: warn if last_check is older than 15 minutes
let staleBanner = document.getElementById('stale-banner');
if (lastCheck) {
@@ -138,9 +163,6 @@ function updateStatusBar(summary, lastCheck, daemonOk, followUps = 0, hasStaleTi
}
function updateHostGrid(hosts) {
const scHosts = document.getElementById('stat-hosts-val');
if (scHosts) scHosts.textContent = Object.keys(hosts).length;
for (const [name, host] of Object.entries(hosts)) {
const card = document.querySelector(`.host-card[data-host="${CSS.escape(name)}"]`);
if (!card) continue;
@@ -153,15 +175,17 @@ function updateHostGrid(hosts) {
const ifaceList = card.querySelector('.iface-list');
if (ifaceList && host.interfaces && Object.keys(host.interfaces).length > 0) {
ifaceList.innerHTML = Object.entries(host.interfaces)
.sort(([a], [b]) => a.localeCompare(b))
.map(([iface, state]) => `
// NICs marked unused fold into one line, so the card shows what is cabled
const all = Object.entries(host.interfaces).sort(([a], [b]) => a.localeCompare(b));
const inUse = all.filter(([, state]) => state !== 'unused');
const unused = all.length - inUse.length;
ifaceList.innerHTML = inUse.map(([iface, state]) => `
<div class="iface-row">
<span class="iface-dot dot-${state}"></span>
<span class="iface-dot dot-${lt.escHtml(state)}"></span>
<span class="iface-name">${lt.escHtml(iface)}</span>
<span class="iface-state state-${state}">${state}</span>
<span class="iface-state state-${lt.escHtml(state)}">${lt.escHtml(state)}</span>
</div>
`).join('');
`).join('') + (unused ? `<div class="iface-unused">+${unused} unused</div>` : '');
}
}
}
@@ -417,30 +441,18 @@ function updateModem(data) {
}
function updateUnifiTable(devices) {
const tbody = document.querySelector('#unifi-table tbody');
if (!tbody || !devices.length) return;
tbody.innerHTML = devices.map(d => {
const statusClass = d.connected ? '' : 'row-critical';
const dotClass = d.connected ? 'dot-up' : 'dot-down';
const statusText = d.connected ? 'ONLINE' : 'OFFLINE';
const suppressBtn = !d.connected
? `<button class="lt-btn lt-btn-ghost lt-btn-sm btn-suppress"
data-sup-type="unifi_device"
data-sup-name="${lt.escHtml(d.name)}"
data-sup-detail=""
aria-label="Suppress alerts for ${lt.escHtml(d.name)}">🔕 Suppress</button>`
: '';
return `
<tr class="${statusClass}">
<td><span class="${dotClass}"></span> ${statusText}</td>
<td><a class="device-link" href="${lt.escHtml(deviceUrl(d.name))}"><strong>${lt.escHtml(d.name)}</strong></a></td>
<td>${lt.escHtml(d.type)}</td>
<td>${lt.escHtml(d.model)}</td>
<td>${lt.escHtml(d.ip)}</td>
<td>${suppressBtn}</td>
</tr>`;
}).join('');
const grid = document.getElementById('unifi-grid');
if (!grid || !devices.length) return;
const esc = lt.escHtml;
grid.innerHTML = devices.map(d => `
<li class="unifi-chip${d.connected ? '' : ' unifi-chip-down'}">
<span class="${d.connected ? 'dot-up' : 'dot-down'}" title="${d.connected ? 'Online' : 'Offline'}"></span>
<a class="device-link unifi-chip-name" href="${esc(deviceUrl(d.name))}">${esc(d.name)}</a>
<span class="unifi-chip-model">${esc(d.model)}</span>
${d.connected ? '' : `<button class="lt-btn lt-btn-ghost lt-btn-sm btn-suppress" data-sup-type="unifi_device"
data-sup-name="${esc(d.name)}" data-sup-detail="" title="Suppress alerts for ${esc(d.name)}"
aria-label="Suppress alerts for ${esc(d.name)}">🔕</button>`}
</li>`).join('');
}
function updateEventsTable(events, totalActive) {
+120 -42
View File
@@ -67,15 +67,19 @@ function renderSummary() {
const problems = cables.filter(c => c.problem).length;
const matches = cables.filter(c => c.verdict === 'match').length;
const labels = _cs.labels.cables.length + _cs.labels.ports.length;
const chip = (n, text, cls, target) =>
`<a class="cs-chip ${cls}" href="#${target}"><b>${n}</b> ${esc(text)}</a>`;
document.getElementById('cs-summary').innerHTML = [
chip(cables.length, 'cables', '', 'cs-cables-section'),
chip(matches, 'match what Gandalf sees', 'cs-chip-ok', 'cs-cables-section'),
chip(problems, problems === 1 ? 'problem' : 'problems', problems ? 'cs-chip-bad' : '', 'cs-cables-section'),
chip(_cs.suggestions.length, 'undocumented links', _cs.suggestions.length ? 'cs-chip-warn' : '', 'cs-suggest-section'),
chip(labels, 'labels to make', labels ? 'cs-chip-warn' : '', 'cs-labels-section'),
].join('');
document.getElementById('cs-summary').innerHTML =
`<b class="cs-ok">${matches}</b> of ${cables.length} match what Gandalf sees`
+ (problems ? ` · <b class="cs-bad">${problems}</b> ${problems === 1 ? 'problem' : 'problems'}` : '');
// Each tab says how much is in it; To do counts what needs doing
const todo = _cs.suggestions.length + portFixes() + labels;
const tabCount = (id, n, cls) => {
const el = document.getElementById(`cs-tabcount-${id}`);
el.textContent = n ? String(n) : '';
el.className = `cs-tab-count${cls ? ` ${cls}` : ''}`;
};
tabCount('cables', cables.length, problems ? 'cs-tab-count-bad' : '');
tabCount('todo', todo, todo ? 'cs-tab-count-warn' : '');
tabCount('items', _cs.items.length, '');
}
function cableMatches(c, words, status, problemsOnly) {
@@ -153,6 +157,51 @@ function renderSuggestions() {
${_showAllSuggestions ? 'Show fewer' : `Show all ${list.length}`}</button>` : ''}`;
}
// ── Port names in UniFi ─────────────────────────────────────────────────
const PORT_NAME_GROUPS = [
['wrong', 'Named after the wrong device', 'cs-chip-bad'],
['moved', 'Named after a device that moved', 'cs-chip-warn'],
['empty', 'Named, but nothing is plugged in', ''],
['unnamed', 'Unnamed, with a known device plugged in', ''],
];
// Wrong and moved names are worth fixing; empty and unnamed ports are only worth a look
function portFixes() {
return (_cs.port_names || []).filter(r => r.kind === 'wrong' || r.kind === 'moved').length;
}
function renderPortNames() {
const rows = _cs.port_names || [];
document.getElementById('cs-portnames-count').textContent = rows.length;
const wrap = document.getElementById('cs-portnames');
if (!rows.length) {
wrap.innerHTML = emptyState('✅', 'Every port name fits what is plugged in', '');
return;
}
wrap.innerHTML = PORT_NAME_GROUPS.map(([kind, title, cls]) => {
const list = rows.filter(r => r.kind === kind);
if (!list.length) return '';
const table = `<div class="lt-table-wrap">
<table class="lt-table lt-table-sm">
<caption class="lt-sr-only">${esc(title)}</caption>
<thead><tr><th>Switch port</th><th>Name in UniFi</th><th>What Gandalf sees</th><th>Suggested name</th></tr></thead>
<tbody>${list.map(r => `
<tr>
<td>${deviceLink(r.switch)} <a class="cs-port" href="/device/${encodeURIComponent(r.switch)}#port-${esc(r.port_idx)}">port ${esc(r.port_idx)}</a></td>
<td>${esc(r.port_name)}</td>
<td>${esc(r.detail)}</td>
<td>${r.suggestion ? `<code>${esc(r.suggestion)}</code>` : '<span class="val-neutral">your call</span>'}</td>
</tr>`).join('')}
</tbody>
</table>
</div>`;
// The long, low-priority group starts folded
const open = kind !== 'unnamed' ? ' open' : '';
return `<details class="cs-portname-group"${open}>
<summary><span class="cs-chip ${cls}"><b>${list.length}</b> ${esc(title)}</span></summary>${table}</details>`;
}).join('');
}
function cableAt(name, port, side) {
return _cs.cables.find(c => c.status !== 'retired' &&
['a', 'b'].some(e => c[`${e}_device`] === name && c[`${e}_port`] === String(port) && c[`${e}_side`] === side));
@@ -163,6 +212,9 @@ function farEnd(c, name, port, side) {
return endText(c, end);
}
// Panels whose every port is shown, not just the ones with something on them
const _panelsShowAll = new Set();
function renderPanels() {
const panels = _cs.items.filter(i => i.kind === 'patch_panel').sort((a, b) => natural(a.name, b.name));
const wrap = document.getElementById('cs-panels');
@@ -174,10 +226,14 @@ function renderPanels() {
for (const l of _cs.port_labels) labels[`${l.item_id}|${l.port}`] = l;
wrap.innerHTML = panels.map(p => {
const rows = [];
const all = _panelsShowAll.has(p.id);
let used = 0;
for (let n = 1; n <= (p.port_count || 0); n++) {
const front = cableAt(p.name, n, 'front');
const rear = cableAt(p.name, n, 'rear');
const lab = labels[`${p.id}|${n}`];
if (front || rear || lab) used += 1;
else if (!all) continue;
const cell = (c, side) => c
? `<a class="cs-id" href="#cable-${esc(c.id)}">${esc(c.label || 'unlabeled')}</a> → ${farEnd(c, p.name, n, side)}`
: '<span class="val-neutral">-</span>';
@@ -190,17 +246,24 @@ function renderPanels() {
<td>${cell(rear, 'rear')}</td>
</tr>`);
}
return `
<div class="lt-frame cs-panel" id="item-${esc(p.id)}">
<span class="lt-frame-bl">&#x255A;</span><span class="lt-frame-br">&#x255D;</span>
<div class="lt-section-header">${esc(p.name)}${p.rack_u ? ` · U${esc(p.rack_u)}` : ''}${p.location ? ` · ${esc(p.location)}` : ''}</div>
const total = p.port_count || 0;
const toggle = total && used < total
? `<button type="button" class="cs-link-btn no-print" data-action="panel-all" data-id="${esc(p.id)}" aria-expanded="${all}">${all ? `Show only the ${used} in use` : `Show all ${total} ports`}</button>`
: '';
const table = rows.length ? `
<div class="lt-table-wrap">
<table class="lt-table lt-table-sm">
<caption class="lt-sr-only">Ports on ${esc(p.name)}</caption>
<thead><tr><th>Port</th><th>Label</th><th>Front (patch cord)</th><th>Rear (run)</th></tr></thead>
<tbody>${rows.join('')}</tbody>
</table>
</div>
</div>` : '';
return `
<div class="lt-frame cs-panel" id="item-${esc(p.id)}">
<span class="lt-frame-bl">&#x255A;</span><span class="lt-frame-br">&#x255D;</span>
<div class="lt-section-header">${esc(p.name)}${p.rack_u ? ` · U${esc(p.rack_u)}` : ''}${p.location ? ` · ${esc(p.location)}` : ''}</div>
<p class="cs-panel-use">${used} of ${total} ports have a cable or label${used ? '' : '; nothing documented yet'}. ${toggle}</p>
${table}
</div>`;
}).join('');
}
@@ -236,27 +299,6 @@ function renderLabels() {
${unlabeled.length ? `<p class="cs-hint">${unlabeled.length} more cable(s) have no ID yet.</p>` : ''}`;
}
function renderRack() {
const placed = _cs.items.filter(i => i.rack_u).sort((a, b) => (b.rack_u + (b.rack_height || 1)) - (a.rack_u + (a.rack_height || 1)));
const wrap = document.getElementById('cs-rack');
if (!placed.length) {
wrap.innerHTML = emptyState('🗄️', 'No rack positions recorded', CS_CAN_EDIT ? 'Set a rack unit on a panel, shelf or device in the inventory.' : '');
return;
}
wrap.innerHTML = `
<div class="cs-rack">
${placed.map(i => {
const top = i.rack_u + (i.rack_height || 1) - 1;
return `
<div class="cs-rack-unit" style="--u:${Math.min(i.rack_height || 1, 8)}">
<span class="cs-rack-u">${i.rack_height > 1 ? `U${esc(top)}-${esc(i.rack_u)}` : `U${esc(i.rack_u)}`}</span>
<span class="cs-rack-name">${deviceLink(i.name)}</span>
<span class="cs-rack-kind">${esc(KIND_TEXT[i.kind] || i.kind)}</span>
</div>`;
}).join('')}
</div>`;
}
function rackText(i) {
if (i.shelf) return `on ${esc(i.shelf)}${i.slot ? `, position ${esc(i.slot)}` : ''}`;
if (!i.rack_u) return '-';
@@ -331,9 +373,9 @@ function render() {
renderSummary();
renderCables();
renderSuggestions();
renderPortNames();
renderPanels();
renderLabels();
renderRack();
renderItems();
renderHistory();
renderDatalists();
@@ -349,13 +391,39 @@ async function load() {
return;
}
render();
const hash = window.location.hash;
if (hash && /^#(cable|item)-\d+$/.test(hash)) {
const el = document.getElementById(hash.slice(1));
if (el) { el.classList.add('cs-flash'); el.scrollIntoView({ block: 'center' }); }
}
reveal(window.location.hash);
}
// Open the tab holding a section, cable or item (links from the dashboard, the rack and
// other tabs point at them), then scroll to it. Cables and items flash so they're easy to spot.
function reveal(hash) {
if (!hash || !/^#[\w-]+$/.test(hash)) return false;
const el = document.getElementById(hash.slice(1));
if (!el) return false;
const panel = el.closest('.lt-tab-panel');
if (panel && !panel.classList.contains('active')) lt.tabs.switch(panel.id);
if (el.classList.contains('lt-tab-panel')) return true;
if (/^#(cable|item)-\d+$/.test(hash)) {
el.classList.remove('cs-flash');
void el.offsetWidth;
el.classList.add('cs-flash');
el.scrollIntoView({ block: 'center' });
} else {
el.scrollIntoView({ block: 'start' });
}
return true;
}
window.addEventListener('hashchange', () => reveal(window.location.hash));
document.addEventListener('click', e => {
// A link to something on another tab: switch tabs even when the hash is already set
const a = e.target.closest('a[href^="#"]');
if (a && a.getAttribute('href').length > 1 && reveal(a.getAttribute('href'))) {
e.preventDefault();
history.replaceState(null, '', a.getAttribute('href'));
}
});
// ── Editing ─────────────────────────────────────────────────────────────
function fillPorts(end) {
const device = document.querySelector(`#cs-cable-form [name="${end}_device"]`).value;
@@ -659,6 +727,11 @@ document.addEventListener('click', e => {
else if (action === 'edit-item') openItem(_cs.items.find(i => String(i.id) === btn.dataset.id));
else if (action === 'edit-port-label') openPortLabel(btn.dataset.item, btn.dataset.port);
else if (action === 'print-labels') printLabels();
else if (action === 'panel-all') {
const id = Number(btn.dataset.id);
if (_panelsShowAll.has(id)) _panelsShowAll.delete(id); else _panelsShowAll.add(id);
renderPanels();
}
else if (action === 'trace-start') startTrace();
else if (action === 'trace-stop') { stopTrace(); traceStatus('Stopped.'); }
else if (action === 'trace-record') {
@@ -700,13 +773,18 @@ function printLabels() {
function openFromQuery() {
const q = new URLSearchParams(window.location.search);
if (!CS_CAN_EDIT || !q.get('a_device')) return;
openCable(null, { a_device: q.get('a_device'), a_port: q.get('a_port') || '' });
openCable(null, {
a_device: q.get('a_device'), a_port: q.get('a_port') || '',
b_device: q.get('b_device') || '', b_port: q.get('b_port') || '', cable_type: q.get('cable_type') || '',
});
history.replaceState(null, '', window.location.pathname);
}
document.getElementById('cs-filter').addEventListener('input', () => _cs && renderCables());
document.getElementById('cs-status-filter').addEventListener('change', () => _cs && renderCables());
document.getElementById('cs-problems-only').addEventListener('change', () => _cs && renderCables());
// The dashboard's "Needs attention" list links here with ?problems=1
if (new URLSearchParams(window.location.search).get('problems')) document.getElementById('cs-problems-only').checked = true;
if (CS_CAN_EDIT) {
document.getElementById('cs-cable-form').addEventListener('submit', saveCable);
document.getElementById('cs-item-form').addEventListener('submit', saveItem);
+6 -2
View File
@@ -292,10 +292,14 @@ function renderOutlets(d) {
<td><span class="dot-${o.on ? 'up' : 'down'}"></span></td>
<td>#${esc(o.index)}</td>
<td>${esc(o.name || '-')}</td>
<td class="device-num">${o.power_w === null || o.power_w === undefined ? '-' : `${o.power_w.toFixed(1)} W`}</td>
<td class="device-num">${o.power_w === null || o.power_w === undefined ? '-' : `${o.power_w.toFixed(1)} W${o.stale ? ' <span class="lt-badge" title="UniFi has been sending this same reading for a long time">stale</span>' : ''}`}</td>
<td>${o.auto_power_cycle ? '<span class="lt-badge">auto power-cycle</span>' : ''}</td>
</tr>`).join('');
return section('Outlets', `<div class="lt-table-wrap"><table class="lt-table">
const since = d.info.outlets_stale_since;
const note = since
? `<p class="g-page-sub">The outlet readings have not changed since ${esc(since)}: UniFi is sending a frozen snapshot, so they are not live. The power draw total is live.</p>`
: '';
return section('Outlets', `${note}<div class="lt-table-wrap"><table class="lt-table">
<caption class="lt-sr-only">PDU outlets</caption>
<thead><tr><th><span class="lt-sr-only">State</span></th><th>Outlet</th><th>Name</th><th>Power</th><th></th></tr></thead>
<tbody>${rows}</tbody></table></div>`);
+45 -1
View File
@@ -147,6 +147,18 @@ function outletFaceSvg(kind, w, h, idx) {
return `<rect class="fp-usbc" width="${w}" height="${h}" rx="${w / 2}"/>
<rect class="fp-usbc-tongue" x="${cx - 1}" y="4" width="2" height="${h - 8}" rx="1"/>`;
}
if (kind === 'usbc-h') {
return `<rect class="fp-usbc" width="${w}" height="${h}" rx="${h / 2}"/>
<rect class="fp-usbc-tongue" x="4" y="${cy - 1}" width="${w - 8}" height="2" rx="1"/>`;
}
if (kind === 'us-bare') {
// A US socket moulded straight into a white body (the SmartPower Strip): no face plate,
// just a shallow recess with the two blades over the round ground
return `<rect class="fp-outlet-bare" width="${w}" height="${h}" rx="${w / 4}"/>
<rect class="fp-slot" x="${cx - 17}" y="${cy - 20}" width="5.5" height="17" rx=".8"/>
<rect class="fp-slot" x="${cx + 11.5}" y="${cy - 22}" width="5.5" height="19" rx=".8"/>
<path class="fp-slot" d="M${cx - 7} ${cy + 22} v-8 a7 7 0 0 1 14 0 v8 Z"/>`;
}
const face = `<rect class="fp-outlet-face" width="${w}" height="${h}" rx="3"/>`;
if (kind === 'horizontal') {
return `${face}
@@ -168,7 +180,7 @@ function outletTitle(o, data) {
if (data) {
if (data.name && data.name !== parts[0]) parts.push(data.name);
parts.push(data.on === false ? 'off' : 'on');
if (data.power_w != null) parts.push(`${data.power_w.toFixed(1)} W`);
if (data.power_w != null) parts.push(`${data.power_w.toFixed(1)} W${data.stale ? ' (stale reading)' : ''}`);
if (data.auto_power_cycle) parts.push('auto power-cycle');
}
return lt.escHtml(parts.join(' · '));
@@ -566,6 +578,38 @@ const FACEPLATES = {
</g>`;
},
},
// UniFi SmartPower Strip (USP-Strip), top face. Traced from the product render on Ubiquiti's
// datasheet (images.salsify.com/.../046c9c047ca057faf25eb38f48c598318c9ae699.pdf, page 1) and
// sized from its 229.5 x 111.5 mm footprint at 4 units per mm, plus the cord on the left.
// Six AC outlets in three facing pairs (1 over 2, 3 over 4, 5 over 6), and four USB-C ports
// that UniFi switches together as outlet 7, "USB Outlets".
UP6: {
width: 968, height: 446, frameClass: 'fp-desk', noBody: true,
label: 'SmartPower Strip',
legend: [['outlet-on', 'outlet on'], ['outlet-off', 'outlet off']],
ports: [],
outlets: [
...[338, 502, 664].flatMap((cx, i) => [
{ idx: 2 * i + 1, kind: 'us-bare', flip: true, x: cx - 33, y: 86, w: 66, h: 66, label: [cx - 16, 232] },
{ idx: 2 * i + 2, kind: 'us-bare', x: cx - 33, y: 294, w: 66, h: 66, label: [cx + 22, 232] },
]),
...[84, 165, 250, 335].map((y, i) => ({
idx: 7, kind: 'usbc-h', x: 852, y: y - 7, w: 40, h: 14, label: i === 3 ? [872, y + 46] : null,
})),
],
decor({ online }) {
const usbNums = [84, 165, 250, 335].map((y, i) =>
`<text class="fp-label fp-label-sm" x="836" y="${y + 5}" text-anchor="middle">${i + 1}</text>`).join('');
return `<path class="fp-cord" d="M0 223 H48"/>
<rect class="fp-cord-boot" x="26" y="203" width="26" height="40" rx="6"/>
<rect class="fp-body-white" x="48" y="2" width="918" height="442" rx="44"/>
<path class="fp-strip-logo" d="M120 206 v18 a10 10 0 0 0 20 0 v-18"/>
<rect class="fp-strip-led${online ? ' fp-strip-led-on' : ''}" x="198" y="196" width="8" height="54" rx="4"/>
<text class="fp-label fp-label-sm" x="896" y="420" text-anchor="middle">USB-C</text>
${usbNums}`;
},
},
};
function faceplateLegendSwatch(cls) {
+188 -9
View File
@@ -1030,6 +1030,13 @@ tr.device-row.is-selected { background: var(--bg-tertiary); box-shadow: inset 3p
.fp-usbc-tongue { fill: #b9bcc2; }
.fp-outlet-is-off .fp-outlet-face { fill: #5b5c60; }
.fp-outlet-is-off .fp-usbc { fill: #66676b; }
.fp-outlet-bare { fill: #e6e6e8; stroke: #cfcfd2; stroke-width: 1; }
.fp-outlet-is-off .fp-outlet-bare { fill: #b9babe; }
.fp-cord { stroke: #d9d9db; stroke-width: 16; stroke-linecap: round; fill: none; }
.fp-cord-boot { fill: #cfcfd2; }
.fp-strip-logo { fill: none; stroke: #b9babe; stroke-width: 6; stroke-linecap: round; }
.fp-strip-led { fill: #c9cacd; }
.fp-strip-led-on { fill: #5ad7f0; filter: drop-shadow(0 0 4px #5ad7f0); }
.fp-outlet:hover .fp-hit { stroke: rgba(0,90,220,.55); }
.fp-outlet:focus-visible .fp-hit { stroke: #0058e0; fill: rgba(0,88,224,.14); }
.fp-outlet-state { fill: #8d8e93; }
@@ -1087,7 +1094,6 @@ polygon.fp-led-off { fill: #6b6c71; }
.cs-trace-status { margin-top: 10px; font-size: .88rem; line-height: 1.6; }
.cs-trace-found { font-size: 1rem; margin-bottom: 6px; }
.cs-actions { display: flex; flex-wrap: wrap; gap: 8px; align-items: center; }
.cs-summary { display: flex; flex-wrap: wrap; gap: 8px; margin: 0 0 18px; }
.cs-chip { padding: 5px 10px; border: 1px solid var(--border-color, #234); border-radius: 3px; font-size: .82rem;
color: inherit; text-decoration: none; }
.cs-chip b { font-size: .95rem; }
@@ -1095,6 +1101,19 @@ polygon.fp-led-off { fill: #6b6c71; }
.cs-chip-bad { border-color: var(--status-critical, #e0312b); }
.cs-chip-bad b { color: var(--status-critical, #e0312b); }
.cs-chip-warn b { color: var(--accent-amber, #f0a020); }
.cs-summary { font-size: .82rem; color: var(--text-secondary); margin: 0 0 10px; }
.cs-summary .cs-ok { color: var(--accent-green); }
.cs-summary .cs-bad { color: var(--accent-red); }
/* Tabs: wrap on phones rather than scroll the page sideways */
.cs-tabs { flex-wrap: wrap; }
.cs-tab-count { color: var(--text-secondary); font-weight: 400; margin-left: 2px; }
.cs-tab-count:empty { display: none; }
.cs-tab-count-bad { color: var(--accent-red); }
.cs-tab-count-warn { color: var(--accent-amber); }
.cs-panel-use { font-size: .8rem; color: var(--text-secondary); margin: 6px 12px 8px; }
.cs-portname-group { margin: 0 0 12px; }
.cs-portname-group > summary { cursor: pointer; list-style-position: inside; margin-bottom: 8px; }
.cs-portname-group code { white-space: nowrap; }
.cs-filters { display: flex; flex-wrap: wrap; gap: 10px; align-items: center; margin-bottom: 10px; }
.cs-filters .lt-input { flex: 1 1 240px; min-width: 0; }
.cs-filters .lt-select { flex: 0 1 180px; }
@@ -1120,12 +1139,6 @@ polygon.fp-led-off { fill: #6b6c71; }
.cs-label-text { font-family: var(--font-mono, monospace); font-size: 1.05rem; font-weight: 700; letter-spacing: .05em; }
.cs-label-copies { font-size: .8rem; color: var(--text-muted, #8aa); }
.cs-label-where { grid-column: 1 / -1; font-size: .74rem; color: var(--text-muted, #8aa); }
.cs-rack { display: flex; flex-direction: column; gap: 3px; max-width: 560px; }
.cs-rack-unit { display: grid; grid-template-columns: 70px 1fr auto; gap: 10px; align-items: center;
min-height: calc(var(--u, 1) * 26px); padding: 4px 10px; border: 1px solid var(--border-color, #234);
border-radius: 2px; background: rgba(255,255,255,.02); }
.cs-rack-u { font-family: var(--font-mono, monospace); font-size: .78rem; color: var(--text-muted, #8aa); }
.cs-rack-kind { font-size: .74rem; color: var(--text-muted, #8aa); }
.cs-end { border: 1px solid var(--border-color, #234); border-radius: 3px; padding: 4px 12px 0; margin: 0 0 12px; }
.cs-end legend { font-size: .78rem; padding: 0 6px; color: var(--text-muted, #8aa); text-transform: uppercase; }
.cs-side[hidden] { display: none; }
@@ -1143,11 +1156,11 @@ polygon.fp-led-off { fill: #6b6c71; }
.cs-table td.cs-id { font-size: 1rem; }
.cs-row-problem { box-shadow: inset 3px 0 0 var(--status-critical, #e0312b); }
.cs-row-problem td:first-child { box-shadow: none; }
.cs-rack-unit { grid-template-columns: 56px 1fr; }
.cs-rack-kind { display: none; }
}
@media print {
.no-print, .lt-header, .lt-nav-drawer, .lt-nav-drawer-overlay { display: none !important; }
/* Printing shows every tab, or only the labels */
.lt-tab-panel { display: block !important; }
body.cs-print-labels .g-section:not(#cs-labels-section),
body.cs-print-labels .lt-page-header, body.cs-print-labels .cs-summary { display: none !important; }
.cs-label-card { break-inside: avoid; border-color: #000; color: #000; }
@@ -1495,6 +1508,12 @@ body.fp-marks-off .fp-svg .fp-mark { display: none; }
.tp-stub-q { font-family: var(--font); font-size: 30px; font-weight: 700; fill: #9aa3ad; }
.tp-st-down .tp-stub-body { stroke: #e0312b; }
.tp-stub-jack.tp-off { opacity: .4; }
.tp-pp-body { fill: #2b2f35; stroke: #1b1e22; stroke-width: 3; }
.tp-pp-jack rect { fill: #121417; stroke: #4a5059; stroke-width: 2; }
.tp-pp-jack.tp-pp-used rect { fill: #121417; stroke: #4aa3ff; stroke-width: 4; }
.tp-pp-num { font-family: var(--font); font-size: 18px; fill: #8a929c; }
.tp-pp-used .tp-pp-num { fill: #cfe6ff; font-weight: 700; }
.tp-st-down .tp-pp-body { stroke: #e0312b; }
.tp-group-body { stroke-dasharray: 10 8; stroke: #5d6670; }
.tp-group-hint { font-family: var(--font); font-size: 20px; fill: #9aa3ad; }
.tp-select { font-size: .95em; padding: 1px 4px; margin-left: 4px; }
@@ -1636,3 +1655,163 @@ body.fp-marks-off .fp-svg .fp-mark { display: none; }
.tp-chip-bad { color: var(--red); border-color: var(--red); background: var(--red-dim); }
.tp-chip-warn { color: var(--amber); border-color: var(--amber); background: var(--amber-dim); }
.tp-problem-chip:hover, .tp-problem-chip:focus-visible { filter: brightness(1.25); outline: none; }
/* Power: outlet lists on power cards, badges on what they feed, feed lines on hover */
.tp-outlet-hit { fill: transparent; }
.tp-outlet-row:hover .tp-outlet-hit, .tp-outlet-row:focus-visible .tp-outlet-hit { fill: rgba(255,179,0,.12); }
.tp-outlet-row[role="button"] { cursor: pointer; outline: none; }
.tp-outlet-idx { font-family: var(--font); font-size: 24px; fill: var(--text-muted); }
.tp-outlet-target { font-family: var(--font); font-size: 26px; fill: var(--text); }
.tp-outlet-watts { font-family: var(--font); font-size: 24px; fill: #e0a400; }
.tp-outlet-free .tp-outlet-target { fill: var(--text-muted); font-style: italic; }
.tp-outlet-off .tp-outlet-watts, .tp-outlet-off .tp-outlet-target { fill: #ff6b5e; }
.tp-outlet-stale .tp-outlet-watts { fill: var(--text-muted, #8a929c); font-style: italic; }
.tp-power-badge { font-family: var(--font); font-size: 26px; font-weight: 700; fill: #e0a400; }
.tp-power-off { fill: #ff6b5e; }
.tp-feeds { pointer-events: none; }
.tp-feed path { fill: none; stroke: #ffb300; stroke-width: 6; stroke-dasharray: 2 14; stroke-linecap: round; }
.tp-feed circle { fill: #ffb300; }
.tp-feed-off path { stroke: #e0312b; }
.tp-feed-off circle { fill: #e0312b; }
.tp-feed-tag rect { stroke: #ffb300; }
.tp-pop { position: absolute; z-index: 3; width: 280px; padding: 10px 12px; font-size: .8em;
background: var(--bg-primary); border: 1px solid var(--amber); box-shadow: 0 8px 24px rgba(0,0,0,.35); cursor: auto; }
.tp-pop[hidden] { display: none; }
.tp-pop-title { font-weight: 700; color: var(--amber); }
.tp-pop-sub { color: var(--text-muted); margin: 2px 0 8px; overflow-wrap: anywhere; }
.tp-pop-label { display: block; color: var(--text-dim); margin-bottom: 3px; }
.tp-pop select { width: 100%; }
.tp-pop-hint { color: var(--text-muted); font-size: .9em; margin: 6px 0 8px; }
.tp-pop-actions { display: flex; justify-content: flex-end; gap: 6px; }
/* ── Needs attention (dashboard) ─────────────────────────────────── */
.attention-groups { display: grid; grid-template-columns: 1fr 1fr; gap: 14px; }
.attention-group {
background: var(--bg-card);
border: 1px solid var(--border-color);
padding: 10px 14px 12px;
min-width: 0;
}
.attention-group-title {
font-size: .78em;
font-weight: bold;
letter-spacing: .08em;
text-transform: uppercase;
color: var(--text-secondary);
margin: 0 0 8px;
}
.attention-group-broken .attention-group-title { color: var(--accent-red); }
.attention-count {
display: inline-block;
min-width: 1.6em;
padding: 0 5px;
margin-left: 4px;
border: 1px solid currentColor;
text-align: center;
font-size: .9em;
}
.attention-list { list-style: none; margin: 0; padding: 0; }
.attention-item {
position: relative;
padding: 5px 0 5px 16px;
border-top: 1px solid var(--border-color);
font-size: .86em;
}
.attention-item:first-child { border-top: 0; }
.attention-item::before {
content: '';
position: absolute;
left: 2px;
top: .85em;
width: 7px;
height: 7px;
border-radius: 50%;
background: var(--text-muted);
}
.attention-bad::before { background: var(--accent-red); }
.attention-warn::before { background: var(--accent-amber); }
.attention-info::before { background: var(--accent-cyan); }
.attention-link { color: var(--text-primary); text-decoration: none; }
.attention-link:hover, .attention-link:focus-visible { color: var(--accent-cyan); text-decoration: underline; }
.attention-detail {
display: block;
color: var(--text-muted);
font-size: .9em;
overflow-wrap: anywhere;
}
.attention-clear { color: var(--accent-green); font-size: .86em; margin: 0; }
.attention-empty { color: var(--text-muted); font-size: .86em; margin: 0; }
@media (max-width: 768px) {
.attention-groups { grid-template-columns: 1fr; }
}
/* ── Brand: what GANDALF stands for ──────────────────────────────── */
.g-brand-expansion { letter-spacing: .08em; line-height: 1.35; }
.g-brand-expansion b { color: var(--accent-cyan); font-weight: 700; }
.g-help-about { font-size: .86em; color: var(--text-secondary); margin: 0 0 12px; line-height: 1.5; }
.g-help-about b { color: var(--accent-cyan); }
/* A tab holding one section already says what it is: skip the repeated heading */
.lt-tab-panel > .g-section:only-child > .g-section-header { display: none; }
/* ── Dashboard: calmer host cards and device list ────────────────── */
.host-suppress { margin-left: auto; padding: 0 6px; opacity: .45; }
.host-suppress:hover, .host-suppress:focus-visible { opacity: 1; }
.iface-unused { font-size: .74em; color: var(--text-muted); padding: 2px 0 0 14px; }
.unifi-grid {
list-style: none; margin: 0; padding: 0;
display: grid; grid-template-columns: repeat(auto-fill, minmax(220px, 1fr)); gap: 6px;
}
.unifi-chip {
display: flex; align-items: center; gap: 8px; min-width: 0;
padding: 6px 10px; border: 1px solid var(--border-color); background: var(--bg-card);
font-size: .84em;
}
.unifi-chip-down { border-color: var(--accent-red); }
.unifi-chip-name { color: var(--text-primary); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
.unifi-chip-model { margin-left: auto; color: var(--text-muted); font-size: .86em; }
.unifi-chip .btn-suppress { padding: 0 6px; }
.resolved-fold > summary { cursor: pointer; list-style: none; }
.resolved-fold > summary::-webkit-details-marker { display: none; }
.resolved-fold > summary::after { content: '▸ show'; margin-left: auto; font-size: .72em; color: var(--text-muted); }
.resolved-fold[open] > summary::after { content: '▾ hide'; }
/* ── Navigation: More menu ───────────────────────────────────────── */
.g-nav-more { position: relative; }
.g-nav-more > summary { list-style: none; cursor: pointer; }
.g-nav-more > summary::-webkit-details-marker { display: none; }
.g-nav-more-menu {
position: absolute; top: calc(100% + 6px); left: 0; z-index: 60;
display: flex; flex-direction: column; min-width: 180px;
background: var(--bg-secondary); border: 1px solid var(--border-color);
box-shadow: 0 8px 24px rgba(0,0,0,.35);
}
.g-nav-more-link {
padding: 9px 14px; font-size: .72rem; letter-spacing: .12em; text-transform: uppercase;
color: var(--text-secondary); text-decoration: none;
}
.g-nav-more-link:hover, .g-nav-more-link:focus-visible { color: var(--accent-cyan); background: rgba(0,212,255,.05); }
.g-nav-more-link.active { color: var(--accent-orange); }
.g-drawer-group {
display: block; margin: 14px 0 4px; padding: 0 16px; font-size: .66rem;
letter-spacing: .14em; text-transform: uppercase; color: var(--text-muted);
}
/* ── Page intros: the how-to sits behind a small "?" ─────────────── */
.g-howto { display: inline; }
.g-howto > summary {
display: inline-flex; align-items: center; justify-content: center;
width: 1.5em; height: 1.5em; margin-left: 4px; cursor: pointer; list-style: none;
border: 1px solid var(--border-color); border-radius: 50%; color: var(--accent-cyan); font-size: .9em;
}
.g-howto > summary::-webkit-details-marker { display: none; }
.g-howto[open] > span { display: block; margin-top: 6px; color: var(--text-secondary); max-width: 70ch; }
.tp-summary-toggle { background: none; border: 0; padding: 0; font: inherit; font-weight: 700; cursor: pointer; color: inherit; }
.tp-summary-bad .tp-summary-toggle { color: var(--red); }
.tp-summary-warn .tp-summary-toggle { color: var(--amber); }
.tp-summary-text { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; min-width: 0; flex: 1 1 0; }
/* ── Phone header: room for the GANDALF name ─────────────────────── */
@media (max-width: 767px) {
.lt-header-user, .lt-cmd-hint-btn, .lt-header-right [data-action="start-maintenance"] { display: none; }
}
.g-drawer-action { background: none; border: 0; width: 100%; text-align: left; font: inherit; cursor: pointer; }
+294 -18
View File
@@ -1,5 +1,5 @@
'use strict';
/* global FACEPLATES, faceplateSvg, faceplatePortAnchor, RACK_FRONTS, SHELF_GEAR, DESK_FACEPLATES, CHASSIS_FACEPLATES, rackFrontSvg */
/* global TOPO_CAN_EDIT, FACEPLATES, faceplateSvg, faceplatePortAnchor, RACK_FRONTS, SHELF_GEAR, DESK_FACEPLATES, CHASSIS_FACEPLATES, rackFrontSvg */
// Topology page: a card per device with its real faceplate or chassis, and each cable leaving the
// exact port it is plugged into. Data comes from /api/topology (topology.build_graph).
@@ -8,7 +8,8 @@ const PER_MM = 1100 / 482.6;
const NODE_GAP = 90;
const REFRESH_MS = 30000;
const FILTER_KEY = 'gandalf.topology.filters';
const DEFAULT_FILTERS = { stubs: 'grouped', power: false, traffic: true, mgmt: false, alerts: false };
const PROBLEMS_KEY = 'gandalf.topology.problemsOpen';
const DEFAULT_FILTERS = { stubs: 'grouped', power: true, traffic: true, mgmt: false, alerts: false };
const STUB_MODES = ['grouped', 'all', 'none'];
const state = {
@@ -19,7 +20,11 @@ const state = {
filters: loadFilters(),
expanded: new Set(), // switches whose unknown devices are shown one by one
selected: null,
pinned: null, // the device a touch screen tapped to trace
problemsOpen: (() => { try { return localStorage.getItem(PROBLEMS_KEY) === '1'; } catch (_) { return false; } })(),
};
// Whether the last press was a mouse, pen or finger: touch has no hover, so taps trace instead
let lastPointer = 'mouse';
function loadFilters() {
try {
@@ -100,6 +105,18 @@ function problemsOf(data) {
out.push({ kind: 'node', id: n.id, severity: n.status === 'down' || n.severity === 'critical' ? 'bad' : 'warn',
text: `${n.name}: ${bits.join(', ')}` });
});
(data.power || []).forEach(src => {
if (src.stale_since) {
out.push({ kind: 'node', id: src.node, severity: 'warn',
text: `${src.node} outlet watts frozen since ${sinceText(src.stale_since)}; its total is live` });
}
});
(data.power || []).forEach(src => src.outlets.forEach(o => {
if (o.on || !o.target) return;
const down = (byId[o.target] || {}).status === 'down';
out.push({ kind: 'node', id: o.target, severity: down ? 'bad' : 'warn',
text: `${src.node} outlet ${o.index} is off, and it feeds ${o.target}` });
}));
data.links.forEach(l => {
const p = linkProblem(l);
if (!p) return;
@@ -123,6 +140,17 @@ function problemsOf(data) {
return out;
}
// "2026-11-14 22:48:00 UTC" as local time: just the time today, else the date and time
function sinceText(utc) {
const d = new Date(String(utc).replace(' UTC', 'Z').replace(' ', 'T'));
if (Number.isNaN(d.getTime())) return String(utc);
const time = d.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });
return d.toDateString() === new Date().toDateString() ? time : `${d.toLocaleDateString()} ${time}`;
}
const STALE_TIP = 'UniFi has been sending the same outlet readings for a long time, so these watts are not live. '
+ 'The unit\'s total is still live.';
function speedClass(mbps) {
if (mbps >= 10000) return 'tp-s-10g';
if (mbps >= 1000) return 'tp-s-1g';
@@ -317,6 +345,24 @@ function stubDrawing() {
};
}
// The far end of a cable the cutsheet says goes into a patch panel: the panel's row of jacks,
// with the cable landing on its documented port
function patchPanelDrawing(node) {
const n = 24, pitch = 42, w = 80 + n * pitch, h = 130;
const used = Number(node.via.port);
const jacks = Array.from({ length: n }, (_, i) => {
const x = 40 + i * pitch + 6;
const on = i + 1 === used;
return `<g class="tp-pp-jack${on ? ' tp-pp-used' : ''}"><rect x="${x}" y="46" width="30" height="34" rx="3"/>
<text class="tp-pp-num" x="${x + 15}" y="108" text-anchor="middle">${i + 1}</text></g>`;
}).join('');
return {
w, h,
svg: `<rect class="tp-pp-body" x="0" y="20" width="${w}" height="${h - 20}" rx="8"/>${jacks}`,
anchor: () => (used >= 1 && used <= n ? { x: 40 + (used - 1) * pitch + 21, y: 46, face: 'top' } : { x: w / 2, y: 20, face: 'top' }),
};
}
// A host's drawn front, from its cutsheet item's Front drawing
function hostFront(node) {
const ctx = { name: node.name, status: node.status, interfaces: node.interfaces || [] };
@@ -340,10 +386,10 @@ function artFor(node) {
switch (node.kind) {
case 'internet': return internetDrawing();
case 'modem': return modemDrawing(node);
case 'stub': return stubDrawing();
case 'stub': return node.via && node.via.kind === 'patch_panel' ? patchPanelDrawing(node) : stubDrawing();
case 'group': return groupDrawing(node);
case 'ap': return apDrawing(node);
case 'strip': return stripDrawing(node);
case 'strip': return spec ? faceplateDrawing(node, node.model, 1100) : stripDrawing(node);
default:
if (spec && DESK_FACEPLATES[node.model]) return deskFaceplate(node);
if (spec) return faceplateDrawing(node, node.model, 1100, { rack: node.kind === 'ups', crop: !node.power });
@@ -352,6 +398,22 @@ function artFor(node) {
}
}
// ── Power ───────────────────────────────────────────────────────────────
function wattText(w) {
return w == null ? '' : `${w >= 100 ? Math.round(w) : (+w).toFixed(1)} W`;
}
function powerOf(name) {
return ((state.data && state.data.power) || []).find(p => p.node === name);
}
// The outlets worth listing on a power card: those feeding something, drawing power, or off
function listedOutlets(src) {
return src.outlets.filter(o => o.target || (o.power_w || 0) >= 0.5 || !o.on);
}
const ROW_H = 46;
// ── Cards ───────────────────────────────────────────────────────────────
// Every device is a card of the same height: its name and state on top, and below that its real
// faceplate (or, for a server, its front and a socket per NIC) shrunk to fit. Cables meet the card
@@ -411,7 +473,8 @@ function cardFor(node, linksByIface) {
band = `${art}${sockets.svg}`;
anchorAt = end => (end.iface && sockets.pos[end.iface]) || null;
} else {
const small = ['internet', 'modem', 'stub', 'group', 'ap', 'strip'].includes(node.kind);
const panel = node.kind === 'stub' && node.via && node.via.kind === 'patch_panel';
const small = !panel && ['internet', 'modem', 'stub', 'group', 'ap', 'strip'].includes(node.kind);
w = Math.max(small ? CARD_SMALL_W : CARD_W, Math.min(node.name.length * 27 + 130, 980));
const art = artFor(node);
const f = fitArt(art, 28, BAND_Y, w - 56, BAND_H);
@@ -421,22 +484,63 @@ function cardFor(node, linksByIface) {
return a ? { x: f.ox + a.x * f.k, y: f.oy + a.y * f.k } : null;
};
}
// Power gear lists its outlets under the picture: what each feeds and what it draws
let h = CARD_H;
let rowsSvg = '';
const rows = {};
const src = node.power ? powerOf(node.name) : null;
if (src) {
const list = listedOutlets(src);
rowsSvg = list.map((o, i) => {
const y = CARD_H + i * ROW_H;
rows[o.index] = y + ROW_H / 2;
const what = o.target || (o.match === 'cleared' ? 'nothing' : 'unassigned');
const cls = `tp-outlet-row${o.on ? '' : ' tp-outlet-off'}${o.target ? '' : ' tp-outlet-free'}${o.stale ? ' tp-outlet-stale' : ''}`;
const tip = `${node.name} outlet ${o.index}${o.name ? ` "${o.name}"` : ''} · ${o.on ? 'on' : 'off'}${o.power_w != null ? ` · ${wattText(o.power_w)}${o.stale ? ' (stale)' : ''}` : ''} · feeds ${what}${o.match === 'saved' ? ' (set here)' : o.match === 'name' ? ' (from its name)' : o.match === 'mac' ? ' (from the MAC in its name)' : ''}${TOPO_CAN_EDIT ? ' · click to change' : ''}`;
const staleTip = o.stale ? ` · ${STALE_TIP}` : '';
return `<g class="${cls}" data-outlet-source="${esc(node.name)}" data-outlet="${o.index}"${TOPO_CAN_EDIT ? ' role="button" tabindex="0"' : ''}>
<title>${esc(tip + staleTip)}</title>
<rect class="tp-outlet-hit" x="16" y="${y + 4}" width="${w - 32}" height="${ROW_H - 8}" rx="8"/>
<text class="tp-outlet-idx" x="34" y="${y + 31}">${o.index}</text>
<text class="tp-outlet-target" x="96" y="${y + 31}">${esc(what.length > 22 ? `${what.slice(0, 21)}…` : what)}</text>
<text class="tp-outlet-watts" x="${w - 34}" y="${y + 31}" text-anchor="end">${!o.on ? 'off' : o.stale ? 'stale' : esc(wattText(o.power_w))}</text>
</g>`;
}).join('');
h = CARD_H + list.length * ROW_H + (list.length ? 16 : 0);
}
// What feeds this device, as a badge by its name
let badge = '';
if ((node.power_in || []).length) {
const off = node.power_in.some(f => !f.on);
const stale = node.power_in.some(f => f.stale);
const watts = node.power_in.reduce((t, f) => t + (f.power_w || 0), 0);
const tip = node.power_in.map(f => `${f.source} outlet ${f.outlet}${f.on ? '' : ' (off)'}${f.power_w != null ? ` · ${wattText(f.power_w)}${f.stale ? ' (stale)' : ''}` : ''}`).join('; ');
// A frozen reading is not shown as if it were live
const text = off ? 'off' : stale ? 'fed' : (wattText(watts) || 'fed');
badge = `<text class="tp-power-badge${off ? ' tp-power-off' : ''}" x="${w - 34}" y="108" text-anchor="end"><title>${esc(`Fed by ${tip}${stale ? `. ${STALE_TIP}` : ''}`)}</title>⚡ ${esc(text)}</text>`;
}
const maxChars = Math.floor((w - 130) / 27);
const name = node.name.length > maxChars ? `${node.name.slice(0, maxChars - 1)}…` : node.name;
let sub;
if (node.kind === 'group') sub = `on ${node.switch}`;
else if (node.kind === 'stub' && node.named_by_via) sub = `${node.via.cable ? `${node.via.cable} · ` : ''}device beyond it unknown`;
else if (node.kind === 'stub' && node.via) sub = `via ${node.via.name}`;
else if (node.kind === 'stub') sub = node.ip ? `${node.switch} port ${node.port_idx}` : (node.mac || `${node.switch} port ${node.port_idx}`);
else if (node.kind === 'host') sub = node.status === 'up' ? 'server' : `server · ${node.status}`;
else if (node.kind === 'internet') sub = node.status === 'up' ? 'connected' : node.status;
else sub = [node.model || node.kind, node.status !== 'up' ? node.status : ''].filter(Boolean).join(' · ');
const svg = `<rect class="tp-card" width="${w}" height="${CARD_H}" rx="18"/>
<rect class="tp-card-stripe tp-stripe-${esc(node.status)}" x="0" y="18" width="8" height="${CARD_H - 36}" rx="4"/>
else sub = [node.model || node.kind, src && src.power_w != null ? `${wattText(src.power_w)} total` : '',
node.status !== 'up' ? node.status : ''].filter(Boolean).join(' · ');
// The second line shares its space with the power badge
const subMax = Math.floor((w - (badge ? 250 : 70)) / 16.8);
if (sub.length > subMax) sub = `${sub.slice(0, subMax - 1)}…`;
const svg = `<rect class="tp-card" width="${w}" height="${h}" rx="18"/>
<rect class="tp-card-stripe tp-stripe-${esc(node.status)}" x="0" y="18" width="8" height="${h - 36}" rx="4"/>
<text class="tp-card-name" x="34" y="66">${esc(name)}</text>
<text class="tp-card-sub" x="34" y="108">${esc(sub)}</text>
<circle class="tp-dot tp-dot-${esc(node.status)}" cx="${w - 42}" cy="52" r="13"/>
<circle class="tp-dot tp-dot-${esc(node.status)}" cx="${w - 42}" cy="52" r="13"/>${badge}
<rect class="tp-band" x="20" y="${BAND_Y - 8}" width="${w - 40}" height="${BAND_H + 16}" rx="10"/>
${band}`;
return { w, h: CARD_H, svg, anchorAt };
${band}${rowsSvg}`;
return { w, h, svg, anchorAt, rows };
}
// ── Layout ──────────────────────────────────────────────────────────────
@@ -789,7 +893,10 @@ function renderNode(node, lay) {
<g class="tp-badge tp-badge-${esc(node.severity)}" transform="translate(${d.w - 6} 6)"><circle r="30"/><text y="11" text-anchor="middle">${node.alert_count}</text></g>`
: '';
const alertText = (node.alerts || []).map(a => `${a.severity}: ${a.type.replace(/_/g, ' ')}${a.detail ? ` ${a.detail}` : ''}`).join('; ');
const label = `${node.name}${node.kind === 'stub' ? ' (not identified)' : ''} · ${node.status}${alertText ? ` · ${alertText}` : ''}`;
const what = node.kind !== 'stub' ? ''
: node.named_by_via ? ` (${node.via.device}; what is patched in beyond it is not identified)`
: ` (not identified${node.via ? `; via ${node.via.name}` : ''})`;
const label = `${node.name}${what} · ${node.status}${alertText ? ` · ${alertText}` : ''}`;
const open = node.kind === 'group'
? `<g class="tp-node-link" tabindex="0" role="button" data-expand="${esc(node.switch)}" aria-label="${esc(`${node.name} on ${node.switch}: show them`)}">`
: (href ? `<a class="tp-node-link" href="${esc(href)}" aria-label="${esc(label)}">` : `<g class="tp-node-link" tabindex="0" aria-label="${esc(label)}">`);
@@ -829,7 +936,8 @@ function render() {
const cables = lay.links.map(l => renderLink(l, lay));
world.innerHTML = `<g class="tp-links">${cables.map(c => c.under).join('')}</g>
<g class="tp-nodes">${lay.nodes.map(n => renderNode(n, lay)).join('')}</g>
<g class="tp-links-over">${cables.map(c => c.over).join('')}</g>`;
<g class="tp-links-over">${cables.map(c => c.over).join('')}</g>
<g class="tp-feeds" id="tp-feeds"></g>`;
document.getElementById('tp-loading').hidden = true;
applyFilterClasses();
if (!state.fitted) {
@@ -844,6 +952,11 @@ function render() {
if (link) showPanel(link);
else hidePanel();
}
// A refresh redraws everything: keep a tapped device traced
if (state.pinned) {
if (lay.pos[state.pinned]) highlight(state.pinned);
else state.pinned = null;
}
}
// ── Cable panel ─────────────────────────────────────────────────────────
@@ -863,6 +976,23 @@ function endHtml(end, byId) {
return `${name}${where ? ` · ${where}` : ''}`;
}
// A link to the cutsheet's new-cable form, filled in with both ends as Gandalf sees them
function documentLink(link, byId) {
if (!TOPO_CAN_EDIT || link.ghost || link.bundle) return '';
const sw = [link.a, link.b].find(e => e.port_idx != null && (byId[e.node] || {}).kind !== 'stub');
if (!sw) return '';
const far = sw === link.a ? link.b : link.a;
const farNode = byId[far.node] || {};
const q = new URLSearchParams({ a_device: sw.node, a_port: String(sw.port_idx) });
if (farNode.kind && farNode.kind !== 'stub') {
q.set('b_device', far.node);
if (far.port_idx != null) q.set('b_port', String(far.port_idx));
else if (far.iface) q.set('b_port', far.iface);
}
if (link.medium === 'dac') q.set('cable_type', 'DAC');
return ` · <a class="device-link" href="/cutsheet?${esc(q.toString())}">document it</a>`;
}
function showPanel(link) {
const byId = Object.fromEntries(state.data.nodes.map(n => [n.id, n]));
const panel = document.getElementById('tp-panel');
@@ -885,9 +1015,12 @@ function showPanel(link) {
}
if (link.cable) {
const label = link.cable.label || `cable #${link.cable.id}`;
row('Cutsheet', `<a class="device-link" href="/cutsheet#cable-${esc(link.cable.id)}">${esc(label)}</a>${link.cable.type ? ` · ${esc(link.cable.type)}` : ''}${link.cable.color ? ` · ${esc(link.cable.color)}` : ''}`);
const far = link.cable.far;
const to = far && far.device && !byId[far.device]
? `<br><span class="tp-dim-text">into ${esc(far.device)}${far.port ? ` port ${esc(far.port)}` : ''}</span>` : '';
row('Cutsheet', `<a class="device-link" href="/cutsheet#cable-${esc(link.cable.id)}">${esc(label)}</a>${link.cable.type ? ` · ${esc(link.cable.type)}` : ''}${link.cable.color ? ` · ${esc(link.cable.color)}` : ''}${to}`);
} else if (!link.wan) {
row('Cutsheet', '<span class="tp-dim-text">not documented</span>');
row('Cutsheet', `<span class="tp-dim-text">not documented</span>${documentLink(link, byId)}`);
}
const warn = link.name_mismatch
? `<p class="tp-panel-warn">⚠ The port is named after <strong>${esc(link.name_mismatch.named)}</strong>, but <strong>${esc(link.name_mismatch.actual)}</strong> is plugged into it. Rename the port in UniFi, or check the cable.</p>`
@@ -929,14 +1062,52 @@ function upstream(id) {
return { nodes, hot };
}
// Power feeds, drawn while a power unit or a device it feeds is under the pointer: dotted lines
// from the outlet's row on the power card to the device
function drawFeeds(id) {
const lay = state.layout;
const g = document.getElementById('tp-feeds');
if (!g || !lay) return [];
const pairs = [];
((state.data && state.data.power) || []).forEach(src => {
const sp = lay.pos[src.node];
if (!sp) return;
src.outlets.forEach(o => {
if (!o.target || !lay.pos[o.target] || (id !== src.node && id !== o.target)) return;
const rowY = lay.drawings[src.node].rows[o.index];
if (rowY == null) return;
pairs.push({ o, from: { x: sp.x, y: sp.y + rowY }, to: lay.pos[o.target], toH: lay.drawings[o.target].h, target: o.target });
});
});
g.innerHTML = pairs.map(({ o, from, to, toH, target }) => {
const B = { x: to.x + to.w, y: to.y + toH / 2 };
if (to.rail) { B.x = to.x; }
const c = Math.max(160, Math.abs(from.x - B.x) * 0.4);
const d = `M${from.x} ${from.y} C${from.x - c} ${from.y} ${B.x + c} ${B.y} ${B.x} ${B.y}`;
const mx = (from.x + B.x) / 2, my = (from.y + B.y) / 2;
const text = `⚡ ${target} ${!o.on ? 'off' : o.stale ? '(watts stale)' : wattText(o.power_w)}`;
const tw = Math.max(300, text.length * 15 + 40);
return `<g class="tp-feed${o.on ? '' : ' tp-feed-off'}"><path d="${d}"/>
<circle cx="${B.x}" cy="${B.y}" r="10"/>
<g class="tp-tag tp-feed-tag" transform="translate(${mx} ${my})"><rect x="${-tw / 2}" y="-26" width="${tw}" height="44" rx="22"/>
<text y="6" text-anchor="middle">${esc(text)}</text></g></g>`;
}).join('');
// Everything at either end of a feed stays lit while the path is traced
return new Set(pairs.flatMap(p => [p.target, ...((state.data.power || []).filter(src => src.outlets.includes(p.o)).map(src => src.node))]));
}
function highlight(id) {
const canvas = document.getElementById('tp-canvas');
document.querySelectorAll('.tp-hot').forEach(el => el.classList.remove('tp-hot'));
const feeds = document.getElementById('tp-feeds');
if (feeds) feeds.innerHTML = '';
if (!id || !state.layout) {
canvas.classList.remove('tp-tracing');
return;
}
const fed = drawFeeds(id);
const { nodes, hot } = upstream(id);
fed.forEach(n => nodes.add(n));
nodes.forEach(n => document.querySelector(`.tp-node[data-node="${CSS.escape(n)}"]`)?.classList.add('tp-hot'));
hot.forEach(l => document.querySelectorAll(`.tp-link[data-link="${CSS.escape(l)}"]`).forEach(el => el.classList.add('tp-hot')));
canvas.classList.add('tp-tracing');
@@ -1068,6 +1239,29 @@ function initPanZoom() {
function initEvents() {
const svg = document.getElementById('tp-svg');
svg.addEventListener('click', e => {
const outletRow = e.target.closest('[data-outlet]');
if (outletRow && TOPO_CAN_EDIT) {
e.preventDefault();
openOutletEditor(outletRow, e);
return;
}
if (!e.target.closest('#tp-pop')) closeOutletEditor();
// A touch screen has no hover: the first tap on a device traces it (its path to the internet
// and its power feeds), a second tap opens it
const tapped = e.target.closest('.tp-node');
if (lastPointer === 'touch') {
const id = tapped && tapped.querySelector('a.tp-node-link') ? tapped.dataset.node : null;
if (id && state.pinned !== id && !e.target.closest('[data-action="select-port"]')) {
e.preventDefault();
state.pinned = id;
highlight(id);
return;
}
if (!tapped) {
state.pinned = null;
highlight(null);
}
}
const port = e.target.closest('[data-action="select-port"]');
if (port) {
e.preventDefault();
@@ -1090,6 +1284,12 @@ function initEvents() {
});
svg.addEventListener('keydown', e => {
if (e.key !== 'Enter' && e.key !== ' ') return;
const outletRow = e.target.closest('[data-outlet]');
if (outletRow && TOPO_CAN_EDIT) {
e.preventDefault();
openOutletEditor(outletRow, null);
return;
}
const group = e.target.closest('[data-expand]');
if (group) {
e.preventDefault();
@@ -1105,15 +1305,32 @@ function initEvents() {
}
});
const trace = e => {
if (lastPointer === 'touch') return; // taps trace in the click handler instead
const node = e.target.closest('.tp-node');
highlight(node ? node.dataset.node : null);
};
svg.addEventListener('pointerdown', e => { lastPointer = e.pointerType; }, true);
svg.addEventListener('mouseover', trace);
svg.addEventListener('focusin', trace);
svg.addEventListener('mouseleave', () => highlight(null));
svg.addEventListener('mouseleave', () => { if (lastPointer !== 'touch') highlight(null); });
svg.addEventListener('focusout', e => { if (!svg.contains(e.relatedTarget)) highlight(null); });
document.getElementById('tp-pop').addEventListener('click', e => {
const b = e.target.closest('[data-pop]');
if (!b) return;
if (b.dataset.pop === 'save') saveOutlet();
else closeOutletEditor();
});
document.getElementById('tp-pop').addEventListener('keydown', e => {
if (e.key === 'Escape') closeOutletEditor();
});
document.getElementById('tp-summary').addEventListener('click', e => {
if (e.target.closest('[data-action="toggle-problems"]')) {
state.problemsOpen = !state.problemsOpen;
try { localStorage.setItem(PROBLEMS_KEY, state.problemsOpen ? '1' : '0'); } catch (_) { /* private mode */ }
renderSummary();
return;
}
const chip = e.target.closest('.tp-problem-chip');
if (!chip) return;
if (chip.dataset.focusNode) focusOn('node', chip.dataset.focusNode);
@@ -1145,6 +1362,62 @@ function initEvents() {
});
}
// ── Outlet editor (admins) ──────────────────────────────────────────────
function closeOutletEditor() {
const pop = document.getElementById('tp-pop');
if (pop) pop.hidden = true;
}
function openOutletEditor(row, evt) {
const pop = document.getElementById('tp-pop');
const source = row.dataset.outletSource;
const index = Number(row.dataset.outlet);
const src = powerOf(source);
const o = src && src.outlets.find(x => x.index === index);
if (!o) return;
const names = state.data.nodes.filter(n => !['stub', 'internet'].includes(n.kind) && n.name !== source)
.map(n => n.name).sort((a, b) => a.localeCompare(b));
const current = o.match === 'saved' ? o.target : (o.match === 'cleared' ? '__none' : '__auto');
const opt = (v, t) => `<option value="${esc(v)}"${v === current ? ' selected' : ''}>${esc(t)}</option>`;
pop.innerHTML = `<div class="tp-pop-title">${esc(source)} outlet ${index}</div>
<div class="tp-pop-sub">${esc(o.name || 'no name in UniFi')} · ${o.on ? esc(wattText(o.power_w) || 'on') : 'off'}</div>
<label class="tp-pop-label" for="tp-pop-select">Feeds</label>
<select class="lt-select" id="tp-pop-select">
${opt('__auto', `Automatic (${o.match === 'name' || o.match === 'mac' ? o.target : 'from its name: nothing'})`)}
${opt('__none', 'Nothing')}
${names.map(n => opt(n, n)).join('')}
</select>
<p class="tp-pop-hint">Saved in Gandalf only; the outlet keeps its name in UniFi.</p>
<div class="tp-pop-actions">
<button type="button" class="lt-btn lt-btn-secondary lt-btn-sm" data-pop="cancel">Cancel</button>
<button type="button" class="lt-btn lt-btn-primary lt-btn-sm" data-pop="save">Save</button>
</div>`;
const canvas = document.getElementById('tp-canvas').getBoundingClientRect();
const r = evt ? { x: evt.clientX, y: evt.clientY } : (() => { const b = row.getBoundingClientRect(); return { x: b.left, y: b.bottom }; })();
pop.hidden = false;
const left = Math.min(Math.max(8, r.x - canvas.left - pop.offsetWidth - 12), canvas.width - pop.offsetWidth - 8);
const top = Math.min(Math.max(8, r.y - canvas.top - 20), canvas.height - pop.offsetHeight - 8);
pop.style.left = `${left}px`;
pop.style.top = `${top}px`;
pop.dataset.source = source;
pop.dataset.outlet = String(index);
document.getElementById('tp-pop-select').focus();
}
async function saveOutlet() {
const pop = document.getElementById('tp-pop');
const v = document.getElementById('tp-pop-select').value;
const target = v === '__auto' ? null : (v === '__none' ? '' : v);
try {
await lt.api.put(`/api/topology/power/${encodeURIComponent(pop.dataset.source)}/${encodeURIComponent(pop.dataset.outlet)}`, { target });
closeOutletEditor();
lt.toast.success('Outlet saved');
refresh();
} catch (e) {
lt.toast.error(`Could not save: ${e.message || e}`);
}
}
// ── Problem summary ─────────────────────────────────────────────────────
function renderSummary() {
const box = document.getElementById('tp-summary');
@@ -1157,8 +1430,11 @@ function renderSummary() {
return;
}
box.className = `tp-summary ${problems.some(p => p.severity === 'bad') ? 'tp-summary-bad' : 'tp-summary-warn'}`;
box.innerHTML = `<span class="tp-summary-head">⚠ ${problems.length} to look at</span>
${problems.map(p => `<button type="button" class="tp-problem-chip tp-chip-${p.severity}" data-focus-${p.kind}="${esc(p.id)}">${esc(p.text)}</button>`).join('')}`;
// One line by default: the dashboard already lists these; open it to jump to each on the map
const open = state.problemsOpen;
box.innerHTML = `<button type="button" class="tp-summary-head tp-summary-toggle" data-action="toggle-problems" aria-expanded="${open}">⚠ ${problems.length} to look at ${open ? '▾' : '▸'}</button>
${open ? '' : `<span class="tp-summary-text">${esc(problems.slice(0, 2).map(p => p.text).join(' · '))}${problems.length > 2 ? ' ...' : ''}</span>`}
${!open ? '' : problems.map(p => `<button type="button" class="tp-problem-chip tp-chip-${p.severity}" data-focus-${p.kind}="${esc(p.id)}">${esc(p.text)}</button>`).join('')}`;
}
// Centre the view on a device or cable and show what is wrong with it
+55 -41
View File
@@ -5,6 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover">
<meta name="theme-color" content="#030508">
<meta name="robots" content="noindex, nofollow">
<meta name="description" content="GANDALF: Global Advanced Network Detection And Link Facilitator">
<link rel="icon" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Crect width='16' height='16' rx='3' fill='%23030508'/%3E%3Cpath d='M8 2l5 3v6l-5 3-5-3V5z' fill='none' stroke='%2300e5ff' stroke-width='1.5'/%3E%3C/svg%3E">
<title>{% block title %}Network Monitor{% endblock %} | GANDALF</title>
@@ -30,29 +31,33 @@
<!-- MOBILE NAV DRAWER -->
<div id="lt-nav-drawer" class="lt-nav-drawer" aria-hidden="true" role="dialog" aria-modal="true" aria-label="Navigation menu">
<div class="lt-nav-drawer-header">
<span class="lt-brand-title">GANDALF</span>
<span class="lt-brand-title" title="Global Advanced Network Detection And Link Facilitator">GANDALF</span>
<button type="button" class="lt-nav-drawer-close" id="lt-nav-drawer-close" aria-label="Close navigation">&#x2715;</button>
</div>
<nav class="lt-nav-drawer-links" aria-label="Mobile navigation">
<a href="{{ url_for('index') }}"
class="lt-nav-drawer-link{% if request.endpoint == 'index' %} active{% endif %}"
{% if request.endpoint == 'index' %}aria-current="page"{% endif %}>Dashboard</a>
<a href="{{ url_for('events_page') }}"
class="lt-nav-drawer-link{% if request.endpoint == 'events_page' %} active{% endif %}"
{% if request.endpoint == 'events_page' %}aria-current="page"{% endif %}>History</a>
<a href="{{ url_for('cutsheet_page') }}"
class="lt-nav-drawer-link{% if request.endpoint == 'cutsheet_page' %} active{% endif %}"
{% if request.endpoint == 'cutsheet_page' %}aria-current="page"{% endif %}>Cutsheet</a>
<a href="{{ url_for('rack_page') }}"
class="lt-nav-drawer-link{% if request.endpoint == 'rack_page' %} active{% endif %}"
{% if request.endpoint == 'rack_page' %}aria-current="page"{% endif %}>Rack</a>
<a href="{{ url_for('topology_page') }}"
class="lt-nav-drawer-link{% if request.endpoint == 'topology_page' %} active{% endif %}"
{% if request.endpoint == 'topology_page' %}aria-current="page"{% endif %}>Topology</a>
<a href="{{ url_for('rack_page') }}"
class="lt-nav-drawer-link{% if request.endpoint == 'rack_page' %} active{% endif %}"
{% if request.endpoint == 'rack_page' %}aria-current="page"{% endif %}>Rack</a>
<a href="{{ url_for('cutsheet_page') }}"
class="lt-nav-drawer-link{% if request.endpoint == 'cutsheet_page' %} active{% endif %}"
{% if request.endpoint == 'cutsheet_page' %}aria-current="page"{% endif %}>Cutsheet</a>
<span class="g-drawer-group">More</span>
<a href="{{ url_for('events_page') }}"
class="lt-nav-drawer-link{% if request.endpoint == 'events_page' %} active{% endif %}"
{% if request.endpoint == 'events_page' %}aria-current="page"{% endif %}>Alert history</a>
{% if user.groups and 'admin' in user.groups %}
<a href="{{ url_for('suppressions_page') }}"
class="lt-nav-drawer-link{% if request.endpoint == 'suppressions_page' %} active{% endif %}"
{% if request.endpoint == 'suppressions_page' %}aria-current="page"{% endif %}>Suppressions</a>
{% if not maintenance %}
<button type="button" class="lt-nav-drawer-link g-drawer-action" data-action="start-maintenance">Start maintenance</button>
{% endif %}
{% endif %}
</nav>
</div>
@@ -81,43 +86,37 @@
class="lt-brand-title lt-glitch"
data-text="GANDALF"
aria-label="GANDALF home">GANDALF</a>
<span class="lt-brand-subtitle">Network Monitor // LotusGuild</span>
<span class="lt-brand-subtitle g-brand-expansion" title="GANDALF: Global Advanced Network Detection And Link Facilitator"><b>G</b>lobal <b>A</b>dvanced <b>N</b>etwork<br><b>D</b>etection <b>A</b>nd <b>L</b>ink <b>F</b>acilitator</span>
</div>
<!-- Desktop nav -->
<!-- Desktop nav: the four pages used daily, the rest under More -->
<nav class="lt-nav" aria-label="Main navigation">
<a href="{{ url_for('index') }}"
class="lt-nav-link{% if request.endpoint == 'index' %} active{% endif %}"
{% if request.endpoint == 'index' %}aria-current="page"{% endif %}>
Dashboard
</a>
<a href="{{ url_for('events_page') }}"
class="lt-nav-link{% if request.endpoint == 'events_page' %} active{% endif %}"
{% if request.endpoint == 'events_page' %}aria-current="page"{% endif %}>
History
</a>
<a href="{{ url_for('cutsheet_page') }}"
class="lt-nav-link{% if request.endpoint == 'cutsheet_page' %} active{% endif %}"
{% if request.endpoint == 'cutsheet_page' %}aria-current="page"{% endif %}>
Cutsheet
</a>
<a href="{{ url_for('rack_page') }}"
class="lt-nav-link{% if request.endpoint == 'rack_page' %} active{% endif %}"
{% if request.endpoint == 'rack_page' %}aria-current="page"{% endif %}>
Rack
</a>
{% if request.endpoint == 'index' %}aria-current="page"{% endif %}>Dashboard</a>
<a href="{{ url_for('topology_page') }}"
class="lt-nav-link{% if request.endpoint == 'topology_page' %} active{% endif %}"
{% if request.endpoint == 'topology_page' %}aria-current="page"{% endif %}>
Topology
</a>
{% if user.groups and 'admin' in user.groups %}
<a href="{{ url_for('suppressions_page') }}"
class="lt-nav-link{% if request.endpoint == 'suppressions_page' %} active{% endif %}"
{% if request.endpoint == 'suppressions_page' %}aria-current="page"{% endif %}>
Suppressions
</a>
{% endif %}
{% if request.endpoint == 'topology_page' %}aria-current="page"{% endif %}>Topology</a>
<a href="{{ url_for('rack_page') }}"
class="lt-nav-link{% if request.endpoint == 'rack_page' %} active{% endif %}"
{% if request.endpoint == 'rack_page' %}aria-current="page"{% endif %}>Rack</a>
<a href="{{ url_for('cutsheet_page') }}"
class="lt-nav-link{% if request.endpoint == 'cutsheet_page' %} active{% endif %}"
{% if request.endpoint == 'cutsheet_page' %}aria-current="page"{% endif %}>Cutsheet</a>
{% set _more = request.endpoint in ('events_page', 'suppressions_page') %}
<details class="g-nav-more">
<summary class="lt-nav-link{% if _more %} active{% endif %}">More ▾</summary>
<div class="g-nav-more-menu">
<a href="{{ url_for('events_page') }}"
class="g-nav-more-link{% if request.endpoint == 'events_page' %} active{% endif %}"
{% if request.endpoint == 'events_page' %}aria-current="page"{% endif %}>Alert history</a>
{% if user.groups and 'admin' in user.groups %}
<a href="{{ url_for('suppressions_page') }}"
class="g-nav-more-link{% if request.endpoint == 'suppressions_page' %} active{% endif %}"
{% if request.endpoint == 'suppressions_page' %}aria-current="page"{% endif %}>Suppressions</a>
{% endif %}
</div>
</details>
</nav>
</div>
@@ -229,7 +228,7 @@
<span class="lt-footer-sep">|</span>
<button type="button" class="lt-footer-hint" data-action="show-keyboard-help"><span class="lt-footer-key">[ ? ]</span> HELP</button>
</nav>
<span>GANDALF | TDS v1.2</span>
<span>GANDALF: Global Advanced Network Detection And Link Facilitator | TDS v1.2</span>
</footer>
{% if user.groups and 'admin' in user.groups and not maintenance %}
@@ -331,6 +330,7 @@
<button type="button" class="lt-modal-close" data-modal-close aria-label="Close">&#x2715;</button>
</div>
<div class="lt-modal-body">
<p class="g-help-about"><strong>GANDALF</strong>: <b>G</b>lobal <b>A</b>dvanced <b>N</b>etwork <b>D</b>etection <b>A</b>nd <b>L</b>ink <b>F</b>acilitator. It watches the UniFi switches and the hosts' links, works out what is plugged in where, and raises a ticket when something breaks.</p>
<table class="lt-table">
<thead><tr><th>Shortcut</th><th>Action</th></tr></thead>
<tbody>
@@ -417,6 +417,20 @@
]);
}
// ── More menu: close on a click elsewhere or Escape ───────────────────
document.addEventListener('click', function(e) {
document.querySelectorAll('.g-nav-more[open]').forEach(function(d) {
if (!d.contains(e.target)) d.removeAttribute('open');
});
});
document.addEventListener('keydown', function(e) {
if (e.key !== 'Escape') return;
document.querySelectorAll('.g-nav-more[open]').forEach(function(d) {
d.removeAttribute('open');
d.querySelector('summary').focus();
});
});
// ── Global footer + key actions ───────────────────────────────────────
document.addEventListener('click', function(e) {
const btn = e.target.closest('[data-action]');
+108 -91
View File
@@ -5,7 +5,7 @@
<div class="lt-page-header">
<div>
<h1 class="lt-page-title">Cutsheet</h1>
<p class="g-page-sub">Where every cable is meant to go, checked against what Gandalf sees on the network.</p>
<p class="g-page-sub">Where every cable is meant to go, checked against the live network.</p>
</div>
<div class="cs-actions no-print">
{% if can_edit %}
@@ -17,102 +17,119 @@
</div>
</div>
<div id="cs-summary" class="cs-summary" aria-live="polite"></div>
<div class="lt-tabs cs-tabs no-print" role="tablist" aria-label="Cutsheet sections">
<button type="button" class="lt-tab active" role="tab" id="cs-tabbtn-cables" data-tab="cs-tab-cables" aria-controls="cs-tab-cables" aria-selected="true">Cables <span class="cs-tab-count" id="cs-tabcount-cables"></span></button>
<button type="button" class="lt-tab" role="tab" id="cs-tabbtn-todo" data-tab="cs-tab-todo" aria-controls="cs-tab-todo" aria-selected="false">To do <span class="cs-tab-count" id="cs-tabcount-todo"></span></button>
<button type="button" class="lt-tab" role="tab" id="cs-tabbtn-panels" data-tab="cs-tab-panels" aria-controls="cs-tab-panels" aria-selected="false">Patch panels</button>
<button type="button" class="lt-tab" role="tab" id="cs-tabbtn-items" data-tab="cs-tab-items" aria-controls="cs-tab-items" aria-selected="false">Inventory <span class="cs-tab-count" id="cs-tabcount-items"></span></button>
<button type="button" class="lt-tab" role="tab" id="cs-tabbtn-history" data-tab="cs-tab-history" aria-controls="cs-tab-history" aria-selected="false">History</button>
</div>
<section class="g-section" id="cs-cables-section">
<div class="g-section-header">
<h2 class="g-section-title">Cables</h2>
<span class="g-section-badge" id="cs-cable-count">0</span>
</div>
<div class="cs-filters no-print">
<input type="search" class="lt-input" id="cs-filter" placeholder="Filter by label, device, port or note" aria-label="Filter cables">
<select class="lt-select" id="cs-status-filter" aria-label="Filter by status">
<option value="">All statuses</option>
<option value="installed">Installed</option>
<option value="planned">Planned</option>
<option value="dark">Dark</option>
<option value="retired">Retired</option>
</select>
<label class="cs-check"><input type="checkbox" id="cs-problems-only"> Problems only</label>
</div>
<div id="cs-cables"></div>
</section>
<section class="g-section no-print" id="cs-suggest-section">
<div class="g-section-header">
<h2 class="g-section-title">Undocumented links</h2>
<span class="g-section-badge" id="cs-suggest-count">0</span>
</div>
<p class="cs-hint">Switch ports with a live link that no cable record mentions. Adding one pre-fills what Gandalf already knows; insert the patch panel hop if the cable runs through one.</p>
<div id="cs-suggestions"></div>
</section>
<section class="g-section" id="cs-panels-section">
<div class="g-section-header">
<h2 class="g-section-title">Patch panels</h2>
</div>
{% if can_edit %}
<div class="lt-frame cs-trace no-print" id="cs-trace">
<span class="lt-frame-bl">&#x255A;</span><span class="lt-frame-br">&#x255D;</span>
<div class="lt-section-header">Trace a cord</div>
<div class="lt-section-body">
<p class="cs-hint">Find which switch port a panel port's cord goes to: start, then unplug that cord at the panel.
Gandalf watches every switch port and shows the one that drops. Plug it back in afterwards. The device on it
loses its link for those few seconds.</p>
<div class="cs-trace-form">
<div class="lt-form-group">
<label class="lt-label" for="cs-trace-panel">Panel</label>
<select class="lt-select" id="cs-trace-panel"></select>
</div>
<div class="lt-form-group">
<label class="lt-label" for="cs-trace-port">Port</label>
<input class="lt-input" id="cs-trace-port" type="number" min="1" max="512" value="1">
</div>
<div class="lt-form-group cs-trace-buttons">
<button type="button" class="lt-btn lt-btn-primary lt-btn-sm" data-action="trace-start">Start</button>
<button type="button" class="lt-btn lt-btn-secondary lt-btn-sm" data-action="trace-stop" hidden>Stop</button>
</div>
</div>
<div id="cs-trace-status" class="cs-trace-status" aria-live="polite"></div>
<div class="lt-tab-panel active" id="cs-tab-cables" role="tabpanel" aria-labelledby="cs-tabbtn-cables">
<section class="g-section" id="cs-cables-section">
<div class="g-section-header">
<h2 class="g-section-title">Cables</h2>
<span class="g-section-badge" id="cs-cable-count">0</span>
</div>
</div>
{% endif %}
<div id="cs-panels"></div>
</section>
<p class="cs-summary" id="cs-summary" aria-live="polite"></p>
<div class="cs-filters no-print">
<input type="search" class="lt-input" id="cs-filter" placeholder="Filter by label, device, port or note" aria-label="Filter cables">
<select class="lt-select" id="cs-status-filter" aria-label="Filter by status">
<option value="">All statuses</option>
<option value="installed">Installed</option>
<option value="planned">Planned</option>
<option value="dark">Dark</option>
<option value="retired">Retired</option>
</select>
<label class="cs-check"><input type="checkbox" id="cs-problems-only"> Problems only</label>
</div>
<div id="cs-cables"></div>
</section>
</div>
<section class="g-section" id="cs-labels-section">
<div class="g-section-header">
<h2 class="g-section-title">Labels to make</h2>
<span class="g-section-badge" id="cs-label-count">0</span>
<button type="button" class="lt-btn lt-btn-secondary lt-btn-sm no-print" data-action="print-labels">Print list</button>
</div>
<p class="cs-hint">Type these on the label maker. Cable IDs go on both ends of the cord; panel labels go on the port. Tick each one once it's stuck on.</p>
<div id="cs-labels"></div>
</section>
<div class="lt-tab-panel" id="cs-tab-todo" role="tabpanel" aria-labelledby="cs-tabbtn-todo">
<section class="g-section no-print" id="cs-suggest-section">
<div class="g-section-header">
<h2 class="g-section-title">Undocumented links</h2>
<span class="g-section-badge" id="cs-suggest-count">0</span>
</div>
<p class="cs-hint">Live switch ports no cable record mentions. Add pre-fills what Gandalf knows.</p>
<div id="cs-suggestions"></div>
</section>
<section class="g-section" id="cs-rack-section">
<div class="g-section-header">
<h2 class="g-section-title">Rack</h2>
</div>
<div id="cs-rack"></div>
<p class="g-section-more"><a href="/rack">Open the rack drawing →</a></p>
</section>
<section class="g-section no-print" id="cs-portnames-section">
<div class="g-section-header">
<h2 class="g-section-title">Port names in UniFi</h2>
<span class="g-section-badge" id="cs-portnames-count">0</span>
</div>
<p class="cs-hint">Names that no longer fit what is plugged in. Rename them in UniFi; Gandalf never changes UniFi.</p>
<div id="cs-portnames"></div>
</section>
<section class="g-section" id="cs-items-section">
<div class="g-section-header">
<h2 class="g-section-title">Inventory</h2>
<span class="g-section-badge" id="cs-item-count">0</span>
</div>
<p class="cs-hint">Things Gandalf can't discover: patch panels, wall jacks, shelves, and rack positions for devices.</p>
<div id="cs-items"></div>
</section>
<section class="g-section" id="cs-labels-section">
<div class="g-section-header">
<h2 class="g-section-title">Labels to make</h2>
<span class="g-section-badge" id="cs-label-count">0</span>
<button type="button" class="lt-btn lt-btn-secondary lt-btn-sm no-print" data-action="print-labels">Print list</button>
</div>
<p class="cs-hint">Cable IDs go on both ends of the cord, panel labels on the port. Tick each once it's stuck on.</p>
<div id="cs-labels"></div>
</section>
</div>
<section class="g-section no-print" id="cs-history-section">
<div class="g-section-header">
<h2 class="g-section-title">History</h2>
</div>
<div id="cs-history"></div>
</section>
<div class="lt-tab-panel" id="cs-tab-panels" role="tabpanel" aria-labelledby="cs-tabbtn-panels">
<section class="g-section" id="cs-panels-section">
<div class="g-section-header">
<h2 class="g-section-title">Patch panels</h2>
</div>
{% if can_edit %}
<div class="lt-frame cs-trace no-print" id="cs-trace">
<span class="lt-frame-bl">&#x255A;</span><span class="lt-frame-br">&#x255D;</span>
<div class="lt-section-header">Trace a cord</div>
<div class="lt-section-body">
<p class="cs-hint">Press Start, then unplug the panel port's cord: the switch port that drops is where it goes.
The device on it loses its link until you plug it back in.</p>
<div class="cs-trace-form">
<div class="lt-form-group">
<label class="lt-label" for="cs-trace-panel">Panel</label>
<select class="lt-select" id="cs-trace-panel"></select>
</div>
<div class="lt-form-group">
<label class="lt-label" for="cs-trace-port">Port</label>
<input class="lt-input" id="cs-trace-port" type="number" min="1" max="512" value="1">
</div>
<div class="lt-form-group cs-trace-buttons">
<button type="button" class="lt-btn lt-btn-primary lt-btn-sm" data-action="trace-start">Start</button>
<button type="button" class="lt-btn lt-btn-secondary lt-btn-sm" data-action="trace-stop" hidden>Stop</button>
</div>
</div>
<div id="cs-trace-status" class="cs-trace-status" aria-live="polite"></div>
</div>
</div>
{% endif %}
<div id="cs-panels"></div>
</section>
</div>
<div class="lt-tab-panel" id="cs-tab-items" role="tabpanel" aria-labelledby="cs-tabbtn-items">
<section class="g-section" id="cs-items-section">
<div class="g-section-header">
<h2 class="g-section-title">Inventory</h2>
<span class="g-section-badge" id="cs-item-count">0</span>
</div>
<p class="cs-hint">Things Gandalf can't discover: patch panels, wall jacks, shelves and rack positions. <a href="/rack">See them in the rack drawing →</a></p>
<div id="cs-items"></div>
</section>
</div>
<div class="lt-tab-panel" id="cs-tab-history" role="tabpanel" aria-labelledby="cs-tabbtn-history">
<section class="g-section no-print" id="cs-history-section">
<div class="g-section-header">
<h2 class="g-section-title">History</h2>
</div>
<div id="cs-history"></div>
</section>
</div>
<datalist id="cs-device-list"></datalist>
<datalist id="cs-a-port-list"></datalist>
+1 -1
View File
@@ -5,7 +5,7 @@
<div class="lt-page-header">
<div>
<h1 class="lt-page-title">Alert History</h1>
<p class="g-page-sub">Every alert Gandalf raised, including the ones that cleared on their own. Resolved alerts are kept 90 days.</p>
<p class="g-page-sub">Every alert raised, including ones that cleared on their own; kept 90 days.</p>
</div>
</div>
+32 -117
View File
@@ -30,43 +30,13 @@
</div>
</div>
<!-- ── Stats summary cards ──────────────────────────────────────────── -->
<div class="lt-stats-grid">
<div class="lt-stat-card{% if summary.critical %} lt-stat-card--alert{% endif %}"
id="stat-critical" role="button" tabindex="0"
data-stat-filter="critical" aria-label="{{ summary.critical or 0 }} critical alerts"
aria-controls="events-table-wrap">
<span class="lt-stat-icon lt-text-red" aria-hidden="true">●</span>
<div class="lt-stat-info">
<span class="lt-stat-value lt-text-red" id="stat-critical-val">{{ summary.critical or 0 }}</span>
<span class="lt-stat-label">Critical</span>
</div>
<!-- ── Needs attention: every page's problems in one place ──────────── -->
<section class="g-section attention" id="attention" aria-labelledby="attention-title">
<div class="g-section-header"><h2 class="g-section-title" id="attention-title">Needs attention</h2></div>
<div class="attention-groups" id="attention-body" aria-live="polite">
<p class="attention-empty">Checking every page…</p>
</div>
<div class="lt-stat-card"
id="stat-warning" role="button" tabindex="0"
data-stat-filter="warning" aria-label="{{ summary.warning or 0 }} warning alerts"
aria-controls="events-table-wrap">
<span class="lt-stat-icon lt-text-amber" aria-hidden="true">●</span>
<div class="lt-stat-info">
<span class="lt-stat-value lt-text-amber" id="stat-warning-val">{{ summary.warning or 0 }}</span>
<span class="lt-stat-label">Warning</span>
</div>
</div>
<div class="lt-stat-card" id="stat-hosts" aria-label="Monitored hosts">
<span class="lt-stat-icon lt-text-cyan" aria-hidden="true">⬡</span>
<div class="lt-stat-info">
<span class="lt-stat-value lt-text-cyan" id="stat-hosts-val">{{ snapshot.hosts | length }}</span>
<span class="lt-stat-label">Hosts</span>
</div>
</div>
<div class="lt-stat-card" id="stat-resolved" aria-label="{{ recent_resolved | length }} alerts resolved in last 24 hours">
<span class="lt-stat-icon lt-text-green" aria-hidden="true">✔</span>
<div class="lt-stat-info">
<span class="lt-stat-value lt-text-green" id="stat-resolved-val">{{ recent_resolved | length }}</span>
<span class="lt-stat-label">Resolved 24h</span>
</div>
</div>
</div>
</section>
<!-- ── Device search ──────────────────────────────────────────────── -->
<section class="g-section device-search" id="device-search" role="search">
@@ -236,6 +206,9 @@
{% if suppressed or has_global_sup %}
<span class="badge-suppressed" title="Suppressed">🔕</span>
{% endif %}
<button class="lt-btn lt-btn-ghost lt-btn-sm btn-suppress host-suppress"
data-sup-type="host" data-sup-name="{{ name }}" data-sup-detail=""
title="Suppress alerts for {{ name }}" aria-label="Suppress alerts for {{ name }}">🔕</button>
</div>
<div class="host-meta">
<span class="host-ip">{{ host.ip }}</span>
@@ -244,32 +217,21 @@
</div>
{% if host.interfaces %}
{% set in_use = host.interfaces | dictsort | rejectattr(1, 'equalto', 'unused') | list %}
{% set unused = (host.interfaces | length) - (in_use | length) %}
<div class="iface-list">
{% for iface, state in host.interfaces.items() | sort %}
{% for iface, state in in_use %}
<div class="iface-row">
<span class="iface-dot dot-{{ state }}"></span>
<span class="iface-name">{{ iface }}</span>
<span class="iface-state state-{{ state }}">{{ state }}</span>
</div>
{% endfor %}
{% if unused %}<div class="iface-unused">+{{ unused }} unused</div>{% endif %}
</div>
{% else %}
<div class="host-ping-note">{% if host.source == 'ping' %}ping-only / no node_exporter{% else %}no metrics from node_exporter{% endif %}</div>
{% endif %}
<div class="host-actions">
<button class="lt-btn lt-btn-ghost lt-btn-sm btn-suppress"
data-sup-type="host"
data-sup-name="{{ name }}"
data-sup-detail=""
aria-label="Suppress alerts for {{ name }}">
🔕 Suppress
</button>
<a href="{{ url_for('device_page', name=name) }}"
class="lt-btn lt-btn-secondary lt-btn-sm">
↗ Details
</a>
</div>
</div>
{% else %}
<div class="lt-empty-state lt-empty-state--sm">
@@ -287,61 +249,30 @@
<div class="g-section-header">
<h2 class="g-section-title">UniFi Devices</h2>
</div>
<div class="lt-frame">
<span class="lt-frame-bl">&#x255A;</span>
<span class="lt-frame-br">&#x255D;</span>
<div class="lt-section-header">Device Inventory</div>
<div class="lt-table-wrap">
<table class="lt-table" id="unifi-table">
<caption class="lt-sr-only">UniFi network devices</caption>
<thead>
<tr>
<th>Status</th>
<th>Name</th>
<th>Type</th>
<th>Model</th>
<th>IP</th>
<th>Actions</th>
</tr>
</thead>
<tbody>
{% for d in snapshot.unifi %}
<tr class="{% if not d.connected %}row-critical{% endif %}">
<td>
<span class="dot-{{ 'up' if d.connected else 'down' }}"></span>
{{ 'ONLINE' if d.connected else 'OFFLINE' }}
</td>
<td><a class="device-link" href="{{ url_for('device_page', name=d.name) }}"><strong>{{ d.name }}</strong></a></td>
<td>{{ d.type }}</td>
<td>{{ d.model }}</td>
<td>{{ d.ip }}</td>
<td>
{% if not d.connected %}
<button class="lt-btn lt-btn-ghost lt-btn-sm btn-suppress"
data-sup-type="unifi_device"
data-sup-name="{{ d.name }}"
data-sup-detail=""
aria-label="Suppress alerts for {{ d.name }}">
🔕 Suppress
</button>
{% endif %}
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
<ul class="unifi-grid" id="unifi-grid">
{% for d in snapshot.unifi %}
<li class="unifi-chip{% if not d.connected %} unifi-chip-down{% endif %}">
<span class="dot-{{ 'up' if d.connected else 'down' }}" title="{{ 'Online' if d.connected else 'Offline' }}"></span>
<a class="device-link unifi-chip-name" href="{{ url_for('device_page', name=d.name) }}">{{ d.name }}</a>
<span class="unifi-chip-model">{{ d.model }}</span>
{% if not d.connected %}
<button class="lt-btn lt-btn-ghost lt-btn-sm btn-suppress" data-sup-type="unifi_device"
data-sup-name="{{ d.name }}" data-sup-detail="" title="Suppress alerts for {{ d.name }}"
aria-label="Suppress alerts for {{ d.name }}">🔕</button>
{% endif %}
</li>
{% endfor %}
</ul>
</section>
{% endif %}
<!-- ── Recently Resolved (last 24h) ───────────────────────────────── -->
{% if recent_resolved %}
<section class="g-section">
<div class="g-section-header">
<details class="g-section resolved-fold">
<summary class="g-section-header">
<h2 class="g-section-title">Recently Resolved</h2>
<span class="g-section-badge g-section-badge-resolved">{{ recent_resolved | length }} in last 24h</span>
</div>
</summary>
<div class="lt-timeline">
{% for e in recent_resolved %}
{%- set dot_cls = 'lt-timeline-item--green' if e.severity == 'info' else 'lt-timeline-item--dim' -%}
@@ -361,7 +292,7 @@
</div>
{% endfor %}
</div>
</section>
</details>
{% endif %}
{% endblock %}
@@ -370,6 +301,7 @@
<script>
// Load once even when auto-refresh is set to Off
refreshModem();
refreshAttention();
// Start auto-refresh using saved settings interval (default 30 s)
const _savedInterval = window.gandalfSettings?.refreshInterval ?? 30;
@@ -440,22 +372,5 @@
.observe(document.getElementById('events-table-wrap'), { childList: true, subtree: true });
initDeviceSearch();
// Stat card clicks: filter events table by severity
document.querySelectorAll('.lt-stat-card[data-stat-filter]').forEach(card => {
card.addEventListener('click', () => {
const sev = card.dataset.statFilter;
document.querySelectorAll('.sev-pills .pill').forEach(p => {
p.classList.remove('active');
p.setAttribute('aria-pressed', 'false');
});
const matchPill = document.querySelector(`.sev-pills .pill[data-sev="${sev}"]`);
if (matchPill) { matchPill.classList.add('active'); matchPill.setAttribute('aria-pressed', 'true'); }
_filterSev = sev;
applyEventsFilter();
document.getElementById('events-table-wrap')?.scrollIntoView({ behavior: 'smooth', block: 'start' });
});
card.addEventListener('keydown', e => { if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); card.click(); } });
});
</script>
{% endblock %}
+2 -1
View File
@@ -5,7 +5,8 @@
<div class="lt-page-header">
<div>
<h1 class="lt-page-title">Rack</h1>
<p class="g-page-sub">The rack front, drawn from the rack units on the cutsheet with live port state. Hover a port to light up every port on the same cable run; click it to open the port or the cable.</p>
<div class="g-page-sub">The rack, drawn from the cutsheet with live port state.
<details class="g-howto"><summary aria-label="How to use this page">?</summary><span>Hover a port to light up every port on the same cable run; click it to open the port or the cable.</span></details></div>
</div>
<div class="cs-actions no-print">
<button type="button" class="lt-btn lt-btn-secondary lt-btn-sm" data-export="svg">Download SVG</button>
+1 -1
View File
@@ -6,7 +6,7 @@
<div class="lt-page-header">
<div>
<h1 class="lt-page-title">Alert Suppressions</h1>
<p class="g-page-sub">Manage maintenance windows and per-target alert suppression rules.</p>
<p class="g-page-sub">Maintenance windows and alert suppression rules.</p>
</div>
</div>
+4 -1
View File
@@ -5,7 +5,8 @@
<div class="lt-page-header">
<div>
<h1 class="lt-page-title">Topology</h1>
<p class="g-page-sub">Every device and cable as the switches see them right now. Drag to pan, scroll or pinch to zoom. Hover a device to trace its path to the internet; click a cable for its details, or a group of unknown devices to open it.</p>
<div class="g-page-sub">Every device and cable, as the switches see them now.
<details class="g-howto"><summary aria-label="How to use this page">?</summary><span>Drag to pan; scroll or pinch to zoom. Hover a device to trace its path to the internet and its power (on a touch screen, tap once to trace and again to open it). Click a cable for its details, or a group of unknown devices to open it.</span></details></div>
</div>
</div>
@@ -39,6 +40,7 @@
</svg>
<div class="link-loading tp-loading" id="tp-loading">Loading topology</div>
<aside class="tp-panel" id="tp-panel" hidden aria-live="polite" aria-label="Cable details"></aside>
<div class="tp-pop" id="tp-pop" role="dialog" aria-label="What this outlet feeds" hidden></div>
</div>
<div class="tp-legend" aria-label="Legend">
@@ -55,6 +57,7 @@
{% endblock %}
{% block scripts %}
<script>const TOPO_CAN_EDIT = {{ 'true' if can_edit else 'false' }};</script>
<script src="{{ url_for('static', filename='faceplates.js') }}"></script>
<script src="{{ url_for('static', filename='fronts.js') }}"></script>
<script src="{{ url_for('static', filename='topology.js') }}"></script>
+102 -2
View File
@@ -95,10 +95,12 @@ class TestPagesAndNav:
def test_home_section_order(self, client):
html = client.get('/', headers=AUTH).get_data(as_text=True)
order = [html.index(m) for m in (
'id="device-search"', 'Alert Queue', 'WAN / Fiber', 'g-section-title">Hosts<',
'Device Inventory',
'id="attention"', 'id="device-search"', 'Alert Queue', 'WAN / Fiber', 'g-section-title">Hosts<',
'id="unifi-grid"',
)]
assert order == sorted(order)
# The needs-attention list replaced the stat cards
assert 'lt-stat-card' not in html
def test_dashboard_topology_moved_to_its_own_page(self, client):
html = client.get('/', headers=AUTH).get_data(as_text=True)
@@ -217,6 +219,7 @@ class TestCutsheetApi:
assert view['next_label'] == 'C01'
assert view['labels']['cables'][0]['text'] == 'C07'
assert any(d['name'] == 'PP1' for d in view['catalog'])
assert isinstance(view['port_names'], list)
def test_create_cable(self, cs_client):
client, db = cs_client
@@ -743,3 +746,100 @@ class TestTopology:
patch.object(gandalf.db, 'check_suppressed', return_value=True):
data = client.get('/api/topology', headers=AUTH).get_json()
assert next(n for n in data['nodes'] if n['name'] == 'large1')['alert_count'] == 0
class TestPowerFeedApi:
LINK_STATS = json.dumps({'hosts': {}, 'unifi_switches': {}, 'unifi_devices': {
'RPDU': {'outlets': [{'index': 7, 'name': 'Outlet 7', 'on': True, 'power_w': 48.0}]}}})
SNAPSHOT = json.dumps({
'hosts': {'large1': {'status': 'up', 'interfaces': {}}},
'unifi': [{'name': 'RPDU', 'type': 'usw', 'model': 'USPPDUP', 'connected': True, 'mac': '', 'ip': ''}],
})
def _put(self, client, path, body, headers=AUTH):
state = dict(STATE, link_stats=self.LINK_STATS, network_snapshot=self.SNAPSHOT)
gandalf._cutsheet_schema_ready = True
with patch.object(gandalf.db, 'get_state', side_effect=lambda k, d=None: state.get(k, d)):
return client.put(path, json=body, headers=headers)
def test_admin_assigns_an_outlet(self, client):
resp = self._put(client, '/api/topology/power/RPDU/7', {'target': 'large1'})
assert resp.status_code == 200
gandalf.db.set_power_feed.assert_called_once_with('RPDU', 7, 'large1', 'jared')
def test_empty_means_nothing_and_null_means_automatic(self, client):
assert self._put(client, '/api/topology/power/RPDU/7', {'target': ''}).status_code == 200
assert self._put(client, '/api/topology/power/RPDU/7', {'target': None}).status_code == 200
calls = [c.args for c in gandalf.db.set_power_feed.call_args_list]
assert calls == [('RPDU', 7, '', 'jared'), ('RPDU', 7, None, 'jared')]
def test_needs_admin(self, client):
resp = self._put(client, '/api/topology/power/RPDU/7', {'target': 'large1'},
headers=dict(AUTH, **{'Remote-Groups': 'users'}))
assert resp.status_code in (401, 403)
gandalf.db.set_power_feed.assert_not_called()
def test_unknown_target_source_or_outlet(self, client):
assert self._put(client, '/api/topology/power/RPDU/7', {'target': 'nope'}).status_code == 400
assert self._put(client, '/api/topology/power/NOPE/7', {'target': 'large1'}).status_code == 404
assert self._put(client, '/api/topology/power/RPDU/99', {'target': 'large1'}).status_code == 404
gandalf.db.set_power_feed.assert_not_called()
def test_body_must_say_target(self, client):
assert self._put(client, '/api/topology/power/RPDU/7', {}).status_code == 400
assert self._put(client, '/api/topology/power/RPDU/7', {'target': 5}).status_code == 400
def test_must_be_json(self, client):
gandalf._cutsheet_schema_ready = True
resp = client.put('/api/topology/power/RPDU/7', data='target=large1', headers=AUTH,
content_type='application/x-www-form-urlencoded')
assert resp.status_code == 400
class TestAttention:
def test_needs_auth(self, client):
assert client.get('/api/attention').status_code == 401
def test_gathers_every_page(self, client):
gandalf._cutsheet_schema_ready = True
ev = {'id': 1, 'event_type': 'host_down', 'severity': 'critical', 'target_name': 'large1',
'target_detail': '', 'description': ''}
with patch.object(gandalf.db, 'cutsheet_load', return_value={'items': [], 'cables': [], 'port_labels': []}), \
patch.object(gandalf.db, 'get_active_events', return_value=[ev]), \
patch.object(gandalf.db, 'get_power_feeds', return_value=[]), \
patch.object(gandalf.db, 'cutsheet_racks', return_value=[]), \
patch.object(gandalf.db, 'check_suppressed', return_value=False):
data = client.get('/api/attention', headers=AUTH).get_json()
assert set(data) == {'broken', 'tidy'}
assert data['broken'][0]['text'] == '1 active alert (1 critical)'
def test_survives_a_cutsheet_failure(self, client):
gandalf._cutsheet_schema_ready = True
with patch.object(gandalf.db, 'cutsheet_load', side_effect=RuntimeError('db down')):
resp = client.get('/api/attention', headers=AUTH)
assert resp.status_code == 200
assert set(resp.get_json()) == {'broken', 'tidy'}
def test_dashboard_has_the_list_and_says_what_gandalf_stands_for(self, client):
html = client.get('/', headers=AUTH).get_data(as_text=True)
assert 'id="attention-body"' in html
assert 'Global Advanced Network Detection And Link Facilitator' in html
class TestCalmDashboard:
def test_unused_nics_fold_into_one_line(self, client):
snap = json.dumps({'hosts': {'large1': {'ip': '10.0.0.2', 'status': 'up', 'source': 'prometheus',
'interfaces': {'eth0': 'up', 'eth1': 'unused', 'eth2': 'unused'}}},
'unifi': []})
state = dict(STATE, network_snapshot=snap)
with patch.object(gandalf.db, 'get_state', side_effect=lambda k, d=None: state.get(k, d)):
html = client.get('/', headers=AUTH).get_data(as_text=True)
assert '>eth0<' in html and '>eth1<' not in html
assert '+2 unused' in html
def test_resolved_alerts_are_folded(self, client):
ev = {'target_name': 'large1', 'target_detail': '', 'severity': 'warning', 'event_type': 'host_down',
'first_seen': '2026-11-15 01:00:00 UTC', 'resolved_at': '2026-11-15 02:00:00 UTC'}
with patch.object(gandalf.db, 'get_recent_resolved', return_value=[ev]):
html = client.get('/', headers=AUTH).get_data(as_text=True)
assert '<details class="g-section resolved-fold">' in html
+86
View File
@@ -0,0 +1,86 @@
"""The dashboard's "Needs attention" list (attention.py)."""
import attention
def _alert(target, severity='critical', **kw):
return dict({'target_name': target, 'severity': severity, 'is_suppressed': False}, **kw)
def _outlet(index, on=True, target=None, power_w=10.0, match=None):
return {'index': index, 'on': on, 'target': target, 'power_w': power_w,
'match': match or ('name' if target else 'none')}
class TestAlerts:
def test_one_line_for_all_alerts_with_the_targets(self):
out = attention.build([_alert('pbs'), _alert('24RJ45-POE', 'warning')], [], None)
[line] = out['broken']
assert line['text'] == '2 active alerts (1 critical)'
assert line['severity'] == 'bad'
assert line['detail'] == '24RJ45-POE, pbs'
assert line['href'] == '#events-table-wrap'
def test_suppressed_and_info_alerts_are_left_out(self):
events = [_alert('pbs', is_suppressed=True), _alert('large1', 'info')]
assert attention.build(events, [], None)['broken'] == []
def test_warnings_only_is_amber(self):
[line] = attention.build([_alert('x', 'warning')], [], None)['broken']
assert line['severity'] == 'warn' and line['text'] == '1 active alert'
class TestPower:
def test_frozen_readings_and_an_off_outlet_feeding_a_device(self):
power = [{'node': 'RPDU', 'stale_since': '2026-11-15 05:26:54 UTC',
'outlets': [_outlet(19, on=False, target='pbs'), _outlet(3, on=False)]}]
broken = attention.build([], power, None)['broken']
assert [b['text'] for b in broken] == ['RPDU outlet 19 is off, and it feeds pbs',
'RPDU: outlet watts are frozen']
def test_powered_outlets_with_nothing_assigned(self):
power = [{'node': 'RPDU', 'outlets': [
_outlet(1, target='large1'), _outlet(2, power_w=40), _outlet(3, power_w=1),
_outlet(4, power_w=40, match='cleared'), _outlet(5, on=False, power_w=0)]}]
[line] = attention.build([], power, None)['tidy']
assert line['text'] == '1 powered outlet with no device assigned'
assert line['detail'] == 'RPDU 2'
class TestCutsheet:
VIEW = {
'cables': [{'id': 1, 'label': 'C01', 'status': 'installed', 'problem': True},
{'id': 2, 'label': 'C02', 'status': 'retired', 'problem': True},
{'id': 3, 'label': 'C03', 'status': 'installed', 'problem': False}],
'suggestions': [{}, {}, {}],
'port_names': [{'kind': 'wrong', 'switch': 'POE', 'port_idx': 11, 'port_name': 'Large1 Management'},
{'kind': 'empty', 'switch': 'POE', 'port_idx': 20, 'port_name': 'WAP'},
{'kind': 'unnamed', 'switch': 'POE', 'port_idx': 4, 'port_name': 'Port 4'}],
'labels': {'cables': [{}, {}], 'ports': [{}]},
}
def test_every_cutsheet_todo(self):
out = attention.build([], [], self.VIEW)
assert [b['text'] for b in out['broken']] == ['1 cable not where the cutsheet says']
assert out['broken'][0]['detail'] == 'C01'
assert out['broken'][0]['href'].startswith('/cutsheet?problems=1')
tidy = {t['text']: t for t in out['tidy']}
assert set(tidy) == {'1 UniFi port name pointing at the wrong device', '1 named port with nothing plugged in',
'3 live links not on the cutsheet', '3 labels to print and stick on'}
assert tidy['1 UniFi port name pointing at the wrong device']['detail'] == 'POE port 11 "Large1 Management"'
# Worst first
assert out['tidy'][0]['severity'] == 'warn'
def test_unnamed_ports_alone_are_not_worth_a_line(self):
view = {'port_names': [{'kind': 'unnamed', 'switch': 'POE', 'port_idx': 4, 'port_name': 'Port 4'}]}
assert attention.build([], [], view) == {'broken': [], 'tidy': []}
class TestRack:
def test_overlaps_and_items_outside_the_rack(self):
racks = {'Rack 1': {'overlaps': [{'name': 'NAS', 'units': 'U5-6', 'with': ['storage-01']}],
'outside': [{'name': 'Shelf', 'units': 'U43'}]}}
texts = [t['text'] for t in attention.build([], [], None, racks)['tidy']]
assert texts == ['NAS overlaps storage-01 at U5-6', 'Shelf at U43 is outside Rack 1']
def test_nothing_to_report(self):
assert attention.build([], [], {}, {}) == {'broken': [], 'tidy': []}
+22
View File
@@ -62,3 +62,25 @@ class TestGetClearedTickets:
out = db.get_cleared_tickets(['1', '2'])
assert [r['ticket_id'] for r in out] == ['2', '1']
assert out[0]['target_name'] == 'micro1'
class TestPowerFeeds:
def test_none_goes_back_to_automatic(self):
patcher, cur = _fake_conn([])
with patcher:
db.set_power_feed('RPDU', 7, None, 'jared')
sql, args = cur.execute.call_args.args
assert sql.startswith('DELETE FROM power_feeds') and args == ('RPDU', 7)
def test_empty_target_is_saved_as_nothing(self):
patcher, cur = _fake_conn([])
with patcher:
db.set_power_feed('RPDU', 7, '', 'jared')
sql, args = cur.execute.call_args.args
assert 'INSERT INTO power_feeds' in sql and args == ('RPDU', 7, '', 'jared')
def test_rows_come_back_with_iso_times(self):
patcher, _ = _fake_conn([{'source': 'RPDU', 'outlet': 7, 'target': 'large1', 'updated_by': 'jared',
'updated_at': NOW}])
with patcher:
assert db.get_power_feeds()[0]['updated_at'] == '2026-11-14T12:00:00Z'
+46
View File
@@ -485,6 +485,52 @@ class TestWanIncident:
assert not mon.tickets.create.called and not mon.tickets.comment.called
class TestStaleOutletReadings:
@staticmethod
def _pdu(w1=20.622, w2=0.0):
return {'RPDU': {'outlets': [
{'index': 1, 'power_w': w1, 'current_a': 0.322},
{'index': 2, 'power_w': w2, 'current_a': 0.0},
{'index': 3, 'power_w': None, 'current_a': None}, # USB: never metered
]}}
def _collector(self):
c = monitor.LinkStatsCollector.__new__(monitor.LinkStatsCollector)
c._outlet_readings = {}
return c
def test_readings_frozen_past_the_limit_are_stale(self):
c = self._collector()
c._mark_stale_outlets(self._pdu(), 1000.0)
later = self._pdu()
c._mark_stale_outlets(later, 1000.0 + c.OUTLET_STALE_AFTER_S)
assert later['RPDU']['outlets_stale_since'] == '1970-01-01 00:16:40 UTC'
assert [o.get('stale') for o in later['RPDU']['outlets']] == [True, True, None]
def test_moving_readings_are_live(self):
c = self._collector()
c._mark_stale_outlets(self._pdu(), 1000.0)
c._mark_stale_outlets(self._pdu(w1=21.0), 1000.0 + c.OUTLET_STALE_AFTER_S - 1)
later = self._pdu(w1=21.0)
c._mark_stale_outlets(later, 1000.0 + c.OUTLET_STALE_AFTER_S + 60)
assert 'outlets_stale_since' not in later['RPDU']
assert not any(o.get('stale') for o in later['RPDU']['outlets'])
def test_idle_outlets_reading_zero_are_not_stale(self):
c = self._collector()
c._mark_stale_outlets(self._pdu(w1=0.0), 1000.0)
later = self._pdu(w1=0.0)
c._mark_stale_outlets(later, 1000.0 + 10 * c.OUTLET_STALE_AFTER_S)
assert 'outlets_stale_since' not in later['RPDU']
def test_unmetered_strip_is_left_alone(self):
c = self._collector()
strip = {'USP Strip': {'outlets': [{'index': 1, 'power_w': None}]}}
c._mark_stale_outlets(strip, 1000.0)
c._mark_stale_outlets(strip, 1000.0 + 10 * c.OUTLET_STALE_AFTER_S)
assert 'outlets_stale_since' not in strip['USP Strip'] and 'USP Strip' not in c._outlet_readings
class TestUnifiDeviceDetail:
def test_parses_string_stats_and_outlets(self):
d = monitor.UnifiClient._device_detail({
+151 -1
View File
@@ -326,13 +326,163 @@ class TestCutsheetLabels:
'b_port': '', 'status': 'retired'}]
g = build(items=items, cables=cables)
(stub,) = find(g, 'Dream Machine Pro', 'stub:Dream Machine Pro:8')
assert stub['cable'] == {'id': 7, 'label': 'C07', 'type': 'Cat6', 'color': 'Black'}
assert stub['cable'] == {'id': 7, 'label': 'C07', 'type': 'Cat6', 'color': 'Black',
'far': {'device': 'Patch', 'port': '1', 'kind': ''}}
# Retired cables are not on the network any more
assert find(g, 'Dream Machine Pro', 'host-a')[0]['cable'] is None
def test_unknown_device_behind_a_patch_panel_is_named_after_it(self):
items = [{'name': 'PP1', 'device': '', 'kind': 'patch_panel'},
{'name': 'UDM-Pro', 'device': 'Dream Machine Pro'}]
cables = [{'id': 7, 'label': 'C07', 'a_device': 'UDM-Pro', 'a_port': '8', 'b_device': 'PP1',
'b_port': '3', 'status': 'installed'}]
stub = node(build(items=items, cables=cables), 'stub:Dream Machine Pro:8')
assert stub['name'] == 'Patch panel port 3' and stub['named_by_via']
assert stub['via'] == {'device': 'PP1', 'port': '3', 'kind': 'patch_panel', 'name': 'Patch panel port 3',
'cable': 'C07'}
def test_a_named_stub_keeps_its_name_and_notes_the_panel(self):
items = [{'name': 'PP1', 'device': '', 'kind': 'patch_panel'}]
cables = [{'id': 2, 'label': 'C02', 'a_device': '24RJ45-POE', 'a_port': '1', 'b_device': 'PP1',
'b_port': '2', 'status': 'installed'}]
g = build(items=items, cables=cables)
stub = node(g, 'stub:24RJ45-POE:1')
assert stub['name'] == 'Micro 2 Eth2' and not stub.get('named_by_via')
assert stub['via']['name'] == 'Patch panel port 2'
def test_a_cable_to_a_live_device_is_not_a_via(self):
cables = [{'id': 3, 'label': 'C03', 'a_device': 'Dream Machine Pro', 'a_port': '8',
'b_device': '8SFP-AGG', 'b_port': '1', 'status': 'installed'}]
assert 'via' not in node(build(cables=cables), 'stub:Dream Machine Pro:8')
class TestEmpty:
def test_no_data_yet(self):
g = topology.build_graph({}, {}, None, [], [], [], None)
assert [n['id'] for n in g['nodes']] == [topology.INTERNET]
assert g['links'] == [] and g['warnings']
class TestPower:
OUTLETS = [
{'index': 1, 'name': 'AT&T Modem', 'on': True, 'power_w': 9.0},
{'index': 6, 'name': 'Dream Machine Pro', 'on': True, 'power_w': 20.6},
{'index': 7, 'name': 'Outlet 7', 'on': True, 'power_w': 48.0},
{'index': 14, 'name': 'host-a', 'on': False, 'power_w': 0.0},
{'index': 16, 'name': '02:00:5e:00:0a:01', 'on': True, 'power_w': 131.7},
{'index': 17, 'name': 'USB Outlet 1', 'on': True, 'power_w': None},
]
def _graph(self, feeds=(), outlets=None):
snapshot, link_stats, modem = network()
link_stats['unifi_devices']['RPDU']['outlets'] = outlets or self.OUTLETS
link_stats['host_macs'] = {'02:00:5e:00:0a:01': ['host-c', 'nic0']}
return topology.build_graph(snapshot, link_stats, modem, [], [], [], None, list(feeds))
def _outlets(self, g, source='RPDU'):
return {o['index']: o for o in next(s for s in g['power'] if s['node'] == source)['outlets']}
def test_matched_by_name_alias_and_mac(self):
out = self._outlets(self._graph())
assert (out[1]['target'], out[1]['match']) == ('att-modem', 'name')
assert (out[6]['target'], out[6]['match']) == ('Dream Machine Pro', 'name')
assert (out[14]['target'], out[14]['on']) == ('host-a', False)
assert (out[16]['target'], out[16]['match']) == ('host-c', 'mac')
def test_generic_names_feed_nothing(self):
out = self._outlets(self._graph())
assert (out[7]['target'], out[7]['match']) == (None, 'none')
assert out[17]['target'] is None
def test_saved_assignment_wins_and_empty_means_nothing(self):
feeds = [{'source': 'RPDU', 'outlet': 7, 'target': 'host-b'},
{'source': 'RPDU', 'outlet': 6, 'target': ''}]
out = self._outlets(self._graph(feeds))
assert (out[7]['target'], out[7]['match']) == ('host-b', 'saved')
assert (out[6]['target'], out[6]['match']) == (None, 'cleared')
def test_devices_know_what_feeds_them(self):
g = self._graph()
assert node(g, 'host-c')['power_in'] == [{'source': 'RPDU', 'outlet': 16, 'on': True, 'power_w': 131.7,
'stale': False}]
assert node(g, 'host-b')['power_in'] == []
def test_frozen_readings_are_passed_on_as_stale(self):
snapshot, link_stats, modem = network()
link_stats['unifi_devices']['RPDU']['outlets'] = [
dict(o, stale=True) if o.get('power_w') is not None else o for o in self.OUTLETS]
link_stats['unifi_devices']['RPDU']['outlets_stale_since'] = '2026-11-14 22:48:00 UTC'
link_stats['host_macs'] = {'02:00:5e:00:0a:01': ['host-c', 'nic0']}
g = topology.build_graph(snapshot, link_stats, modem, [], [], [], None, [])
src = next(s for s in g['power'] if s['node'] == 'RPDU')
assert src['stale_since'] == '2026-11-14 22:48:00 UTC'
assert src['outlets'][[o['index'] for o in src['outlets']].index(16)]['stale'] is True
assert node(g, 'host-c')['power_in'][0]['stale'] is True
assert next(s for s in g['power'] if s['node'] == 'UPS 2U Pro')['stale_since'] is None
def test_a_power_device_does_not_feed_itself(self):
out = self._outlets(self._graph(outlets=[{'index': 1, 'name': 'RPDU spare', 'on': True}]))
assert out[1]['target'] is None
def test_every_power_device_is_listed(self):
assert [s['node'] for s in self._graph()['power']] == ['RPDU', 'UPS 2U Pro', 'USP Strip']
class TestPortNameReport:
def _report(self, poe_port_11='Port 11', pbs_up=True, extra=(), known=None):
snapshot, link_stats, modem = network(poe_port_11, pbs_up)
link_stats['unifi_switches']['24RJ45-POE']['ports'].update(dict(extra))
return topology.port_name_report(snapshot, link_stats, modem, known)
def _row(self, rows, sw, idx):
return next((r for r in rows if r['switch'] == sw and r['port_idx'] == idx), None)
def test_named_after_the_wrong_device(self):
rows = self._report(poe_port_11='Host-A Management')
r = self._row(rows, '24RJ45-POE', 11)
assert r['kind'] == 'wrong' and r['suggestion'] == 'AP'
assert r['detail'] == ('Named after host-a, but AP is plugged in; '
'host-a is on 8SFP-AGG port 1, Dream Machine Pro port 1')
assert rows[0] is r # the most urgent kind comes first
def test_named_after_a_device_that_moved(self):
rows = self._report(extra=[port(20, 'host-c', up=False)])
r = self._row(rows, '24RJ45-POE', 20)
assert r['kind'] == 'moved' and r['suggestion'] == 'Port 20'
assert r['detail'] == 'Named after host-c, which is now on 8SFP-AGG port 8'
def test_named_but_empty_says_who_was_last_seen(self):
known = {'pbs': {'uplinks': [{'switch': '24RJ45-POE', 'port_idx': 7}], 'seen': '2026-11-01 10:00:00 UTC'}}
rows = self._report(extra=[port(7, 'Guest Bedroom', up=False)], known=known)
r = self._row(rows, '24RJ45-POE', 7)
assert r['kind'] == 'empty' and r['suggestion'] == ''
assert r['detail'] == ('Nothing plugged in; last seen here: pbs (2026-11-01 10:00:00 UTC), '
'now on 24RJ45-POE port 15')
def test_unnamed_ports_get_a_suggestion(self):
rows = self._report()
# A server with two cables gets its NIC in the name; a switch-to-switch port is a downlink
assert self._row(rows, '24RJ45-POE', 4)['suggestion'] == 'host-b enp2s0'
assert self._row(rows, '24RJ45-POE', 19)['suggestion'] == 'RPDU'
assert self._row(rows, '8SFP-AGG', 7)['suggestion'] == 'Uplink'
assert self._row(rows, '8SFP-AGG', 8)['suggestion'] == 'host-c'
assert {r['kind'] for r in rows} == {'unnamed'}
def test_good_names_and_unknown_devices_are_left_alone(self):
rows = self._report()
for sw, idx in [('24RJ45-POE', 15), # "PBS" with pbs plugged in
('24RJ45-POE', 3), # "Living Room Downlink" to the Flex
('8SFP-AGG', 5), # "Downlink to 24RJ45-POE"
('24RJ45-POE', 1), # a custom name over an unknown device
('24RJ45-POE', 8), # an IP-only target
('24RJ45-POE', 12), # "Port 12", nothing plugged in
('RPDU', 1)]: # a PDU's management port
assert self._row(rows, sw, idx) is None, (sw, idx)
def test_a_port_named_after_a_device_that_is_off_is_right(self):
rows = self._report(pbs_up=False)
for sw, idx in [('24RJ45-POE', 15)]: # "PBS" while pbs is down
assert self._row(rows, sw, idx) is None, (sw, idx)
def test_no_data(self):
assert topology.port_name_report({}, {}, None) == []
+196 -9
View File
@@ -119,35 +119,200 @@ def name_mismatch(port_name: str, neighbour: str, own: str, known: Dict[str, str
"""
if not port_name or _is_generic_port_name(port_name):
return None
words = _TOKEN_RE.findall(port_name.lower())
skip = {_norm(neighbour), _norm(own)}
named = _named_device(port_name, known, {_norm(neighbour), _norm(own)})
return {'named': named, 'actual': neighbour} if named else None
def _named_device(text: str, known: Dict[str, str], skip=()) -> Optional[str]:
"""The device a free-text name refers to: the longest run of up to four of its words that
is a device name (ignoring case, spaces, dashes and underscores), or None."""
words = _TOKEN_RE.findall((text or '').lower())
for size in range(min(4, len(words)), 0, -1):
for i in range(len(words) - size + 1):
run = ''.join(words[i:i + size])
if run in known and run not in skip:
return {'named': known[run], 'actual': neighbour}
return known[run]
return None
# What each port-name finding means, most urgent first
PORT_NAME_KINDS = ('wrong', 'moved', 'empty', 'unnamed')
def _port_name_suggestion(neighbour: str, kind: str, port: dict, links: int) -> str:
if kind in ('router', 'switch'):
return 'Uplink' if port.get('is_uplink') else f'Downlink to {neighbour}'
iface = str((port.get('lldp') or {}).get('port_id') or '')
# A server with two cables: say which NIC, so the two ports read differently
if kind == 'host' and links > 1 and iface and not _MAC_IN_TEXT.fullmatch(iface):
return f'{neighbour} {iface}'
return neighbour
def port_name_report(snapshot: dict, link_stats: dict, modem: Optional[dict],
known_uplinks: Optional[dict] = None) -> List[dict]:
"""UniFi port names that no longer fit what is plugged in, as a checklist to fix in UniFi.
Each row is {switch, port_idx, port_name, kind, neighbour, suggestion, detail}, kind one of:
wrong: named after one device, with a different known device plugged in
moved: named after a device that is now linked on another port, with nothing known here
empty: a custom name on a port with nothing plugged in (with who was last seen there)
unnamed: still "Port N" / "SFP+ N" with a known device plugged in
Gandalf only reports these; it never renames anything in UniFi.
"""
snapshot = snapshot or {}
link_stats = link_stats or {}
switches = link_stats.get('unifi_switches') or {}
configured = set(snapshot.get('hosts') or {})
kinds = {e['name']: e['kind'] for e in devices.build_index(snapshot, link_stats, modem)
if e['kind'] != 'host' or e['name'] in configured}
known = {_norm(n): n for n in kinds}
# Where each known device is linked right now, and who was last seen on each port
live_at: Dict[str, List[str]] = {}
for sw_name, sw in sorted(switches.items()):
for p in (sw.get('ports') or {}).values():
nb = (p.get('lldp') or {}).get('system_name') or ''
if p.get('up') and nb in kinds and p.get('port_idx') is not None:
live_at.setdefault(nb, []).append(f'{sw_name} port {p["port_idx"]}')
last_seen: Dict[Tuple[str, int], Tuple[str, str]] = {}
for name, entry in (known_uplinks or {}).items():
for up in (entry or {}).get('uplinks') or []:
if up.get('switch') and up.get('port_idx') is not None:
last_seen[(up['switch'], up['port_idx'])] = (name, (entry or {}).get('seen') or '')
rows: List[dict] = []
for sw_name in sorted(switches):
if kinds.get(sw_name) in POWER_KINDS or _POWER_MODELS.get((switches[sw_name] or {}).get('model', '')):
continue # a PDU's one management port
for pname, port in (switches[sw_name].get('ports') or {}).items():
idx = port.get('port_idx')
if idx is None:
continue
nb = (port.get('lldp') or {}).get('system_name') or ''
nb = nb if nb in kinds and nb != sw_name else ''
generic = _is_generic_port_name(pname)
row = {'switch': sw_name, 'port_idx': idx, 'port_name': pname, 'neighbour': nb,
'suggestion': '', 'detail': ''}
named = None if generic else _named_device(pname, known, {_norm(sw_name)})
if nb and port.get('up'):
suggestion = _port_name_suggestion(nb, kinds[nb], port, len(live_at.get(nb, [])))
if named and named != nb and _norm(named) != _norm(nb):
elsewhere = [w for w in live_at.get(named, []) if w != f'{sw_name} port {idx}']
row.update(kind='wrong', suggestion=suggestion,
detail=f'Named after {named}, but {nb} is plugged in'
+ (f'; {named} is on {", ".join(elsewhere)}' if elsewhere else ''))
elif generic and not pname.lower().startswith(('uplink', 'downlink')):
row.update(kind='unnamed', suggestion=suggestion,
detail=f'{nb} is plugged in')
else:
continue
elif named and named in live_at:
row.update(kind='moved', suggestion=f'Port {idx}' if not port.get('up') else '',
detail=f'Named after {named}, which is now on {", ".join(live_at[named])}')
elif named:
continue # named after a known device that is just not linked now: the name is right
elif not generic and not port.get('up') and not port.get('lldp'):
seen = last_seen.get((sw_name, idx))
detail = 'Nothing plugged in'
if seen:
detail += f'; last seen here: {seen[0]}' + (f' ({seen[1]})' if seen[1] else '')
if seen[0] in live_at:
detail += f', now on {", ".join(live_at[seen[0]])}'
row.update(kind='empty', detail=detail)
else:
continue
rows.append(row)
order = {k: i for i, k in enumerate(PORT_NAME_KINDS)}
rows.sort(key=lambda r: (order[r['kind']], r['switch'].lower(), r['port_idx']))
return rows
_MAC_IN_TEXT = re.compile(r'\b([0-9a-f]{2}(?:[:-][0-9a-f]{2}){5})\b', re.IGNORECASE)
def build_power(nodes: Dict[str, dict], link_stats: dict, feeds: List[dict]) -> List[dict]:
"""What every PDU, UPS and power strip outlet feeds.
In order: an assignment saved on the topology page (target '' means nothing), then the
outlet's name if it names a device ("storage-01", "Dream Machine Pro", or "AT&T Modem" for
the modem), then a MAC in its name that belongs to a host NIC or a UniFi device.
Returns [{node, power_w, stale_since, outlets: [{index, name, on, power_w, stale,
auto_power_cycle, target, match: saved|cleared|name|mac|none}]}]. stale_since is set when
the monitor saw the unit's outlet readings stop changing (UniFi serving a frozen snapshot).
"""
known = {_norm(n['name']): n['name'] for n in nodes.values() if n['kind'] not in ('stub', 'internet')}
modem = next((n['name'] for n in nodes.values() if n['kind'] == 'modem'), None)
macs = {str(mac).lower(): owner[0] for mac, owner in (link_stats.get('host_macs') or {}).items() if owner}
for name, info in (link_stats.get('unifi_devices') or {}).items():
if info.get('mac'):
macs.setdefault(info['mac'].lower(), name)
saved = {}
for f in feeds or []:
try:
saved[(f['source'], int(f['outlet']))] = f.get('target') or ''
except (KeyError, TypeError, ValueError):
continue
sources = []
for node in sorted((n for n in nodes.values() if n.get('power')), key=lambda n: n['name'].lower()):
rows = []
for o in node.get('outlets') or []:
idx = o.get('index')
text = str(o.get('name') or '')
target, how = None, 'none'
if (node['name'], idx) in saved:
target = saved[(node['name'], idx)] or None
how = 'saved' if target else 'cleared'
else:
target = _named_device(text, known, {_norm(node['name'])})
if not target and modem and 'modem' in _TOKEN_RE.findall(text.lower()):
target = modem
if target:
how = 'name'
else:
m = _MAC_IN_TEXT.search(text)
target = macs.get(m.group(1).lower().replace('-', ':')) if m else None
how = 'mac' if target else 'none'
rows.append({'index': idx, 'name': text, 'on': o.get('on') is not False,
'power_w': o.get('power_w'), 'stale': bool(o.get('stale')),
'auto_power_cycle': bool(o.get('auto_power_cycle')),
'target': target, 'match': how})
sources.append({'node': node['name'], 'power_w': node.get('power_w'), 'outlets': rows,
'stale_since': node.get('outlets_stale_since')})
return sources
def _cable_labels(items: List[dict], cables: List[dict]) -> Dict[Tuple[str, str], dict]:
"""{(device, port): cable} for cutsheet cables still in place. A cable can name the
device itself or a cutsheet item linked to it."""
device_of = {i['name']: (i.get('device') or i['name']) for i in items or []}
device itself or a cutsheet item linked to it. Each entry also says where the cable's
other end goes ('far': {device, port, kind}), so a cable into a patch panel shows as one."""
by_name = {i['name']: i for i in items or []}
device_of = {name: (i.get('device') or name) for name, i in by_name.items()}
out: Dict[Tuple[str, str], dict] = {}
for c in cables or []:
if c.get('status') == 'retired':
continue
for end in ('a', 'b'):
for end, other in (('a', 'b'), ('b', 'a')):
dev = c.get(f'{end}_device') or ''
if not dev:
continue
far_dev = c.get(f'{other}_device') or ''
ref = {'id': c.get('id'), 'label': c.get('label') or '', 'type': c.get('cable_type') or '',
'color': c.get('color') or ''}
'color': c.get('color') or '',
'far': {'device': device_of.get(far_dev, far_dev), 'port': str(c.get(f'{other}_port') or ''),
'kind': (by_name.get(far_dev) or {}).get('kind') or ''} if far_dev else None}
for name in {dev, device_of.get(dev, dev)}:
out[(name, str(c.get(f'{end}_port') or ''))] = ref
return out
def _via_name(far: dict) -> str:
"""How to name the far end of a cable that leads to cutsheet gear, not a live device."""
where = {'patch_panel': 'Patch panel', 'wall_jack': 'Wall jack'}.get(far['kind'], far['device'])
return f'{where} port {far["port"]}' if far['port'] else where
def _alerts_by_target(events: List[dict]) -> Dict[str, List[dict]]:
out: Dict[str, List[dict]] = {}
for ev in events or []:
@@ -167,13 +332,14 @@ def _worst(alerts: List[dict]) -> str:
def build_graph(snapshot: dict, link_stats: dict, modem: Optional[dict], events: List[dict],
cutsheet_items: List[dict], cutsheet_cables: List[dict],
known_uplinks: Optional[dict] = None) -> dict:
"""Every device and cable, as {nodes, links, warnings, updated}.
known_uplinks: Optional[dict] = None, power_feeds: Optional[List[dict]] = None) -> dict:
"""Every device and cable, as {nodes, links, power, warnings, updated}.
snapshot, link_stats, modem: the monitor's saved state.
events: active events, with is_suppressed set (suppressed ones are left out).
known_uplinks: the monitor's record of where each device was last plugged in,
drawn as "last seen" links for a device with no live link.
power_feeds: outlet assignments saved on the topology page (see build_power).
"""
snapshot = snapshot or {}
link_stats = link_stats or {}
@@ -219,6 +385,7 @@ def build_graph(snapshot: dict, link_stats: dict, modem: Optional[dict], events:
info = unifi_info.get(name) or {}
node['power_w'] = info.get('power_w')
node['outlets'] = info.get('outlets') or []
node['outlets_stale_since'] = info.get('outlets_stale_since')
node_alerts = alerts.get(name, [])
node['alerts'] = node_alerts[:10]
node['alert_count'] = len(node_alerts)
@@ -333,6 +500,14 @@ def build_graph(snapshot: dict, link_stats: dict, modem: Optional[dict], events:
'alerts': [], 'alert_count': 0, 'severity': '', 'power': False,
}
link = add_link(here, _end(stub_id, iface=nodes[stub_id]['iface']), port)
# The cutsheet says the cable goes into a patch panel (or other documented gear that
# is not on the network): say so, and name a stub that has nothing better after it
far = (link['cable'] or {}).get('far')
if far and far['device'] not in nodes:
nodes[stub_id]['via'] = dict(far, name=_via_name(far), cable=link['cable']['label'])
if label == 'unknown device':
nodes[stub_id]['name'] = nodes[stub_id]['via']['name']
nodes[stub_id]['named_by_via'] = True
# A stub labelled by its port name would always "match" it, so compare with what was seen
link['name_mismatch'] = name_mismatch(pname, neighbour or mac or 'an unnamed device', sw_name, known_names)
if link['name_mismatch']:
@@ -401,11 +576,23 @@ def build_graph(snapshot: dict, link_stats: dict, modem: Optional[dict], events:
if nic['name'] == end['iface']:
nic.setdefault('links', []).append(link['id'])
# Power: what each outlet feeds, and on each device, the outlets feeding it
power = build_power({k: v for k, v in nodes.items() if v['kind'] != 'stub'}, link_stats, power_feeds or [])
for node in nodes.values():
node['power_in'] = []
for src in power:
for o in src['outlets']:
if o['target'] in nodes:
nodes[o['target']]['power_in'].append(
{'source': src['node'], 'outlet': o['index'], 'on': o['on'], 'power_w': o['power_w'],
'stale': o['stale']})
if not switches:
warnings.append('No UniFi switch data yet: the monitor has not reported any ports')
return {
'nodes': sorted(nodes.values(), key=lambda n: (99 if n['depth'] is None else n['depth'], n['name'].lower())),
'links': links,
'power': power,
'warnings': warnings,
'updated': link_stats.get('updated'),
}