Compare commits
61
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7da4cc26e2 | ||
|
|
73787daaec | ||
|
|
6a717af3f2 | ||
|
|
f1355c4bd8 | ||
|
|
abac6983b2 | ||
|
|
4646d9be90 | ||
|
|
c535bfd9fb | ||
|
|
a90ce44c80 | ||
|
|
4dfabce2fb | ||
|
|
d6fcddb6fc | ||
|
|
ce68d592c3 | ||
|
|
3a1371e8b7 | ||
|
|
60d892badb | ||
|
|
206175df39 | ||
|
|
b9e008bc2b | ||
|
|
ab59b42bea | ||
|
|
415d2222e7 | ||
|
|
dcf5fdf4cc | ||
|
|
20822d000e | ||
|
|
7dba1750ee | ||
|
|
abe88df3a4 | ||
|
|
aa7341af06 | ||
|
|
390748173c | ||
|
|
64eba37f81 | ||
|
|
0631de74c7 | ||
|
|
0921e82c54 | ||
|
|
7b80633088 | ||
|
|
379e3be365 | ||
|
|
6b03fe7b44 | ||
|
|
3834546f38 | ||
|
|
aeb7a89e81 | ||
|
|
9bdf5d9eed | ||
|
|
cbdae54d70 | ||
|
|
36cbdd061d | ||
|
|
6e6150f9b9 | ||
|
|
d234e36e3f | ||
|
|
7408b1feca | ||
|
|
64ef4222d0 | ||
|
|
fde1d01f27 | ||
|
|
8edaa78ad7 | ||
|
|
3bc8df6dc7 | ||
|
|
d8e827c88b | ||
|
|
a0e062493d | ||
|
|
d07787ee38 | ||
|
|
7e75ba8b3c | ||
|
|
0243b23732 | ||
|
|
90e051dc22 | ||
|
|
486a93c5a0 | ||
|
|
a9de175d90 | ||
|
|
ce12dede5f | ||
|
|
6530433d9c | ||
|
|
5fdd317539 | ||
|
|
3e2918526f | ||
|
|
50db56cdcb | ||
|
|
619a2c913d | ||
|
|
3c9e5fd593 | ||
|
|
565fdd81de | ||
|
|
0f4e129c20 | ||
|
|
b416239438 | ||
|
|
97e6692ebf | ||
|
|
bee260f1cd |
No files matched your search
@@ -1,7 +1,7 @@
|
||||
[flake8]
|
||||
max-line-length = 120
|
||||
# E221: multiple spaces before operator — intentional column alignment
|
||||
# E305: two blank lines after function — relaxed for module-level code
|
||||
# E221: multiple spaces before operator: intentional column alignment
|
||||
# E305: two blank lines after function: relaxed for module-level code
|
||||
extend-ignore = E221, E305
|
||||
exclude = __pycache__, .git, node_modules
|
||||
extend-exclude = node_modules
|
||||
@@ -50,7 +50,7 @@ jobs:
|
||||
if [ -z "$MATRIX_WEBHOOK_URL" ] || [ "$MATRIX_WEBHOOK_URL" = "CONFIGURE_ME" ]; then exit 0; fi
|
||||
curl -sf -X POST "$MATRIX_WEBHOOK_URL" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "{\"text\":\"CI FAILED: ${REPO} @ ${BRANCH} — ${RUN_URL}\"}"
|
||||
-d "{\"text\":\"CI FAILED: ${REPO} @ ${BRANCH}: ${RUN_URL}\"}"
|
||||
|
||||
deploy:
|
||||
name: Deploy
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
Network monitoring dashboard for the LotusGuild Proxmox cluster.
|
||||
Deployed on **LXC 157** (monitor-02 / 10.10.10.9), reachable at `gandalf.lotusguild.org`.
|
||||
|
||||
**Design System**: [web_template](https://code.lotusguild.org/LotusGuild/web_template) — shared CSS, JS, and layout patterns for all LotusGuild apps
|
||||
**Design System**: [web_template](https://code.lotusguild.org/LotusGuild/web_template): shared CSS, JS, and layout patterns for all LotusGuild apps
|
||||
|
||||

|
||||
|
||||
@@ -19,11 +19,13 @@ A Proxmox/Ceph cluster lives or dies by its network, and network problems are sn
|
||||
|
||||
## Gallery
|
||||
|
||||
**Dashboard**: alert queue with linked tickets, a live topology, per-host interface status and the UniFi device inventory.
|
||||
**Dashboard**: alert queue with linked tickets, per-host interface status and the UniFi device inventory.
|
||||
|
||||

|
||||
|
||||

|
||||
**Topology**: every device drawn from its real faceplate or chassis, with each cable leaving the port it is plugged into, styled by medium and speed, with live traffic.
|
||||
|
||||

|
||||
|
||||

|
||||
|
||||
@@ -51,11 +53,11 @@ A Proxmox/Ceph cluster lives or dies by its network, and network problems are sn
|
||||
|
||||
GANDALF uses the **LotusGuild Terminal Design System**. For all styling, component, and layout documentation see:
|
||||
|
||||
- [`web_template/README.md`](https://code.lotusguild.org/LotusGuild/web_template/src/branch/main/README.md) — full component reference, CSS variables, JS API
|
||||
- [`web_template/base.css`](https://code.lotusguild.org/LotusGuild/web_template/src/branch/main/base.css) — unified CSS (`.lt-*` classes)
|
||||
- [`web_template/base.js`](https://code.lotusguild.org/LotusGuild/web_template/src/branch/main/base.js) — `window.lt` utilities (toast, modal, auto-refresh, fetch helpers)
|
||||
- [`web_template/python/base.html`](https://code.lotusguild.org/LotusGuild/web_template/src/branch/main/python/base.html) — Jinja2 base template
|
||||
- [`web_template/python/auth.py`](https://code.lotusguild.org/LotusGuild/web_template/src/branch/main/python/auth.py) — `@require_auth` decorator pattern
|
||||
- [`web_template/README.md`](https://code.lotusguild.org/LotusGuild/web_template/src/branch/main/README.md): full component reference, CSS variables, JS API
|
||||
- [`web_template/base.css`](https://code.lotusguild.org/LotusGuild/web_template/src/branch/main/base.css): unified CSS (`.lt-*` classes)
|
||||
- [`web_template/base.js`](https://code.lotusguild.org/LotusGuild/web_template/src/branch/main/base.js): `window.lt` utilities (toast, modal, auto-refresh, fetch helpers)
|
||||
- [`web_template/python/base.html`](https://code.lotusguild.org/LotusGuild/web_template/src/branch/main/python/base.html): Jinja2 base template
|
||||
- [`web_template/python/auth.py`](https://code.lotusguild.org/LotusGuild/web_template/src/branch/main/python/auth.py): `@require_auth` decorator pattern
|
||||
|
||||
---
|
||||
|
||||
@@ -81,8 +83,8 @@ Two processes share a MariaDB database:
|
||||
| Source | What it provides |
|
||||
|---|---|
|
||||
| **Prometheus** (`10.10.10.48:9090`) | Physical NIC link state + traffic/error rates via `node_exporter` |
|
||||
| **UniFi API** (`https://10.10.10.1`) | Switch port stats, device status, LLDP neighbor table, PoE data |
|
||||
| **Pulse Worker** | SSH relay — runs `ethtool` + SFP DOM queries on each Proxmox host |
|
||||
| **UniFi API** (`https://10.10.10.1`) | Switch port stats, device status, LLDP neighbor table, PoE data, the WAN health timeline (latency, loss, drops) |
|
||||
| **Pulse Worker** | SSH relay: runs `ethtool` + SFP DOM queries on each Proxmox host |
|
||||
| **Ping** | Reachability for hosts without `node_exporter` (e.g. PBS) |
|
||||
| **AT&T BGW320** (`http://192.168.1.254`) | Fiber light levels, PON and WAN state, WAN counters, scraped read-only from the gateway's status pages (no login) |
|
||||
|
||||
@@ -92,7 +94,7 @@ Two processes share a MariaDB database:
|
||||
|---|---|
|
||||
| large1 | 10.10.10.2:9100 |
|
||||
| compute-storage-01 | 10.10.10.4:9100 |
|
||||
| micro1 | 10.10.10.8:9100 |
|
||||
| monitor-01 | 10.10.10.8:9100 |
|
||||
| monitor-02 | 10.10.10.9:9100 |
|
||||
| compute-storage-gpu-01 | 10.10.10.10:9100 |
|
||||
| storage-01 | 10.10.10.11:9100 |
|
||||
@@ -104,15 +106,31 @@ 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*: internet trouble in the last hour (see below), 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, topology, and recently resolved alerts
|
||||
- Real-time host status grid with per-NIC link state (UP / DOWN / degraded)
|
||||
- Network topology diagram (Internet → Modem → Gateway → Switches → Hosts)
|
||||
- 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
|
||||
- Quick-suppress modal: apply timed or manual suppression from any alert row
|
||||
- Auto-refreshes every 30 seconds via `/api/status` + `/api/network`
|
||||
- WAN / Fiber panel: WAN and PON state, Rx/Tx power, optics temperature, throughput, errors, gateway uptime and last restart (just the last restart when the gateway doesn't report uptime), a 24 hour internet health strip from UniFi, 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 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
|
||||
@@ -133,12 +151,35 @@ The rack front, drawn from the rack units set on cutsheet items, top first.
|
||||
patch panels get a generic panel with each port's label; anything else is a labelled plate with its
|
||||
live status. Cables may use either name: checks, suggestions, tickets and the device page treat an
|
||||
item and its device as the same thing.
|
||||
- **Drawn fronts**: gear without a live faceplate can pick a **Front drawing** on its cutsheet item:
|
||||
UniFi NVR Pro (a full faceplate, `UNVRPRO` in `static/faceplates.js`, laid out from the CC0 NetBox
|
||||
device library image), Sliger CX4712 4U (10 numbered bays), Rosewill RSV-L4500U 4U (perforated fan
|
||||
door), the UniFi blank 24-port keystone patch panel (UACC-Rack-Panel-Patch-Blank-24: keystone jacks
|
||||
appear where cables are documented), or a generic 1U/2U/4U server. The power light shows the linked device's live status. Case
|
||||
drawings live in `static/fronts.js`.
|
||||
- **Shelves**: an item can sit on a shelf item instead of having a rack unit. The shelf draws what is on
|
||||
it side by side (mini PCs, desk switches), each with its status and a link to its page.
|
||||
- **Front and rear**: each item is mounted from the front, the rear, or full depth (both sides). On a
|
||||
4-post rack a front and a rear item can share a unit; a full-depth item (a server) takes it on both
|
||||
sides, and the rear view shows its back. Items on a shelf take the shelf's side. The Front / Rear switch
|
||||
flips the drawing (`?face=rear`).
|
||||
- **Posts, facing and views**: each item hangs on the front posts, the rear posts, or both (full
|
||||
depth), and its ports face the front or the rear. On a 4-post rack a front-post and a rear-post item
|
||||
can share a unit; a full-depth item takes it on both. The page has three views: **Front** (the front
|
||||
posts), **Rear posts** (gear on the rear posts seen from the front, i.e. what sits behind the front
|
||||
gear, such as a PDU or a shelf mounted from the rear but facing forward) and **Rear** (from behind).
|
||||
An item seen from the side it doesn't face shows its back. Items on a shelf take the shelf's posts
|
||||
and facing.
|
||||
- **Shelves to scale**: a shelf draws its contents left to right by **Position on shelf**, at true scale
|
||||
(a 19" panel is 482.6 mm). Gear with a drawing, such as the IceWhale ZimaBoard 832 (traced from
|
||||
IceWhale's labelled photo of its port end), shows its real ports: the onboard RJ45 link lights follow
|
||||
enp2s0 (left) and enp3s0 (right), and the status glow follows the host. The "ZimaBoard 832 +
|
||||
ConnectX-3" drawing adds the single-port SFP+ card lying flat in the side PCIe slot, as in the rack,
|
||||
with a DAC attached; its round dot is Gandalf's link mark for enp1s0 (the slot is PCI bus 1), not an
|
||||
LED on the card. UniFi desk switches (Flex Mini, Flex) on a shelf are drawn with their live faceplate
|
||||
at their real width. Anything else is a labelled box.
|
||||
- **More drawn fronts**: the Sliger CX4712 with its red, white or blue perforated front fitted (as in
|
||||
the rack photo, drive cages faint behind the mesh), and the UniFi brush panel
|
||||
(UACC-Rack-Panel-Brush-1U, from Ubiquiti's product images).
|
||||
- **Gear resting on other gear**: a shelf item with Front drawing "No shelf: gear resting on what is
|
||||
below" draws no tray, so a switch lying on top of the NVR is a "shelf" in the unit above the NVR whose
|
||||
contents sit directly on it.
|
||||
- **Racks**: admins name a rack and set its height with **Rack settings** on the page, and add more with
|
||||
**+ Rack** (a tab per rack). Renaming a rack moves its items; an empty rack can be deleted. Each item
|
||||
has a rack (empty means the first). Until a rack is saved, racks come from config:
|
||||
@@ -154,6 +195,68 @@ The rack front, drawn from the rack units set on cutsheet items, top first.
|
||||
claim the same top unit, the one recorded first is drawn. Items without a rack unit are listed below.
|
||||
- The rack keeps its own dark "hardware" palette in both themes.
|
||||
|
||||
### Topology (`/topology`)
|
||||
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** 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
|
||||
port inspector and rack page), cropped to the ports; servers show the **Front drawing** of their
|
||||
cutsheet item and a socket per physical NIC, so every cable lands on the NIC it is plugged into
|
||||
(NICs marked unused are dimmed). The internet, modem and gateway sit side by side along the top.
|
||||
- **Cables run like cable management**: each leaves the card edge right below its port (a short tail
|
||||
shows the port), drops into a tray above the row it goes to, runs along its own lane (10G on the
|
||||
upper lanes), and drops straight into its socket, so cables never lie on top of each other and only cross at right angles. Devices are placed clear of
|
||||
the cables passing down through their row, and each sits under its fastest cable.
|
||||
- **One line per physical cable**, leaving the exact port: a switch-to-switch cable is reported by both
|
||||
switches and drawn once. A server with two links (10G and 1G) has two cables. Colour is the cable
|
||||
type (DAC, multimode fibre, the provider's fibre, an SFP+ module that doesn't say which, copper) and
|
||||
thickness is the speed. A cable that is down is dashed red.
|
||||
- **Last seen**: a device with no live cable is drawn on the port it was last seen on, dotted red.
|
||||
- **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. 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. 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** 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, 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,
|
||||
otherwise 503 with the failing check: `{"status": "degraded", "checks": {"db": "ok", "monitor": "stale",
|
||||
@@ -169,7 +272,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,
|
||||
@@ -242,6 +346,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`.
|
||||
@@ -250,8 +355,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
|
||||
@@ -264,7 +374,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
|
||||
@@ -286,6 +405,12 @@ can view it; only the `admin` group can edit, and every change is logged with wh
|
||||
- Suppression history (last 50)
|
||||
- Available targets reference grid (all known hosts + interfaces)
|
||||
|
||||
**Maintenance**: admins get a **Maintenance** button in the header. It starts a global suppression for
|
||||
30 min, 1, 2 or 4 hours with a reason (by default "Maintenance"). While it runs, every page shows a banner
|
||||
saying when tickets resume, with **End now** for admins. Gandalf keeps checking and recording alerts, and
|
||||
anything still failing when maintenance ends gets a ticket as usual. Use it before a UniFi update, a switch
|
||||
swap or recabling.
|
||||
|
||||
---
|
||||
|
||||
## Alert Logic
|
||||
@@ -329,6 +454,18 @@ whatever Gandalf knows around the problem:
|
||||
|
||||
Titles keep the `[target][auto][production]...` tag format, which Tinker uses to spot duplicates.
|
||||
|
||||
### Unused interfaces
|
||||
|
||||
An admin can mark a host interface as unused on its device page (**Mark unused** on a down interface,
|
||||
with an optional reason; **In use again** to undo). An unused interface:
|
||||
|
||||
- never raises a link-down alert, and can't count toward the cluster-wide alert;
|
||||
- doesn't count toward the host's status, so a host whose only down ports are unused shows as up;
|
||||
- shows as "unused" (greyed, dashed dot) on the dashboard, the device page and the rack drawings;
|
||||
- has any open link-down alert closed quietly when it is marked (no recovery note: nothing recovered).
|
||||
|
||||
Marks are stored in `unused_interfaces` (host, interface, reason, who, when).
|
||||
|
||||
### Recovery notes
|
||||
|
||||
When an alert that opened a ticket clears, the monitor adds a comment to that ticket: when it cleared, how
|
||||
@@ -340,6 +477,20 @@ A note that fails to post is retried every cycle for 24 hours. Posting needs a T
|
||||
`read_write` scope; if Tinker answers 401 or 403, the monitor logs one error and stops trying until it is
|
||||
restarted.
|
||||
|
||||
### Follow-up
|
||||
|
||||
Gandalf only comments on tickets, so a ticket can stay open long after its problem is fixed, and an alert can
|
||||
sit active for days once everyone has stopped looking. The dashboard flags both:
|
||||
|
||||
- **Stale alert**: active for `monitor.stale_alert_days` (default 3) or longer. Shown as a ⏳ badge with its age.
|
||||
- **Ticket closed**: the alert is still active but its ticket was closed in Tinker, so nobody is tracking it.
|
||||
- **Ticket left open**: every alert on a ticket cleared at least `monitor.stale_ticket_hours` (default 24) ago,
|
||||
but the ticket is still Open, Pending or In Progress. Listed in the Needs Follow-up panel.
|
||||
|
||||
The monitor reads the list of open tickets from Tinker's `api/tickets_api.php` every 15 minutes (one request,
|
||||
read scope only) and saves it. If that list is over 2 hours old, because Tinker or the key stopped working,
|
||||
the ticket flags are left off rather than guessed. Stale alerts are still flagged.
|
||||
|
||||
### WAN modem notes
|
||||
|
||||
The alarm and warning limits are read from the gateway on every poll, so they are never hard-coded here.
|
||||
@@ -351,7 +502,32 @@ Outages can be over between polls: two real ones lasted about two minutes agains
|
||||
So WAN outages and modem restarts also come from the UniFi system log, and a drop in the modem's uptime
|
||||
records a restart even if nothing logged it. A single short outage only appears in the panel's history.
|
||||
|
||||
To silence modem alerts during maintenance, create a `host` suppression with the modem's `name`.
|
||||
Internet quality (slow or lossy rather than down) comes from UniFi too, not from Gandalf's own pings: the
|
||||
UDM rates every 5 minutes as fine, high latency, packet loss or down, which is the timeline its Network app
|
||||
charts. Each cycle the monitor reads the last day of it from the dashboard API (read only) into
|
||||
`monitor_state.wan_quality`. The panel draws it as a 24 hour strip with the current latency to Cloudflare,
|
||||
Google and Microsoft. Needs attention says *Internet: packet loss* (red) when 2 or more of the last 12
|
||||
periods had loss or downtime, *high latency* (amber) when 3 or more had any problem, and lists drops from
|
||||
the last hour. These are dashboard lines, not tickets, and they go once the hour is clean. A copy older
|
||||
than 30 minutes is ignored.
|
||||
|
||||
**One ticket per incident.** The modem and WAN reports from one check cycle open a single ticket, led by
|
||||
the most urgent (a P2 "WAN modem unreachable" leads, and an RPDU power-cycle seen in the same cycle is listed
|
||||
under "Also seen in this incident"). A report that comes while the modem has an open alert, or one that
|
||||
ended under 30 minutes ago, becomes a comment on that alert's ticket instead of a new ticket. If the
|
||||
comment can't be posted, the report gets its own ticket as before.
|
||||
|
||||
**UniFi updates.** UniFi logs `NETWORK_UPDATED` (Network app) and `FIRMWARE_UPDATED_V2` (device firmware)
|
||||
once an update has finished. Updating the Network app can drop the UDM's WAN, and Smart Power may then
|
||||
power-cycle a modem that was fine. When Gandalf reads one of these entries it:
|
||||
|
||||
- comments on modem and WAN tickets first seen from 20 minutes before the update to 15 minutes after,
|
||||
naming the update (for example "UniFi Network 11.0.97 to 11.0.99") as the likely cause;
|
||||
- opens no new modem or WAN tickets for 15 minutes after the update. A problem still there after that gets
|
||||
its ticket as usual; a power-cycle report during the hold only goes into the event history.
|
||||
|
||||
To silence modem alerts during maintenance, create a `host` suppression with the modem's `name`, or use
|
||||
**Maintenance** (below) to pause every ticket.
|
||||
|
||||
### Baseline Tracking
|
||||
|
||||
@@ -369,7 +545,7 @@ generate tickets. Baseline is stored in MariaDB and survives daemon restarts.
|
||||
| `all` | Everything (global maintenance mode) |
|
||||
|
||||
Suppressions can be manual (persist until removed) or timed (auto-expire).
|
||||
Expired suppressions are checked at evaluation time — no background cleanup needed.
|
||||
Expired suppressions are checked at evaluation time: no background cleanup needed.
|
||||
|
||||
---
|
||||
|
||||
@@ -414,7 +590,7 @@ Shared by both processes. Located in the working directory (`/var/www/html/prod/
|
||||
"hosts": [
|
||||
{ "name": "large1", "prometheus_instance": "10.10.10.2:9100" },
|
||||
{ "name": "compute-storage-01", "prometheus_instance": "10.10.10.4:9100" },
|
||||
{ "name": "micro1", "prometheus_instance": "10.10.10.8:9100" },
|
||||
{ "name": "monitor-01", "prometheus_instance": "10.10.10.8:9100" },
|
||||
{ "name": "monitor-02", "prometheus_instance": "10.10.10.9:9100" },
|
||||
{ "name": "compute-storage-gpu-01", "prometheus_instance": "10.10.10.10:9100" },
|
||||
{ "name": "storage-01", "prometheus_instance": "10.10.10.11:9100" }
|
||||
@@ -451,6 +627,7 @@ Shared by both processes. Located in the working directory (`/var/www/html/prod/
|
||||
| `ticket_api.url` | Tinker Tickets `create_ticket_api.php` URL |
|
||||
| `ticket_api.api_key` | Tinker Tickets bearer token. Needs `read_write` scope to add recovery notes |
|
||||
| `ticket_api.comment_url` | Tinker comment endpoint (default: `api/ticket_comment_api.php` beside `ticket_api.url`) |
|
||||
| `ticket_api.read_url` | Tinker ticket read endpoint, used to find tickets left open (default: `api/tickets_api.php` beside `ticket_api.url`) |
|
||||
| `gandalf.public_url` | Gandalf's own address, for links in tickets (default: `https://gandalf.lotusguild.org`) |
|
||||
| `rack.units`, `rack.name` | The single rack's height and name on `/rack` (defaults: 42, "Rack 1") |
|
||||
| `racks` | Several racks: `[{"name": "...", "units": 42}, ...]`, in tab order; overrides `rack` |
|
||||
@@ -465,9 +642,11 @@ Shared by both processes. Located in the working directory (`/var/www/html/prod/
|
||||
| `monitor.poll_interval` | Seconds between full check cycles (default: 120) |
|
||||
| `monitor.failure_threshold` | Consecutive failures before creating ticket (default: 2) |
|
||||
| `monitor.host_failure_threshold` | Consecutive failures before ticketing a host that has disappeared, whether it has no metrics or doesn't answer ping (default: 5). A normal reboot takes about 3-5 minutes, so the default rides it out: the host still shows as down on the dashboard, but a ticket opens only after about 8 minutes at the default poll interval. For longer maintenance, suppress the host first. |
|
||||
| `monitor.unifi_failure_threshold` | Consecutive failures before ticketing a UniFi device as offline (default: same as `failure_threshold`). Set higher than `failure_threshold` — UniFi switches/APs can take several minutes to rejoin after a firmware-update reboot, so a low threshold cuts tickets for momentary maintenance reboots instead of real failures. |
|
||||
| `monitor.unifi_failure_threshold` | Consecutive failures before ticketing a UniFi device as offline (default: same as `failure_threshold`). Set higher than `failure_threshold`: UniFi switches/APs can take several minutes to rejoin after a firmware-update reboot, so a low threshold cuts tickets for momentary maintenance reboots instead of real failures. |
|
||||
| `monitor.cluster_threshold` | Hosts with failures to trigger cluster-wide P1 (default: 3) |
|
||||
| `monitor.ping_hosts` | Hosts checked only by ping (no node_exporter) |
|
||||
| `monitor.stale_alert_days` | Days an alert can stay active before the dashboard flags it as stale (default: 3) |
|
||||
| `monitor.stale_ticket_hours` | Hours a ticket can stay open after all its alerts cleared before it is listed under Needs Follow-up (default: 24) |
|
||||
| `cutsheet.mismatch_ticket_hours` | Hours a cutsheet mismatch must last before it opens a P4 ticket (default: 24; `0` never tickets). The mismatch shows on the dashboard and the switch's page straight away, so recabling never pages anyone. Suppressing the switch or its port also stops the ticket. |
|
||||
| `modem.url` | AT&T gateway base URL. Omit the `modem` block to disable modem monitoring. Must be reachable from the monitor host. |
|
||||
| `modem.name` | Name used for the modem's alerts, tickets, and suppressions (default: `att-modem`) |
|
||||
@@ -480,7 +659,7 @@ Shared by both processes. Located in the working directory (`/var/www/html/prod/
|
||||
|
||||
## Deployment (LXC 157)
|
||||
|
||||
### 1. Database — MariaDB LXC 149 (`10.10.10.50`)
|
||||
### 1. Database: MariaDB LXC 149 (`10.10.10.50`)
|
||||
|
||||
```sql
|
||||
CREATE DATABASE gandalf CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
|
||||
@@ -494,7 +673,7 @@ Import schema:
|
||||
mysql -h 10.10.10.50 -u gandalf -p gandalf < schema.sql
|
||||
```
|
||||
|
||||
### 2. LXC 157 — Install dependencies
|
||||
### 2. LXC 157: Install dependencies
|
||||
|
||||
```bash
|
||||
pip3 install -r requirements.txt
|
||||
@@ -661,6 +840,7 @@ gandalf/
|
||||
├── monitor.py # Background daemon (Prometheus, UniFi, Pulse, alert logic)
|
||||
├── modem.py # Read-only AT&T gateway status page client and parser
|
||||
├── devices.py # Device inventory for search and device pages
|
||||
├── topology.py # The topology graph: devices, cables, depth, last-seen links
|
||||
├── cutsheet.py # Cutsheet validation, path tracing, plan-vs-actual checks, CSV
|
||||
├── ticket_text.py # Markdown for tickets and recovery notes
|
||||
├── db.py # Database operations (MariaDB via pymysql, thread-local conn reuse)
|
||||
@@ -674,6 +854,9 @@ gandalf/
|
||||
│ ├── cutsheet.js # Cutsheet page
|
||||
│ ├── events.js # Alert history page
|
||||
│ ├── rack.js # Rack drawing
|
||||
│ ├── topology.js # Topology page: layout, cables, pan and zoom
|
||||
│ ├── faceplates.js # UniFi faceplates drawn from each model's real layout
|
||||
│ ├── fronts.js # Drawn fronts for gear without a live faceplate (NVR, server cases)
|
||||
│ └── port-inspector.js # Switch front panel, port panel, path check, diagnostics
|
||||
└── templates/
|
||||
├── base.html # Shared layout (header, nav, footer)
|
||||
@@ -682,6 +865,7 @@ gandalf/
|
||||
├── cutsheet.html # Cutsheet page and its editors
|
||||
├── events.html # Alert history page
|
||||
├── rack.html # Rack drawing
|
||||
├── topology.html # Topology page
|
||||
├── _modem_panel.html # WAN / Fiber panel, shared by the dashboard and modem page
|
||||
└── suppressions.html # Suppression management page
|
||||
```
|
||||
@@ -697,6 +881,17 @@ gandalf/
|
||||
4. Restart monitor: `systemctl restart gandalf-monitor`
|
||||
5. For SFP DOM / ethtool: ensure the host is SSH-accessible from the Pulse worker
|
||||
|
||||
### Faceplates included
|
||||
|
||||
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
|
||||
adopted. If UniFi reports a Pro Max under a different model code, add it as another alias at the end of
|
||||
`static/faceplates.js`.
|
||||
|
||||
### Adding a New Device Faceplate
|
||||
|
||||
Find the UniFi model code on the device page, then add an entry to `FACEPLATES` in `static/faceplates.js`.
|
||||
@@ -717,14 +912,15 @@ Take LED colors from the model's quick start guide. See the comment at the top o
|
||||
|
||||
### Database Schema Notes
|
||||
|
||||
- `cutsheet_items` gained `rack`, `shelf`, `device` and `mount` columns; they are added automatically on first use
|
||||
- `cutsheet_items` gained `rack`, `shelf`, `device`, `mount`, `chassis`, `facing` and `slot` columns; they are added automatically on first use
|
||||
- `cutsheet_racks`: racks saved on the rack page (name, height, notes)
|
||||
- `unused_interfaces`: host interfaces marked unused (no alerts, not counted in host status)
|
||||
- `device_links`: each device's inventory URL, by device name; created with the cutsheet tables
|
||||
- `network_events`: one row per active event; `resolved_at` is set when recovered, and
|
||||
`recovery_notified` once the recovery note is on its ticket (column added automatically at monitor startup)
|
||||
- `suppression_rules`: `active=FALSE` when removed; `expires_at` checked at query time
|
||||
- `monitor_state`: key/value store; `interface_baseline`, `link_stats`, and `modem_stats` are JSON blobs
|
||||
- `monitor_state` also holds `wan_history` (WAN outages, modem restarts) and `unifi_log_cursor` (how far the UniFi log has been read)
|
||||
- `monitor_state` also holds `wan_history` (WAN outages, modem restarts), `wan_quality` (UniFi's 5 minute WAN health timeline) and `unifi_log_cursor` (how far the UniFi log has been read)
|
||||
- Database sessions run in UTC (`db.py`), whatever the server's time zone
|
||||
- `modem_samples`: optical readings per poll, kept 90 days; created automatically at monitor startup
|
||||
- `cutsheet_items`, `cutsheet_cables`, `cutsheet_port_labels`, `cutsheet_history`: cutsheet records and
|
||||
@@ -740,7 +936,7 @@ Take LED colors from the model's quick start guide. See the comment at the top o
|
||||
- **Interface name validation**: `monitor.py` validates SSH interface names against
|
||||
`^[a-zA-Z0-9_.@-]+$` before use, and additionally wraps them with `shlex.quote()`
|
||||
for defense-in-depth.
|
||||
- **DB parameters**: all SQL uses parameterised queries via pymysql — no string
|
||||
- **DB parameters**: all SQL uses parameterised queries via pymysql: no string
|
||||
concatenation into SQL.
|
||||
- **Auth**: Authelia enforces admin-only access at the NPM/LXC 167 layer; the Flask
|
||||
app additionally checks the `Remote-User` and `Remote-Groups` headers via `@require_auth`.
|
||||
@@ -753,13 +949,13 @@ Take LED colors from the model's quick start guide. See the comment at the top o
|
||||
|
||||
### Known Limitations
|
||||
|
||||
- Single gunicorn worker (`--workers 1`) — required because `db.py` uses thread-local
|
||||
- Single gunicorn worker (`--workers 1`): required because `db.py` uses thread-local
|
||||
connection reuse (one connection per thread). Multiple workers would each have their
|
||||
own connection, which is fine, but the thread-local optimisation only helps within
|
||||
one worker.
|
||||
- No CSRF tokens on API endpoints — mitigated by Authelia session cookies being
|
||||
- No CSRF tokens on API endpoints: mitigated by Authelia session cookies being
|
||||
`SameSite=Strict` and the site being admin-only.
|
||||
- SSH collection via Pulse is synchronous — if Pulse is slow, the entire monitor cycle
|
||||
- SSH collection via Pulse is synchronous: if Pulse is slow, the entire monitor cycle
|
||||
is delayed. The `pulse.timeout` config controls the max wait.
|
||||
- UniFi LLDP data is only as fresh as the last monitor poll (120s default).
|
||||
|
||||
@@ -771,11 +967,11 @@ Take LED colors from the model's quick start guide. See the comment at the top o
|
||||
|---|---|---|
|
||||
| `lint.yml` (python-lint) | flake8 on all `.py` files | Every push and PR |
|
||||
| `lint.yml` (js-lint) | ESLint on `static/` | Every push and PR |
|
||||
| `test.yml` | pytest — `diagnose.py`, `modem.py`, and `monitor.py` alert logic | Every push and PR |
|
||||
| `test.yml` | pytest: `diagnose.py`, `modem.py`, and `monitor.py` alert logic | Every push and PR |
|
||||
| `security.yml` | bandit `-ll` (medium+ severity) | Every push, PR, and weekly Monday 6am |
|
||||
| `deploy` job in `lint.yml` | Calls the `gandalf-deploy` webhook on CT157 (10.10.10.61) | Push to `main` only, after both lint jobs pass |
|
||||
|
||||
Branch protection is enabled on `main` — both lint jobs must pass before any PR can merge.
|
||||
Branch protection is enabled on `main`: both lint jobs must pass before any PR can merge.
|
||||
|
||||
Tests live in `tests/`:
|
||||
- `test_diagnose.py`: `DiagnosticsRunner` static methods (`build_ssh_command`, `parse_output`,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
"""Gandalf – Global Advanced Network Detection And Link Facilitator.
|
||||
"""Gandalf: Global Advanced Network Detection And Link Facilitator.
|
||||
|
||||
Flask web application serving the monitoring dashboard and suppression
|
||||
management UI. Authentication via Authelia forward-auth headers.
|
||||
@@ -22,10 +22,12 @@ 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
|
||||
import diagnose
|
||||
import topology
|
||||
from monitor import PulseClient, UnifiClient
|
||||
|
||||
logging.basicConfig(
|
||||
@@ -60,10 +62,23 @@ def inject_config():
|
||||
}
|
||||
|
||||
|
||||
@app.context_processor
|
||||
def inject_maintenance():
|
||||
"""The active global suppression (maintenance), shown as a banner on every page."""
|
||||
try:
|
||||
active = [s for s in db.get_active_suppressions() if s.get('target_type') == 'all']
|
||||
except Exception as e:
|
||||
logger.error(f'Reading maintenance state failed: {e}')
|
||||
active = []
|
||||
# Of several, the one that ends last decides when tickets resume; no expiry beats any
|
||||
active.sort(key=lambda s: (s.get('expires_at') is None, s.get('expires_at') or ''))
|
||||
return {'maintenance': active[-1] if active else None}
|
||||
|
||||
|
||||
# In-memory diagnostic job store { job_id: { status, result, created_at } }
|
||||
_diag_jobs: dict = {}
|
||||
_diag_lock = threading.Lock()
|
||||
# Per-user rate-limit: { username: [epoch_float, ...] } — cleaned inside _diag_lock
|
||||
# Per-user rate-limit: { username: [epoch_float, ...] }: cleaned inside _diag_lock
|
||||
_diag_rate: dict = {}
|
||||
|
||||
|
||||
@@ -80,7 +95,7 @@ def _purge_old_jobs_loop():
|
||||
for jid, j in list(_diag_jobs.items()):
|
||||
if j['status'] == 'running' and j.get('created_at', 0) < stuck_cutoff:
|
||||
j['status'] = 'done'
|
||||
j['result'] = {'status': 'error', 'error': 'Diagnostic abandoned — no activity for 5 minutes.'}
|
||||
j['result'] = {'status': 'error', 'error': 'Diagnostic abandoned: no activity for 5 minutes.'}
|
||||
logger.error(f'Diagnostic job {jid} stuck (no activity for 5 min); marked done/error')
|
||||
|
||||
|
||||
@@ -201,7 +216,7 @@ def require_auth(f):
|
||||
f'only auth.trusted_proxies may send them'
|
||||
)
|
||||
return (
|
||||
'<h1>401 – Not authenticated</h1>'
|
||||
'<h1>401: Not authenticated</h1>'
|
||||
'<p>Please access Gandalf through '
|
||||
'<a href="https://auth.lotusguild.org">auth.lotusguild.org</a>.</p>',
|
||||
401,
|
||||
@@ -211,7 +226,7 @@ def require_auth(f):
|
||||
safe_user = html.escape(user['username'])
|
||||
safe_groups = html.escape(', '.join(allowed))
|
||||
return (
|
||||
f'<h1>403 – Access denied</h1>'
|
||||
f'<h1>403: Access denied</h1>'
|
||||
f'<p>Your account ({safe_user}) is not in an allowed group '
|
||||
f'({safe_groups}).</p>',
|
||||
403,
|
||||
@@ -261,6 +276,72 @@ def _annotate_suppressions(events: list, suppressions: list) -> None:
|
||||
ev['is_suppressed'] = db.check_suppressed(suppressions, 'host', name, detail)
|
||||
|
||||
|
||||
# The monitor refreshes the open ticket list every 15 minutes; older than this and
|
||||
# it has stopped working, so nothing is flagged rather than flagging on stale data.
|
||||
_OPEN_TICKETS_MAX_AGE_S = 2 * 3600
|
||||
|
||||
|
||||
def _stale_settings() -> tuple:
|
||||
"""(days an alert can stay active before it counts as stale,
|
||||
hours a ticket can stay open after its alert cleared)."""
|
||||
mon = _config().get('monitor', {})
|
||||
try:
|
||||
days = float(mon.get('stale_alert_days', 3))
|
||||
hours = int(mon.get('stale_ticket_hours', 24))
|
||||
except (TypeError, ValueError):
|
||||
days, hours = 3.0, 24
|
||||
return days, hours
|
||||
|
||||
|
||||
def _open_tickets() -> Optional[dict]:
|
||||
"""{ticket_id: status} of open Tinker tickets, or None when the list is missing or out of date."""
|
||||
try:
|
||||
raw = db.get_state('open_tickets')
|
||||
data = json.loads(raw) if raw else None
|
||||
if not data or time.time() - float(data.get('checked_at', 0)) > _OPEN_TICKETS_MAX_AGE_S:
|
||||
return None
|
||||
return {str(k): v for k, v in (data.get('tickets') or {}).items()}
|
||||
except Exception as e:
|
||||
logger.error(f'Reading open ticket list failed: {e}')
|
||||
return None
|
||||
|
||||
|
||||
def _annotate_staleness(events: list, open_tickets: Optional[dict]) -> None:
|
||||
"""Add stale_days (set when an alert has been active too long) and ticket_closed
|
||||
(its ticket was closed in Tinker while the alert is still active) to each event."""
|
||||
days, _ = _stale_settings()
|
||||
now = datetime.now(timezone.utc)
|
||||
for ev in events:
|
||||
ev['stale_days'] = None
|
||||
ev['ticket_closed'] = False
|
||||
try:
|
||||
first = datetime.fromisoformat(str(ev.get('first_seen', '')).replace('Z', '+00:00'))
|
||||
if first.tzinfo is None:
|
||||
first = first.replace(tzinfo=timezone.utc)
|
||||
age = (now - first).total_seconds() / 86400
|
||||
if age >= days:
|
||||
ev['stale_days'] = int(age)
|
||||
except ValueError:
|
||||
pass
|
||||
tid = ev.get('ticket_id')
|
||||
if tid and open_tickets is not None and str(tid) not in open_tickets:
|
||||
ev['ticket_closed'] = True
|
||||
|
||||
|
||||
def _stale_view(events: list) -> list:
|
||||
"""Flag stale active alerts in place; return tickets left open after their alerts cleared."""
|
||||
open_tickets = _open_tickets()
|
||||
_annotate_staleness(events, open_tickets)
|
||||
if open_tickets is None:
|
||||
return []
|
||||
_, hours = _stale_settings()
|
||||
try:
|
||||
return db.get_cleared_tickets(list(open_tickets), older_than_hours=hours)
|
||||
except Exception as e:
|
||||
logger.error(f'Finding tickets left open failed: {e}')
|
||||
return []
|
||||
|
||||
|
||||
def _state_json(key: str) -> dict:
|
||||
"""Return a monitor_state JSON blob as a dict, or {} if missing or unreadable."""
|
||||
raw = db.get_state(key)
|
||||
@@ -294,6 +375,7 @@ def index():
|
||||
snapshot = {}
|
||||
suppressions = db.get_active_suppressions()
|
||||
_annotate_suppressions(events, suppressions)
|
||||
stale_tickets = _stale_view(events)
|
||||
recent_resolved = db.get_recent_resolved(hours=24, limit=10)
|
||||
return render_template(
|
||||
'index.html',
|
||||
@@ -305,6 +387,8 @@ def index():
|
||||
last_check=last_check,
|
||||
suppressions=suppressions,
|
||||
recent_resolved=recent_resolved,
|
||||
stale_tickets=stale_tickets,
|
||||
stale_alerts=sum(1 for e in events if e.get('stale_days') is not None or e.get('ticket_closed')),
|
||||
daemon_ok=_daemon_ok(last_check),
|
||||
)
|
||||
|
||||
@@ -406,11 +490,13 @@ def api_status():
|
||||
active = db.get_active_events(limit=_PAGE_LIMIT)
|
||||
suppressions = db.get_active_suppressions()
|
||||
_annotate_suppressions(active, suppressions)
|
||||
stale_tickets = _stale_view(active)
|
||||
last_check = db.get_state('last_check', 'Never')
|
||||
return jsonify({
|
||||
'summary': db.get_status_summary(),
|
||||
'last_check': last_check,
|
||||
'events': active,
|
||||
'stale_tickets': stale_tickets,
|
||||
'total_active': db.count_active_events(),
|
||||
'daemon_ok': _daemon_ok(last_check),
|
||||
})
|
||||
@@ -469,6 +555,7 @@ def api_modem():
|
||||
logger.error(f'Failed to load modem history: {e}')
|
||||
data['history'] = []
|
||||
data['wan_history'] = _state_json('wan_history')
|
||||
data['wan_quality'] = _state_json('wan_quality') or None
|
||||
data['configured'] = True
|
||||
return jsonify(data)
|
||||
|
||||
@@ -528,6 +615,12 @@ def api_device(name: str):
|
||||
logger.error(f'Cutsheet unavailable for {name}: {e}')
|
||||
detail['cutsheet'] = []
|
||||
detail['inventory'] = _inventory_for(name, detail.get('model') or '')
|
||||
try:
|
||||
_ensure_cutsheet_schema()
|
||||
detail['unused_interfaces'] = db.get_unused_interfaces().get(name, {})
|
||||
except Exception as e:
|
||||
logger.error(f'Unused interfaces unavailable for {name}: {e}')
|
||||
detail['unused_interfaces'] = {}
|
||||
return jsonify(detail)
|
||||
|
||||
|
||||
@@ -602,7 +695,7 @@ def api_create_suppression():
|
||||
)
|
||||
logger.info(
|
||||
f'Suppression #{sup_id} created by {user["username"]}: '
|
||||
f'{target_type}/{target_name}/{target_detail} – {reason}'
|
||||
f'{target_type}/{target_name}/{target_detail}: {reason}'
|
||||
)
|
||||
return jsonify({'success': True, 'id': sup_id})
|
||||
|
||||
@@ -814,7 +907,7 @@ def api_avatar():
|
||||
# Query lldap
|
||||
bind_pw = ldap_cfg.get('bind_pw', '')
|
||||
if not bind_pw:
|
||||
logger.error('LDAP bind_pw not configured — avatar lookup disabled')
|
||||
logger.error('LDAP bind_pw not configured: avatar lookup disabled')
|
||||
return '', 404
|
||||
|
||||
avatar_data = None
|
||||
@@ -832,7 +925,7 @@ def api_avatar():
|
||||
if conn.entries and conn.entries[0]['avatar'].value:
|
||||
avatar_data = conn.entries[0]['avatar'].value
|
||||
except ImportError:
|
||||
logger.error('ldap3 not installed — run: pip install ldap3')
|
||||
logger.error('ldap3 not installed; run pip install ldap3')
|
||||
return '', 404
|
||||
except Exception as e:
|
||||
logger.error(f'LDAP avatar lookup failed for {username}: {e}')
|
||||
@@ -941,7 +1034,11 @@ 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,
|
||||
'statuses': cutsheet.STATUSES, 'cable_types': cutsheet.CABLE_TYPES}
|
||||
data['updated'] = link_stats.get('updated')
|
||||
@@ -1104,6 +1201,9 @@ def _racks(items: list) -> list:
|
||||
return racks
|
||||
|
||||
|
||||
_physical_interfaces = devices.physical_interfaces
|
||||
|
||||
|
||||
def _device_status(name: str, snapshot: dict) -> str:
|
||||
host = (snapshot.get('hosts') or {}).get(name)
|
||||
if host:
|
||||
@@ -1122,8 +1222,8 @@ def api_rack():
|
||||
Query: rack (name; default the first rack), face (front|rear).
|
||||
"""
|
||||
face = request.args.get('face', 'front')
|
||||
if face not in ('front', 'rear'):
|
||||
return jsonify({'error': 'face must be front or rear'}), 400
|
||||
if face not in cutsheet.RACK_VIEWS:
|
||||
return jsonify({'error': f'face must be one of {", ".join(cutsheet.RACK_VIEWS)}'}), 400
|
||||
view = _cutsheet_view()
|
||||
link_stats = _state_json('link_stats')
|
||||
switches = link_stats.get('unifi_switches') or {}
|
||||
@@ -1144,7 +1244,9 @@ def api_rack():
|
||||
for r in racks:
|
||||
racked = [i for i in view['items'] if not i.get('shelf') and i.get('rack_u') and rack_of(i) == r['name']]
|
||||
r['count'] = len(racked)
|
||||
# How many items each view shows: rear-post gear is what "behind" and "rear" add
|
||||
r['rear'] = sum(1 for i in racked if i.get('mount') in ('rear', 'full'))
|
||||
r['behind'] = sum(1 for i in racked if i.get('mount') == 'rear')
|
||||
for cable in view['cables']:
|
||||
cable['run'] = [h['cable_id'] for h in cable['path'] if 'cable_id' in h]
|
||||
marks = cutsheet.port_marks(view['cables'])
|
||||
@@ -1174,6 +1276,7 @@ def api_rack():
|
||||
entry['device'] = device
|
||||
entry['linked'] = device in known
|
||||
entry['mount'] = item.get('mount') or 'front'
|
||||
entry['chassis'] = item.get('chassis') or ''
|
||||
entry['through'] = item.get('through', False)
|
||||
entry['url'] = url(item)
|
||||
entry['status'] = _device_status(device, snapshot) if device in known else ''
|
||||
@@ -1187,12 +1290,15 @@ def api_rack():
|
||||
'outlets': (unifi_info.get(device) or {}).get('outlets') or [],
|
||||
'online': online.get(device, True)}
|
||||
if item['kind'] == 'shelf':
|
||||
# Left to right: by position on the shelf, then by name
|
||||
entry['contents'] = [
|
||||
{'id': c['id'], 'name': c['name'], 'kind': c['kind'], 'url': url(c),
|
||||
'status': _device_status(dev(c), snapshot) if dev(c) in known else '',
|
||||
'model': next((u.get('model') for u in snapshot.get('unifi') or [] if u.get('name') == dev(c)), '')
|
||||
or '', 'notes': c.get('notes') or ''}
|
||||
for c in sorted(on_shelf.get(name, []), key=lambda c: c['name'].lower())
|
||||
or '', 'notes': c.get('notes') or '', 'chassis': c.get('chassis') or '',
|
||||
'slot': c.get('slot'), 'interfaces': _physical_interfaces(dev(c), snapshot),
|
||||
'device': dev(c), 'ports': (switches.get(dev(c)) or {}).get('ports') or {}}
|
||||
for c in sorted(on_shelf.get(name, []), key=lambda c: (c.get('slot') or 999, c['name'].lower()))
|
||||
]
|
||||
out.append(entry)
|
||||
return jsonify({
|
||||
@@ -1204,6 +1310,96 @@ def api_rack():
|
||||
})
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Topology
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@app.route('/topology')
|
||||
@require_auth
|
||||
def topology_page():
|
||||
user = _get_user()
|
||||
return render_template('topology.html', user=user, can_edit='admin' in user['groups'])
|
||||
|
||||
|
||||
@app.route('/api/topology')
|
||||
@require_auth
|
||||
def api_topology():
|
||||
"""Every device and physical cable, for the topology page (see topology.build_graph)."""
|
||||
events = db.get_active_events(limit=_PAGE_LIMIT)
|
||||
_annotate_suppressions(events, db.get_active_suppressions())
|
||||
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, 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, _state_json('wan_quality'))
|
||||
|
||||
|
||||
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'), feeds,
|
||||
)
|
||||
|
||||
|
||||
@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'])
|
||||
@require_auth
|
||||
@require_admin
|
||||
@@ -1237,6 +1433,36 @@ def api_cutsheet_delete_rack(rack_id: int):
|
||||
return jsonify({'success': True})
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Unused interfaces
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
_IFACE_RE = re.compile(r'^[A-Za-z0-9_.:@-]{1,64}$')
|
||||
|
||||
|
||||
@app.route('/api/device/<path:name>/interfaces/<iface>/unused', methods=['PUT', 'DELETE'])
|
||||
@require_auth
|
||||
@require_admin
|
||||
@_cutsheet_write
|
||||
def api_interface_unused(name: str, iface: str):
|
||||
"""Mark a host interface unused (PUT {reason}) or in use again (DELETE).
|
||||
|
||||
Unused interfaces raise no link-down alerts and don't count toward the host's status;
|
||||
marking one quietly closes any link-down alert it has open.
|
||||
"""
|
||||
if len(name) > 255 or not _IFACE_RE.match(iface):
|
||||
raise cutsheet.ValidationError('Not a valid host or interface name')
|
||||
user = _get_user()['username']
|
||||
if request.method == 'DELETE':
|
||||
found = db.clear_unused_interface(name, iface)
|
||||
logger.info(f'{user} marked {name} {iface} in use again')
|
||||
return jsonify({'success': True, 'changed': found})
|
||||
reason = str(_json_body().get('reason') or '').strip()[:255]
|
||||
db.set_unused_interface(name, iface, reason, user)
|
||||
logger.info(f'{user} marked {name} {iface} unused: {reason or "(no reason)"}')
|
||||
return jsonify({'success': True})
|
||||
|
||||
|
||||
@app.route('/api/cutsheet/cables', methods=['POST'])
|
||||
@require_auth
|
||||
@require_admin
|
||||
@@ -1414,4 +1640,4 @@ def health():
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
app.run(debug=True, host='0.0.0.0', port=5000) # nosec B201 B104 — dev runner only; production uses gunicorn
|
||||
app.run(debug=True, host='0.0.0.0', port=5000) # nosec B201 B104: dev runner only; production uses gunicorn
|
||||
+176
@@ -0,0 +1,176 @@
|
||||
"""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.
|
||||
"""
|
||||
import time
|
||||
from typing import Dict, List, Optional
|
||||
|
||||
import modem
|
||||
|
||||
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
|
||||
|
||||
|
||||
# UniFi's WAN timeline: judge the last hour, and ignore a copy the monitor stopped refreshing
|
||||
_WAN_WINDOW_S = 3600
|
||||
_WAN_STALE_S = 1800
|
||||
_WAN_BAD_PERIODS = 3 # periods with any problem before the list mentions it
|
||||
_WAN_LOSS_PERIODS = 2 # periods with packet loss before it counts as broken
|
||||
|
||||
|
||||
def _ago(seconds: float) -> str:
|
||||
minutes = max(1, round(seconds / 60))
|
||||
return f'{minutes} min ago' if minutes < 60 else f'{round(minutes / 60)} h ago'
|
||||
|
||||
|
||||
def _wan(quality: Optional[dict], now: float) -> List[dict]:
|
||||
if not quality or now - (quality.get('updated') or 0) > _WAN_STALE_S:
|
||||
return []
|
||||
out = []
|
||||
periods = quality.get('periods') or []
|
||||
# The last hour is the newest 12 periods (each stamped with its start), so the count
|
||||
# doesn't dip while UniFi is still filling in the current one
|
||||
newest = periods[-1]['ts'] if periods else now
|
||||
recent = modem.quality_counts(periods, newest - _WAN_WINDOW_S + modem.QUALITY_PERIOD_S)
|
||||
total = sum(recent.values())
|
||||
bad = total - recent['ok']
|
||||
day = modem.quality_counts(periods, now - 86400)
|
||||
day_bad = sum(day.values()) - day['ok']
|
||||
latencies = quality.get('latencies') or {}
|
||||
detail = (f'UniFi flagged {day_bad} of the last {sum(day.values())} five-minute periods. '
|
||||
if day_bad else '')
|
||||
if latencies:
|
||||
detail += 'Now: ' + ', '.join(f'{k} {v} ms' for k, v in sorted(latencies.items())) + '. '
|
||||
detail += 'See the 24 hour strip on the WAN / Fiber panel.'
|
||||
lossy = recent['loss'] + recent['down']
|
||||
if lossy >= _WAN_LOSS_PERIODS:
|
||||
out.append(_entry('broken', 'bad', f'Internet: packet loss in {lossy} of the last {total} '
|
||||
'five-minute periods', '#modem-section', detail))
|
||||
elif bad >= _WAN_BAD_PERIODS:
|
||||
out.append(_entry('broken', 'warn', f'Internet: high latency in {bad} of the last {total} '
|
||||
'five-minute periods', '#modem-section', detail))
|
||||
drops = [d for d in quality.get('downtime') or [] if d['ts'] >= now - _WAN_WINDOW_S]
|
||||
if len(drops) == 1:
|
||||
out.append(_entry('broken', 'warn', f'Internet dropped for {round(drops[0]["seconds"])} s, '
|
||||
f'{_ago(now - drops[0]["ts"])}', '#modem-section'))
|
||||
elif drops:
|
||||
out.append(_entry('broken', 'warn', f'Internet dropped {len(drops)} times in the last hour, '
|
||||
f'{round(sum(d["seconds"] for d in drops))} s in all',
|
||||
'#modem-section'))
|
||||
return out
|
||||
|
||||
|
||||
def build(events: List[dict], power: List[dict], cutsheet_view: Optional[dict],
|
||||
rack_issues: Optional[Dict[str, dict]] = None, wan_quality: Optional[dict] = None,
|
||||
now: Optional[float] = 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()}.
|
||||
wan_quality: modem.wan_quality() output as stored by the monitor. now: for tests.
|
||||
Entry: {group, severity: bad|warn|info, text, href, detail}.
|
||||
"""
|
||||
entries = _wan(wan_quality, time.time() if now is None else now) + _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
|
||||
+48
-9
@@ -25,7 +25,31 @@ ITEM_KINDS = ('patch_panel', 'wall_jack', 'device', 'shelf', 'other')
|
||||
# Which side of a 4-post rack an item is mounted from. A front and a rear item can share
|
||||
# a unit; a full-depth one (a server) takes the unit on both sides.
|
||||
MOUNTS = ('front', 'rear', 'full')
|
||||
# Which way an item's ports face. Gear on the rear posts usually still faces the front.
|
||||
FACINGS = ('front', 'rear')
|
||||
# Rack views: the front posts seen from the front, the rear posts seen from the front
|
||||
# (what is behind the front gear), and the rack seen from behind
|
||||
RACK_VIEWS = ('front', 'behind', 'rear')
|
||||
RACK_UNITS_MAX = 60
|
||||
# Drawn fronts for gear without a live faceplate (keys of RACK_FRONTS in static/fronts.js)
|
||||
CHASSIS = {
|
||||
'unvr-pro': 'UniFi NVR Pro (UNVR Pro)',
|
||||
'uacc-patch-24': 'UniFi Patch Panel Blank 24 (UACC-Rack-Panel-Patch-Blank-24)',
|
||||
'usw-pro-max-24-poe': 'UniFi Switch Pro Max 24 PoE (until UniFi reports it)',
|
||||
'usw-pro-max-48-poe': 'UniFi Switch Pro Max 48 PoE (until UniFi reports it)',
|
||||
'sliger-cx4712': 'Sliger CX4712 4U (10-bay, faceplate off)',
|
||||
'sliger-cx4712-red': 'Sliger CX4712 4U, red front',
|
||||
'sliger-cx4712-white': 'Sliger CX4712 4U, white front',
|
||||
'sliger-cx4712-blue': 'Sliger CX4712 4U, blue front',
|
||||
'uacc-brush-1u': 'UniFi Rack Panel Brush 1U (UACC-Rack-Panel-Brush-1U)',
|
||||
'rosewill-rsv-l4500u': 'Rosewill RSV-L4500U 4U (15-bay)',
|
||||
'zimaboard-832': 'IceWhale ZimaBoard 832 (shelf gear)',
|
||||
'zimaboard-832-cx3': 'IceWhale ZimaBoard 832 + ConnectX-3 SFP+ in PCIe (shelf gear)',
|
||||
'resting': 'No shelf: gear resting on what is below (for a shelf item)',
|
||||
'server-1u': 'Generic 1U server',
|
||||
'server-2u': 'Generic 2U server',
|
||||
'server-4u': 'Generic 4U server',
|
||||
}
|
||||
PASSIVE_KINDS = ('patch_panel', 'wall_jack')
|
||||
SIDES = ('front', 'rear')
|
||||
STATUSES = ('planned', 'installed', 'dark', 'retired')
|
||||
@@ -99,9 +123,18 @@ def validate_item(data: dict, items: Optional[Dict[str, dict]] = None) -> dict:
|
||||
'rack': _text(data, 'rack', RACK_NAME_MAX),
|
||||
'device': _text(data, 'device'),
|
||||
'mount': _text(data, 'mount', 10) or 'front',
|
||||
'chassis': _text(data, 'chassis', 40),
|
||||
'facing': _text(data, 'facing', 10) or 'front',
|
||||
'slot': _int(data, 'slot', 1, 99, 'Position on the shelf'),
|
||||
'shelf': _text(data, 'shelf', NAME_MAX),
|
||||
'notes': _text(data, 'notes', NOTES_MAX),
|
||||
}
|
||||
if item['chassis'] and item['chassis'] not in CHASSIS:
|
||||
raise ValidationError(f'Unknown front drawing {item["chassis"]}')
|
||||
if item['facing'] not in FACINGS:
|
||||
raise ValidationError(f'facing must be one of {", ".join(FACINGS)}')
|
||||
if item['slot'] and not item['shelf']:
|
||||
raise ValidationError('A position applies only to an item on a shelf')
|
||||
if item['mount'] not in MOUNTS:
|
||||
raise ValidationError(f'mount must be one of {", ".join(MOUNTS)}')
|
||||
if item['shelf']:
|
||||
@@ -114,6 +147,7 @@ def validate_item(data: dict, items: Optional[Dict[str, dict]] = None) -> dict:
|
||||
raise ValidationError('An item on a shelf takes its rack position from the shelf; clear the rack unit')
|
||||
item['rack'] = '' # the shelf's rack and side
|
||||
item['mount'] = 'front'
|
||||
item['facing'] = 'front'
|
||||
if item['rack_height'] and not item['rack_u']:
|
||||
raise ValidationError('Set a rack unit to go with the height')
|
||||
if item['rack_u'] and not item['rack_height']:
|
||||
@@ -589,15 +623,20 @@ def _sides(item: dict) -> Tuple[str, ...]:
|
||||
|
||||
|
||||
def rack_layout(items: List[dict], units: int, face: str = 'front') -> dict:
|
||||
"""Place items that have a rack unit, top of the rack first, as seen from one face.
|
||||
"""Place items that have a rack unit, top of the rack first, for one view.
|
||||
|
||||
Front and rear items may share a unit; full-depth items take it on both sides.
|
||||
An item that would share a unit and side with one already placed, or runs past the
|
||||
top of the rack, is reported (whichever face is asked for) rather than drawn over another.
|
||||
Front-post and rear-post items may share a unit; full-depth items take it on both.
|
||||
Views (RACK_VIEWS): 'front' shows the front posts from the front; 'behind' shows the
|
||||
rear posts from the front (what sits behind the front gear); 'rear' shows the rear posts
|
||||
from behind. Full-depth items appear in all three.
|
||||
An item that would share a unit and post with one already placed, or runs past the
|
||||
top of the rack, is reported (whatever the view) rather than drawn over another.
|
||||
Returns {'placed': [item + 'rack_top' + 'through'], 'overlaps': [{'name', 'units', 'with'}],
|
||||
'outside': [name]}, where 'through' marks a full-depth item seen from the side it isn't faced to
|
||||
(its back, for the rear view).
|
||||
'outside': [name]}, where 'through' marks an item seen from the side it doesn't face
|
||||
(its back, rather than its ports).
|
||||
"""
|
||||
side = 'front' if face == 'front' else 'rear'
|
||||
looking = 'rear' if face == 'rear' else 'front'
|
||||
taken: Dict[tuple, str] = {}
|
||||
placed, overlaps, outside = [], [], []
|
||||
racked = [i for i in items if i.get('rack_u')]
|
||||
@@ -605,7 +644,7 @@ def rack_layout(items: List[dict], units: int, face: str = 'front') -> dict:
|
||||
for item in sorted(racked, key=lambda i: (-(i['rack_u'] + (i.get('rack_height') or 1)), i.get('id') or 0)):
|
||||
low = item['rack_u']
|
||||
high = low + (item.get('rack_height') or 1) - 1
|
||||
span = f'U{low}' if high == low else f'U{low}–{high}'
|
||||
span = f'U{low}' if high == low else f'U{low}-{high}'
|
||||
if high > units:
|
||||
outside.append({'name': item['name'], 'units': span})
|
||||
continue
|
||||
@@ -617,8 +656,8 @@ def rack_layout(items: List[dict], units: int, face: str = 'front') -> dict:
|
||||
continue
|
||||
for c in cells:
|
||||
taken[c] = item['name']
|
||||
if face in sides:
|
||||
placed.append(dict(item, rack_top=high, through=item.get('mount') == 'full' and face == 'rear'))
|
||||
if side in sides:
|
||||
placed.append(dict(item, rack_top=high, through=(item.get('facing') or 'front') != looking))
|
||||
return {'placed': placed, 'overlaps': overlaps, 'outside': outside}
|
||||
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import logging
|
||||
import threading
|
||||
from contextlib import contextmanager
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from typing import Optional
|
||||
from typing import List, Optional
|
||||
|
||||
import pymysql
|
||||
import pymysql.cursors
|
||||
@@ -198,6 +198,35 @@ def set_ticket_id(event_id: int, ticket_id: str) -> None:
|
||||
)
|
||||
|
||||
|
||||
def get_incident_ticket(target_name: str, within_s: int) -> Optional[str]:
|
||||
"""The ticket of *target_name*'s newest event that is still open or ended within *within_s*."""
|
||||
with get_conn() as conn:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"""SELECT ticket_id FROM network_events
|
||||
WHERE target_name=%s AND ticket_id IS NOT NULL AND ticket_id <> ''
|
||||
AND (resolved_at IS NULL OR resolved_at >= NOW() - INTERVAL %s SECOND)
|
||||
ORDER BY first_seen DESC, id DESC LIMIT 1""",
|
||||
(target_name, int(within_s)),
|
||||
)
|
||||
row = cur.fetchone()
|
||||
return row['ticket_id'] if row else None
|
||||
|
||||
|
||||
def get_ticket_ids_between(target_name: str, start: datetime, end: datetime) -> List[str]:
|
||||
"""Tickets of *target_name*'s events first seen between *start* and *end* (UTC), oldest first."""
|
||||
with get_conn() as conn:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"""SELECT ticket_id, MIN(first_seen) AS first FROM network_events
|
||||
WHERE target_name=%s AND ticket_id IS NOT NULL AND ticket_id <> ''
|
||||
AND first_seen BETWEEN %s AND %s
|
||||
GROUP BY ticket_id ORDER BY first""",
|
||||
(target_name, start, end),
|
||||
)
|
||||
return [r['ticket_id'] for r in cur.fetchall()]
|
||||
|
||||
|
||||
def get_active_events(limit: int = 200, offset: int = 0) -> list:
|
||||
with get_conn() as conn:
|
||||
with conn.cursor() as cur:
|
||||
@@ -218,6 +247,49 @@ def get_active_events(limit: int = 200, offset: int = 0) -> list:
|
||||
return rows
|
||||
|
||||
|
||||
def get_cleared_tickets(open_ids: List[str], older_than_hours: int = 24) -> list:
|
||||
"""Of the given open tickets, those whose every alert cleared at least `older_than_hours` ago.
|
||||
|
||||
One row per ticket, describing its most recent alert, newest clearance first:
|
||||
{ticket_id, event_type, target_name, target_detail, severity, first_seen, cleared_at, events}
|
||||
"""
|
||||
ids = sorted({str(i) for i in open_ids if i})
|
||||
if not ids:
|
||||
return []
|
||||
placeholders = ','.join(['%s'] * len(ids))
|
||||
with get_conn() as conn:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
f"""SELECT ticket_id, event_type, target_name, target_detail, severity,
|
||||
first_seen, resolved_at
|
||||
FROM network_events WHERE ticket_id IN ({placeholders})
|
||||
ORDER BY first_seen""", # nosec B608: placeholders are only %s markers
|
||||
ids,
|
||||
)
|
||||
rows = cur.fetchall()
|
||||
cur.execute('SELECT NOW() AS now')
|
||||
now = cur.fetchone()['now']
|
||||
by_ticket: dict = {}
|
||||
for r in rows:
|
||||
by_ticket.setdefault(str(r['ticket_id']), []).append(r)
|
||||
out = []
|
||||
for tid, events in by_ticket.items():
|
||||
if any(e['resolved_at'] is None for e in events):
|
||||
continue
|
||||
cleared = max(e['resolved_at'] for e in events)
|
||||
if (now - cleared).total_seconds() < older_than_hours * 3600:
|
||||
continue
|
||||
last = events[-1]
|
||||
out.append({
|
||||
'ticket_id': tid, 'event_type': last['event_type'], 'target_name': last['target_name'],
|
||||
'target_detail': last['target_detail'], 'severity': last['severity'],
|
||||
'first_seen': events[0]['first_seen'].isoformat() + 'Z',
|
||||
'cleared_at': cleared.isoformat() + 'Z', 'events': len(events),
|
||||
})
|
||||
out.sort(key=lambda r: r['cleared_at'], reverse=True)
|
||||
return out
|
||||
|
||||
|
||||
def count_active_events() -> int:
|
||||
"""Return count of all unresolved events (for pagination)."""
|
||||
with get_conn() as conn:
|
||||
@@ -678,6 +750,9 @@ _CUTSHEET_SCHEMA = (
|
||||
shelf VARCHAR(100) NOT NULL DEFAULT '',
|
||||
device VARCHAR(255) NOT NULL DEFAULT '',
|
||||
mount VARCHAR(10) NOT NULL DEFAULT 'front',
|
||||
chassis VARCHAR(40) NOT NULL DEFAULT '',
|
||||
facing VARCHAR(10) NOT NULL DEFAULT 'front',
|
||||
slot SMALLINT NULL,
|
||||
notes TEXT NULL,
|
||||
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
||||
updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||
@@ -735,6 +810,15 @@ _CUTSHEET_SCHEMA = (
|
||||
updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||
UNIQUE KEY uq_rack_name (name)
|
||||
) ENGINE=InnoDB""",
|
||||
# Host interfaces an admin has marked as not in use: no alerts, not counted in host status
|
||||
"""CREATE TABLE IF NOT EXISTS unused_interfaces (
|
||||
host VARCHAR(255) NOT NULL,
|
||||
iface VARCHAR(64) NOT NULL,
|
||||
reason VARCHAR(255) NOT NULL DEFAULT '',
|
||||
set_by VARCHAR(255) NOT NULL,
|
||||
set_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
PRIMARY KEY (host, iface)
|
||||
) ENGINE=InnoDB""",
|
||||
# Where a device lives in the asset inventory (HomeBox), set by hand on its Gandalf page
|
||||
"""CREATE TABLE IF NOT EXISTS device_links (
|
||||
name VARCHAR(255) NOT NULL PRIMARY KEY,
|
||||
@@ -742,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:
|
||||
@@ -768,7 +887,7 @@ def set_device_link(name: str, inventory_url: str, user: str) -> None:
|
||||
)
|
||||
|
||||
_ITEM_FIELDS = ('name', 'kind', 'port_count', 'location', 'rack_u', 'rack_height', 'rack', 'shelf', 'device',
|
||||
'mount', 'notes')
|
||||
'mount', 'chassis', 'facing', 'slot', 'notes')
|
||||
# Columns added to cutsheet_items after its first release: (name, definition)
|
||||
_ITEM_COLUMNS_ADDED = (
|
||||
('rack', "VARCHAR(100) NOT NULL DEFAULT ''"),
|
||||
@@ -776,6 +895,11 @@ _ITEM_COLUMNS_ADDED = (
|
||||
# The Gandalf device (UniFi or host name) an item is, when its own name differs
|
||||
('device', "VARCHAR(255) NOT NULL DEFAULT ''"),
|
||||
('mount', "VARCHAR(10) NOT NULL DEFAULT 'front'"),
|
||||
('chassis', "VARCHAR(40) NOT NULL DEFAULT ''"),
|
||||
# Which way the ports face, independent of which posts it hangs on
|
||||
('facing', "VARCHAR(10) NOT NULL DEFAULT 'front'"),
|
||||
# Left-to-right position on a shelf
|
||||
('slot', 'SMALLINT NULL'),
|
||||
)
|
||||
_CABLE_FIELDS = ('label', 'a_device', 'a_port', 'a_side', 'b_device', 'b_port', 'b_side',
|
||||
'cable_type', 'length_m', 'color', 'status', 'label_applied', 'notes')
|
||||
@@ -1099,3 +1223,47 @@ def cutsheet_delete_rack(rack_id: int, user: str) -> bool:
|
||||
cur.execute('DELETE FROM cutsheet_racks WHERE id=%s', (rack_id,))
|
||||
_cs_log(cur, user, 'rack', rack_id, 'delete', f'Removed rack {before["name"]}', _cs_jsonable(before), None)
|
||||
return True
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Unused interfaces: ports an admin says aren't meant to be up
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def get_unused_interfaces() -> dict:
|
||||
"""{host: {iface: {'reason', 'set_by', 'set_at'}}}"""
|
||||
with get_conn() as conn:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute('SELECT host, iface, reason, set_by, set_at FROM unused_interfaces')
|
||||
out: dict = {}
|
||||
for r in cur.fetchall():
|
||||
at = r['set_at'].isoformat() + 'Z' if hasattr(r['set_at'], 'isoformat') else r['set_at']
|
||||
out.setdefault(r['host'], {})[r['iface']] = {'reason': r['reason'], 'set_by': r['set_by'],
|
||||
'set_at': at}
|
||||
return out
|
||||
|
||||
|
||||
def set_unused_interface(host: str, iface: str, reason: str, user: str) -> None:
|
||||
"""Mark an interface unused and quietly close any link-down alert it has open.
|
||||
|
||||
The alert is resolved without a recovery note: nothing recovered, the port just isn't used.
|
||||
"""
|
||||
with get_conn() as conn:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"""INSERT INTO unused_interfaces (host, iface, reason, set_by) VALUES (%s, %s, %s, %s)
|
||||
ON DUPLICATE KEY UPDATE reason=VALUES(reason), set_by=VALUES(set_by)""",
|
||||
(host, iface, reason, user),
|
||||
)
|
||||
cur.execute(
|
||||
"""UPDATE network_events SET resolved_at=NOW(), recovery_notified=1, last_seen=last_seen
|
||||
WHERE event_type='interface_down' AND target_name=%s AND target_detail=%s
|
||||
AND resolved_at IS NULL""",
|
||||
(host, iface),
|
||||
)
|
||||
|
||||
|
||||
def clear_unused_interface(host: str, iface: str) -> bool:
|
||||
with get_conn() as conn:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute('DELETE FROM unused_interfaces WHERE host=%s AND iface=%s', (host, iface))
|
||||
return cur.rowcount > 0
|
||||
+13
@@ -14,6 +14,19 @@ _KIND_BY_TYPE = {
|
||||
}
|
||||
|
||||
|
||||
_VIRTUAL_IFACE = ('lo', 'vmbr', 'bond', 'docker', 'veth', 'tap', 'fwbr', 'fwpr', 'fwln', 'br-', 'virbr', 'wg', 'tun')
|
||||
|
||||
|
||||
def physical_interfaces(name: str, snapshot: dict) -> List[dict]:
|
||||
"""A host's physical NICs in name order, with their state: [{'name', 'up', 'unused'}].
|
||||
|
||||
Drawn fronts light one RJ45 per NIC in this order (first NIC on the leftmost jack).
|
||||
"""
|
||||
ifaces = (((snapshot or {}).get('hosts') or {}).get(name) or {}).get('interfaces') or {}
|
||||
return [{'name': n, 'up': str(state).lower() == 'up', 'unused': str(state).lower() == 'unused'}
|
||||
for n, state in sorted(ifaces.items()) if not n.startswith(_VIRTUAL_IFACE)]
|
||||
|
||||
|
||||
def unifi_kind(unifi_type: str, model: str) -> str:
|
||||
if model in _PDU_MODELS:
|
||||
return 'pdu'
|
||||
|
||||
+12
-12
@@ -1,4 +1,4 @@
|
||||
"""Gandalf – Link Diagnostics module.
|
||||
"""Gandalf: Link Diagnostics module.
|
||||
|
||||
Runs a comprehensive SSH-based diagnostic against a server NIC and
|
||||
analyses the result against switch port data to surface root causes.
|
||||
@@ -475,7 +475,7 @@ class DiagnosticsRunner:
|
||||
# Physical carrier
|
||||
if carrier == '0':
|
||||
add(issues, 'NO_CARRIER',
|
||||
'No physical carrier — cable/SFP disconnected or switch port disabled')
|
||||
'No physical carrier: cable/SFP disconnected or switch port disabled')
|
||||
elif eth.get('link_detected') is False and carrier != '0':
|
||||
add(issues, 'LINK_NOT_DETECTED',
|
||||
'NIC does not detect link signal despite carrier sysfs reading non-zero')
|
||||
@@ -483,7 +483,7 @@ class DiagnosticsRunner:
|
||||
# Duplex
|
||||
if eth.get('duplex') == 'half':
|
||||
add(issues, 'HALF_DUPLEX',
|
||||
'Half-duplex detected — likely duplex mismatch; force full-duplex on both ends')
|
||||
'Half-duplex detected: likely duplex mismatch; force full-duplex on both ends')
|
||||
|
||||
# Speed mismatch (switch vs server NIC)
|
||||
sw_speed = switch_port_data.get('speed_mbps', 0) or 0
|
||||
@@ -498,31 +498,31 @@ class DiagnosticsRunner:
|
||||
if rx_dbm is not None:
|
||||
if rx_dbm < -25:
|
||||
add(issues, 'SFP_RX_CRITICAL',
|
||||
f'RX power critically low ({rx_dbm:.2f} dBm) — fiber not connected or SFP failed')
|
||||
f'RX power critically low ({rx_dbm:.2f} dBm): fiber not connected or SFP failed')
|
||||
elif rx_dbm < -18:
|
||||
add(warnings, 'SFP_RX_LOW',
|
||||
f'RX power low ({rx_dbm:.2f} dBm) — check fiber cleanliness and SFP seating')
|
||||
f'RX power low ({rx_dbm:.2f} dBm): check fiber cleanliness and SFP seating')
|
||||
if tx_dbm is not None and tx_dbm < -10:
|
||||
add(warnings, 'SFP_TX_LOW',
|
||||
f'TX power low ({tx_dbm:.2f} dBm) — SFP may be failing or requires cleaning')
|
||||
f'TX power low ({tx_dbm:.2f} dBm): SFP may be failing or requires cleaning')
|
||||
|
||||
# Carrier changes (flapping)
|
||||
if cc is not None:
|
||||
if cc > 100:
|
||||
add(issues, 'CARRIER_FLAPPING',
|
||||
f'Link has flapped {cc} times — severe physical instability')
|
||||
f'Link has flapped {cc} times: severe physical instability')
|
||||
elif cc > 20:
|
||||
add(warnings, 'CARRIER_FLAPS',
|
||||
f'Link has flapped {cc} times — intermittent physical issue')
|
||||
f'Link has flapped {cc} times: intermittent physical issue')
|
||||
|
||||
# CRC errors
|
||||
crc = sysfs.get('rx_crc_errors', 0) or 0
|
||||
if crc > 100:
|
||||
add(issues, 'CRC_ERRORS_HIGH',
|
||||
f'High CRC error count ({crc}) — dirty fiber/connector or cable damage')
|
||||
f'High CRC error count ({crc}): dirty fiber/connector or cable damage')
|
||||
elif crc > 10:
|
||||
add(warnings, 'CRC_ERRORS_LOW',
|
||||
f'CRC errors present ({crc}) — cable or SFP quality issue')
|
||||
f'CRC errors present ({crc}): cable or SFP quality issue')
|
||||
|
||||
# Kernel events
|
||||
err_events = [e for e in dmesg if e['severity'] == 'error']
|
||||
@@ -540,9 +540,9 @@ class DiagnosticsRunner:
|
||||
if expected_switch and srv_neighbor and names_differ:
|
||||
add(warnings, 'LLDP_MISMATCH',
|
||||
f'LLDP mismatch: this port is on "{switch_port_data.get("switch_name")}" but the server\'s '
|
||||
f'lldpctl sees "{lldp.get("neighbor_system")}" — cross-cabled port?')
|
||||
f'lldpctl sees "{lldp.get("neighbor_system")}": cross-cabled port?')
|
||||
else:
|
||||
add(info, 'LLDP_MISSING',
|
||||
'lldpd not running on server — install lldpd for full path validation')
|
||||
'lldpd not running on server: install lldpd for full path validation')
|
||||
|
||||
return {'issues': issues, 'warnings': warnings, 'info': info}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 90 KiB After Width: | Height: | Size: 161 KiB |
@@ -242,6 +242,31 @@ LOG_WAN_RESTORED = 'NETWORK_WAN_RESTORED_2'
|
||||
LOG_WAN_UNSTABLE = 'NETWORK_WAN_FAILED_MULTIPLE_TIMES_2'
|
||||
LOG_MODEM_RESTARTED = 'SMART_POWER_MODEM_RESTARTED'
|
||||
WAN_LOG_KEYS = (LOG_WAN_FAILED, LOG_WAN_RESTORED, LOG_WAN_UNSTABLE, LOG_MODEM_RESTARTED)
|
||||
# An app or firmware update finishing. The UDM often drops its WAN while the Network app
|
||||
# updates, and Smart Power may then power-cycle a modem that was fine.
|
||||
LOG_NETWORK_UPDATED = 'NETWORK_UPDATED'
|
||||
LOG_FIRMWARE_UPDATED = 'FIRMWARE_UPDATED_V2'
|
||||
_UPDATE_KEY_RE = re.compile(r'[A-Z_]+_(?:UPDATED|UPGRADED)(?:_V\d+)?')
|
||||
|
||||
|
||||
def is_update_key(key: str) -> bool:
|
||||
"""True for log keys that mean an update finished (other app names follow the same pattern)."""
|
||||
return key in (LOG_NETWORK_UPDATED, LOG_FIRMWARE_UPDATED) or (
|
||||
bool(_UPDATE_KEY_RE.fullmatch(key or '')) and 'AVAILABLE' not in key
|
||||
and not key.startswith('MADE_CHANGES'))
|
||||
|
||||
|
||||
def wanted_log_key(key: str) -> bool:
|
||||
return key in WAN_LOG_KEYS or is_update_key(key)
|
||||
|
||||
|
||||
def update_label(event: dict) -> str:
|
||||
"""'UniFi Network 11.0.97 to 11.0.99' from an update log event."""
|
||||
what = event.get('app') or event.get('device') or 'UniFi'
|
||||
before, after = event.get('previous') or '', event.get('version') or ''
|
||||
if before and after:
|
||||
return f'{what} {before} to {after}'
|
||||
return f'{what} {after}'.strip()
|
||||
|
||||
_HISTORY_LIMIT = 50
|
||||
# The RPDU's log entry and the gateway's calculated boot time can differ by this much.
|
||||
@@ -285,3 +310,53 @@ def record_uptime_reset(history: dict, boot_ts: float) -> None:
|
||||
return
|
||||
restarts.append({'at': boot_ts, 'by': None, 'confirmed': True})
|
||||
del restarts[:-_HISTORY_LIMIT]
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# WAN quality: UniFi's own 5 minute health timeline (high latency, packet loss, down),
|
||||
# the same data its Network app charts. Read only; Gandalf doesn't measure it again.
|
||||
# ---------------------------------------------------------------------------
|
||||
QUALITY_STATES = ('ok', 'latency', 'loss', 'down') # mildest to worst
|
||||
QUALITY_PERIOD_S = 300
|
||||
|
||||
|
||||
def wan_quality(dashboard: dict, now: float) -> Optional[dict]:
|
||||
"""The primary WAN's health timeline from UniFi's aggregated dashboard, or None.
|
||||
|
||||
Returns {'wan', 'periods': [{'ts', 'state'}], 'downtime': [{'ts', 'seconds'}],
|
||||
'latencies': {service: ms}, 'updated'}. Each period is 5 minutes; its state is the
|
||||
worst flag UniFi set for it.
|
||||
"""
|
||||
details = ((dashboard or {}).get('wan_history') or {}).get('wan_history_details') or []
|
||||
if not details:
|
||||
return None
|
||||
primary = next((d for d in details if d.get('network_group') == 'WAN'), details[0])
|
||||
periods = []
|
||||
for h in primary.get('health_history') or []:
|
||||
if not isinstance(h.get('timestamp'), (int, float)):
|
||||
continue
|
||||
state = ('down' if h.get('wan_downtime') else 'loss' if h.get('packet_loss')
|
||||
else 'latency' if h.get('high_latency') else 'ok')
|
||||
periods.append({'ts': h['timestamp'] / 1000, 'state': state})
|
||||
periods.sort(key=lambda p: p['ts'])
|
||||
downtime = sorted(
|
||||
({'ts': d['timestamp'] / 1000, 'seconds': d.get('downtime_in_seconds') or 0}
|
||||
for d in primary.get('downtime_history') or [] if isinstance(d.get('timestamp'), (int, float))),
|
||||
key=lambda d: d['ts'])
|
||||
latencies = {}
|
||||
for w in ((dashboard.get('wan') or {}).get('wan_details') or []):
|
||||
if w.get('network_group') == primary.get('network_group'):
|
||||
for s in (w.get('stats') or {}).get('service_latencies') or []:
|
||||
if s.get('service_name') and isinstance(s.get('latency'), (int, float)):
|
||||
latencies[s['service_name']] = s['latency']
|
||||
return {'wan': primary.get('network_group') or '', 'periods': periods, 'downtime': downtime,
|
||||
'latencies': latencies, 'updated': now}
|
||||
|
||||
|
||||
def quality_counts(periods: List[dict], since: float) -> Dict[str, int]:
|
||||
"""How many periods starting at or after *since* were in each state."""
|
||||
counts = {s: 0 for s in QUALITY_STATES}
|
||||
for p in periods:
|
||||
if p['ts'] >= since and p['state'] in counts:
|
||||
counts[p['state']] += 1
|
||||
return counts
|
||||
+315
-42
@@ -13,7 +13,8 @@ import re
|
||||
import shlex
|
||||
import statistics
|
||||
import time
|
||||
from datetime import datetime, timezone
|
||||
from contextlib import contextmanager
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from typing import Dict, List, Optional
|
||||
from urllib.parse import urljoin, urlparse
|
||||
|
||||
@@ -192,8 +193,12 @@ class UnifiClient:
|
||||
logger.error(f'UniFi client list error: {e}')
|
||||
return []
|
||||
|
||||
def get_system_events(self, since_ms: int, keys: tuple) -> Optional[List[dict]]:
|
||||
"""Return system log entries with the given keys, or None if the log is unavailable."""
|
||||
def get_system_events(self, since_ms: int, keys) -> Optional[List[dict]]:
|
||||
"""Return system log entries with the given keys, or None if the log is unavailable.
|
||||
|
||||
keys: a tuple of log keys, or a function that takes a key and says whether to keep it.
|
||||
"""
|
||||
wanted = keys if callable(keys) else keys.__contains__
|
||||
url = f'{self.base_url}/proxy/network/v2/api/site/{self.site_id}/system-log/all'
|
||||
found: List[dict] = []
|
||||
try:
|
||||
@@ -210,19 +215,42 @@ class UnifiClient:
|
||||
if not items:
|
||||
break
|
||||
for e in items:
|
||||
if e.get('key') in keys and e.get('timestamp', 0) >= since_ms:
|
||||
if wanted(e.get('key') or '') and e.get('timestamp', 0) >= since_ms:
|
||||
params = e.get('parameters') or {}
|
||||
found.append({
|
||||
'key': e['key'], 'ts': e['timestamp'] / 1000,
|
||||
'device': (params.get('DEVICE') or {}).get('name', ''),
|
||||
'wan': (params.get('WAN_ID') or {}).get('name', '')
|
||||
or str((params.get('WAN_ID') or {}).get('id', '')),
|
||||
**self._update_fields(params),
|
||||
})
|
||||
return found
|
||||
except Exception as e:
|
||||
logger.error(f'UniFi system log error: {e}')
|
||||
return None
|
||||
|
||||
def get_wan_dashboard(self) -> Optional[dict]:
|
||||
"""UniFi's aggregated dashboard for the last day (WAN health timeline and service
|
||||
latencies, as the Network app charts them), or None if unavailable. Read only."""
|
||||
url = f'{self.base_url}/proxy/network/v2/api/site/{self.site_id}/aggregated-dashboard'
|
||||
try:
|
||||
resp = self.session.get(url, headers=self.headers, timeout=20, params={'historySeconds': 86400})
|
||||
resp.raise_for_status()
|
||||
data = resp.json()
|
||||
return data if isinstance(data, dict) else None
|
||||
except Exception as e:
|
||||
logger.error(f'UniFi dashboard error: {e}')
|
||||
return None
|
||||
|
||||
@staticmethod
|
||||
def _update_fields(params: dict) -> dict:
|
||||
"""The app and versions of an update entry; nothing for other entries."""
|
||||
def text(key):
|
||||
value = params.get(key)
|
||||
return str(value.get('name') or value.get('id') or '') if isinstance(value, dict) else str(value or '')
|
||||
fields = {'app': text('APPLICATION'), 'version': text('VERSION'), 'previous': text('PREVIOUS_VERSION')}
|
||||
return {k: v for k, v in fields.items() if v}
|
||||
|
||||
def get_devices(self) -> Optional[List[dict]]:
|
||||
"""Return list of UniFi devices, or None if the controller is unreachable."""
|
||||
try:
|
||||
@@ -393,6 +421,10 @@ class TicketClient:
|
||||
self.comment_url = cfg.get('comment_url') or (
|
||||
urljoin(self.url, 'api/ticket_comment_api.php') if self.url else '')
|
||||
self.comments_denied = False
|
||||
self.read_url = cfg.get('read_url') or (
|
||||
urljoin(self.url, 'api/tickets_api.php') if self.url else '')
|
||||
# Titles whose create matched a Closed ticket Tinker couldn't reopen: {title: (ticket_id, when)}
|
||||
self._closed_matches: Dict[str, tuple] = {}
|
||||
|
||||
def comment(self, ticket_id: str, text: str) -> bool:
|
||||
"""Add a Markdown comment to a ticket. Never raises; False means try again later."""
|
||||
@@ -425,9 +457,57 @@ class TicketClient:
|
||||
logger.error(f'Ticket comment failed for #{ticket_id}: {e}')
|
||||
return False
|
||||
|
||||
# Statuses that mean someone still has a ticket on their list
|
||||
OPEN_STATUSES = 'Open,Pending,In Progress'
|
||||
_OPEN_TICKETS_MAX_PAGES = 20
|
||||
|
||||
def open_tickets(self) -> Optional[Dict[str, str]]:
|
||||
"""{ticket_id: status} for every ticket not yet closed, or None if Tinker can't say.
|
||||
|
||||
Read only: this needs the key's read scope and never changes a ticket.
|
||||
"""
|
||||
if not self.api_key or not self.read_url:
|
||||
return None
|
||||
found: Dict[str, str] = {}
|
||||
try:
|
||||
for page in range(1, self._OPEN_TICKETS_MAX_PAGES + 1):
|
||||
resp = requests.get(
|
||||
self.read_url,
|
||||
params={'status': self.OPEN_STATUSES, 'limit': 100, 'page': page},
|
||||
headers={'Authorization': f'Bearer {self.api_key}'},
|
||||
timeout=15,
|
||||
)
|
||||
resp.raise_for_status()
|
||||
data = resp.json()
|
||||
if not data.get('success'):
|
||||
logger.warning(f'Unexpected ticket list response: {str(data)[:200]}')
|
||||
return None
|
||||
for t in data.get('tickets') or []:
|
||||
found[str(t.get('ticket_id'))] = t.get('status') or ''
|
||||
if page >= int(data.get('pages') or 1):
|
||||
return found
|
||||
logger.warning('Open ticket list is longer than expected; using the first pages only')
|
||||
return found
|
||||
except Exception as e:
|
||||
logger.error(f'Reading open tickets failed: {e}')
|
||||
return None
|
||||
|
||||
# How long to wait before asking again after a create matched an unreopenable Closed ticket.
|
||||
# Each ask adds a "recurred" comment to that ticket, so once a poll would pile them up.
|
||||
CLOSED_MATCH_RETRY_S = 24 * 3600
|
||||
|
||||
def create(self, title: str, description: str, priority: str = '2') -> Optional[str]:
|
||||
"""Open a ticket. Returns its ID, or None if there is no ticket to track.
|
||||
|
||||
Tinker deduplicates: the response's `action` says what happened (new, deduplicated,
|
||||
updated, reopened, recurrence_noted). recurrence_noted means it matched a Closed ticket
|
||||
it could not reopen unattended; that ticket isn't tracking this alert, so it isn't used.
|
||||
"""
|
||||
if not self.api_key or not self.url:
|
||||
logger.warning('Ticket API not configured – skipping ticket creation')
|
||||
logger.warning('Ticket API not configured: skipping ticket creation')
|
||||
return None
|
||||
seen = self._closed_matches.get(title)
|
||||
if seen and time.time() - seen[1] < self.CLOSED_MATCH_RETRY_S:
|
||||
return None
|
||||
try:
|
||||
resp = requests.post(
|
||||
@@ -450,10 +530,19 @@ class TicketClient:
|
||||
if not tid:
|
||||
logger.warning(f'Ticket API success but no ticket_id in response: {data}')
|
||||
return None
|
||||
logger.info(f'Created ticket #{tid}: {title}')
|
||||
action = data.get('action') or 'created'
|
||||
if action == 'recurrence_noted':
|
||||
self._closed_matches[title] = (tid, time.time())
|
||||
logger.warning(
|
||||
f'Ticket API matched Closed ticket #{tid}, which it could not reopen; not using it '
|
||||
f'for this alert. Reopen #{tid} in Tinker to track it there. Retrying in 24 h: {title}'
|
||||
)
|
||||
return None
|
||||
self._closed_matches.pop(title, None)
|
||||
logger.info(f'Ticket #{tid} ({action}): {title}')
|
||||
return tid
|
||||
if data.get('existing_ticket_id'):
|
||||
logger.info(f'Duplicate suppressed by API – existing #{data["existing_ticket_id"]}')
|
||||
logger.info(f'Duplicate suppressed by API: existing #{data["existing_ticket_id"]}')
|
||||
return data['existing_ticket_id']
|
||||
logger.warning(f'Unexpected ticket API response: {data}')
|
||||
except Exception as e:
|
||||
@@ -583,6 +672,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)
|
||||
@@ -814,7 +929,7 @@ class LinkStatsCollector:
|
||||
host = instance_map.get(instance, host_ip)
|
||||
ifaces = list(iface_metrics.keys())
|
||||
|
||||
# SSH ethtool collection via Pulse worker — only for explicitly configured
|
||||
# SSH ethtool collection via Pulse worker: only for explicitly configured
|
||||
# hosts (instance_map keys). Hosts like postgresql/matrix may report
|
||||
# node_exporter metrics to Prometheus but don't need link diagnostics.
|
||||
ethtool_data: Dict[str, dict] = {}
|
||||
@@ -853,17 +968,22 @@ class LinkStatsCollector:
|
||||
logger.warning(f'UniFi switch port collection failed: {e}')
|
||||
|
||||
unifi_devices = (self.unifi.get_device_details() or {}) if self.unifi else {}
|
||||
self._resolve_neighbors(unifi_switches, unifi_devices, instance_map)
|
||||
self._mark_stale_outlets(unifi_devices, time.time())
|
||||
host_macs = self._resolve_neighbors(unifi_switches, unifi_devices, instance_map)
|
||||
|
||||
return {
|
||||
'hosts': result_hosts,
|
||||
'unifi_switches': unifi_switches,
|
||||
'unifi_devices': unifi_devices,
|
||||
# Which host NIC owns each MAC, for matching outlets and neighbours named by MAC
|
||||
'host_macs': {mac: list(owner) for mac, owner in host_macs.items()},
|
||||
'updated': datetime.now(timezone.utc).strftime('%Y-%m-%d %H:%M:%S UTC'),
|
||||
}
|
||||
|
||||
def _resolve_neighbors(self, switches: dict, unifi_devices: dict, instance_map: Dict[str, str]) -> None:
|
||||
"""Name port neighbors: UniFi's LLDP data has only MACs, and many servers send none."""
|
||||
def _resolve_neighbors(self, switches: dict, unifi_devices: dict, instance_map: Dict[str, str]) -> dict:
|
||||
"""Name port neighbors: UniFi's LLDP data has only MACs, and many servers send none.
|
||||
|
||||
Returns {mac: (host, interface)} for every physical host NIC Prometheus reports."""
|
||||
host_macs: Dict[str, tuple] = {}
|
||||
host_ips: Dict[str, str] = {}
|
||||
# Bonds share their MAC with their member NICs, and LLDP runs on the NIC.
|
||||
@@ -886,6 +1006,7 @@ class LinkStatsCollector:
|
||||
}
|
||||
devices.resolve_lldp_neighbors(switches, host_macs, device_macs, host_ips)
|
||||
devices.apply_client_locations(switches, self.unifi.get_wired_clients(), host_macs, device_macs)
|
||||
return host_macs
|
||||
|
||||
def _compute_unifi_rates(self, raw: Dict[str, dict], now: float) -> Dict[str, dict]:
|
||||
"""Compute per-port byte/error rates from delta against previous snapshot."""
|
||||
@@ -941,12 +1062,25 @@ CLUSTER_NAME = 'proxmox-cluster'
|
||||
DEFAULT_PUBLIC_URL = 'https://gandalf.lotusguild.org'
|
||||
# Reports of something already over: the ticket is the whole story, no recovery note
|
||||
ONE_SHOT_EVENTS = ('modem_power_cycled', 'wan_unstable')
|
||||
# Modem and WAN reports this close together are one incident, so they share one ticket
|
||||
WAN_INCIDENT_WINDOW_S = 1800
|
||||
# UniFi logs an update when it finishes, after any WAN trouble it caused. So tickets opened
|
||||
# this long before the entry get a note, and new modem/WAN tickets wait this long after it.
|
||||
UPDATE_LOOKBACK_S = 1200
|
||||
UPDATE_HOLD_S = 900
|
||||
UNIFI_UPDATE_STATE = 'unifi_update'
|
||||
# Ports a host or device was last seen on, kept so a ticket for a dead host
|
||||
# (whose link, and so its LLDP entry, is gone) can still say where it plugs in
|
||||
KNOWN_UPLINKS_STATE = 'known_uplinks'
|
||||
# Which tickets are still open in Tinker, so the dashboard can flag ones left open
|
||||
# after their alert cleared. Refreshed this often; one list request per refresh.
|
||||
OPEN_TICKETS_STATE = 'open_tickets'
|
||||
OPEN_TICKETS_SYNC_S = 900
|
||||
|
||||
|
||||
class NetworkMonitor:
|
||||
_open_tickets_synced = 0.0
|
||||
|
||||
def __init__(self):
|
||||
with open('config.json') as f:
|
||||
self.cfg = json.load(f)
|
||||
@@ -1021,6 +1155,16 @@ class NetworkMonitor:
|
||||
def _hostname(self, instance: str) -> str:
|
||||
return self._instance_map.get(instance, instance.split(':')[0])
|
||||
|
||||
def _unused_for(self, host: str) -> dict:
|
||||
return (getattr(self, '_unused', None) or {}).get(host) or {}
|
||||
|
||||
def _load_unused(self) -> None:
|
||||
"""Reload the interfaces marked unused (once a cycle; keeps the last list on error)."""
|
||||
try:
|
||||
self._unused = db.get_unused_interfaces()
|
||||
except Exception as e:
|
||||
logger.error(f'Could not load unused interfaces: {e}')
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# Tickets: context, and notes when an alert clears
|
||||
# ------------------------------------------------------------------
|
||||
@@ -1189,6 +1333,20 @@ class NetworkMonitor:
|
||||
elif self.tickets.comments_denied:
|
||||
break
|
||||
|
||||
def _sync_open_tickets(self) -> None:
|
||||
"""Save which tickets are still open in Tinker, at most every OPEN_TICKETS_SYNC_S.
|
||||
|
||||
On a failed read the previous list stays, with its old checked_at, so the
|
||||
dashboard can tell it is out of date rather than treat every ticket as closed.
|
||||
"""
|
||||
now = time.time()
|
||||
if now - self._open_tickets_synced < OPEN_TICKETS_SYNC_S:
|
||||
return
|
||||
self._open_tickets_synced = now
|
||||
found = self.tickets.open_tickets()
|
||||
if found is not None:
|
||||
db.set_state(OPEN_TICKETS_STATE, {'checked_at': now, 'tickets': found})
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# Interface monitoring (Prometheus)
|
||||
# ------------------------------------------------------------------
|
||||
@@ -1205,7 +1363,10 @@ class NetworkMonitor:
|
||||
new_baseline.setdefault(host, {})
|
||||
host_has_regression = False
|
||||
|
||||
unused = self._unused_for(host)
|
||||
for iface, is_up in ifaces.items():
|
||||
if iface in unused:
|
||||
continue # marked unused: no alerts, and it can't count as a regression
|
||||
prev = baseline.get(host, {}).get(iface) # 'up', 'initial_down', or None
|
||||
|
||||
if is_up:
|
||||
@@ -1213,11 +1374,11 @@ class NetworkMonitor:
|
||||
db.resolve_event('interface_down', host, iface)
|
||||
else:
|
||||
if prev is None:
|
||||
# First observation is down – could be unused port, don't alert
|
||||
# First observation is down: could be unused port, don't alert
|
||||
new_baseline[host][iface] = 'initial_down'
|
||||
|
||||
elif prev == 'initial_down':
|
||||
# Persistently down since first observation – no alert
|
||||
# Persistently down since first observation: no alert
|
||||
pass
|
||||
|
||||
else: # prev == 'up'
|
||||
@@ -1256,7 +1417,7 @@ class NetworkMonitor:
|
||||
|
||||
db.set_baseline(new_baseline)
|
||||
|
||||
# Cluster-wide check – only genuine regressions count
|
||||
# Cluster-wide check: only genuine regressions count
|
||||
if len(hosts_with_regression) >= self.cluster_thresh:
|
||||
sup = db.check_suppressed(suppressions, 'all', '')
|
||||
event_id, is_new, consec, ticket_id = db.upsert_event(
|
||||
@@ -1506,14 +1667,95 @@ class NetworkMonitor:
|
||||
event_type, severity, 'modem', name, detail, f'{description} ({_now_utc()})',
|
||||
)
|
||||
if not sup and consec >= self.modem_fail_thresh and not ticket_id:
|
||||
self._open_ticket(
|
||||
event_id, event_type, name, detail,
|
||||
title=f'[{name}][auto][production][issue][network][cluster-wide] {heading}',
|
||||
heading='WAN Modem Alert',
|
||||
facts=[('Modem', f'{name} ({self.modem.base_url})'), ('Detected', _now_utc()),
|
||||
('Consecutive check failures', str(consec))],
|
||||
summary=description, checks=[advice], priority=priority,
|
||||
)
|
||||
self._queue_wan_ticket({
|
||||
'event_id': event_id, 'event_type': event_type, 'detail': detail,
|
||||
'title': f'[{name}][auto][production][issue][network][cluster-wide] {heading}',
|
||||
'name': heading, 'heading': 'WAN Modem Alert',
|
||||
'facts': [('Modem', f'{name} ({self.modem.base_url})'), ('Detected', _now_utc()),
|
||||
('Consecutive check failures', str(consec))],
|
||||
'summary': description, 'checks': [advice], 'priority': priority, 'recovers': True,
|
||||
})
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# Modem and WAN tickets: one per incident, held around UniFi updates
|
||||
# ------------------------------------------------------------------
|
||||
@contextmanager
|
||||
def _wan_batch(self):
|
||||
"""Collect the cycle's modem and WAN tickets so related ones are opened together."""
|
||||
self._wan_pending = []
|
||||
try:
|
||||
yield
|
||||
finally:
|
||||
pending, self._wan_pending = self._wan_pending, None
|
||||
if pending:
|
||||
self._open_wan_tickets(pending)
|
||||
|
||||
def _queue_wan_ticket(self, item: dict) -> None:
|
||||
held = self._update_hold()
|
||||
if held:
|
||||
logger.info(f'Not opening a ticket for {item["event_type"]} yet: {held} just finished')
|
||||
return
|
||||
if getattr(self, '_wan_pending', None) is not None:
|
||||
self._wan_pending.append(item)
|
||||
else:
|
||||
self._open_wan_tickets([item])
|
||||
|
||||
def _update_hold(self) -> Optional[str]:
|
||||
"""The update that modem and WAN tickets are waiting out, if any."""
|
||||
raw = db.get_state(UNIFI_UPDATE_STATE)
|
||||
if not raw:
|
||||
return None
|
||||
try:
|
||||
update = json.loads(raw)
|
||||
except ValueError:
|
||||
return None
|
||||
if update.get('hold_until', 0) <= time.time():
|
||||
return None
|
||||
return update.get('label') or 'a UniFi update'
|
||||
|
||||
def _open_wan_tickets(self, items: List[dict]) -> None:
|
||||
"""Comment on the incident's ticket if one is recent, else open one ticket for all of *items*."""
|
||||
# Most urgent first; at equal priority an ongoing problem leads over a past event
|
||||
items = sorted(items, key=lambda i: (int(i['priority']), not i['recovers']))
|
||||
incident = db.get_incident_ticket(self.modem_name, WAN_INCIDENT_WINDOW_S)
|
||||
if incident:
|
||||
left = []
|
||||
for item in items:
|
||||
text = ticket_text.incident_comment(item['name'], item['summary'], item['checks'], _now_utc())
|
||||
if self.tickets.comment(incident, text):
|
||||
db.set_ticket_id(item['event_id'], incident)
|
||||
else:
|
||||
left.append(item) # comments failing must not lose the report
|
||||
items = left
|
||||
if not items:
|
||||
return
|
||||
first, others = items[0], items[1:]
|
||||
sections = []
|
||||
if first['recovers']:
|
||||
sections = self._ticket_sections(first['event_id'], first['event_type'], self.modem_name, first['detail'])
|
||||
if others:
|
||||
sections.append(('Also seen in this incident', [f'- **{o["name"]}:** {o["summary"]}' for o in others]))
|
||||
desc = ticket_text.description(first['heading'], first['facts'], first['summary'], first['checks'],
|
||||
sections, recovers=any(i['recovers'] for i in items))
|
||||
tid = self.tickets.create(first['title'], desc, priority=first['priority'])
|
||||
if tid:
|
||||
for item in items:
|
||||
db.set_ticket_id(item['event_id'], tid)
|
||||
|
||||
def _note_unifi_update(self, event: dict) -> None:
|
||||
"""Hold new modem/WAN tickets for a while and explain the ones opened just before."""
|
||||
label = modem_api.update_label(event)
|
||||
when = datetime.fromtimestamp(event['ts'], timezone.utc)
|
||||
logger.info(f'UniFi update finished: {label} at {when:%Y-%m-%d %H:%M:%S} UTC')
|
||||
if event['ts'] + UPDATE_HOLD_S > time.time():
|
||||
db.set_state(UNIFI_UPDATE_STATE, {'label': label, 'at': event['ts'],
|
||||
'hold_until': event['ts'] + UPDATE_HOLD_S})
|
||||
naive = when.replace(tzinfo=None)
|
||||
tickets = db.get_ticket_ids_between(
|
||||
self.modem_name, naive - timedelta(seconds=UPDATE_LOOKBACK_S), naive + timedelta(seconds=UPDATE_HOLD_S))
|
||||
for tid in tickets:
|
||||
self.tickets.comment(tid, ticket_text.update_comment(
|
||||
label, f'{when:%Y-%m-%d %H:%M} UTC', UPDATE_LOOKBACK_S // 60, UPDATE_HOLD_S // 60))
|
||||
|
||||
def _process_modem_failure(self, suppressions: list, error: Exception) -> None:
|
||||
"""Handle a failed poll. Link and optical events stay as they are: we can't see them."""
|
||||
@@ -1653,14 +1895,13 @@ class NetworkMonitor:
|
||||
name = self.modem_name
|
||||
event_id, _, _, ticket_id = db.upsert_event(event_type, 'warning', 'unifi', name, '', description)
|
||||
if not db.check_suppressed(suppressions, 'host', name) and not ticket_id:
|
||||
tid = self.tickets.create(
|
||||
f'[{name}][auto][production][issue][network][cluster-wide] {heading}',
|
||||
ticket_text.description('WAN Event', [('Modem', name), ('Reported', _now_utc())],
|
||||
description, [advice], recovers=False),
|
||||
priority=priority,
|
||||
)
|
||||
if tid:
|
||||
db.set_ticket_id(event_id, tid)
|
||||
self._queue_wan_ticket({
|
||||
'event_id': event_id, 'event_type': event_type, 'detail': '',
|
||||
'title': f'[{name}][auto][production][issue][network][cluster-wide] {heading}',
|
||||
'name': heading, 'heading': 'WAN Event',
|
||||
'facts': [('Modem', name), ('Reported', _now_utc())],
|
||||
'summary': description, 'checks': [advice], 'priority': priority, 'recovers': False,
|
||||
})
|
||||
db.resolve_event(event_type, name, '')
|
||||
|
||||
def _process_wan_log(self, suppressions: list) -> None:
|
||||
@@ -1676,12 +1917,21 @@ class NetworkMonitor:
|
||||
return
|
||||
# After long monitor downtime, don't open tickets for stale events.
|
||||
since_ms = max(int(raw_cursor) + 1, int((now - 86400) * 1000))
|
||||
events = self.unifi.get_system_events(since_ms, modem_api.WAN_LOG_KEYS)
|
||||
events = self.unifi.get_system_events(since_ms, modem_api.wanted_log_key)
|
||||
if not events:
|
||||
return # None = log unavailable, so the cursor stays put and it's retried
|
||||
|
||||
# Updates first: one in this batch explains (and holds) the WAN events beside it
|
||||
updates = [e for e in events if modem_api.is_update_key(e['key'])]
|
||||
for e in sorted(updates, key=lambda ev: ev['ts']):
|
||||
try:
|
||||
self._note_unifi_update(e)
|
||||
except Exception as ex:
|
||||
logger.error(f'Noting UniFi update failed: {ex}', exc_info=True)
|
||||
|
||||
history = self._load_wan_history()
|
||||
actionable = modem_api.apply_wan_events(history, events)
|
||||
actionable = modem_api.apply_wan_events(
|
||||
history, [e for e in events if not modem_api.is_update_key(e['key'])])
|
||||
|
||||
# UniFi repeats "failed multiple times" per failure, so ticket it once a day at most.
|
||||
unstable = [e for e in actionable if e['key'] == modem_api.LOG_WAN_UNSTABLE]
|
||||
@@ -1713,6 +1963,13 @@ class NetworkMonitor:
|
||||
'point toward the provider or the modem rather than the fiber.',
|
||||
)
|
||||
|
||||
def _collect_wan_quality(self) -> None:
|
||||
"""Store UniFi's WAN health timeline. If UniFi can't be read, the last copy stays
|
||||
and goes stale, and the dashboard stops drawing conclusions from it."""
|
||||
quality = modem_api.wan_quality(self.unifi.get_wan_dashboard(), time.time())
|
||||
if quality is not None:
|
||||
db.set_state('wan_quality', quality)
|
||||
|
||||
def _collect_modem(self, suppressions: list) -> None:
|
||||
"""Poll the modem, then store its status and raise any alerts."""
|
||||
try:
|
||||
@@ -1775,8 +2032,11 @@ class NetworkMonitor:
|
||||
continue # skip Prometheus instances not in config (e.g. LXC app servers)
|
||||
host = self._hostname(instance)
|
||||
phys = {k: v for k, v in ifaces.items()}
|
||||
up_count = sum(1 for v in phys.values() if v)
|
||||
total = len(phys)
|
||||
# Interfaces marked unused don't count toward the host's status
|
||||
unused = self._unused_for(host)
|
||||
counted = {k: v for k, v in phys.items() if k not in unused}
|
||||
up_count = sum(1 for v in counted.values() if v)
|
||||
total = len(counted)
|
||||
if not prom_ok:
|
||||
status = 'unknown'
|
||||
elif total == 0 or up_count == total:
|
||||
@@ -1788,7 +2048,7 @@ class NetworkMonitor:
|
||||
|
||||
hosts[host] = {
|
||||
'ip': instance.split(':')[0],
|
||||
'interfaces': {k: ('up' if v else 'down') for k, v in phys.items()},
|
||||
'interfaces': {k: ('unused' if k in unused else ('up' if v else 'down')) for k, v in phys.items()},
|
||||
'status': status,
|
||||
'source': 'prometheus',
|
||||
}
|
||||
@@ -1824,21 +2084,22 @@ class NetworkMonitor:
|
||||
# ------------------------------------------------------------------
|
||||
def run(self) -> None:
|
||||
logger.info(
|
||||
f'Gandalf monitor started – poll_interval={self.poll_interval}s '
|
||||
f'Gandalf monitor started: poll_interval={self.poll_interval}s '
|
||||
f'fail_thresh={self.fail_thresh} host_fail_thresh={self.host_fail_thresh} '
|
||||
f'unifi_fail_thresh={self.unifi_fail_thresh}'
|
||||
)
|
||||
while True:
|
||||
try:
|
||||
logger.info('Starting network check cycle')
|
||||
self._load_unused()
|
||||
|
||||
# 1. Fetch interface states once — shared by snapshot and alert processing
|
||||
# 1. Fetch interface states once: shared by snapshot and alert processing
|
||||
iface_states = self.prom.get_interface_states()
|
||||
|
||||
# 2. Fetch UniFi devices once — used by both snapshot and alert processing
|
||||
# 2. Fetch UniFi devices once: used by both snapshot and alert processing
|
||||
unifi_devices = self.unifi.get_devices()
|
||||
|
||||
# 3a. Ping-only hosts once — shared by snapshot and alert processing
|
||||
# 3a. Ping-only hosts once: shared by snapshot and alert processing
|
||||
ping_states: Dict[str, Optional[bool]] = {
|
||||
h['name']: self.pulse.ping(h['ip'])
|
||||
for h in self.cfg.get('monitor', {}).get('ping_hosts', [])
|
||||
@@ -1886,17 +2147,29 @@ class NetworkMonitor:
|
||||
# WAN modem: isolated so a failure here can't stop the rest of the cycle
|
||||
if self.modem:
|
||||
try:
|
||||
# Log first, so a restart it reports can explain an uptime reset below
|
||||
self._process_wan_log(suppressions)
|
||||
self._collect_modem(suppressions)
|
||||
# Log first, so a restart it reports can explain an uptime reset below.
|
||||
# Tickets open when the batch ends, so one incident gets one ticket.
|
||||
with self._wan_batch():
|
||||
self._process_wan_log(suppressions)
|
||||
self._collect_modem(suppressions)
|
||||
except Exception as e:
|
||||
logger.error(f'Modem collection failed: {e}', exc_info=True)
|
||||
|
||||
# Internet quality as UniFi measures it (latency, loss, drops): for the dashboard
|
||||
try:
|
||||
self._collect_wan_quality()
|
||||
except Exception as e:
|
||||
logger.error(f'WAN quality collection failed: {e}', exc_info=True)
|
||||
|
||||
# Note on the tickets of anything that cleared this cycle (or failed to post before)
|
||||
try:
|
||||
self._post_recovery_notes()
|
||||
except Exception as e:
|
||||
logger.error(f'Posting recovery notes failed: {e}', exc_info=True)
|
||||
try:
|
||||
self._sync_open_tickets()
|
||||
except Exception as e:
|
||||
logger.error(f'Syncing open tickets failed: {e}', exc_info=True)
|
||||
|
||||
# Housekeeping: deactivate expired suppressions and purge old resolved events
|
||||
db.cleanup_expired_suppressions()
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
-- Gandalf Network Monitor – Database Schema
|
||||
-- Gandalf Network Monitor: Database Schema
|
||||
-- Run on MariaDB LXC 149 (10.10.10.50)
|
||||
|
||||
CREATE DATABASE IF NOT EXISTS gandalf
|
||||
|
||||
+230
-97
@@ -11,13 +11,13 @@
|
||||
const resp = await _fetch(...args);
|
||||
if (resp.status === 401) {
|
||||
window.location.reload();
|
||||
throw new Error('Session expired — reloading');
|
||||
throw new Error('Session expired, reloading');
|
||||
}
|
||||
return resp;
|
||||
};
|
||||
})();
|
||||
|
||||
// ── Toast notifications — thin wrapper over lt.toast ──────────────────
|
||||
// ── Toast notifications: thin wrapper over lt.toast ──────────────────
|
||||
function showToast(msg, type = 'success') {
|
||||
if (type === 'error') return lt.toast.error(msg);
|
||||
if (type === 'warning') return lt.toast.warning(msg);
|
||||
@@ -43,19 +43,22 @@ async function refreshAll() {
|
||||
lt.api.get('/api/network'),
|
||||
lt.api.get('/api/status'),
|
||||
refreshModem(),
|
||||
refreshAttention(),
|
||||
]);
|
||||
if (netResult.status === 'fulfilled') {
|
||||
const net = netResult.value;
|
||||
updateHostGrid(net.hosts || {});
|
||||
updateUnifiTable(net.unifi || []);
|
||||
updateTopology(net.hosts || {});
|
||||
} else {
|
||||
showToast('Network data unavailable', 'warning');
|
||||
}
|
||||
if (statusResult.status === 'fulfilled') {
|
||||
const status = statusResult.value;
|
||||
updateEventsTable(status.events || [], status.total_active);
|
||||
updateStatusBar(status.summary || {}, status.last_check || '', status.daemon_ok);
|
||||
updateFollowUp(status.stale_tickets || []);
|
||||
updateStatusBar(status.summary || {}, status.last_check || '', status.daemon_ok,
|
||||
followUpCount(status.events || [], status.stale_tickets || []),
|
||||
(status.stale_tickets || []).length > 0);
|
||||
if (typeof window.gandalfNotifUpdate === 'function') window.gandalfNotifUpdate(status.events || []);
|
||||
} else {
|
||||
showToast('Status data unavailable', 'warning');
|
||||
@@ -66,7 +69,48 @@ async function refreshAll() {
|
||||
}
|
||||
}
|
||||
|
||||
function updateStatusBar(summary, lastCheck, daemonOk) {
|
||||
// ── 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' &&
|
||||
((e.stale_days !== null && e.stale_days !== undefined) || e.ticket_closed)).length;
|
||||
return flagged + staleTickets.length;
|
||||
}
|
||||
|
||||
function updateStatusBar(summary, lastCheck, daemonOk, followUps = 0, hasStaleTickets = false) {
|
||||
const bar = document.querySelector('.status-chips');
|
||||
if (!bar) return;
|
||||
const chips = [];
|
||||
@@ -74,6 +118,10 @@ function updateStatusBar(summary, lastCheck, daemonOk) {
|
||||
if (summary.critical) chips.push(`<span class="chip chip-critical">● ${summary.critical} CRITICAL</span>`);
|
||||
if (summary.warning) chips.push(`<span class="chip chip-warning">● ${summary.warning} WARNING</span>`);
|
||||
if (!summary.critical && !summary.warning && daemonOk !== false) chips.push('<span class="chip chip-ok">✔ ALL SYSTEMS NOMINAL</span>');
|
||||
if (followUps) {
|
||||
const href = hasStaleTickets ? '#followup' : '#events-table-wrap';
|
||||
chips.push(`<a class="chip chip-warning chip-followup" href="${href}">⏳ ${followUps} TO FOLLOW UP</a>`);
|
||||
}
|
||||
bar.innerHTML = chips.join('');
|
||||
|
||||
const lc = document.getElementById('last-check');
|
||||
@@ -92,16 +140,6 @@ function updateStatusBar(summary, lastCheck, daemonOk) {
|
||||
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) {
|
||||
@@ -116,7 +154,7 @@ function updateStatusBar(summary, lastCheck, daemonOk) {
|
||||
}
|
||||
const mins = Math.floor(checkAge / 60);
|
||||
staleBanner.querySelector('.lt-alert-msg').textContent =
|
||||
`Monitoring data is stale — last check was ${mins} minute${mins !== 1 ? 's' : ''} ago. The monitor daemon may be down.`;
|
||||
`Monitoring data is stale: last check was ${mins} minute${mins !== 1 ? 's' : ''} ago. The monitor daemon may be down.`;
|
||||
staleBanner.style.display = '';
|
||||
} else if (staleBanner) {
|
||||
staleBanner.style.display = 'none';
|
||||
@@ -125,9 +163,6 @@ function updateStatusBar(summary, lastCheck, daemonOk) {
|
||||
}
|
||||
|
||||
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;
|
||||
@@ -140,39 +175,21 @@ 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>` : '');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function updateTopology(hosts) {
|
||||
document.querySelectorAll('.topo-host').forEach(node => {
|
||||
const name = node.dataset.host;
|
||||
const host = hosts[name];
|
||||
if (!host) return;
|
||||
node.className = node.className.replace(/topo-v2-status-(up|down|degraded|unknown)/g, '');
|
||||
node.classList.add(`topo-v2-status-${host.status}`);
|
||||
const badge = node.querySelector('.topo-badge');
|
||||
if (badge) {
|
||||
badge.className = `topo-badge topo-badge-${host.status}`;
|
||||
badge.textContent = host.status;
|
||||
}
|
||||
|
||||
// Animate the 10G drop-wire red+dashed when host is down
|
||||
document.querySelectorAll(`.topo-v2-wire-10g[data-host="${CSS.escape(name)}"]`).forEach(wire => {
|
||||
wire.classList.toggle('wire-down', host.status === 'down');
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
// ── Device search ─────────────────────────────────────────────────────
|
||||
function deviceUrl(name) {
|
||||
return `/device/${encodeURIComponent(name)}`;
|
||||
@@ -275,7 +292,7 @@ async function refreshModem() {
|
||||
}
|
||||
|
||||
function _modemUptime(seconds) {
|
||||
if (seconds === null || seconds === undefined) return '–';
|
||||
if (seconds === null || seconds === undefined) return '-';
|
||||
const d = Math.floor(seconds / 86400);
|
||||
const h = Math.floor((seconds % 86400) / 3600);
|
||||
const m = Math.floor((seconds % 3600) / 60);
|
||||
@@ -283,7 +300,7 @@ function _modemUptime(seconds) {
|
||||
}
|
||||
|
||||
function _modemRate(bytesPerSec) {
|
||||
if (bytesPerSec === null || bytesPerSec === undefined) return '–';
|
||||
if (bytesPerSec === null || bytesPerSec === undefined) return '-';
|
||||
const mbps = bytesPerSec * 8 / 1e6;
|
||||
return mbps >= 1000 ? `${(mbps / 1000).toFixed(2)} Gbps` : `${mbps.toFixed(1)} Mbps`;
|
||||
}
|
||||
@@ -298,7 +315,7 @@ function _modemStat(label, value, cls, note) {
|
||||
}
|
||||
|
||||
function _modemOptic(label, metric, status, unit) {
|
||||
if (!metric || metric.value === null || metric.value === undefined) return _modemStat(label, '–');
|
||||
if (!metric || metric.value === null || metric.value === undefined) return _modemStat(label, '-');
|
||||
const cls = { alarm: 'lt-text-red', warning: 'lt-text-amber', ok: 'lt-text-green' }[status] || '';
|
||||
return _modemStat(label, `${metric.value} ${unit}`, cls, `warn ${metric.warn_low} to ${metric.warn_high}`);
|
||||
}
|
||||
@@ -346,6 +363,16 @@ function _modemLastRestart(history) {
|
||||
return `restarted ${_modemWhen(last.at)}${last.by ? ` by ${last.by}` : ''}`;
|
||||
}
|
||||
|
||||
function _modemUptimeStat(data) {
|
||||
if (data.uptime_s !== null && data.uptime_s !== undefined) {
|
||||
return _modemStat('Uptime', _modemUptime(data.uptime_s), '', _modemLastRestart(data.wan_history));
|
||||
}
|
||||
const restarts = (data.wan_history && data.wan_history.restarts) || [];
|
||||
if (!restarts.length) return '';
|
||||
const last = restarts[restarts.length - 1];
|
||||
return _modemStat('Last restart', _modemWhen(last.at), '', last.by ? `by ${last.by}` : '');
|
||||
}
|
||||
|
||||
function _modemDuration(seconds) {
|
||||
if (seconds < 60) return `${Math.round(seconds)}s`;
|
||||
if (seconds < 3600) return `${Math.floor(seconds / 60)}m ${Math.round(seconds % 60)}s`;
|
||||
@@ -368,6 +395,39 @@ function _modemOutages(history) {
|
||||
</div>`;
|
||||
}
|
||||
|
||||
const _QUALITY_LABELS = { ok: 'fine', latency: 'high latency', loss: 'packet loss', down: 'down' };
|
||||
|
||||
// UniFi's own internet health timeline, one block per 5 minutes, worst flag wins
|
||||
function _modemQuality(q) {
|
||||
const periods = (q && q.periods) || [];
|
||||
if (!periods.length) return '';
|
||||
const counts = { ok: 0, latency: 0, loss: 0, down: 0 };
|
||||
periods.forEach(p => { if (p.state in counts) counts[p.state] += 1; });
|
||||
const t0 = periods[0].ts, span = Math.max(periods[periods.length - 1].ts + 300 - t0, 300);
|
||||
const blocks = periods.map(p => {
|
||||
const x = (p.ts - t0) / span * 1000, w = Math.max(300 / span * 1000, 1);
|
||||
const tip = `${_modemWhen(p.ts)}: ${_QUALITY_LABELS[p.state] || p.state}`;
|
||||
return `<rect class="wq-${lt.escHtml(p.state)}" x="${x.toFixed(1)}" y="0" width="${w.toFixed(2)}" height="20">` +
|
||||
`<title>${lt.escHtml(tip)}</title></rect>`;
|
||||
}).join('');
|
||||
const flagged = ['latency', 'loss', 'down'].filter(s => counts[s])
|
||||
.map(s => `${_QUALITY_LABELS[s]} ${counts[s]}`).join(', ');
|
||||
const summary = flagged ? `${flagged} of ${periods.length} periods` : 'no problems';
|
||||
const lat = Object.entries(q.latencies || {}).sort()
|
||||
.map(([k, v]) => `${lt.escHtml(k)} ${lt.escHtml(String(v))} ms`).join(', ');
|
||||
const legend = ['latency', 'loss', 'down']
|
||||
.map(s => `<span><i class="wq-key wq-${s}"></i>${_QUALITY_LABELS[s]}</span>`).join('');
|
||||
return `
|
||||
<div class="modem-chart modem-quality">
|
||||
<div class="modem-chart-title">Internet, last 24 hours (from UniFi) <span>${lt.escHtml(summary)}</span></div>
|
||||
<svg viewBox="0 0 1000 20" preserveAspectRatio="none" role="img"
|
||||
aria-label="Internet health over the last 24 hours: ${lt.escHtml(summary)}">${blocks}</svg>
|
||||
<div class="wq-foot"><span>${lt.escHtml(_modemWhen(t0))}</span>
|
||||
<span class="wq-legend">${legend}</span><span>now</span></div>
|
||||
${lat ? `<div class="modem-stat-note">Latency now: ${lat}</div>` : ''}
|
||||
</div>`;
|
||||
}
|
||||
|
||||
function updateModem(data) {
|
||||
const section = document.getElementById('modem-section');
|
||||
const body = document.getElementById('modem-body');
|
||||
@@ -382,16 +442,13 @@ function updateModem(data) {
|
||||
detailsLink.hidden = false;
|
||||
}
|
||||
|
||||
const rxLabel = document.getElementById('topo-modem-rx');
|
||||
const topo = document.getElementById('topo-modem');
|
||||
const title = document.getElementById('modem-title');
|
||||
|
||||
if (!data.reachable) {
|
||||
if (rxLabel) rxLabel.textContent = 'unreachable';
|
||||
if (topo) topo.classList.add('topo-v2-status-down');
|
||||
body.innerHTML = `
|
||||
<div class="modem-error">Modem status unavailable: ${lt.escHtml(data.error || 'unknown error')}
|
||||
<span class="modem-stat-note">Last attempt ${lt.escHtml(data.updated || '–')}</span></div>
|
||||
<span class="modem-stat-note">Last attempt ${lt.escHtml(data.updated || '-')}</span></div>
|
||||
${_modemQuality(data.wan_quality)}
|
||||
${_modemChart(data.history)}`;
|
||||
return;
|
||||
}
|
||||
@@ -401,10 +458,7 @@ function updateModem(data) {
|
||||
const status = data.optics_status || {};
|
||||
const counters = data.counters || {};
|
||||
const rates = data.rates || {};
|
||||
const rx = optics.rx_power ? optics.rx_power.value : null;
|
||||
|
||||
if (topo) topo.classList.toggle('topo-v2-status-down', problems.length > 0);
|
||||
if (rxLabel) rxLabel.textContent = (rx === null || rx === undefined) ? 'Rx –' : `Rx ${rx} dBm`;
|
||||
if (title) {
|
||||
title.textContent = [data.model || 'AT&T Gateway', data.firmware && `fw ${data.firmware}`]
|
||||
.filter(Boolean).join(' · ');
|
||||
@@ -417,44 +471,33 @@ function updateModem(data) {
|
||||
<div class="modem-stats">
|
||||
${_modemStat('WAN', problems.length ? 'DOWN' : 'UP', problems.length ? 'lt-text-red' : 'lt-text-green',
|
||||
data.wan_ip || '')}
|
||||
${_modemStat('PON', data.pon_state || '–', '', data.wavelength || '')}
|
||||
${_modemStat('PON', data.pon_state || '-', '', data.wavelength || '')}
|
||||
${_modemOptic('Rx power', optics.rx_power, status.rx_power, 'dBm')}
|
||||
${_modemOptic('Tx power', optics.tx_power, status.tx_power, 'dBm')}
|
||||
${_modemOptic('Optics temp', optics.temperature, status.temperature, '°C')}
|
||||
${_modemStat('Throughput', `↓ ${_modemRate(rates.rx_bytes)}`, '', `↑ ${_modemRate(rates.tx_bytes)}`)}
|
||||
${_modemStat('Errors / drops', `${errs} / ${drops}`, errs ? 'lt-text-amber' : '', 'since modem reboot')}
|
||||
${_modemStat('Uptime', _modemUptime(data.uptime_s), '', _modemLastRestart(data.wan_history))}
|
||||
${_modemUptimeStat(data)}
|
||||
</div>
|
||||
${_modemQuality(data.wan_quality)}
|
||||
${_modemChart(data.history)}
|
||||
${_modemOutages(data.wan_history)}
|
||||
<div class="modem-stat-note modem-updated">Updated ${lt.escHtml(data.updated || '–')}</div>`;
|
||||
<div class="modem-stat-note modem-updated">Updated ${lt.escHtml(data.updated || '-')}</div>`;
|
||||
}
|
||||
|
||||
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) {
|
||||
@@ -469,7 +512,7 @@ function updateEventsTable(events, totalActive) {
|
||||
|
||||
const truncated = totalActive !== null && totalActive !== undefined && totalActive > active.length;
|
||||
const countNotice = truncated
|
||||
? `<div class="pagination-notice">Showing ${active.length} of ${totalActive} active alerts — <a href="/api/events?limit=1000">view all via API</a></div>`
|
||||
? `<div class="pagination-notice">Showing ${active.length} of ${totalActive} active alerts: <a href="/api/events?limit=1000">view all via API</a></div>`
|
||||
: '';
|
||||
|
||||
const rows = active.map(e => {
|
||||
@@ -481,22 +524,28 @@ function updateEventsTable(events, totalActive) {
|
||||
const ticket = e.ticket_id
|
||||
? `<a href="${lt.escHtml(ticketBase)}${lt.escHtml(String(e.ticket_id))}" target="_blank"
|
||||
class="ticket-link">#${lt.escHtml(String(e.ticket_id))}</a>`
|
||||
: '–';
|
||||
: '-';
|
||||
const supBadge = e.is_suppressed
|
||||
? `<span class="lt-badge badge-suppressed" title="Alert suppressed">🔕 sup</span>`
|
||||
: '';
|
||||
const staleBadge = (e.stale_days !== null && e.stale_days !== undefined)
|
||||
? `<span class="lt-badge badge-stale" title="Active for ${Number(e.stale_days)} days with no fix yet">⏳ ${Number(e.stale_days)}d</span>`
|
||||
: '';
|
||||
const closedBadge = e.ticket_closed
|
||||
? `<span class="lt-badge badge-ticket-closed" title="Ticket #${lt.escHtml(String(e.ticket_id))} was closed in Tinker, but this alert is still active">ticket closed</span>`
|
||||
: '';
|
||||
return `
|
||||
<tr class="row-${e.severity}${e.is_suppressed ? ' row-suppressed' : ''}">
|
||||
<td><span class="lt-badge badge-${e.severity}">${e.severity}</span>${supBadge}</td>
|
||||
<td>${lt.escHtml(e.event_type.replace(/_/g,' '))}</td>
|
||||
<td><strong>${lt.escHtml(e.target_name)}</strong></td>
|
||||
<td>${lt.escHtml(e.target_detail || '–')}</td>
|
||||
<td class="desc-cell" title="${lt.escHtml(e.description || '')}">${lt.escHtml((e.description||'').substring(0,60))}${(e.description||'').length>60?'…':''}</td>
|
||||
<td class="ts-cell" title="${lt.escHtml(e.first_seen||'')}">${lt.time.ago(_toIso(e.first_seen))}</td>
|
||||
<td class="ts-cell" title="${lt.escHtml(e.last_seen||'')}">${lt.time.ago(_toIso(e.last_seen))}</td>
|
||||
<td>${e.consecutive_failures}</td>
|
||||
<td>${ticket}</td>
|
||||
<td>
|
||||
<td data-label="Sev"><span class="lt-badge badge-${e.severity}">${e.severity}</span>${supBadge}${staleBadge}${closedBadge}</td>
|
||||
<td data-label="Type">${lt.escHtml(e.event_type.replace(/_/g,' '))}</td>
|
||||
<td data-label="Target"><strong>${lt.escHtml(e.target_name)}</strong></td>
|
||||
<td data-label="Detail">${lt.escHtml(e.target_detail || '-')}</td>
|
||||
<td data-label="Description" class="desc-cell" title="${lt.escHtml(e.description || '')}">${lt.escHtml((e.description||'').substring(0,60))}${(e.description||'').length>60?'…':''}</td>
|
||||
<td data-label="First seen" class="ts-cell" title="${lt.escHtml(e.first_seen||'')}">${lt.time.ago(_toIso(e.first_seen))}</td>
|
||||
<td data-label="Last seen" class="ts-cell" title="${lt.escHtml(e.last_seen||'')}">${lt.time.ago(_toIso(e.last_seen))}</td>
|
||||
<td data-label="Failures">${e.consecutive_failures}</td>
|
||||
<td data-label="Ticket">${ticket}</td>
|
||||
<td data-label="Actions">
|
||||
<button class="lt-btn lt-btn-ghost lt-btn-sm btn-suppress"
|
||||
data-sup-type="${lt.escHtml(supType)}"
|
||||
data-sup-name="${lt.escHtml(e.target_name)}"
|
||||
@@ -509,7 +558,7 @@ function updateEventsTable(events, totalActive) {
|
||||
wrap.innerHTML = `
|
||||
${countNotice}
|
||||
<div class="lt-table-wrap">
|
||||
<table class="lt-table" id="events-table">
|
||||
<table class="lt-table lt-table-responsive" id="events-table">
|
||||
<caption class="lt-sr-only">Active network alerts</caption>
|
||||
<thead>
|
||||
<tr>
|
||||
@@ -522,6 +571,28 @@ function updateEventsTable(events, totalActive) {
|
||||
</div>`;
|
||||
}
|
||||
|
||||
// ── Needs follow-up: tickets left open after their alert cleared ──────
|
||||
function updateFollowUp(tickets) {
|
||||
const section = document.getElementById('followup');
|
||||
const tbody = document.querySelector('#followup-table tbody');
|
||||
if (!section || !tbody) return;
|
||||
section.hidden = !tickets.length;
|
||||
const badge = document.getElementById('followup-badge');
|
||||
if (badge) badge.textContent = tickets.length;
|
||||
const ticketBase = (typeof GANDALF_CONFIG !== 'undefined' && GANDALF_CONFIG.ticket_web_url)
|
||||
? GANDALF_CONFIG.ticket_web_url : 'http://t.lotusguild.org/ticket/';
|
||||
tbody.innerHTML = tickets.map(t => `
|
||||
<tr>
|
||||
<td><a href="${lt.escHtml(ticketBase)}${lt.escHtml(String(t.ticket_id))}" target="_blank" rel="noopener"
|
||||
class="ticket-link">#${lt.escHtml(String(t.ticket_id))}</a></td>
|
||||
<td><strong>${lt.escHtml(t.target_name || '')}</strong></td>
|
||||
<td>${lt.escHtml((t.event_type || '').replace(/_/g, ' '))}${t.target_detail
|
||||
? ` <span class="lt-text-muted">${lt.escHtml(t.target_detail)}</span>` : ''}</td>
|
||||
<td class="ts-cell" title="${lt.escHtml(t.cleared_at || '')}">${lt.time.ago(_toIso(t.cleared_at))}</td>
|
||||
<td>${Number(t.events) || 0}</td>
|
||||
</tr>`).join('');
|
||||
}
|
||||
|
||||
// ── Suppression modal ─────────────────────────────────────────────────
|
||||
function openSuppressModal(type, name, detail) {
|
||||
const modal = document.getElementById('suppress-modal');
|
||||
@@ -618,7 +689,7 @@ async function submitSuppress(e) {
|
||||
}
|
||||
}
|
||||
|
||||
// ── Suppress form – wired here so the modal works from any page ──────
|
||||
// ── Suppress form: wired here so the modal works from any page ──────
|
||||
document.getElementById('suppress-form')?.addEventListener('submit', submitSuppress);
|
||||
document.getElementById('sup-type')?.addEventListener('change', updateSuppressForm);
|
||||
|
||||
@@ -648,3 +719,65 @@ document.addEventListener('click', e => {
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
// ── Maintenance: pause every ticket for a while (a global suppression with an expiry) ──
|
||||
(function () {
|
||||
const until = document.querySelector('.maint-banner .maint-until');
|
||||
if (until) {
|
||||
const t = new Date(until.getAttribute('datetime'));
|
||||
if (!isNaN(t)) {
|
||||
const sameDay = t.toDateString() === new Date().toDateString();
|
||||
until.textContent = sameDay
|
||||
? t.toLocaleTimeString([], { hour: 'numeric', minute: '2-digit' })
|
||||
: t.toLocaleString([], { weekday: 'short', hour: 'numeric', minute: '2-digit' });
|
||||
until.title = t.toLocaleString();
|
||||
}
|
||||
}
|
||||
|
||||
let minutes = 60;
|
||||
document.addEventListener('click', async e => {
|
||||
if (e.target.closest('[data-action="start-maintenance"]')) {
|
||||
lt.modal.open('maint-modal');
|
||||
document.getElementById('maint-reason')?.focus();
|
||||
return;
|
||||
}
|
||||
const pill = e.target.closest('.maint-pill');
|
||||
if (pill) {
|
||||
minutes = parseInt(pill.dataset.minutes, 10);
|
||||
document.querySelectorAll('.maint-pill').forEach(p => {
|
||||
const on = p === pill;
|
||||
p.classList.toggle('active', on);
|
||||
p.setAttribute('aria-pressed', String(on));
|
||||
});
|
||||
return;
|
||||
}
|
||||
const end = e.target.closest('[data-action="end-maintenance"]');
|
||||
if (end) {
|
||||
end.disabled = true;
|
||||
try {
|
||||
await lt.api.delete(`/api/suppressions/${encodeURIComponent(end.dataset.supId)}`);
|
||||
window.location.reload();
|
||||
} catch (err) {
|
||||
end.disabled = false;
|
||||
showToast(err.message || 'Could not end maintenance', 'error');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
document.getElementById('maint-form')?.addEventListener('submit', async e => {
|
||||
e.preventDefault();
|
||||
const reason = (document.getElementById('maint-reason').value || '').trim();
|
||||
if (!reason) { showToast('Reason is required', 'error'); return; }
|
||||
const submit = e.target.querySelector('[type="submit"]');
|
||||
submit.disabled = true;
|
||||
try {
|
||||
await lt.api.post('/api/suppressions', {
|
||||
target_type: 'all', target_name: '', reason, expires_minutes: minutes,
|
||||
});
|
||||
window.location.reload();
|
||||
} catch (err) {
|
||||
submit.disabled = false;
|
||||
showToast(err.message || 'Could not start maintenance', 'error');
|
||||
}
|
||||
});
|
||||
})();
|
||||
+9
-8
@@ -347,7 +347,7 @@
|
||||
'[ OK ] Scheduled tasks registered',
|
||||
'[ OK ] Terminal interface rendered',
|
||||
'',
|
||||
'> ALL SYSTEMS NOMINAL — ' + name,
|
||||
'> ALL SYSTEMS NOMINAL: ' + name,
|
||||
'',
|
||||
];
|
||||
|
||||
@@ -486,8 +486,9 @@
|
||||
---------------------------------------------------------------- */
|
||||
function timeAgo(value) {
|
||||
const date = value instanceof Date ? value : new Date(value);
|
||||
if (isNaN(date)) return '—';
|
||||
if (isNaN(date)) return '-';
|
||||
const diff = Math.floor((Date.now() - date.getTime()) / 1000);
|
||||
if (diff < 5) return 'just now'; // also a clock a little ahead of this browser's
|
||||
if (diff < 60) return diff + 's ago';
|
||||
if (diff < 3600) return Math.floor(diff / 60) + 'm ago';
|
||||
if (diff < 86400) return Math.floor(diff / 3600) + 'h ago';
|
||||
@@ -505,7 +506,7 @@
|
||||
|
||||
function formatDate(value) {
|
||||
const date = value instanceof Date ? value : new Date(value);
|
||||
if (isNaN(date)) return '—';
|
||||
if (isNaN(date)) return '-';
|
||||
try {
|
||||
return date.toLocaleString(undefined, {
|
||||
timeZone: global.APP_TIMEZONE || undefined,
|
||||
@@ -522,7 +523,7 @@
|
||||
lt.bytes.format(n)
|
||||
---------------------------------------------------------------- */
|
||||
function formatBytes(bytes) {
|
||||
if (bytes == null) return '—';
|
||||
if (bytes == null) return '-';
|
||||
const units = ['B','KB','MB','GB','TB']; let i = 0;
|
||||
while (bytes >= 1024 && i < units.length - 1) { bytes /= 1024; i++; }
|
||||
return bytes.toFixed(i === 0 ? 0 : 2) + ' ' + units[i];
|
||||
@@ -1137,9 +1138,9 @@
|
||||
lt.num.format / compact / percent / pad / clamp / lerp
|
||||
---------------------------------------------------------------- */
|
||||
const num = {
|
||||
format(n, d) { if (n == null || isNaN(n)) return '—'; return Number(n).toLocaleString(undefined, { minimumFractionDigits: d || 0, maximumFractionDigits: d != null ? d : 2 }); },
|
||||
format(n, d) { if (n == null || isNaN(n)) return '-'; return Number(n).toLocaleString(undefined, { minimumFractionDigits: d || 0, maximumFractionDigits: d != null ? d : 2 }); },
|
||||
compact(n) { if (Math.abs(n) >= 1e9) return (n/1e9).toFixed(1)+'B'; if (Math.abs(n) >= 1e6) return (n/1e6).toFixed(1)+'M'; if (Math.abs(n) >= 1e3) return (n/1e3).toFixed(1)+'K'; return String(n); },
|
||||
percent(n, total) { return total ? ((n/total)*100).toFixed(1)+'%' : '—'; },
|
||||
percent(n, total) { return total ? ((n/total)*100).toFixed(1)+'%' : '-'; },
|
||||
pad(n, w) { return String(Math.floor(n)).padStart(w, '0'); },
|
||||
clamp(n, a, b) { return Math.min(b, Math.max(a, n)); },
|
||||
lerp(a, b, t) { return a + (b - a) * t; },
|
||||
@@ -1759,7 +1760,7 @@
|
||||
_offlineBanner.className = 'lt-offline-banner';
|
||||
_offlineBanner.setAttribute('role', 'alert');
|
||||
_offlineBanner.setAttribute('aria-live', 'assertive');
|
||||
_offlineBanner.innerHTML = '<span class="lt-dot lt-dot--red"></span> NO NETWORK CONNECTION — RECONNECTING...';
|
||||
_offlineBanner.innerHTML = '<span class="lt-dot lt-dot--red"></span> NO NETWORK CONNECTION, RECONNECTING...';
|
||||
document.body.appendChild(_offlineBanner);
|
||||
}
|
||||
}
|
||||
@@ -1770,7 +1771,7 @@
|
||||
window.addEventListener('offline', () => {
|
||||
document.body.classList.add('lt-is-offline');
|
||||
_offlineGetBanner().classList.add('is-visible');
|
||||
toast.warning('Connection lost — working offline');
|
||||
toast.warning('Connection lost, working offline');
|
||||
_offlineHandlers.forEach(fn => fn());
|
||||
});
|
||||
window.addEventListener('online', () => {
|
||||
|
||||
+137
-57
@@ -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) {
|
||||
@@ -112,10 +116,10 @@ function renderCables() {
|
||||
<thead><tr><th>ID</th><th>From</th><th>To</th><th>Type</th><th>Status</th><th>Check</th>${CS_CAN_EDIT ? '<th class="no-print"></th>' : ''}</tr></thead>
|
||||
<tbody>${rows.map(c => `
|
||||
<tr id="cable-${esc(c.id)}" class="${c.problem ? 'cs-row-problem' : ''}${c.status === 'retired' ? ' row-resolved' : ''}">
|
||||
<td class="cs-id">${c.label ? esc(c.label) : '<span class="val-neutral">–</span>'}${c.label && !c.label_applied && c.status !== 'retired' ? ' <span class="cs-tag" title="The label isn\'t on the cable yet">not stuck on</span>' : ''}</td>
|
||||
<td class="cs-id">${c.label ? esc(c.label) : '<span class="val-neutral">-</span>'}${c.label && !c.label_applied && c.status !== 'retired' ? ' <span class="cs-tag" title="The label isn\'t on the cable yet">not stuck on</span>' : ''}</td>
|
||||
<td data-label="From">${endText(c, 'a')}</td>
|
||||
<td data-label="To">${endText(c, 'b')}${pathText(c) ? `<div class="cs-path">${pathText(c)}</div>` : ''}</td>
|
||||
<td data-label="Type">${esc([c.cable_type, c.length_m ? `${c.length_m} m` : '', c.color].filter(Boolean).join(' · ')) || '–'}</td>
|
||||
<td data-label="Type">${esc([c.cable_type, c.length_m ? `${c.length_m} m` : '', c.color].filter(Boolean).join(' · ')) || '-'}</td>
|
||||
<td data-label="Status">${esc(c.status)}</td>
|
||||
<td data-label="Check">${verdictBadge(c)}<div class="cs-detail">${esc(c.detail)}</div></td>
|
||||
${CS_CAN_EDIT ? `<td class="no-print"><button type="button" class="lt-btn lt-btn-secondary lt-btn-sm" data-action="edit-cable" data-id="${esc(c.id)}" aria-label="Edit cable ${esc(c.label || c.id)}">Edit</button></td>` : ''}
|
||||
@@ -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,33 +226,44 @@ 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>';
|
||||
: '<span class="val-neutral">-</span>';
|
||||
rows.push(`
|
||||
<tr>
|
||||
<td class="cs-id">${n}</td>
|
||||
<td>${lab ? esc(lab.label) + (lab.applied ? '' : ' <span class="cs-tag">not stuck on</span>') : '<span class="val-neutral">–</span>'}
|
||||
<td>${lab ? esc(lab.label) + (lab.applied ? '' : ' <span class="cs-tag">not stuck on</span>') : '<span class="val-neutral">-</span>'}
|
||||
${CS_CAN_EDIT ? `<button type="button" class="cs-link-btn no-print" data-action="edit-port-label" data-item="${esc(p.id)}" data-port="${n}" aria-label="Edit label for ${esc(p.name)} port ${n}">edit</button>` : ''}</td>
|
||||
<td>${cell(front, 'front')}</td>
|
||||
<td>${cell(rear, 'rear')}</td>
|
||||
</tr>`);
|
||||
}
|
||||
return `
|
||||
<div class="lt-frame cs-panel" id="item-${esc(p.id)}">
|
||||
<span class="lt-frame-bl">╚</span><span class="lt-frame-br">╝</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">╚</span><span class="lt-frame-br">╝</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,31 +299,10 @@ 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)}`;
|
||||
if (!i.rack_u) return '–';
|
||||
const side = { rear: ' rear', full: ' full depth' }[i.mount] || '';
|
||||
if (i.shelf) return `on ${esc(i.shelf)}${i.slot ? `, position ${esc(i.slot)}` : ''}`;
|
||||
if (!i.rack_u) return '-';
|
||||
const side = ({ rear: ' rear posts', full: ' full depth' }[i.mount] || '') + (i.facing === 'rear' ? ', faces rear' : '');
|
||||
const where = `U${esc(i.rack_u)}${i.rack_height > 1 ? ` (${esc(i.rack_height)}U)` : ''}${side}`;
|
||||
return (_cs.racks || []).length > 1 ? `${where} · ${esc(i.rack || _cs.racks[0])}` : where;
|
||||
}
|
||||
@@ -282,9 +324,9 @@ function renderItems() {
|
||||
<tr id="${i.kind === 'patch_panel' ? '' : `item-${esc(i.id)}`}">
|
||||
<td>${deviceLink(i.name)}</td>
|
||||
<td>${esc(KIND_TEXT[i.kind] || i.kind)}</td>
|
||||
<td>${esc(i.port_count || '–')}</td>
|
||||
<td>${esc(i.port_count || '-')}</td>
|
||||
<td>${rackText(i)}</td>
|
||||
<td>${esc(i.location || '–')}</td>
|
||||
<td>${esc(i.location || '-')}</td>
|
||||
<td>${esc(i.notes || '')}</td>
|
||||
${CS_CAN_EDIT ? `<td class="no-print"><button type="button" class="lt-btn lt-btn-secondary lt-btn-sm" data-action="edit-item" data-id="${esc(i.id)}" aria-label="Edit ${esc(i.name)}">Edit</button></td>` : ''}
|
||||
</tr>`).join('')}
|
||||
@@ -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;
|
||||
@@ -370,7 +438,7 @@ function openCable(cable, prefill) {
|
||||
const form = document.getElementById('cs-cable-form');
|
||||
form.reset();
|
||||
const types = ['', ..._cs.options.cable_types];
|
||||
form.cable_type.innerHTML = types.map(t => `<option value="${esc(t)}">${esc(t || '–')}</option>`).join('');
|
||||
form.cable_type.innerHTML = types.map(t => `<option value="${esc(t)}">${esc(t || '-')}</option>`).join('');
|
||||
const data = Object.assign({ status: 'installed', label: cable ? '' : _cs.next_label }, cable || {}, prefill || {});
|
||||
for (const key of ['id', 'label', 'a_device', 'a_port', 'b_device', 'b_port', 'cable_type', 'length_m', 'color', 'status', 'notes']) {
|
||||
if (form[key]) form[key].value = data[key] == null ? '' : data[key];
|
||||
@@ -389,14 +457,16 @@ function openCable(cable, prefill) {
|
||||
function openItem(item) {
|
||||
const form = document.getElementById('cs-item-form');
|
||||
form.reset();
|
||||
const data = Object.assign({ kind: 'patch_panel', mount: 'front' }, item || {});
|
||||
const data = Object.assign({ kind: 'patch_panel', mount: 'front', facing: 'front' }, item || {});
|
||||
document.getElementById('cs-rack-list').innerHTML = (_cs.racks || []).map(r => `<option value="${esc(r)}">`).join('');
|
||||
document.getElementById('cs-known-devices').innerHTML = (_cs.devices || []).map(d => `<option value="${esc(d)}">`).join('');
|
||||
form.chassis.innerHTML = '<option value="">Automatic (faceplate or plain plate)</option>' +
|
||||
Object.entries(_cs.chassis || {}).map(([k, v]) => `<option value="${esc(k)}">${esc(v)}</option>`).join('');
|
||||
const shelves = _cs.items.filter(i => i.kind === 'shelf' && (!item || i.id !== item.id));
|
||||
form.shelf.innerHTML = '<option value="">Not on a shelf</option>' +
|
||||
shelves.map(i => `<option value="${esc(i.name)}">${esc(i.name)}</option>`).join('');
|
||||
for (const key of ['id', 'name', 'device', 'kind', 'port_count', 'rack_u', 'rack_height', 'rack', 'mount', 'shelf',
|
||||
'location', 'notes']) {
|
||||
for (const key of ['id', 'name', 'device', 'kind', 'port_count', 'rack_u', 'rack_height', 'rack', 'mount', 'facing',
|
||||
'shelf', 'slot', 'chassis', 'location', 'notes']) {
|
||||
form[key].value = data[key] == null ? '' : data[key];
|
||||
}
|
||||
if (!item) form.port_count.value = 24;
|
||||
@@ -449,8 +519,8 @@ async function saveCable(e) {
|
||||
async function saveItem(e) {
|
||||
e.preventDefault();
|
||||
const form = e.target;
|
||||
const body = formData(form, ['name', 'device', 'kind', 'port_count', 'rack_u', 'rack_height', 'rack', 'mount', 'shelf',
|
||||
'location', 'notes']);
|
||||
const body = formData(form, ['name', 'device', 'kind', 'port_count', 'rack_u', 'rack_height', 'rack', 'mount', 'facing',
|
||||
'shelf', 'slot', 'chassis', 'location', 'notes']);
|
||||
const id = form.id.value;
|
||||
await save(() => id ? lt.api.put(`/api/cutsheet/items/${encodeURIComponent(id)}`, body)
|
||||
: lt.api.post('/api/cutsheet/items', body), 'Saved', 'cs-item-modal');
|
||||
@@ -657,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') {
|
||||
@@ -698,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);
|
||||
|
||||
+65
-23
@@ -13,16 +13,16 @@ let _device = null;
|
||||
|
||||
// ── Formatting ───────────────────────────────────────────────────────
|
||||
function fmtSpeed(mbps) {
|
||||
if (!mbps) return '–';
|
||||
if (!mbps) return '-';
|
||||
return mbps >= 1000 ? (mbps / 1000).toFixed(0) + ' Gbps' : mbps + ' Mbps';
|
||||
}
|
||||
|
||||
function fmtUnit(value, unit, digits) {
|
||||
return value === null || value === undefined ? '–' : `${value.toFixed(digits)} ${unit}`;
|
||||
return value === null || value === undefined ? '-' : `${value.toFixed(digits)} ${unit}`;
|
||||
}
|
||||
|
||||
function fmtUptime(seconds) {
|
||||
if (seconds === null || seconds === undefined) return '–';
|
||||
if (seconds === null || seconds === undefined) return '-';
|
||||
const d = Math.floor(seconds / 86400), h = Math.floor((seconds % 86400) / 3600);
|
||||
const m = Math.floor((seconds % 3600) / 60);
|
||||
return d ? `${d}d ${h}h` : `${h}h ${m}m`;
|
||||
@@ -108,7 +108,7 @@ function sfpPanel(s) {
|
||||
<div class="sfp-vendor-row">${vendor}</div>
|
||||
<div class="sfp-grid">
|
||||
${item('Temp', tempClass(s.temp_c), fmtUnit(s.temp_c, '°C', 1), 'Module temperature. Normal: below 70°C.')}
|
||||
${item('Voltage', voltClass(s.voltage_v), fmtUnit(s.voltage_v, 'V', 2), 'Supply voltage. Normal: 3.1–3.5 V.')}
|
||||
${item('Voltage', voltClass(s.voltage_v), fmtUnit(s.voltage_v, 'V', 2), 'Supply voltage. Normal: 3.1-3.5 V.')}
|
||||
${item('Bias', '', fmtUnit(s.bias_ma, 'mA', 2), 'Laser bias current. High values may mean an aging laser.')}
|
||||
${item('TX Power', tx, fmtUnit(s.tx_power_dbm, 'dBm', 2), 'Optical transmit power.', txPct)}
|
||||
${item('RX Power', rx, fmtUnit(s.rx_power_dbm, 'dBm', 2), 'Optical receive power. Very low values may mean dirty or damaged fiber.', rxPct)}
|
||||
@@ -122,14 +122,16 @@ function hostRows(interfaces) {
|
||||
return Object.entries(interfaces)
|
||||
.sort(([a], [b]) => a.localeCompare(b, undefined, { numeric: true }))
|
||||
.map(([name, d]) => {
|
||||
const up = d.state ? d.state === 'up' : d.link_detected !== false;
|
||||
const mark = (_device.unused_interfaces || {})[name];
|
||||
const unused = !!mark || d.state === 'unused';
|
||||
const up = !unused && (d.state ? d.state === 'up' : d.link_detected !== false);
|
||||
return {
|
||||
id: name, label: name, up, data: d, sub: d.port_type || '',
|
||||
id: name, label: name, up, unused, unusedReason: mark ? mark.reason : '', data: d, sub: d.port_type || '',
|
||||
detail: `
|
||||
<div class="link-stats-grid">
|
||||
${stat('Duplex', esc(d.duplex || '–'), 'Full = both directions at once. Half can cause collisions.')}
|
||||
${stat('Auto-neg', d.auto_neg === null || d.auto_neg === undefined ? '–' : d.auto_neg ? 'On' : 'Off')}
|
||||
${stat('Carrier Δ', d.carrier_changes === null || d.carrier_changes === undefined ? '–' : esc(d.carrier_changes), 'Times the link went up or down. High values mean flapping.')}
|
||||
${stat('Duplex', esc(d.duplex || '-'), 'Full = both directions at once. Half can cause collisions.')}
|
||||
${stat('Auto-neg', d.auto_neg === null || d.auto_neg === undefined ? '-' : d.auto_neg ? 'On' : 'Off')}
|
||||
${stat('Carrier Δ', d.carrier_changes === null || d.carrier_changes === undefined ? '-' : esc(d.carrier_changes), 'Times the link went up or down. High values mean flapping.')}
|
||||
${stat('TX Err/s', fmtErrors(d.tx_errs_rate))}
|
||||
${stat('RX Err/s', fmtErrors(d.rx_errs_rate))}
|
||||
${stat('TX Drop/s', fmtErrors(d.tx_drops_rate))}
|
||||
@@ -154,7 +156,21 @@ function portRows(ports) {
|
||||
}
|
||||
|
||||
function rowHasProblem(r) {
|
||||
return !!badges(r.data);
|
||||
return !r.unused && !!badges(r.data);
|
||||
}
|
||||
|
||||
// The Health cell: an unused interface says so (with an admin toggle) instead of reporting down
|
||||
function healthCell(r) {
|
||||
if (r.unused) {
|
||||
const tip = r.unusedReason ? ` title="${esc(r.unusedReason)}"` : '';
|
||||
const btn = CAN_EDIT ? ` <button type="button" class="lt-btn lt-btn-ghost lt-btn-xs" data-unused="0" data-iface="${esc(r.id)}">In use again</button>` : '';
|
||||
return `<span class="lt-badge badge-neutral"${tip}>unused</span>${btn}`;
|
||||
}
|
||||
const state = badges(r.data) || (r.up ? '<span class="val-good">OK</span>' : '<span class="device-row-sub">down</span>');
|
||||
const btn = CAN_EDIT && !r.up && r.num === undefined
|
||||
? ` <button type="button" class="lt-btn lt-btn-ghost lt-btn-xs" data-unused="1" data-iface="${esc(r.id)}"
|
||||
title="Not meant to be up: stop alerting and stop counting it against the host">Mark unused</button>` : '';
|
||||
return state + btn;
|
||||
}
|
||||
|
||||
function renderTable(rows) {
|
||||
@@ -171,17 +187,17 @@ function renderTable(rows) {
|
||||
const d = r.data;
|
||||
const neighbor = r.neighbor
|
||||
? (r.neighbor.name ? `<a class="device-link" href="${esc(deviceUrl(r.neighbor.name))}">${esc(r.neighbor.name)}</a>` : esc(r.neighbor.chassis || r.neighbor.port || ''))
|
||||
: '–';
|
||||
: '-';
|
||||
return `
|
||||
<tr class="device-row${r.up ? '' : ' device-row--down'}"${isPorts ? ` data-port-idx="${esc(r.num)}"` : ''}>
|
||||
<tr class="device-row${r.unused ? ' device-row--unused' : (r.up ? '' : ' device-row--down')}"${isPorts ? ` data-port-idx="${esc(r.num)}"` : ''}>
|
||||
<td><button type="button" class="device-row-toggle" data-row="${esc(r.id)}"${isPorts ? '' : ` aria-expanded="${open}"`} aria-label="Details for ${esc(r.label)}">${open ? '▾' : '▸'}</button></td>
|
||||
<td><span class="dot-${r.up ? 'up' : 'down'}"></span></td>
|
||||
<td><span class="dot-${r.unused ? 'unused' : (r.up ? 'up' : 'down')}"></span></td>
|
||||
<td class="device-row-name">${r.num !== undefined ? `<span class="port-badge port-badge-num">#${esc(r.num)}</span> ` : ''}${esc(r.label)}<div class="device-row-sub">${esc(r.sub)}</div></td>
|
||||
<td class="device-num">${r.up ? fmtSpeed(d.speed_mbps) : '–'}</td>
|
||||
<td class="device-num">${r.up ? fmtSpeed(d.speed_mbps) : '-'}</td>
|
||||
<td class="device-num device-col-wide">${fmtRate(d.rx_bytes_rate)}</td>
|
||||
<td class="device-num device-col-wide">${fmtRate(d.tx_bytes_rate)}</td>
|
||||
${isPorts ? `<td class="device-col-wide">${neighbor}</td>` : ''}
|
||||
<td>${badges(d) || (r.up ? '<span class="val-good">OK</span>' : '<span class="device-row-sub">down</span>')}</td>
|
||||
<td>${healthCell(r)}</td>
|
||||
</tr>
|
||||
${open ? `<tr class="device-row-detail"><td colspan="7">${r.detail}</td></tr>` : ''}`;
|
||||
}).join('');
|
||||
@@ -241,7 +257,7 @@ function renderUplinks(d) {
|
||||
const rows = d.uplinks.map(u => `
|
||||
<tr>
|
||||
<td><span class="dot-${u.up ? 'up' : 'down'}"></span></td>
|
||||
<td>${esc(u.host_interface || '–')}</td>
|
||||
<td>${esc(u.host_interface || '-')}</td>
|
||||
<td><a class="device-link" href="${esc(deviceUrl(u.switch))}">${esc(u.switch)}</a></td>
|
||||
<td><a class="device-link" href="${esc(deviceUrl(u.switch))}#port-${esc(u.port_idx)}">#${esc(u.port_idx)} ${esc(u.port)}</a></td>
|
||||
<td>${fmtSpeed(u.speed_mbps)}</td>
|
||||
@@ -259,8 +275,8 @@ function renderWan(d) {
|
||||
const rows = names.map(n => {
|
||||
const w = wan[n];
|
||||
return `<tr><td><span class="dot-${w.up ? 'up' : 'down'}"></span></td><td>${esc(n.toUpperCase())}</td>
|
||||
<td>${fmtSpeed(w.speed_mbps)}</td><td>${w.latency_ms === null || w.latency_ms === undefined ? '–' : `${esc(w.latency_ms)} ms`}</td>
|
||||
<td>${w.availability === null || w.availability === undefined ? '–' : `${esc(w.availability)}%`}</td></tr>`;
|
||||
<td>${fmtSpeed(w.speed_mbps)}</td><td>${w.latency_ms === null || w.latency_ms === undefined ? '-' : `${esc(w.latency_ms)} ms`}</td>
|
||||
<td>${w.availability === null || w.availability === undefined ? '-' : `${esc(w.availability)}%`}</td></tr>`;
|
||||
}).join('');
|
||||
return section('WAN', `<div class="lt-table-wrap"><table class="lt-table">
|
||||
<caption class="lt-sr-only">WAN connections</caption>
|
||||
@@ -275,11 +291,15 @@ function renderOutlets(d) {
|
||||
<tr>
|
||||
<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>${esc(o.name || '-')}</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>`);
|
||||
@@ -295,7 +315,7 @@ function renderEvents(events) {
|
||||
<tr class="${e.resolved_at ? '' : `row-${esc(e.severity)}`}">
|
||||
<td><span class="lt-badge badge-${e.resolved_at ? 'resolved' : esc(e.severity)}">${esc(e.severity)}</span>${e.is_suppressed && !e.resolved_at ? '<span class="lt-badge badge-suppressed">🔕 sup</span>' : ''}</td>
|
||||
<td>${esc(e.event_type.replace(/_/g, ' '))}</td>
|
||||
<td>${esc(e.target_detail || '–')}</td>
|
||||
<td>${esc(e.target_detail || '-')}</td>
|
||||
<td class="desc-cell">${esc(e.description || '')}</td>
|
||||
<td class="ts-cell" title="${esc(e.first_seen || '')}">${esc(lt.time.ago(_toIso(e.first_seen)))}</td>
|
||||
<td>${e.resolved_at ? `resolved ${esc(lt.time.ago(_toIso(e.resolved_at)))}` : '<strong>active</strong>'}</td>
|
||||
@@ -326,8 +346,10 @@ function updateInterfaceSection(rows, title, hasChassis) {
|
||||
document.getElementById('device-ports-title').textContent = 'Front panel';
|
||||
return;
|
||||
}
|
||||
const inUse = rows.filter(r => !r.unused);
|
||||
const unusedCount = rows.length - inUse.length;
|
||||
document.getElementById('device-ports-title').textContent =
|
||||
`${title} · ${rows.filter(r => r.up).length} of ${rows.length} up`;
|
||||
`${title} · ${inUse.filter(r => r.up).length} of ${inUse.length} up${unusedCount ? ` · ${unusedCount} unused` : ''}`;
|
||||
document.getElementById('device-table-search').setAttribute('aria-label', `Filter ${title.toLowerCase()}`);
|
||||
document.getElementById('device-error-count').textContent = rows.filter(rowHasProblem).length;
|
||||
}
|
||||
@@ -369,7 +391,27 @@ async function saveInventory(e) {
|
||||
|
||||
document.addEventListener('click', e => {
|
||||
if (e.target.closest('[data-action="edit-inventory"]')) openInventoryEditor();
|
||||
const mark = e.target.closest('[data-unused]');
|
||||
if (mark) toggleUnused(mark.dataset.iface, mark.dataset.unused === '1');
|
||||
});
|
||||
|
||||
async function toggleUnused(iface, unused) {
|
||||
const url = `/api/device/${encodeURIComponent(DEVICE_NAME)}/interfaces/${encodeURIComponent(iface)}/unused`;
|
||||
try {
|
||||
if (unused) {
|
||||
const reason = window.prompt(`Why isn't ${iface} in use? (optional, e.g. "spare, never cabled")`, '');
|
||||
if (reason === null) return;
|
||||
await lt.api.put(url, { reason });
|
||||
lt.toast.success(`${iface} marked unused: it won't alert or count against ${DEVICE_NAME}`);
|
||||
} else {
|
||||
await lt.api.delete(url);
|
||||
lt.toast.success(`${iface} is in use again`);
|
||||
}
|
||||
await loadDevice();
|
||||
} catch (err) {
|
||||
lt.toast.error(err.message || 'Save failed');
|
||||
}
|
||||
}
|
||||
const _inventoryForm = document.getElementById('inventory-form');
|
||||
if (_inventoryForm) _inventoryForm.addEventListener('submit', saveInventory);
|
||||
|
||||
|
||||
+3
-3
@@ -28,7 +28,7 @@ function duration(seconds) {
|
||||
}
|
||||
|
||||
function when(iso) {
|
||||
if (!iso) return '–';
|
||||
if (!iso) return '-';
|
||||
const d = new Date(_toIso(iso));
|
||||
if (isNaN(d)) return esc(iso);
|
||||
const text = d.toLocaleString([], { month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit' });
|
||||
@@ -36,7 +36,7 @@ function when(iso) {
|
||||
}
|
||||
|
||||
function ticketLink(id) {
|
||||
if (!id) return '<span class="val-neutral">–</span>';
|
||||
if (!id) return '<span class="val-neutral">-</span>';
|
||||
const base = (typeof GANDALF_CONFIG !== 'undefined' && GANDALF_CONFIG.ticket_web_url) || '';
|
||||
return base ? `<a href="${esc(base + id)}" target="_blank" rel="noopener">#${esc(id)}</a>` : `#${esc(id)}`;
|
||||
}
|
||||
@@ -157,7 +157,7 @@ function renderTable(data) {
|
||||
const next = end < data.total;
|
||||
document.getElementById('ev-pager').innerHTML = (prev || next) ? `
|
||||
<button type="button" class="lt-btn lt-btn-secondary lt-btn-sm" data-page="${data.offset - data.page_size}" ${prev ? '' : 'disabled'}>← Newer</button>
|
||||
<span>${data.offset + 1}–${end} of ${data.total}</span>
|
||||
<span>${data.offset + 1}-${end} of ${data.total}</span>
|
||||
<button type="button" class="lt-btn lt-btn-secondary lt-btn-sm" data-page="${end}" ${next ? '' : 'disabled'}>Older →</button>` : '';
|
||||
}
|
||||
|
||||
|
||||
+175
-13
@@ -1,5 +1,5 @@
|
||||
'use strict';
|
||||
/* exported renderFaceplate, faceplateScrollLeft, FACEPLATES */
|
||||
/* exported renderFaceplate, faceplateScrollLeft, faceplatePortAnchor, FACEPLATES */
|
||||
|
||||
// Realistic front panels, drawn as SVG from each model's real geometry.
|
||||
// Coordinates are traced from reference images. Keys match UniFi's model code.
|
||||
@@ -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(' · '));
|
||||
@@ -225,7 +237,27 @@ function fpQuadScreen(x, y, s) {
|
||||
</g>`;
|
||||
}
|
||||
|
||||
const fpBrand = (x, y, text) => `<text class="fp-brand" x="${x}" y="${y}">${text}</text>`;
|
||||
// The bar UniFi prints under a group of faster ports, with its speed ("2.5G", "10G")
|
||||
function fpSpeedBar(x0, x1, y, text) {
|
||||
return `<rect class="fp-speedbar" x="${x0}" y="${y - 3}" width="${x1 - x0}" height="3" rx="1.5"/>
|
||||
<text class="fp-label fp-label-sm" x="${(x0 + x1) / 2}" y="${y + 6}" text-anchor="middle">${text}</text>`;
|
||||
}
|
||||
|
||||
// The model name printed under a UniFi screen: centred on the screen, first word bold and
|
||||
// second word light ("USW Pro", "NVR Pro"), as on the real units. `bolt` adds the PoE mark.
|
||||
function fpModel(cx, y, bold, light = '', { size = 7.5, bolt = false } = {}) {
|
||||
const chars = bold.length + (light ? light.length + 1 : 0);
|
||||
const boltW = bolt ? size * 1.3 : 0;
|
||||
const textW = chars * size * 0.6;
|
||||
const x = cx - boltW / 2;
|
||||
const mark = bolt
|
||||
? `<g transform="translate(${x + textW / 2 + size * 0.75} ${y - size * 0.4})">
|
||||
<circle class="fp-brand-bolt-ring" r="${size * 0.62}"/>
|
||||
<path class="fp-brand-bolt" transform="scale(${size / 11})" d="M1 -5 L-3 1 H0 L-1 5 L3 -1 H0 Z"/></g>`
|
||||
: '';
|
||||
return `<text class="fp-brand" x="${x}" y="${y}" text-anchor="middle" style="font-size:${size}px">${bold}${light
|
||||
? `<tspan class="fp-brand-light" dx="${size * 0.25}">${light}</tspan>` : ''}</text>${mark}`;
|
||||
}
|
||||
|
||||
// Two rows of jacks, odd numbers on top: how UniFi rack switches number ports
|
||||
function rj45Pairs(columns, rows) {
|
||||
@@ -270,7 +302,7 @@ const FACEPLATES = {
|
||||
<rect class="fp-screen" x="15" y="25" width="56" height="56" rx="3"/>
|
||||
<circle class="fp-screen-ring" cx="43" cy="51" r="13"/>
|
||||
<circle class="fp-screen-dot" cx="43" cy="51" r="4.5"/>
|
||||
${fpBrand(16, 94, 'Dream Machine Pro')}
|
||||
${fpModel(43, 94, 'UDM', 'Pro')}
|
||||
<rect class="fp-bay" x="447" y="19" width="259" height="66" rx="1.5"/>
|
||||
<rect class="fp-bay-edge" x="447.8" y="19.8" width="3.5" height="64.4"/>
|
||||
<circle class="fp-bay-led" cx="681" cy="52" r="1.6"/>
|
||||
@@ -284,6 +316,35 @@ const FACEPLATES = {
|
||||
},
|
||||
},
|
||||
|
||||
// UniFi NVR Pro, 2U. Layout from the CC0 NetBox devicetype-library front image
|
||||
// (elevation-images/Ubiquiti/ubiquiti-unifi-protect-network-video-recorder-pro.front.png):
|
||||
// touchscreen top left, bays 1-3 on top and 4-7 below, RJ45 (1) and SFP+ (2) top right.
|
||||
// UniFi Network doesn't list a Protect NVR, so on the rack it is picked by Front drawing;
|
||||
// if it is ever reported as UNVRPRO its ports go live like any other.
|
||||
UNVRPRO: {
|
||||
width: 1167, height: 230, frameClass: 'fp-scroll', scrollX: 700,
|
||||
label: 'UniFi NVR Pro',
|
||||
legend: [...LEGEND_RJ45, ['white', '10G']],
|
||||
roles: { 1: 'RJ45 1G', 2: 'SFP+ 10G' },
|
||||
ports: [
|
||||
{ idx: 1, type: 'rj45', x: 1040, y: 74, scale: 1.3, label: [1040, 44] },
|
||||
{ idx: 2, type: 'sfp', x: 1072, y: 61, w: 40, h: 27, led: [1092, 96], label: [1092, 44] },
|
||||
],
|
||||
decor() {
|
||||
const spans = [[97, 293], [302, 498], [507, 703], [712, 908], [916, 1112]];
|
||||
const bay = (x, y, n) => `<rect class="fp-bay" x="${x}" y="${y}" width="283" height="76" rx="1.5"/>
|
||||
<rect class="fp-bay-edge" x="${x + 1}" y="${y + 1}" width="4.5" height="74"/>
|
||||
<circle class="fp-bay-led" cx="${x + 255}" cy="${y + 38}" r="2.2"/>
|
||||
<text class="fp-label" x="${x + 141}" y="${y + 89}" text-anchor="middle">${n}</text>`;
|
||||
return `${fpVents(spans, 8, 4)}${fpVents(spans, 216, 4)}
|
||||
${fpQuadScreen(14, 33, 62)}${fpModel(45, 111, 'NVR', 'Pro')}
|
||||
${[97, 384, 669].map((x, i) => bay(x, 27, i + 1)).join('')}
|
||||
${[12, 299, 585, 871].map((x, i) => bay(x, 125, i + 4)).join('')}
|
||||
<rect class="fp-block" x="1014" y="52" width="104" height="44" rx="1"/>
|
||||
${fpReset(1124, 219)}`;
|
||||
},
|
||||
},
|
||||
|
||||
// Port layout and LED colors: https://dl.ui.com/qsg/USW-Pro-24/USW-Pro-24_EN.html
|
||||
// (the non-PoE sibling). PoE draw has no documented LED, so it is a bolt by the number.
|
||||
US24PRO: {
|
||||
@@ -299,7 +360,7 @@ const FACEPLATES = {
|
||||
],
|
||||
decor() {
|
||||
return `${fpVents([[98, 298], [304, 504], [512, 710], [717, 917], [923, 1122]], 3)}
|
||||
${fpQuadScreen(15, 23, 62)}${fpBrand(17, 99, 'USW Pro')}
|
||||
${fpQuadScreen(15, 23, 62)}${fpModel(46, 99, 'USW', 'Pro', { bolt: true })}
|
||||
<rect class="fp-block" x="563" y="19" width="234" height="69" rx="1"/>
|
||||
<rect class="fp-block" x="797.5" y="19" width="233" height="69" rx="1"/>
|
||||
<rect class="fp-divider" x="1083" y="45" width="39" height="16"/>
|
||||
@@ -307,6 +368,53 @@ const FACEPLATES = {
|
||||
},
|
||||
},
|
||||
|
||||
// USW Pro Max 24 PoE, laid out from the CC0 NetBox devicetype-library image
|
||||
// (ubiquiti-unifi-switch-pro-max-24-poe.front.png; jack centres measured from it):
|
||||
// one row of 24 RJ45 in three groups of 8 (17-24 are 2.5G), then 2 SFP+.
|
||||
USPM24P: {
|
||||
width: 1167, height: 117, frameClass: 'fp-scroll', scrollX: 560,
|
||||
label: 'USW Pro Max 24 PoE',
|
||||
legend: [...LEGEND_RJ45, ['white', '10G'], ['poe', 'PoE in use']],
|
||||
roles: { ...roleRange(1, 16, 'RJ45 1G'), ...roleRange(17, 24, 'RJ45 2.5G'), 25: 'SFP+', 26: 'SFP+' },
|
||||
ports: [
|
||||
...[118.5, 427, 734.5].flatMap((x0, g) => Array.from({ length: 8 }, (_, i) => {
|
||||
const x = x0 + i * 37.35;
|
||||
return { idx: g * 8 + i + 1, type: 'rj45', x, y: 74, scale: 1.1, label: [x, 100] };
|
||||
})),
|
||||
...[1030, 1071].map((x, i) => ({ idx: 25 + i, type: 'sfp', x, y: 62, w: 38, h: 27,
|
||||
led: [x + 19, 54], label: [x + 19, 100] })),
|
||||
],
|
||||
decor() {
|
||||
return `${fpVents([[97, 293], [301, 498], [506, 703], [710, 906], [914, 1110]], 9, 3)}
|
||||
${fpQuadScreen(14, 27, 60)}${fpModel(44, 103, 'USW', 'Pro Max', { bolt: true })}
|
||||
${[98, 407, 714].map(x => `<rect class="fp-block" x="${x}" y="53" width="303" height="36" rx="1"/>`).join('')}
|
||||
${fpSpeedBar(714, 1017, 107, '2.5G')}${fpSpeedBar(1030, 1109, 107, '10G')}
|
||||
${fpReset(1128, 101)}`;
|
||||
},
|
||||
},
|
||||
|
||||
// USW Pro Max 48 PoE, from ubiquiti-unifi-switch-pro-max-48-poe.front.png (CC0, NetBox):
|
||||
// two rows, odd ports on top, three groups of 16 (33-48 are 2.5G), then 4 SFP+ (49-52).
|
||||
USPM48P: {
|
||||
width: 1169, height: 114, frameClass: 'fp-scroll', scrollX: 560,
|
||||
label: 'USW Pro Max 48 PoE',
|
||||
legend: [...LEGEND_RJ45, ['white', '10G'], ['poe', 'PoE in use']],
|
||||
roles: { ...roleRange(1, 32, 'RJ45 1G'), ...roleRange(33, 48, 'RJ45 2.5G'), ...roleRange(49, 52, 'SFP+') },
|
||||
ports: [
|
||||
...rj45Pairs([122, 425.5, 731].flatMap(x0 => Array.from({ length: 8 }, (_, i) => x0 + i * 36.8)),
|
||||
{ top: 38, bottom: 68, topLabel: 15, bottomLabel: 97 }),
|
||||
...sfpPairs([1033, 1075], { first: 49, top: 23, bottom: 60, w: 37, h: 27, ledY: 56, ledGap: 9,
|
||||
topLabel: 15, bottomLabel: 97 }),
|
||||
],
|
||||
decor() {
|
||||
return `${fpVents([[97, 293], [301, 498], [506, 703], [710, 906], [914, 1110]], 7, 3)}
|
||||
${fpQuadScreen(14, 25, 60)}${fpModel(44, 101, 'USW', 'Pro Max', { bolt: true })}
|
||||
${[101, 405, 711].map(x => `<rect class="fp-block" x="${x}" y="19" width="298" height="70" rx="1"/>`).join('')}
|
||||
${fpSpeedBar(711, 1009, 104, '2.5G')}${fpSpeedBar(1033, 1112, 104, '10G')}
|
||||
${fpReset(1130, 99)}`;
|
||||
},
|
||||
},
|
||||
|
||||
// No quick start guide was available: layout from a reference image. LED colors
|
||||
// are taken from the SFP+ ports of the USW Pro 24 guide.
|
||||
USL8A: {
|
||||
@@ -321,7 +429,7 @@ const FACEPLATES = {
|
||||
const dividers = [876.4, 925.6, 975.6, 1025]
|
||||
.map(x => `<rect class="fp-divider" x="${x}" y="46.6" width="36" height="15"/>`).join('');
|
||||
return `${fpVents([[91, 280], [287, 476], [482, 671], [678, 867], [874, 1062]], 7)}
|
||||
${fpQuadScreen(12, 25, 58)}${fpBrand(28, 96, 'USW')}
|
||||
${fpQuadScreen(12, 25, 58)}${fpModel(41, 96, 'USW')}
|
||||
${dividers}
|
||||
<rect class="fp-speed-bar" x="874" y="99" width="188" height="4" rx="1"/>
|
||||
${fpReset(1078.6, 95)}`;
|
||||
@@ -396,7 +504,7 @@ const FACEPLATES = {
|
||||
<rect class="fp-ear-hole" x="${x + 13}" y="189" width="27" height="17" rx="8.5"/>`;
|
||||
return `${ear(0)}${ear(1126)}
|
||||
<rect class="fp-body-metal" x="48" y="1" width="1078" height="213" rx="1"/>
|
||||
${fpQuadScreen(61, 132, 56)}${fpBrand(68, 199, 'USP PDU Pro')}
|
||||
${fpQuadScreen(61, 132, 56)}${fpModel(89, 199, 'USP', 'PDU Pro')}
|
||||
<circle class="fp-button" cx="1053" cy="53" r="4.5"/>
|
||||
<rect class="fp-block" x="977" y="160" width="39" height="32.5" rx="1"/>
|
||||
<rect class="fp-block" x="1032" y="130" width="41" height="62.5" rx="1"/>
|
||||
@@ -470,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) {
|
||||
@@ -499,6 +639,15 @@ function faceplateLegendHtml(spec, marks) {
|
||||
// ctx: { swName, portMap, outlets, online, titleFor(port, idx, role), cutsheetFor?(idx) -> {mark, text},
|
||||
// rack? (draw only the front, spec.rackView, as mounted in a rack) }
|
||||
function renderFaceplate(model, ctx) {
|
||||
const { svg, marks } = faceplateSvg(model, ctx);
|
||||
return `<div class="fp-wrap">
|
||||
<div class="fp-frame ${FACEPLATES[model].frameClass}">${svg}</div>
|
||||
</div>${faceplateLegendHtml(FACEPLATES[model], marks)}`;
|
||||
}
|
||||
|
||||
// The faceplate's SVG on its own, for drawing inside another picture (a shelf). `attrs` adds
|
||||
// attributes to the <svg> (x, y, width, height to place it). Returns { svg, marks }.
|
||||
function faceplateSvg(model, ctx, attrs = '') {
|
||||
const spec = FACEPLATES[model];
|
||||
const anyPort = Object.values(ctx.portMap)[0];
|
||||
const marks = new Set();
|
||||
@@ -516,9 +665,7 @@ function renderFaceplate(model, ctx) {
|
||||
const outlets = (spec.outlets || []).map(o => faceplateOutletSvg(o, outletData[o.idx])).join('');
|
||||
const body = spec.noBody ? ''
|
||||
: `<rect class="fp-body" width="${spec.width}" height="${spec.height}" rx="3"/>`;
|
||||
return `<div class="fp-wrap">
|
||||
<div class="fp-frame ${spec.frameClass}">
|
||||
<svg class="fp-svg" viewBox="${((ctx.rack && spec.rackView) || [0, 0, spec.width, spec.height]).join(' ')}" role="group" aria-label="${lt.escHtml(spec.label)} front panel">
|
||||
const svg = `<svg class="fp-svg" ${attrs} viewBox="${((ctx.rack && spec.rackView) || [0, 0, spec.width, spec.height]).join(' ')}" role="group" aria-label="${lt.escHtml(spec.label)} front panel">
|
||||
<defs>
|
||||
<linearGradient id="fp-metal" x1="0" y1="0" x2="0" y2="1">
|
||||
<stop offset="0" stop-color="#e4e4e6"/><stop offset=".08" stop-color="#d6d6d8"/>
|
||||
@@ -532,9 +679,19 @@ function renderFaceplate(model, ctx) {
|
||||
${spec.decor({ online: ctx.online })}
|
||||
${outlets}
|
||||
${ports}
|
||||
</svg>
|
||||
</div>
|
||||
</div>${faceplateLegendHtml(spec, marks)}`;
|
||||
</svg>`;
|
||||
return { svg, marks };
|
||||
}
|
||||
|
||||
// Where a port's cable plugs in, in the faceplate's viewBox units: { x, y, face }, face 'top' for a
|
||||
// port the right way up and 'bottom' for a flipped one (the lower row). null when there is no such
|
||||
// port. A model whose one port takes any index (the PDU's management port) answers for every index.
|
||||
function faceplatePortAnchor(spec, idx) {
|
||||
const p = spec.ports.find(q => q.idx === idx) || spec.ports.find(q => q.anyPort);
|
||||
if (!p) return null;
|
||||
const face = p.flip ? 'bottom' : 'top';
|
||||
if (p.type === 'sfp') return { x: p.x + p.w / 2, y: p.y + p.h / 2, face };
|
||||
return { x: p.x, y: p.y, face };
|
||||
}
|
||||
|
||||
// Where an fp-scroll panel should start: its port area
|
||||
@@ -542,3 +699,8 @@ function faceplateScrollLeft(model, frame) {
|
||||
const spec = FACEPLATES[model];
|
||||
return spec.scrollX ? (frame.scrollWidth / spec.width) * spec.scrollX : 0;
|
||||
}
|
||||
|
||||
// Same fronts under the other model codes UniFi uses for these switches (non-PoE variants
|
||||
// draw the same; PoE marks simply never show)
|
||||
FACEPLATES.USPM24 = FACEPLATES.USPM24P;
|
||||
FACEPLATES.USPM48 = FACEPLATES.USPM48P;
|
||||
@@ -0,0 +1,420 @@
|
||||
'use strict';
|
||||
/* exported RACK_FRONTS, CHASSIS_FACEPLATES, rackFrontSvg, shelfSvg, SHELF_GEAR, DESK_FACEPLATES */
|
||||
// Drawn fronts for rack gear Gandalf can't read a faceplate from: custom-built servers. Chosen per cutsheet item ("Front drawing"). Each one
|
||||
// shows the device's live status on its power light when the item is linked to a device.
|
||||
//
|
||||
// Spec: { label, units, width, height, draw(ctx) -> SVG markup }, ctx: { status, name }.
|
||||
// Width:height should be about 10.5:1 per rack unit so the drawing fills its slot.
|
||||
|
||||
const FRONT_STATUS = { up: '#2fd36b', degraded: '#ffb300', down: '#e0312b' };
|
||||
|
||||
function frontLed(status) {
|
||||
return FRONT_STATUS[status] || '#6b737d';
|
||||
}
|
||||
|
||||
function ears(w, h, cls = 'rf-ear') {
|
||||
// Rack ears with their mounting slots, both sides
|
||||
const slots = Array.from({ length: Math.round(h / 105) }, (_, i) => 105 * i + 52);
|
||||
const holes = x => slots.map(y => `<rect class="rf-slot" x="${x}" y="${y - 9}" width="9" height="18" rx="4"/>`).join('');
|
||||
return `<rect class="${cls}" x="0" y="0" width="34" height="${h}" rx="3"/>${holes(12)}
|
||||
<rect class="${cls}" x="${w - 34}" y="0" width="34" height="${h}" rx="3"/>${holes(w - 21)}`;
|
||||
}
|
||||
|
||||
function vents(x0, x1, y, h = 8, gap = 6, seg = 120) {
|
||||
const out = [];
|
||||
for (let x = x0; x + seg <= x1; x += seg + gap) out.push(`<rect class="rf-vent" x="${x}" y="${y}" width="${seg}" height="${h}" rx="${h / 2}"/>`);
|
||||
return out.join('');
|
||||
}
|
||||
|
||||
function powerButton(cx, cy, r, status) {
|
||||
return `<circle class="rf-power-ring" cx="${cx}" cy="${cy}" r="${r}" style="stroke:${frontLed(status)}"/>
|
||||
<path class="rf-power-icon" d="M${cx - r * 0.35} ${cy - r * 0.3} a${r * 0.48} ${r * 0.48} 0 1 0 ${r * 0.7} 0 M${cx} ${cy - r * 0.55} v${r * 0.5}"/>`;
|
||||
}
|
||||
|
||||
function usbA(x, y) {
|
||||
return `<rect class="rf-port" x="${x}" y="${y}" width="22" height="9" rx="1"/><rect class="rf-port-tongue" x="${x + 3}" y="${y + 2}" width="16" height="3"/>`;
|
||||
}
|
||||
|
||||
function usbC(x, y) {
|
||||
return `<rect class="rf-port" x="${x}" y="${y}" width="16" height="6" rx="3"/>`;
|
||||
}
|
||||
|
||||
function keyLock(cx, cy) {
|
||||
return `<circle class="rf-lock" cx="${cx}" cy="${cy}" r="9"/><rect class="rf-lock-slot" x="${cx - 1.5}" y="${cy - 6}" width="3" height="12" rx="1"/>`;
|
||||
}
|
||||
|
||||
function brand(x, y, text, anchor = 'start') {
|
||||
return `<text class="rf-brand" x="${x}" y="${y}" text-anchor="${anchor}">${text}</text>`;
|
||||
}
|
||||
|
||||
function driveBay(x, y, w, h, vertical) {
|
||||
// A hot-swap bay: tray face, latch and activity light
|
||||
const latch = vertical
|
||||
? `<rect class="rf-latch" x="${x + w / 2 - 6}" y="${y + h - 26}" width="12" height="18" rx="2"/>`
|
||||
: `<rect class="rf-latch" x="${x + w - 26}" y="${y + h / 2 - 6}" width="18" height="12" rx="2"/>`;
|
||||
const led = vertical ? `<circle class="rf-bay-led" cx="${x + w / 2}" cy="${y + 10}" r="2.5"/>`
|
||||
: `<circle class="rf-bay-led" cx="${x + 10}" cy="${y + h / 2}" r="2.5"/>`;
|
||||
return `<rect class="rf-bay" x="${x}" y="${y}" width="${w}" height="${h}" rx="3"/>${latch}${led}`;
|
||||
}
|
||||
|
||||
const RACK_FRONTS = {
|
||||
// Sliger CX4712 4U with its faceplate off (as driveAtlas draws it): two 5.25" blanks side by
|
||||
// side, ten 3.5" hot-swap bays standing on edge in one row, a narrow I/O strip on the right.
|
||||
'sliger-cx4712': {
|
||||
label: 'Sliger CX4712 4U (10-bay)', units: 4, width: 1100, height: 420,
|
||||
draw({ status }) {
|
||||
// Bays numbered left to right, the local convention driveAtlas uses for this case
|
||||
const bays = Array.from({ length: 10 }, (_, i) => `${driveBay(78 + i * 86, 150, 78, 228, true)}
|
||||
<text class="rf-bay-num" x="${117 + i * 86}" y="396" text-anchor="middle">${i + 1}</text>`).join('');
|
||||
return `<rect class="rf-body-dark" width="1100" height="420" rx="3"/>${ears(1100, 420, 'rf-ear-dark')}
|
||||
<rect class="rf-blank" x="78" y="30" width="418" height="98" rx="3"/>
|
||||
<rect class="rf-blank" x="510" y="30" width="418" height="98" rx="3"/>
|
||||
${vents(98, 480, 74, 7, 8, 40)}${vents(530, 912, 74, 7, 8, 40)}
|
||||
${bays}
|
||||
<rect class="rf-io" x="950" y="30" width="104" height="360" rx="4"/>
|
||||
${powerButton(1002, 78, 20, status)}
|
||||
${usbA(991, 130)}${usbA(991, 150)}${usbC(995, 176)}
|
||||
${keyLock(1002, 220)}
|
||||
${brand(1002, 372, 'SLIGER', 'middle')}`;
|
||||
},
|
||||
},
|
||||
|
||||
// Rosewill RSV-L4500U 4U: the perforated, lockable drop-down door over the fan wall
|
||||
// (15 bays sit behind it), D-handles on the ears, I/O strip with power and USB on the right.
|
||||
'rosewill-rsv-l4500u': {
|
||||
label: 'Rosewill RSV-L4500U 4U (15-bay)', units: 4, width: 1100, height: 420,
|
||||
draw({ status }) {
|
||||
const fan = cx => `<circle class="rf-fan" cx="${cx}" cy="210" r="112"/>
|
||||
<circle class="rf-fan-hub" cx="${cx}" cy="210" r="30"/>
|
||||
${[0, 72, 144, 216, 288].map(a => `<path class="rf-fan-blade" transform="rotate(${a} ${cx} 210)" d="M${cx} 180 q40 -40 70 -10 q-30 10 -70 40 z"/>`).join('')}`;
|
||||
const handle = x => `<rect class="rf-handle" x="${x}" y="60" width="16" height="300" rx="8"/>`;
|
||||
return `<rect class="rf-body-dark" width="1100" height="420" rx="3"/>${ears(1100, 420, 'rf-ear-dark')}
|
||||
${handle(36)}${handle(1048)}
|
||||
<defs><pattern id="rf-perf" width="9" height="9" patternUnits="userSpaceOnUse">
|
||||
<circle class="rf-perf-hole" cx="4.5" cy="4.5" r="2.4"/></pattern></defs>
|
||||
<rect class="rf-door" x="64" y="16" width="880" height="388" rx="6"/>
|
||||
${fan(225)}${fan(504)}${fan(783)}
|
||||
<rect class="rf-mesh" x="80" y="32" width="848" height="356" rx="4" fill="url(#rf-perf)"/>
|
||||
<rect class="rf-door-latch" x="900" y="180" width="26" height="60" rx="5"/>
|
||||
<rect class="rf-io" x="954" y="16" width="86" height="388" rx="4"/>
|
||||
${powerButton(997, 62, 18, status)}
|
||||
<circle class="rf-reset" cx="997" cy="104" r="5"/>
|
||||
<circle class="rf-led" cx="985" cy="130" r="3.5" style="fill:${frontLed(status)}"/><circle class="rf-led" cx="1009" cy="130" r="3.5"/>
|
||||
${usbA(986, 160)}${usbA(986, 180)}
|
||||
${keyLock(997, 232)}
|
||||
${brand(997, 388, 'ROSEWILL', 'middle')}`;
|
||||
},
|
||||
},
|
||||
|
||||
// Sliger CX4712 with its coloured front fitted, as in the rack photo (wiki: rack-2026.jpg):
|
||||
// a hex-perforated panel over most of the face, the drive cages faintly visible through it,
|
||||
// black rack ears, and a power button over two USB ports at the top right.
|
||||
'sliger-cx4712-red': sligerFront('#c8161d', '#e9e5e0'),
|
||||
'sliger-cx4712-white': sligerFront('#eceae6', '#9aa0a6'),
|
||||
'sliger-cx4712-blue': sligerFront('#1f5fae', '#e9e5e0'),
|
||||
|
||||
// Ubiquiti UACC-Rack-Panel-Brush-1U, from Ubiquiti's product images (store.ui.com, UACC-Rack-Panel
|
||||
// variant Brush 1U): a light silver face with separate ear plates (two rounded slots each), a
|
||||
// recessed chamfered frame around the opening (shadowed along the top, bright bevel along the
|
||||
// bottom), and two rows of black bristles meeting at a seam along the middle.
|
||||
'uacc-brush-1u': {
|
||||
label: 'UniFi Rack Panel Brush 1U (UACC-Rack-Panel-Brush-1U)', units: 1, width: 1100, height: 105,
|
||||
draw() {
|
||||
// Bristles: each row is shaded root to tip (dark where it leaves the frame, lighter where the
|
||||
// two rows meet), with a faint strand texture on top. Strong individual strands alias into hard
|
||||
// stripes at rack size, so the texture stays low-contrast and the shading carries the look.
|
||||
// The opening runs almost the full width between the ear plates, as in Ubiquiti's image
|
||||
const strands = (y0, y1, seed) => Array.from({ length: 172 }, (_, i) => {
|
||||
const n = (i * 7919 + seed * 104729) % 97;
|
||||
return `<rect x="${60 + i * 5.7 + (n % 5) * 0.4}" y="${y0 + (n % 4)}" width="${1.4 + (n % 3) * 0.5}"
|
||||
height="${y1 - y0 - (n % 4)}" class="ub-strand" style="opacity:${0.18 + (n % 5) * 0.05}"/>`;
|
||||
}).join('');
|
||||
const slot = x => `<rect class="ua-ear-slot" x="${x - 7}" y="22" width="14" height="10" rx="5"/>
|
||||
<rect class="ua-ear-slot" x="${x - 7}" y="73" width="14" height="10" rx="5"/>`;
|
||||
return `<defs><linearGradient id="fp-metal" x1="0" y1="0" x2="0" y2="1">
|
||||
<stop offset="0" stop-color="#e4e4e6"/><stop offset=".08" stop-color="#d6d6d8"/>
|
||||
<stop offset=".92" stop-color="#cfcfd2"/><stop offset="1" stop-color="#a9a9ad"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="ub-row-top" x1="0" y1="0" x2="0" y2="1">
|
||||
<stop offset="0" stop-color="#08090a"/><stop offset=".7" stop-color="#1f2125"/><stop offset="1" stop-color="#34373c"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="ub-row-bottom" x1="0" y1="0" x2="0" y2="1">
|
||||
<stop offset="0" stop-color="#34373c"/><stop offset=".3" stop-color="#1f2125"/><stop offset="1" stop-color="#08090a"/>
|
||||
</linearGradient></defs>
|
||||
<rect class="fp-body" width="1100" height="105" rx="3"/>
|
||||
<rect class="ua-ear-plate" x="0" y="1" width="32" height="103" rx="3"/>
|
||||
<rect class="ua-ear-plate" x="1068" y="1" width="32" height="103" rx="3"/>
|
||||
<rect class="ua-ear-seam" x="31" y="1" width="1.5" height="103"/>
|
||||
<rect class="ua-ear-seam" x="1067.5" y="1" width="1.5" height="103"/>
|
||||
${slot(16)}${slot(1084)}
|
||||
<rect class="ub-frame" x="44" y="20" width="1012" height="66" rx="7"/>
|
||||
<rect class="ub-frame-shadow" x="48" y="24" width="1004" height="7" rx="3"/>
|
||||
<rect class="ub-frame-bevel" x="48" y="77" width="1004" height="5" rx="2.5"/>
|
||||
<rect class="ub-opening" x="56" y="30" width="988" height="47" rx="2"/>
|
||||
<rect x="56" y="30" width="988" height="23.5" fill="url(#ub-row-top)"/>
|
||||
<rect x="56" y="53.5" width="988" height="23.5" fill="url(#ub-row-bottom)"/>
|
||||
${strands(31, 53, 1)}${strands(54, 76, 2)}
|
||||
<rect class="ub-seam" x="56" y="53" width="988" height="1"/>`;
|
||||
},
|
||||
},
|
||||
|
||||
// Generic servers, for gear without a specific drawing
|
||||
'server-1u': genericServer(1, 4),
|
||||
'server-2u': genericServer(2, 12),
|
||||
'server-4u': genericServer(4, 24),
|
||||
};
|
||||
|
||||
// A rack handle on a Sliger ear: a vertical bar standing off the ear on two mounts
|
||||
function sligerHandle(x) {
|
||||
const top = 70, bottom = 350;
|
||||
return `<rect class="rf-sl-mount" x="${x - 2}" y="${top - 14}" width="30" height="22" rx="4"/>
|
||||
<rect class="rf-sl-mount" x="${x - 2}" y="${bottom - 8}" width="30" height="22" rx="4"/>
|
||||
<rect class="rf-sl-handle" x="${x}" y="${top - 6}" width="26" height="${bottom - top + 12}" rx="13"/>
|
||||
<rect class="rf-sl-handle-shine" x="${x + 5}" y="${top + 6}" width="5" height="${bottom - top - 12}" rx="2.5"/>`;
|
||||
}
|
||||
|
||||
function sligerFront(colour, hole) {
|
||||
const W = 1100, H = 420;
|
||||
// Hex perforations: a pattern of hexagons cut out of the panel through a mask
|
||||
const hex = (cx, cy, r) => Array.from({ length: 6 }, (_, i) => {
|
||||
const a = Math.PI / 6 + i * Math.PI / 3;
|
||||
return `${(cx + r * Math.cos(a)).toFixed(1)},${(cy + r * Math.sin(a)).toFixed(1)}`;
|
||||
}).join(' ');
|
||||
// Hole size and pitch from the rack photo: about 20 rows of holes over the panel's height
|
||||
const r = 6.9, dx = 18, dy = 15.6;
|
||||
const holes = [];
|
||||
for (let row = 0, y = 46; y < H - 34; row++, y += dy) {
|
||||
for (let x = 82 + (row % 2 ? dx / 2 : 0); x < 925; x += dx) holes.push(`<polygon points="${hex(x, y, r)}"/>`);
|
||||
}
|
||||
const bays = Array.from({ length: 10 }, (_, i) => `<rect class="rf-sl-bay" x="${140 + i * 74}" y="120" width="44" height="250" rx="3" style="fill:${hole}"/>`).join('');
|
||||
// The cages show only faintly through the mesh
|
||||
return {
|
||||
label: 'Sliger CX4712 4U (10-bay)', units: 4, width: W, height: H,
|
||||
draw({ status }) {
|
||||
const id = `sl-${colour.slice(1)}`;
|
||||
return `<defs><mask id="${id}"><rect width="${W}" height="${H}" fill="#fff"/><g fill="#000">${holes.join('')}</g></mask></defs>
|
||||
<rect class="rf-sl-inside" x="70" y="30" width="870" height="${H - 60}"/>${bays}
|
||||
<rect class="rf-sl-ear" x="0" y="0" width="70" height="${H}" rx="4"/>
|
||||
<rect class="rf-sl-ear" x="${W - 70}" y="0" width="70" height="${H}" rx="4"/>
|
||||
${sligerHandle(14)}${sligerHandle(W - 40)}
|
||||
<rect x="52" y="10" width="${W - 104}" height="${H - 20}" rx="8" style="fill:${colour}" mask="url(#${id})"/>
|
||||
<rect class="rf-sl-edge" x="52" y="10" width="${W - 104}" height="${H - 20}" rx="8"/>
|
||||
<circle class="rf-sl-button" cx="988" cy="88" r="17"/>
|
||||
<circle class="rf-power-ring" cx="988" cy="88" r="12" style="stroke:${frontLed(status)}"/>
|
||||
<rect class="rf-sl-io" x="966" y="138" width="44" height="74" rx="4"/>
|
||||
${usbA(977, 146)}${usbA(977, 168)}${usbC(980, 192)}`;
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
function genericServer(units, bays) {
|
||||
const H = 105 * units;
|
||||
return {
|
||||
label: `Generic ${units}U server`, units, width: 1100, height: H,
|
||||
draw({ status }) {
|
||||
const rows = Math.max(1, Math.round(units * 0.75));
|
||||
const cols = Math.ceil(bays / rows);
|
||||
const bw = Math.min(118, 720 / cols - 8);
|
||||
const bh = (H - 30 - (rows - 1) * 8) / rows;
|
||||
const out = [];
|
||||
for (let r = 0; r < rows; r++) {
|
||||
for (let c = 0; c < cols && r * cols + c < bays; c++) out.push(driveBay(60 + c * (bw + 8), 15 + r * (bh + 8), bw, bh, false));
|
||||
}
|
||||
return `<rect class="rf-body-dark" width="1100" height="${H}" rx="3"/>${ears(1100, H, 'rf-ear-dark')}
|
||||
${out.join('')}
|
||||
${vents(810, 1040, 18, 7, 6, 36)}${units > 1 ? vents(810, 1040, H - 26, 7, 6, 36) : ''}
|
||||
${powerButton(1020, H / 2, Math.min(18, H / 5), status)}`;
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
// Front drawings that are full faceplates in faceplates.js (same parts as the UniFi gear)
|
||||
const CHASSIS_FACEPLATES = {
|
||||
'unvr-pro': 'UNVRPRO',
|
||||
// For a new switch before UniFi reports it (or under a model code not mapped yet)
|
||||
'usw-pro-max-24-poe': 'USPM24P',
|
||||
'usw-pro-max-48-poe': 'USPM48P',
|
||||
};
|
||||
|
||||
// The markup for one item's drawn front, or '' when the key is unknown
|
||||
function rackFrontSvg(key, ctx) {
|
||||
const spec = RACK_FRONTS[key];
|
||||
if (!spec) return '';
|
||||
return `<svg class="rack-svg rack-front" viewBox="0 0 ${spec.width} ${spec.height}" preserveAspectRatio="none"
|
||||
role="img" aria-label="${lt.escHtml(`${ctx.name}: ${spec.label}${ctx.status ? `, ${ctx.status}` : ''}`)}">
|
||||
<title>${lt.escHtml(`${ctx.name} · ${spec.label}${ctx.status ? ` · ${ctx.status}` : ''}`)}</title>
|
||||
${spec.draw(ctx)}
|
||||
</svg>`;
|
||||
}
|
||||
|
||||
// ── IceWhale ZimaBoard 832 (shelf gear) ─────────────────────────────────
|
||||
// The port end, traced from IceWhale's labelled photo in ZimaDocs
|
||||
// (source/images/Hardware-Interface-Introduction-/hardware-interface-introduction.webp),
|
||||
// in that photo's pixel coordinates (the port end spans 862 x 415 px; 81.4 mm wide).
|
||||
// Left to right: Mini-DisplayPort 1.2, two stacks of GbE RJ45 over USB 3.0, DC 12V 5.5x2.5mm,
|
||||
// on a gunmetal case over a thin gold PCB edge and the black polycarbonate base.
|
||||
const ZIMA = { width: 862, height: 415, mm: 81.4 };
|
||||
|
||||
function zimaRj45(x, y, link) {
|
||||
const contacts = Array.from({ length: 8 }, (_, i) => `<rect class="zb-contact" x="${x + 52 + i * 14}" y="${y + 34}" width="5" height="22"/>`).join('');
|
||||
return `<rect class="zb-shield" x="${x}" y="${y}" width="207" height="143" rx="5"/>
|
||||
<rect class="zb-hole" x="${x + 22}" y="${y + 30}" width="163" height="102" rx="2"/>
|
||||
<rect class="zb-hole-key" x="${x + 70}" y="${y + 120}" width="67" height="16" rx="1"/>
|
||||
${contacts}
|
||||
<rect class="zb-led" x="${x + 16}" y="${y + 9}" width="30" height="15" rx="2" style="fill:${link ? '#3ad16b' : '#8f8f8a'}"/>
|
||||
<rect class="zb-led" x="${x + 161}" y="${y + 9}" width="30" height="15" rx="2" style="fill:${link ? '#f2d13a' : '#77714a'}"/>`;
|
||||
}
|
||||
|
||||
function zimaUsb(x, y) {
|
||||
return `<rect class="zb-shield" x="${x}" y="${y}" width="204" height="100" rx="5"/>
|
||||
<rect class="zb-hole" x="${x + 26}" y="${y + 20}" width="152" height="62" rx="2"/>
|
||||
<rect class="zb-usb-tongue" x="${x + 38}" y="${y + 28}" width="128" height="22" rx="2"/>
|
||||
${Array.from({ length: 5 }, (_, i) => `<rect class="zb-usb-pin" x="${x + 50 + i * 24}" y="${y + 46}" width="10" height="4"/>`).join('')}`;
|
||||
}
|
||||
|
||||
// Which NIC is which on a ZimaBoard: the onboard Realtek GbE ports enumerate on PCI buses 2 and 3
|
||||
// (enp2s0 left jack, enp3s0 right), and a card in the PCIe slot on bus 1 (enp1s0, enp1s0d1).
|
||||
const ZIMA_NICS = { rj45: ['enp2s0', 'enp3s0'], slot: /^enp1s0/ };
|
||||
|
||||
function zimaNic(ctx, name) {
|
||||
const n = (ctx.interfaces || []).find(i => i.name === name);
|
||||
return n ? n.up : ctx.status === 'up';
|
||||
}
|
||||
|
||||
function zimaFront(ctx) {
|
||||
// ctx: { status, interfaces: [{name, up}] }
|
||||
const link = i => zimaNic(ctx, ZIMA_NICS.rj45[i]);
|
||||
const on = ctx.status === 'up' || ctx.status === 'degraded';
|
||||
const pads = [60, 105, 420, 470, 640, 700, 790, 835]
|
||||
.map(x => `<rect class="zb-pad" x="${x}" y="309" width="12" height="7"/>`).join('');
|
||||
return `
|
||||
<rect class="zb-base" x="0" y="300" width="862" height="115" rx="10"/>
|
||||
<rect class="zb-base-sheen" x="6" y="330" width="850" height="6" rx="3"/>
|
||||
${on ? '<ellipse class="zb-glow" cx="34" cy="404" rx="34" ry="9"/>' : ''}
|
||||
<rect class="zb-pcb" x="2" y="306" width="858" height="12"/>${pads}
|
||||
<path class="zb-case" d="M0 14 Q0 0 14 0 H848 Q862 0 862 14 V308 H0 Z"/>
|
||||
<rect class="zb-case-edge" x="0" y="6" width="18" height="300"/>
|
||||
<rect class="zb-case-top" x="14" y="0" width="834" height="5"/>
|
||||
<rect class="zb-shield" x="63" y="225" width="127" height="80" rx="6"/>
|
||||
<path class="zb-hole" d="M75 243 H178 V280 L163 293 H90 L75 280 Z"/>
|
||||
<rect class="zb-dp-pins" x="92" y="262" width="69" height="9" rx="1"/>
|
||||
${zimaRj45(213, 47, link(0))}${zimaRj45(443, 47, link(1))}
|
||||
${zimaUsb(216, 205)}${zimaUsb(443, 205)}
|
||||
<rect class="zb-dc" x="678" y="177" width="132" height="130" rx="8"/>
|
||||
<rect class="zb-dc-face" x="690" y="189" width="108" height="106" rx="6"/>
|
||||
<circle class="zb-dc-ring" cx="744" cy="242" r="36"/>
|
||||
<circle class="zb-hole" cx="744" cy="242" r="27"/>
|
||||
<circle class="zb-dc-pin" cx="744" cy="242" r="8"/>`;
|
||||
}
|
||||
|
||||
// A Mellanox ConnectX-3 single-port SFP+ card (MCX311A) in the ZimaBoard's side PCIe slot, lying flat
|
||||
// beside the board as in the rack photo (wiki.lotusguild.org/zimaboards.jpg): its front edge is about
|
||||
// 54 mm (572 px at the ZimaBoard photo's 10.59 px/mm), PCB at the board's PCB height, heatsink on the
|
||||
// chip, and the SFP+ cage toward the board with a DAC plugged in and its pull tab hanging down.
|
||||
// The round dot on the cage is Gandalf's link mark (like the cutsheet marks), not an LED on the card.
|
||||
const CX3_PX = 572;
|
||||
|
||||
function cx3Card(up) {
|
||||
return `
|
||||
<rect class="cx-part" x="40" y="314" width="70" height="22" rx="2"/>
|
||||
<rect class="cx-part" x="150" y="314" width="40" height="16" rx="2"/>
|
||||
<rect class="cx-part" x="250" y="314" width="90" height="26" rx="2"/>
|
||||
<rect class="cx-pcb" x="0" y="296" width="${CX3_PX}" height="18" rx="2"/>
|
||||
<rect class="cx-pcb-edge" x="0" y="296" width="${CX3_PX}" height="4"/>
|
||||
<rect class="cx-heatsink" x="110" y="232" width="210" height="64" rx="3"/>
|
||||
${Array.from({ length: 9 }, (_, i) => `<rect class="cx-fin" x="${120 + i * 22}" y="232" width="9" height="64"/>`).join('')}
|
||||
<rect class="cx-cage" x="380" y="190" width="150" height="106" rx="4"/>
|
||||
<rect class="cx-cage-lip" x="380" y="190" width="150" height="10" rx="3"/>
|
||||
<rect class="cx-plug" x="392" y="206" width="126" height="80" rx="5"/>
|
||||
<rect class="cx-boot" x="410" y="220" width="90" height="52" rx="10"/>
|
||||
<circle class="cx-cable" cx="455" cy="246" r="20"/>
|
||||
<path class="cx-tab" d="M441 286 V392 Q441 404 455 404 Q469 404 469 392 V286"/>
|
||||
<circle class="cx-link" cx="520" cy="200" r="13" style="fill:${up ? '#3ad16b' : '#e0312b'}"><title>Gandalf: SFP+ link ${up ? 'up' : 'down'}</title></circle>`;
|
||||
}
|
||||
|
||||
function zimaCx3Front(ctx) {
|
||||
return `${cx3Card(zimaNic(ctx, (ctx.interfaces || []).map(i => i.name).find(n => ZIMA_NICS.slot.test(n)) || 'enp1s0'))}
|
||||
<g transform="translate(${CX3_PX} 0)">${zimaFront(ctx)}</g>`;
|
||||
}
|
||||
|
||||
const ZIMA_SPECS = 'Intel Celeron N3450, 8GB LPDDR4, 32GB eMMC, 2x GbE, 2x USB 3.0, 2x SATA, PCIe 2.0 x4, 6W';
|
||||
|
||||
const SHELF_GEAR = {
|
||||
'zimaboard-832': {
|
||||
label: 'IceWhale ZimaBoard 832', mm: ZIMA.mm, width: ZIMA.width, height: ZIMA.height, draw: zimaFront,
|
||||
specs: ZIMA_SPECS,
|
||||
},
|
||||
'zimaboard-832-cx3': {
|
||||
label: 'IceWhale ZimaBoard 832 + ConnectX-3 SFP+', mm: ZIMA.mm * (ZIMA.width + CX3_PX) / ZIMA.width,
|
||||
width: ZIMA.width + CX3_PX, height: ZIMA.height, draw: zimaCx3Front,
|
||||
specs: `${ZIMA_SPECS}; Mellanox ConnectX-3 10G SFP+ (enp1s0) in the PCIe slot, DAC attached`,
|
||||
},
|
||||
};
|
||||
|
||||
// UniFi desk gear drawn from its live faceplate when it sits on a shelf: the real width of the
|
||||
// face (Ubiquiti tech specs) and the span of that face in the faceplate drawing, to scale it.
|
||||
const DESK_FACEPLATES = {
|
||||
USMINI: { mm: 107, body: [2, 661], label: 'UniFi Switch Flex Mini' }, // 107 x 70 x 21 mm
|
||||
USF5P: { mm: 122.5, body: [66, 488], label: 'UniFi Switch Flex' }, // 122.5 x 107.1 x 28 mm
|
||||
};
|
||||
|
||||
// A shelf at true scale (1100 units = 482.6 mm, a 19" panel) with what sits on it, left to right.
|
||||
// Gear with a SHELF_GEAR drawing, or UniFi desk gear with a live faceplate, is drawn to its real
|
||||
// width; anything else is a labelled box. A shelf with Front drawing "resting" has no tray: its gear
|
||||
// lies directly on whatever is below it (a switch on top of the NVR).
|
||||
function shelfSvg(item, esc, faceplate) {
|
||||
const units = item.rack_height || 1;
|
||||
const W = 1100, H = 105 * units, perMm = W / 482.6;
|
||||
const resting = item.chassis === 'resting';
|
||||
const floor = resting ? H - 3 : H - 20;
|
||||
let x = 64;
|
||||
const things = (item.contents || []).map(c => {
|
||||
const gear = SHELF_GEAR[c.chassis];
|
||||
const desk = !gear && faceplate && DESK_FACEPLATES[c.model];
|
||||
let w, h, body;
|
||||
if (gear) {
|
||||
w = gear.mm * perMm;
|
||||
const k = w / gear.width;
|
||||
h = gear.height * k;
|
||||
body = `<g transform="translate(${x} ${floor - h}) scale(${k})">${gear.draw(c)}</g>`;
|
||||
} else if (desk) {
|
||||
// Scale the faceplate so its body spans the switch's real width, then place the whole drawing
|
||||
const spec = faceplate.spec(c.model);
|
||||
const k = (desk.mm * perMm) / (desk.body[1] - desk.body[0]);
|
||||
w = desk.mm * perMm;
|
||||
h = spec.height * k;
|
||||
body = faceplate.svg(c, `x="${x - desk.body[0] * k}" y="${floor - h}" width="${spec.width * k}" height="${h}"`);
|
||||
} else {
|
||||
w = 150;
|
||||
h = 58;
|
||||
body = `<rect class="sh-box" x="${x}" y="${floor - h}" width="${w}" height="${h}" rx="4"/>
|
||||
<text class="sh-box-name" x="${x + w / 2}" y="${floor - h / 2 + 5}" text-anchor="middle">${esc(c.name)}</text>`;
|
||||
}
|
||||
const top = floor - h;
|
||||
const nics = (c.interfaces || []).map(n => `${n.name} ${n.unused ? 'unused' : (n.up ? 'up' : 'down')}`).join(', ');
|
||||
const label = gear ? gear.label : (desk ? desk.label : c.kind);
|
||||
const tip = [c.name, label, c.status, nics, gear && gear.specs].filter(Boolean).join(' · ');
|
||||
// A live faceplate's ports are links of their own, so it isn't wrapped in one
|
||||
const open = desk ? '<g class="sh-thing">' : `<a class="sh-thing" href="${esc(c.url)}">`;
|
||||
const tagY = resting ? top - 16 : floor + 5;
|
||||
const out = `${open}<title>${esc(tip)}</title>
|
||||
${body}
|
||||
${desk ? '' : `<rect class="sh-hit" x="${x - 4}" y="${top - 4}" width="${w + 8}" height="${h + 8}" rx="4"/>`}
|
||||
<rect class="sh-tag" x="${x + w / 2 - 46}" y="${tagY}" width="92" height="12" rx="2"/>
|
||||
<text class="sh-tag-text" x="${x + w / 2}" y="${tagY + 9}" text-anchor="middle">${esc(c.name)}</text>
|
||||
${desk ? '</g>' : '</a>'}`;
|
||||
x += w + 26;
|
||||
return out;
|
||||
}).join('');
|
||||
const tray = resting ? '' : `${ears(W, H, 'rf-ear-dark')}
|
||||
<rect class="sh-back" x="36" y="6" width="${W - 72}" height="${floor - 6}"/>
|
||||
<rect class="sh-floor" x="30" y="${floor}" width="${W - 60}" height="${H - floor - 2}" rx="2"/>
|
||||
<rect class="sh-lip" x="30" y="${floor}" width="${W - 60}" height="3"/>`;
|
||||
return `<svg class="rack-svg rack-shelf-svg" viewBox="0 0 ${W} ${H}" preserveAspectRatio="none" role="group"
|
||||
aria-label="${esc(item.name)}">
|
||||
<title>${esc(item.name)}</title>
|
||||
${tray}
|
||||
${things || `<text class="sh-empty" x="${W / 2}" y="${floor - 12}" text-anchor="middle">${resting ? 'nothing here' : 'empty shelf'}</text>`}
|
||||
<text class="sh-name" x="46" y="18">${esc(item.name)}</text>
|
||||
</svg>`;
|
||||
}
|
||||
+27
-27
@@ -9,13 +9,13 @@ const escHtml = s => lt.escHtml(s);
|
||||
|
||||
// ── Formatting helpers ───────────────────────────────────────────────────
|
||||
function fmtShortSpeed(mbps) {
|
||||
if (!mbps) return '–';
|
||||
if (!mbps) return '-';
|
||||
if (mbps >= 1000) return (mbps / 1000).toFixed(0) + 'G';
|
||||
return mbps + 'M';
|
||||
}
|
||||
|
||||
function fmtRate(bytesPerSec) {
|
||||
if (bytesPerSec === null || bytesPerSec === undefined) return '–';
|
||||
if (bytesPerSec === null || bytesPerSec === undefined) return '-';
|
||||
const bps = bytesPerSec * 8;
|
||||
if (bps < 1e3) return bps.toFixed(0) + ' bps';
|
||||
if (bps < 1e6) return (bps / 1e3).toFixed(1) + ' Kbps';
|
||||
@@ -24,7 +24,7 @@ function fmtRate(bytesPerSec) {
|
||||
}
|
||||
|
||||
function fmtErrors(rate) {
|
||||
if (rate === null || rate === undefined) return '–';
|
||||
if (rate === null || rate === undefined) return '-';
|
||||
if (rate < 0.001) return '<span class="val-good">0 /s</span>';
|
||||
return `<span class="val-crit">${rate.toFixed(3)} /s</span>`;
|
||||
}
|
||||
@@ -298,11 +298,11 @@ function renderPanel(swName, idx) {
|
||||
if (!d) return;
|
||||
|
||||
const upStr = d.up ? '<span class="val-good">UP</span>' : '<span class="val-crit">DOWN</span>';
|
||||
const speedStr = d.speed_mbps ? `<span class="val-cyan">${fmtShortSpeed(d.speed_mbps)}bps</span>` : '–';
|
||||
const speedStr = d.speed_mbps ? `<span class="val-cyan">${fmtShortSpeed(d.speed_mbps)}bps</span>` : '-';
|
||||
const duplexCls = d.full_duplex ? 'val-good' : (d.up ? 'val-warn' : 'val-neutral');
|
||||
const duplexStr = d.up ? `<span class="${duplexCls}">${d.full_duplex ? 'Full' : 'Half'}</span>` : '–';
|
||||
const duplexStr = d.up ? `<span class="${duplexCls}">${d.full_duplex ? 'Full' : 'Half'}</span>` : '-';
|
||||
const autoneg = d.autoneg ? 'On' : 'Off';
|
||||
const mediaStr = d.media || '–';
|
||||
const mediaStr = d.media || '-';
|
||||
const isUplinkBadge = d.is_uplink ? ' <span class="port-badge port-badge-uplink">UPLINK</span>' : '';
|
||||
|
||||
// PoE section
|
||||
@@ -321,8 +321,8 @@ function renderPanel(swName, idx) {
|
||||
if (d.tx_bytes_rate != null || d.rx_bytes_rate != null) {
|
||||
trafficHtml = `
|
||||
<div class="lt-divider"><span class="lt-divider-label">Traffic</span></div>
|
||||
<div class="panel-row"><span class="panel-label" data-tooltip="Transmit — outgoing from this port">TX</span><span class="panel-val">${fmtRate(d.tx_bytes_rate)}</span></div>
|
||||
<div class="panel-row"><span class="panel-label" data-tooltip="Receive — incoming to this port">RX</span><span class="panel-val">${fmtRate(d.rx_bytes_rate)}</span></div>`;
|
||||
<div class="panel-row"><span class="panel-label" data-tooltip="Transmit: outgoing from this port">TX</span><span class="panel-val">${fmtRate(d.tx_bytes_rate)}</span></div>
|
||||
<div class="panel-row"><span class="panel-label" data-tooltip="Receive: incoming to this port">RX</span><span class="panel-val">${fmtRate(d.rx_bytes_rate)}</span></div>`;
|
||||
}
|
||||
|
||||
// Errors / drops section
|
||||
@@ -447,14 +447,14 @@ function buildPathDebug(swName, swPort, serverName, ifaceName, svrData) {
|
||||
const duplexMismatch = swPort.up && svrData.duplex &&
|
||||
((swFull && !svrFull) || (!swFull && svrFull));
|
||||
const duplexWarnHtml = duplexMismatch
|
||||
? `<div class="path-mismatch-alert">⚠ DUPLEX MISMATCH — Switch: ${swFull ? 'Full' : 'Half'} · Server: ${escHtml(svrData.duplex)}</div>`
|
||||
? `<div class="path-mismatch-alert">⚠ DUPLEX MISMATCH. Switch: ${swFull ? 'Full' : 'Half'} · Server: ${escHtml(svrData.duplex)}</div>`
|
||||
: '';
|
||||
|
||||
// Detect speed mismatch
|
||||
const swSpd = swPort.speed_mbps, svrSpd = svrData.speed_mbps;
|
||||
const speedMismatch = swSpd && svrSpd && swSpd > 0 && svrSpd > 0 && swSpd !== svrSpd;
|
||||
const speedWarnHtml = speedMismatch
|
||||
? `<div class="path-mismatch-alert">⚠ SPEED MISMATCH — Switch: ${fmtShortSpeed(swSpd)} · Server: ${fmtShortSpeed(svrSpd)}</div>`
|
||||
? `<div class="path-mismatch-alert">⚠ SPEED MISMATCH. Switch: ${fmtShortSpeed(swSpd)} · Server: ${fmtShortSpeed(svrSpd)}</div>`
|
||||
: '';
|
||||
|
||||
return `
|
||||
@@ -474,7 +474,7 @@ function buildPathDebug(swName, swPort, serverName, ifaceName, svrData) {
|
||||
<div class="path-col">
|
||||
<div class="path-col-header">Server: ${escHtml(serverName)}</div>
|
||||
<div class="path-row"><span>Iface</span><span>${escHtml(ifaceName)}</span></div>
|
||||
<div class="path-row"><span>Speed</span><span>${svrData.speed_mbps ? fmtShortSpeed(svrData.speed_mbps) + 'bps' : '–'}</span></div>
|
||||
<div class="path-row"><span>Speed</span><span>${svrData.speed_mbps ? fmtShortSpeed(svrData.speed_mbps) + 'bps' : '-'}</span></div>
|
||||
<div class="path-row"><span>TX</span><span>${fmtRate(svrData.tx_bytes_rate)}</span></div>
|
||||
<div class="path-row"><span>RX</span><span>${fmtRate(svrData.rx_bytes_rate)}</span></div>
|
||||
<div class="path-row"><span>TX Err</span><span class="${svrErrTx}">${fmtErrors(svrData.tx_errs_rate)}</span></div>
|
||||
@@ -587,7 +587,7 @@ function runDiagnostic(swName, portIdx) {
|
||||
})
|
||||
.catch(e => {
|
||||
const msg = (e && e.status === 429)
|
||||
? 'Rate limit reached — max 5 diagnostics per minute. Please wait.'
|
||||
? 'Rate limit reached: max 5 diagnostics per minute. Please wait.'
|
||||
: 'Error: ' + (e && e.message || 'Request failed');
|
||||
statusEl.textContent = msg;
|
||||
});
|
||||
@@ -666,21 +666,21 @@ function renderDiagnosticResults(d, container) {
|
||||
const issueRows = [...issues, ...warns, ...infoArr].map(item => {
|
||||
const cls = issues.includes(item) ? 'diag-val-bad' : warns.includes(item) ? 'diag-val-warn' : 'diag-val-good';
|
||||
const label = issues.includes(item) ? 'CRIT' : warns.includes(item) ? 'WARN' : 'INFO';
|
||||
return `<div class="diag-issue-row"><span class="${cls}">[${label}]</span> <span class="diag-code">${escHtml(item.code)}</span> — ${escHtml(item.message)}</div>`;
|
||||
return `<div class="diag-issue-row"><span class="${cls}">[${label}]</span> <span class="diag-code">${escHtml(item.code)}</span>: ${escHtml(item.message)}</div>`;
|
||||
}).join('');
|
||||
|
||||
// ── Physical layer ──
|
||||
const carrierVal = secs.carrier === '1' ? '<span class="diag-val-good">YES</span>' :
|
||||
secs.carrier === '0' ? '<span class="diag-val-bad">NO</span>' : '–';
|
||||
secs.carrier === '0' ? '<span class="diag-val-bad">NO</span>' : '-';
|
||||
const operstateVal = (secs.operstate || '?').toUpperCase();
|
||||
const opstateCls = secs.operstate === 'up' ? 'diag-val-good' : secs.operstate === 'down' ? 'diag-val-bad' : 'diag-val-warn';
|
||||
const speedVal = eth.speed_mbps ? `<span class="diag-val-good">${fmtShortSpeed(eth.speed_mbps)}bps</span>` : '<span class="diag-val-warn">–</span>';
|
||||
const speedVal = eth.speed_mbps ? `<span class="diag-val-good">${fmtShortSpeed(eth.speed_mbps)}bps</span>` : '<span class="diag-val-warn">-</span>';
|
||||
const duplexVal = eth.duplex === 'full' ? '<span class="diag-val-good">Full</span>' :
|
||||
eth.duplex === 'half' ? '<span class="diag-val-bad">Half</span>' : '–';
|
||||
eth.duplex === 'half' ? '<span class="diag-val-bad">Half</span>' : '-';
|
||||
const linkDetVal = eth.link_detected === true ? '<span class="diag-val-good">Yes</span>' :
|
||||
eth.link_detected === false ? '<span class="diag-val-bad">No</span>' : '–';
|
||||
eth.link_detected === false ? '<span class="diag-val-bad">No</span>' : '-';
|
||||
const autonegVal = eth.auto_neg === true ? '<span class="diag-val-good">On</span>' :
|
||||
eth.auto_neg === false ? '<span class="diag-val-warn">Off</span>' : '–';
|
||||
eth.auto_neg === false ? '<span class="diag-val-warn">Off</span>' : '-';
|
||||
|
||||
const physHtml = `
|
||||
<div class="diag-section">
|
||||
@@ -769,8 +769,8 @@ function renderDiagnosticResults(d, container) {
|
||||
<tr><td>RX Pause</td><td>${pause.rx_pause ? '<span class="diag-val-good">On</span>' : 'Off'}</td></tr>
|
||||
<tr><td>TX Pause</td><td>${pause.tx_pause ? '<span class="diag-val-good">On</span>' : 'Off'}</td></tr>` : ''}
|
||||
${hasRing ? `
|
||||
<tr><td>RX Ring</td><td>${ring.rx_current != null ? ring.rx_current : '–'} / ${ring.rx_max != null ? ring.rx_max : '–'} max</td></tr>
|
||||
<tr><td>TX Ring</td><td>${ring.tx_current != null ? ring.tx_current : '–'} / ${ring.tx_max != null ? ring.tx_max : '–'} max</td></tr>` : ''}
|
||||
<tr><td>RX Ring</td><td>${ring.rx_current != null ? ring.rx_current : '-'} / ${ring.rx_max != null ? ring.rx_max : '-'} max</td></tr>
|
||||
<tr><td>TX Ring</td><td>${ring.tx_current != null ? ring.tx_current : '-'} / ${ring.tx_max != null ? ring.tx_max : '-'} max</td></tr>` : ''}
|
||||
</table>
|
||||
</div>`;
|
||||
}
|
||||
@@ -799,15 +799,15 @@ function renderDiagnosticResults(d, container) {
|
||||
<div class="path-debug-cols">
|
||||
<div class="path-col">
|
||||
<div class="path-col-header">Switch sees</div>
|
||||
<div class="path-row"><span>System</span><span>${escHtml(swLldp.system_name || '–')}</span></div>
|
||||
<div class="path-row"><span>Port</span><span>${escHtml(swLldp.port_id || '–')}</span></div>
|
||||
<div class="path-row"><span>Chassis</span><span>${escHtml(swLldp.chassis_id || '–')}</span></div>
|
||||
<div class="path-row"><span>System</span><span>${escHtml(swLldp.system_name || '-')}</span></div>
|
||||
<div class="path-row"><span>Port</span><span>${escHtml(swLldp.port_id || '-')}</span></div>
|
||||
<div class="path-row"><span>Chassis</span><span>${escHtml(swLldp.chassis_id || '-')}</span></div>
|
||||
</div>
|
||||
<div class="path-col">
|
||||
<div class="path-col-header">Server lldpctl</div>
|
||||
${lldpctl.available
|
||||
? `<div class="path-row"><span>Neighbor</span><span>${escHtml(lldpctl.neighbor_system || '–')}</span></div>
|
||||
<div class="path-row"><span>Port</span><span>${escHtml(lldpctl.neighbor_port || '–')}</span></div>`
|
||||
? `<div class="path-row"><span>Neighbor</span><span>${escHtml(lldpctl.neighbor_system || '-')}</span></div>
|
||||
<div class="path-row"><span>Port</span><span>${escHtml(lldpctl.neighbor_port || '-')}</span></div>`
|
||||
: '<div class="path-row"><span class="diag-val-warn">lldpd not running</span></div>'}
|
||||
</div>
|
||||
</div>
|
||||
@@ -838,8 +838,8 @@ function renderDiagnosticResults(d, container) {
|
||||
<div class="diag-section-header">Switch Port Summary</div>
|
||||
<table class="diag-table">
|
||||
<tr><td>Status</td><td>${swPort.up ? '<span class="diag-val-good">UP</span>' : '<span class="diag-val-bad">DOWN</span>'}</td></tr>
|
||||
<tr><td>Speed</td><td>${swPort.speed_mbps ? fmtShortSpeed(swPort.speed_mbps) + 'bps' : '–'}</td></tr>
|
||||
<tr><td>Duplex</td><td>${swPort.full_duplex ? 'Full' : (swPort.up ? '<span class="diag-val-bad">Half</span>' : '–')}</td></tr>
|
||||
<tr><td>Speed</td><td>${swPort.speed_mbps ? fmtShortSpeed(swPort.speed_mbps) + 'bps' : '-'}</td></tr>
|
||||
<tr><td>Duplex</td><td>${swPort.full_duplex ? 'Full' : (swPort.up ? '<span class="diag-val-bad">Half</span>' : '-')}</td></tr>
|
||||
<tr><td>TX Err</td><td>${fmtErrors(swPort.tx_errs_rate)}</td></tr>
|
||||
<tr><td>RX Err</td><td>${fmtErrors(swPort.rx_errs_rate)}</td></tr>
|
||||
${swPort.poe_power != null ? `<tr><td>PoE</td><td><span class="val-amber">${swPort.poe_power.toFixed(1)}W</span></td></tr>` : ''}
|
||||
|
||||
+77
-24
@@ -1,5 +1,5 @@
|
||||
'use strict';
|
||||
/* global FACEPLATES, renderFaceplate, RACK_CAN_EDIT */
|
||||
/* global FACEPLATES, renderFaceplate, faceplateSvg, RACK_CAN_EDIT, RACK_FRONTS, CHASSIS_FACEPLATES, rackFrontSvg, shelfSvg */
|
||||
// Rack page: draws the rack front from /api/rack. Switches use their real faceplates,
|
||||
// patch panels a generic panel; hovering a port lights up every port on the same cable run.
|
||||
|
||||
@@ -38,9 +38,10 @@ function isRackFaceplate(model) {
|
||||
}
|
||||
|
||||
// ── Item drawings ───────────────────────────────────────────────────────
|
||||
function switchHtml(item) {
|
||||
const sw = item.switch;
|
||||
return renderFaceplate(sw.model, {
|
||||
function switchHtml(item, model) {
|
||||
// A live switch, or a faceplate picked by Front drawing (no port data: drawn unlinked)
|
||||
const sw = item.switch || { model, ports: {}, outlets: [], online: item.status === 'up' };
|
||||
return renderFaceplate(model || sw.model, {
|
||||
swName: item.device, portMap: portMapOf(sw.ports), outlets: sw.outlets, online: sw.online, rack: true,
|
||||
titleFor: (port, idx) => portTitle(port, idx),
|
||||
cutsheetFor: idx => {
|
||||
@@ -61,7 +62,7 @@ function panelSvg(item) {
|
||||
const rowH = (H - 20) / rows;
|
||||
// Label characters that fit under one port at the label's font size (9px, ~5.6px a character)
|
||||
const fit = Math.max(3, Math.floor((pitch - 2) / 5.6));
|
||||
const short = t => (t.length > fit ? `${t.slice(0, fit - 1)}…` : t);
|
||||
const short = (t, max = fit) => (t.length > max ? `${t.slice(0, max - 1)}…` : t);
|
||||
const ports = [];
|
||||
for (let n = 1; n <= count; n++) {
|
||||
const r = Math.floor((n - 1) / perRow), c = (n - 1) % perRow;
|
||||
@@ -81,7 +82,7 @@ function panelSvg(item) {
|
||||
return `<svg class="rack-svg" viewBox="0 0 ${W} ${H}" preserveAspectRatio="xMidYMid meet" role="group"
|
||||
aria-label="${esc(item.name)} patch panel">
|
||||
<rect class="rack-pp-body" width="${W}" height="${H}" rx="3"/>
|
||||
<text class="rack-pp-name" x="${ear - 50}" y="${H / 2 + 5}">${esc(item.name)}</text>
|
||||
<text class="rack-pp-name" x="14" y="17"><title>${esc(item.name)}</title>${esc(short(item.name, 48))}</text>
|
||||
${ports.join('')}
|
||||
</svg>`;
|
||||
}
|
||||
@@ -92,16 +93,46 @@ function statusDot(status) {
|
||||
return status ? `<span class="${STATUS_CLASS[status] || 'dot-unknown'}" title="${esc(status)}"></span>` : '';
|
||||
}
|
||||
|
||||
function shelfHtml(item) {
|
||||
const contents = item.contents || [];
|
||||
const things = contents.map(c => `
|
||||
<a class="rack-shelf-thing" href="${esc(c.url)}" title="${esc([c.name, c.model, c.status].filter(Boolean).join(' · '))}">
|
||||
${statusDot(c.status)}<span class="rack-shelf-name">${esc(c.name)}</span>
|
||||
</a>`).join('');
|
||||
return `<div class="rack-plate rack-shelf">
|
||||
<span class="rack-shelf-label">${esc(item.name)}</span>
|
||||
<div class="rack-shelf-things">${things || '<span class="rack-plate-sub">empty shelf</span>'}</div>
|
||||
</div>`;
|
||||
// Ubiquiti UACC-Rack-Panel-Patch-Blank-24, laid out from the CC0 NetBox devicetype-library image
|
||||
// (elevation-images/Ubiquiti/ubiquiti-uacc-rack-panel-patch-blank-24.front.png): a grey steel face,
|
||||
// darker ears with oval holes, 24 square keystone openings in one row with the cable-support bar
|
||||
// behind them, and a narrow cable slot at each end. A port with a documented cable gets a keystone jack.
|
||||
function uaccPanelSvg(item) {
|
||||
const W = 1178, H = 108, x0 = 107, pitch = 40.5, ow = 34, oy = 36, oh = 40;
|
||||
const count = Math.min(item.port_count || 24, 24);
|
||||
const ports = [];
|
||||
for (let n = 1; n <= count; n++) {
|
||||
const x = x0 + (n - 1) * pitch;
|
||||
const m = item.ports[String(n)];
|
||||
const label = item.labels[String(n)] || '';
|
||||
const title = [`Port ${n}`, label && `"${label}"`, m ? m.text : 'not on the cutsheet'].filter(Boolean).join(' · ');
|
||||
const attrs = m ? ` data-run="${m.run.join(' ')}" data-cable="${m.cable_id}" tabindex="0" role="link"` : '';
|
||||
const jack = m ? `<rect class="ua-keystone" x="${x + 3}" y="${oy + 3}" width="${ow - 6}" height="${oh - 6}" rx="2"/>
|
||||
<path class="ua-keystone-hole" d="M${x + 7} ${oy + 13} h20 v14 h-4 v4 h-12 v-4 h-4 z"/>` : '';
|
||||
ports.push(`<g class="rack-pp-port ua-port${m ? ` rack-pp-${m.mark}` : ''}"${attrs}>
|
||||
<title>${esc(title)}</title>
|
||||
<rect class="ua-open" x="${x}" y="${oy}" width="${ow}" height="${oh}"/>
|
||||
<rect class="ua-bar" x="${x}" y="${oy + 19}" width="${ow}" height="5"/>
|
||||
${jack}
|
||||
<rect class="rack-pp-jack ua-mark" x="${x - 1}" y="${oy - 1}" width="${ow + 2}" height="${oh + 2}" rx="1"/>
|
||||
<text class="ua-num" x="${x + ow / 2}" y="${oy - 6}" text-anchor="middle">${n}</text>
|
||||
${label ? `<text class="ua-label" x="${x + ow / 2}" y="${oy + oh + 12}" text-anchor="middle">${esc(label.length > 7 ? `${label.slice(0, 6)}…` : label)}</text>` : ''}
|
||||
<rect class="rack-pp-hit" x="${x - 3}" y="${oy - 16}" width="${pitch}" height="${oh + 32}"/>
|
||||
</g>`);
|
||||
}
|
||||
const hole = (x, y) => `<rect class="ua-hole" x="${x}" y="${y}" width="22" height="13" rx="6.5"/>`;
|
||||
return `<svg class="rack-svg" viewBox="0 0 ${W} ${H}" preserveAspectRatio="none" role="group"
|
||||
aria-label="${esc(item.name)} patch panel">
|
||||
<title>${esc(item.name)}</title>
|
||||
<rect class="ua-ear" x="0" y="2" width="44" height="${H - 4}" rx="3"/>
|
||||
<rect class="ua-ear" x="${W - 44}" y="2" width="44" height="${H - 4}" rx="3"/>
|
||||
${hole(8, 12)}${hole(8, 83)}${hole(W - 30, 12)}${hole(W - 30, 83)}
|
||||
<rect class="ua-face" x="36" y="0" width="${W - 72}" height="${H}" rx="2"/>
|
||||
<rect class="ua-lip" x="36" y="0" width="${W - 72}" height="4"/>
|
||||
<rect class="ua-open" x="62" y="${oy}" width="28" height="${oh}"/><rect class="ua-bar" x="62" y="${oy + 19}" width="28" height="5"/>
|
||||
<rect class="ua-open" x="${W - 95}" y="${oy}" width="28" height="${oh}"/><rect class="ua-bar" x="${W - 95}" y="${oy + 19}" width="28" height="5"/>
|
||||
${ports.join('')}
|
||||
</svg>`;
|
||||
}
|
||||
|
||||
function plateHtml(item) {
|
||||
@@ -114,6 +145,15 @@ function plateHtml(item) {
|
||||
</div>`;
|
||||
}
|
||||
|
||||
// Live faceplates for UniFi desk gear sitting on a shelf (a Flex Mini on top of the NVR)
|
||||
const shelfFaceplates = {
|
||||
spec: model => FACEPLATES[model],
|
||||
svg: (c, attrs) => faceplateSvg(c.model, {
|
||||
swName: c.device || c.name, portMap: portMapOf(c.ports), outlets: [], online: c.status === 'up',
|
||||
titleFor: (port, idx) => portTitle(port, idx),
|
||||
}, attrs).svg,
|
||||
};
|
||||
|
||||
function backHtml(item) {
|
||||
// A full-depth item seen from the rear: its back, not its faceplate
|
||||
return `<div class="rack-plate rack-back">
|
||||
@@ -126,8 +166,11 @@ function itemHtml(item) {
|
||||
let body;
|
||||
if (item.through) body = backHtml(item);
|
||||
else if (item.switch && isRackFaceplate(item.switch.model)) body = switchHtml(item);
|
||||
else if (CHASSIS_FACEPLATES[item.chassis]) body = switchHtml(item, CHASSIS_FACEPLATES[item.chassis]);
|
||||
else if (item.chassis && RACK_FRONTS[item.chassis]) body = rackFrontSvg(item.chassis, item);
|
||||
else if (item.kind === 'patch_panel' && item.chassis === 'uacc-patch-24') body = uaccPanelSvg(item);
|
||||
else if (item.kind === 'patch_panel') body = panelSvg(item);
|
||||
else if (item.kind === 'shelf') body = shelfHtml(item);
|
||||
else if (item.kind === 'shelf') body = shelfSvg(item, esc, shelfFaceplates);
|
||||
else body = plateHtml(item);
|
||||
return `<div class="rack-item rack-kind-${esc(item.kind)}" data-item="${esc(item.id)}">${body}</div>`;
|
||||
}
|
||||
@@ -149,7 +192,7 @@ function gapRow(top, bottom) {
|
||||
const n = top - bottom + 1;
|
||||
return `<div class="rack-row rack-row-gap" data-gap="${n}" style="--n:${n}">
|
||||
<div class="rack-u" aria-hidden="true"></div>
|
||||
<div class="rack-gap">U${bottom}–${top} · ${n}U free</div>
|
||||
<div class="rack-gap">U${bottom}-${top} · ${n}U free</div>
|
||||
</div>`;
|
||||
}
|
||||
|
||||
@@ -170,14 +213,16 @@ function renderTabs(data) {
|
||||
return `<button type="button" class="rack-tab${on ? ' active' : ''}" role="tab" aria-selected="${on}"
|
||||
data-rack="${esc(r.name)}">${esc(r.name)} <span class="rack-tab-count">${r.count}</span></button>`;
|
||||
}).join('');
|
||||
document.getElementById('rack-title').textContent = `${data.rack} · ${data.face}`;
|
||||
const VIEW_TITLE = { front: 'front', behind: 'rear posts, from the front', rear: 'rear' };
|
||||
document.getElementById('rack-title').textContent = `${data.rack} · ${VIEW_TITLE[data.face] || data.face}`;
|
||||
document.querySelectorAll('.rack-face-btn').forEach(b => {
|
||||
const on = b.dataset.face === data.face;
|
||||
b.classList.toggle('active', on);
|
||||
b.setAttribute('aria-pressed', on);
|
||||
});
|
||||
const rear = (data.racks.find(r => r.name === data.rack) || {}).rear || 0;
|
||||
document.querySelector('.rack-face-btn[data-face="rear"]').textContent = rear ? `Rear (${rear})` : 'Rear';
|
||||
const r = data.racks.find(x => x.name === data.rack) || {};
|
||||
document.querySelector('.rack-face-btn[data-face="behind"]').textContent = r.behind ? `Rear posts (${r.behind})` : 'Rear posts';
|
||||
document.querySelector('.rack-face-btn[data-face="rear"]').textContent = r.rear ? `Rear (${r.rear})` : 'Rear';
|
||||
}
|
||||
|
||||
function render(data) {
|
||||
@@ -281,6 +326,13 @@ function onLeave(e) {
|
||||
|
||||
function openPort(el) {
|
||||
if (el.classList.contains('fp-port')) {
|
||||
const item = _rack && _rack.items.find(i => i.device === el.dataset.switch);
|
||||
if (item && !item.linked) {
|
||||
// A faceplate drawn by Front drawing for gear Gandalf can't see (the NVR) has no device page:
|
||||
// open the port's cable if one is documented, otherwise the item on the cutsheet
|
||||
location.href = el.dataset.cable ? `/cutsheet#cable-${encodeURIComponent(el.dataset.cable)}` : item.url;
|
||||
return;
|
||||
}
|
||||
location.href = `/device/${encodeURIComponent(el.dataset.switch)}#port-${encodeURIComponent(el.dataset.portIdx)}`;
|
||||
} else if (el.dataset.cable) {
|
||||
location.href = `/cutsheet#cable-${encodeURIComponent(el.dataset.cable)}`;
|
||||
@@ -309,7 +361,8 @@ function currentRack() {
|
||||
}
|
||||
|
||||
function currentFace() {
|
||||
return new URLSearchParams(location.search).get('face') === 'rear' ? 'rear' : 'front';
|
||||
const face = new URLSearchParams(location.search).get('face');
|
||||
return ['behind', 'rear'].includes(face) ? face : 'front';
|
||||
}
|
||||
|
||||
function setView(changes) {
|
||||
@@ -330,14 +383,14 @@ document.getElementById('rack-tabs').addEventListener('click', e => {
|
||||
|
||||
document.querySelector('.rack-face').addEventListener('click', e => {
|
||||
const btn = e.target.closest('[data-face]');
|
||||
if (btn) setView({ face: btn.dataset.face === 'rear' ? 'rear' : '' });
|
||||
if (btn) setView({ face: btn.dataset.face === 'front' ? '' : btn.dataset.face });
|
||||
});
|
||||
|
||||
async function load() {
|
||||
try {
|
||||
const q = new URLSearchParams();
|
||||
if (currentRack()) q.set('rack', currentRack());
|
||||
if (currentFace() === 'rear') q.set('face', 'rear');
|
||||
if (currentFace() !== 'front') q.set('face', currentFace());
|
||||
render(await lt.api.get(`/api/rack${q.toString() ? `?${q}` : ''}`));
|
||||
} catch (err) {
|
||||
if (_rack) return; // keep the last drawing on a failed refresh
|
||||
|
||||
+619
-293
File diff suppressed because it is too large.
Load diff
+1494
File diff suppressed because it is too large.
Load diff
+117
-38
@@ -5,8 +5,9 @@
|
||||
<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>
|
||||
<title>{% block title %}Network Monitor{% endblock %} | GANDALF</title>
|
||||
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
@@ -30,26 +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">✕</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('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>
|
||||
@@ -78,38 +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>
|
||||
{% 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>
|
||||
<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 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 == '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>
|
||||
|
||||
@@ -125,9 +132,13 @@
|
||||
<span class="lt-header-user">{{ _uname }}</span>
|
||||
{% if user.groups and 'admin' in user.groups %}
|
||||
<span class="lt-badge lt-badge-admin" aria-label="Administrator">ADMIN</span>
|
||||
{% if not maintenance %}
|
||||
<button type="button" class="lt-btn lt-btn-ghost lt-btn-sm" data-action="start-maintenance"
|
||||
title="Pause all tickets while you work on the network">Maintenance</button>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
<!-- Notification bell — shows active monitoring alerts -->
|
||||
<!-- Notification bell: shows active monitoring alerts -->
|
||||
<div class="lt-notif-dropdown-wrap" id="lt-notif-wrap">
|
||||
<button type="button"
|
||||
class="lt-btn lt-btn-ghost lt-btn-sm lt-notif-bell-btn"
|
||||
@@ -184,10 +195,24 @@
|
||||
|
||||
<!-- MAIN CONTENT -->
|
||||
<main class="lt-main lt-container" id="main-content">
|
||||
{% if maintenance %}
|
||||
<div class="maint-banner" role="status">
|
||||
<span class="maint-banner-text">
|
||||
<strong>Maintenance:</strong> Gandalf is not opening tickets
|
||||
{% if maintenance.expires_at %}until <time class="maint-until" datetime="{{ maintenance.expires_at }}">{{ maintenance.expires_at }}</time>{% else %}until it is ended{% endif %}.
|
||||
Alerts are still recorded, and anything still failing afterwards gets a ticket.
|
||||
<span class="maint-reason">{{ maintenance.reason }}{% if maintenance.suppressed_by %} ({{ maintenance.suppressed_by }}){% endif %}</span>
|
||||
</span>
|
||||
{% if user.groups and 'admin' in user.groups %}
|
||||
<button type="button" class="lt-btn lt-btn-secondary lt-btn-sm" data-action="end-maintenance"
|
||||
data-sup-id="{{ maintenance.id }}">End now</button>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% block content %}{% endblock %}
|
||||
</main>
|
||||
|
||||
<!-- FOOTER — context-sensitive per page -->
|
||||
<!-- FOOTER: context-sensitive per page -->
|
||||
<footer class="lt-footer" role="contentinfo">
|
||||
<nav class="lt-footer-hints" aria-label="Keyboard shortcuts">
|
||||
{% if request.endpoint == 'index' %}
|
||||
@@ -203,10 +228,48 @@
|
||||
<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>
|
||||
|
||||
<!-- QUICK-SUPPRESS MODAL — available on all pages via [S] shortcut -->
|
||||
{% if user.groups and 'admin' in user.groups and not maintenance %}
|
||||
<!-- MAINTENANCE MODAL: pause every ticket for a while -->
|
||||
<div id="maint-modal" class="lt-modal-overlay"
|
||||
role="dialog" aria-modal="true" aria-labelledby="maint-modal-title" aria-hidden="true">
|
||||
<div class="lt-modal">
|
||||
<div class="lt-modal-header">
|
||||
<h3 class="lt-modal-title" id="maint-modal-title">Start maintenance</h3>
|
||||
<button type="button" class="lt-modal-close" data-modal-close aria-label="Close">✕</button>
|
||||
</div>
|
||||
<form id="maint-form">
|
||||
<div class="lt-modal-body">
|
||||
<p class="lt-field-hint maint-intro">Gandalf keeps checking and recording alerts but opens no tickets
|
||||
until this ends. Anything still failing afterwards gets a ticket as usual.</p>
|
||||
<div class="lt-form-group">
|
||||
<label class="lt-label" for="maint-reason">Reason <span class="required">*</span></label>
|
||||
<input type="text" class="lt-input" id="maint-reason" name="reason" maxlength="500"
|
||||
value="Maintenance" required aria-required="true"
|
||||
placeholder="e.g. UniFi Network update">
|
||||
</div>
|
||||
<div class="lt-form-group lt-form-group--last">
|
||||
<span class="lt-label" id="maint-len-label">How long</span>
|
||||
<div class="duration-pills" role="group" aria-labelledby="maint-len-label">
|
||||
<button type="button" class="maint-pill" data-minutes="30" aria-pressed="false">30 min</button>
|
||||
<button type="button" class="maint-pill active" data-minutes="60" aria-pressed="true">1 hr</button>
|
||||
<button type="button" class="maint-pill" data-minutes="120" aria-pressed="false">2 hr</button>
|
||||
<button type="button" class="maint-pill" data-minutes="240" aria-pressed="false">4 hr</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="lt-modal-footer">
|
||||
<button type="button" class="lt-btn lt-btn-secondary" data-modal-close>Cancel</button>
|
||||
<button type="submit" class="lt-btn lt-btn-primary">Start</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<!-- QUICK-SUPPRESS MODAL: available on all pages via [S] shortcut -->
|
||||
<div id="suppress-modal" class="lt-modal-overlay"
|
||||
role="dialog" aria-modal="true" aria-labelledby="suppress-modal-title" aria-hidden="true">
|
||||
<div class="lt-modal">
|
||||
@@ -267,6 +330,7 @@
|
||||
<button type="button" class="lt-modal-close" data-modal-close aria-label="Close">✕</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>
|
||||
@@ -343,6 +407,7 @@
|
||||
{ id: 'nav-history', group: 'Navigate', icon: '⏱', label: 'Alert History', action: function() { window.location.href = '/events'; } },
|
||||
{ id: 'nav-cutsheet', group: 'Navigate', icon: '🔌', label: 'Cutsheet', action: function() { window.location.href = '/cutsheet'; } },
|
||||
{ id: 'nav-rack', group: 'Navigate', icon: '🗄', label: 'Rack', action: function() { window.location.href = '/rack'; } },
|
||||
{ id: 'nav-topology', group: 'Navigate', icon: '⛓', label: 'Topology', action: function() { window.location.href = '/topology'; } },
|
||||
{ id: 'nav-suppressions', group: 'Navigate', icon: '🔕', label: 'Suppressions', action: function() { window.location.href = '/suppressions'; } },
|
||||
{ id: 'action-refresh', group: 'Actions', icon: '↻', label: 'Refresh Data', kbd: 'R', action: function() { lt.autoRefresh.now(); } },
|
||||
{ id: 'action-suppress', group: 'Actions', icon: '🔕', label: 'New Suppression', kbd: 'S', action: function() { if (typeof openSuppressModal === 'function') openSuppressModal('host','',''); else window.location.href='/suppressions'; } },
|
||||
@@ -352,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]');
|
||||
@@ -422,7 +501,7 @@
|
||||
});
|
||||
})();
|
||||
|
||||
// ── Notification Bell — shows active monitoring alerts ────────────────
|
||||
// ── Notification Bell: shows active monitoring alerts ────────────────
|
||||
(function() {
|
||||
const bell = document.getElementById('lt-notif-bell');
|
||||
const panel = document.getElementById('lt-notif-panel');
|
||||
|
||||
+126
-93
@@ -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">╚</span><span class="lt-frame-br">╝</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">╚</span><span class="lt-frame-br">╝</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>
|
||||
@@ -263,6 +280,11 @@
|
||||
<input class="lt-input" id="cs-item-h" name="rack_height" type="number" min="1" max="20">
|
||||
</div>
|
||||
</div>
|
||||
<div class="lt-form-group">
|
||||
<label class="lt-label" for="cs-item-chassis">Front drawing</label>
|
||||
<select class="lt-select" id="cs-item-chassis" name="chassis"><option value="">Automatic (faceplate or plain plate)</option></select>
|
||||
<div class="lt-field-hint">For gear Gandalf has no live faceplate for: the NVR, or a server's case.</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="lt-form-group">
|
||||
<label class="lt-label" for="cs-item-rack">Rack</label>
|
||||
@@ -270,11 +292,18 @@
|
||||
<datalist id="cs-rack-list"></datalist>
|
||||
</div>
|
||||
<div class="lt-form-group">
|
||||
<label class="lt-label" for="cs-item-mount">Mounted</label>
|
||||
<label class="lt-label" for="cs-item-mount">Mounted on</label>
|
||||
<select class="lt-select" id="cs-item-mount" name="mount">
|
||||
<option value="front">Front posts</option>
|
||||
<option value="rear">Rear posts</option>
|
||||
<option value="full">Both (full depth)</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="lt-form-group">
|
||||
<label class="lt-label" for="cs-item-facing">Ports face</label>
|
||||
<select class="lt-select" id="cs-item-facing" name="facing">
|
||||
<option value="front">Front</option>
|
||||
<option value="rear">Rear</option>
|
||||
<option value="full">Full depth (both sides)</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
@@ -283,6 +312,10 @@
|
||||
<label class="lt-label" for="cs-item-shelf">On shelf</label>
|
||||
<select class="lt-select" id="cs-item-shelf" name="shelf"><option value="">Not on a shelf</option></select>
|
||||
</div>
|
||||
<div class="lt-form-group">
|
||||
<label class="lt-label" for="cs-item-slot">Position on shelf</label>
|
||||
<input class="lt-input" id="cs-item-slot" name="slot" type="number" min="1" max="99" placeholder="1 = leftmost">
|
||||
</div>
|
||||
</div>
|
||||
<div class="lt-field-hint cs-shelf-hint">Gear on a shelf (mini PCs, desk switches) takes its place and side from the shelf: leave its rack unit empty. On a 4-post rack a front and a rear item can share a unit; a full-depth one (a server) takes it on both sides.</div>
|
||||
<div class="lt-form-group">
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
+89
-335
@@ -18,6 +18,10 @@
|
||||
{% if daemon_ok and not summary.critical and not summary.warning %}
|
||||
<span class="chip chip-ok">✔ ALL SYSTEMS NOMINAL</span>
|
||||
{% endif %}
|
||||
{% set followups = (stale_tickets | length) + (stale_alerts or 0) %}
|
||||
{% if followups %}
|
||||
<a class="chip chip-warning chip-followup" href="{{ '#followup' if stale_tickets else '#events-table-wrap' }}">⏳ {{ followups }} TO FOLLOW UP</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="status-meta">
|
||||
<span class="last-check" id="last-check" data-tooltip="Last monitor poll timestamp" data-tooltip-pos="bottom">{{ last_check }}</span>
|
||||
@@ -26,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">
|
||||
@@ -79,7 +53,7 @@
|
||||
<section class="g-section">
|
||||
<div class="g-section-header">
|
||||
<h2 class="g-section-title">Active Alerts</h2>
|
||||
<span class="g-section-badge" id="alert-count-badge"
|
||||
<span class="g-section-badge g-section-badge-alert" id="alert-count-badge"
|
||||
{% if not summary.critical and not summary.warning %}style="display:none"{% endif %}>{{ (summary.critical or 0) + (summary.warning or 0) }}</span>
|
||||
</div>
|
||||
<div class="lt-toolbar">
|
||||
@@ -103,10 +77,10 @@
|
||||
<div id="events-table-wrap">
|
||||
{% if events %}
|
||||
{% if total_active is defined and total_active > events|length %}
|
||||
<div class="pagination-notice">Showing {{ events|length }} of {{ total_active }} active alerts — use the search box to filter, or <a href="/api/events?limit=1000" target="_blank" rel="noopener">export all as JSON</a></div>
|
||||
<div class="pagination-notice">Showing {{ events|length }} of {{ total_active }} active alerts. Use the search box to filter, or <a href="/api/events?limit=1000" target="_blank" rel="noopener">export all as JSON</a></div>
|
||||
{% endif %}
|
||||
<div class="lt-table-wrap">
|
||||
<table class="lt-table" id="events-table">
|
||||
<table class="lt-table lt-table-responsive" id="events-table">
|
||||
<caption class="lt-sr-only">Active network alerts</caption>
|
||||
<thead>
|
||||
<tr>
|
||||
@@ -126,28 +100,30 @@
|
||||
{% for e in events %}
|
||||
{% if e.severity != 'info' %}
|
||||
<tr class="row-{{ e.severity }}{% if e.is_suppressed %} row-suppressed{% endif %}">
|
||||
<td>
|
||||
<td data-label="Sev">
|
||||
<span class="lt-badge badge-{{ e.severity }}">{{ e.severity }}</span>
|
||||
{% if e.is_suppressed %}<span class="lt-badge badge-suppressed" title="Alert suppressed">🔕 sup</span>{% endif %}
|
||||
{% if e.stale_days is not none %}<span class="lt-badge badge-stale" title="Active for {{ e.stale_days }} days with no fix yet">⏳ {{ e.stale_days }}d</span>{% endif %}
|
||||
{% if e.ticket_closed %}<span class="lt-badge badge-ticket-closed" title="Ticket #{{ e.ticket_id }} was closed in Tinker, but this alert is still active">ticket closed</span>{% endif %}
|
||||
</td>
|
||||
<td>{{ e.event_type | replace('_', ' ') }}</td>
|
||||
<td><strong>{{ e.target_name }}</strong></td>
|
||||
<td>{{ e.target_detail or '–' }}</td>
|
||||
<td class="desc-cell" title="{{ e.description | e }}">{{ e.description | truncate(60) }}</td>
|
||||
<td class="ts-cell" title="{{ e.first_seen }}">
|
||||
<td data-label="Type">{{ e.event_type | replace('_', ' ') }}</td>
|
||||
<td data-label="Target"><strong>{{ e.target_name }}</strong></td>
|
||||
<td data-label="Detail">{{ e.target_detail or '-' }}</td>
|
||||
<td data-label="Description" class="desc-cell" title="{{ e.description | e }}">{{ e.description | truncate(60) }}</td>
|
||||
<td data-label="First seen" class="ts-cell" title="{{ e.first_seen }}">
|
||||
<span class="event-age" data-ts="{{ e.first_seen }}">{{ e.first_seen }}</span>
|
||||
</td>
|
||||
<td class="ts-cell" title="{{ e.last_seen }}">
|
||||
<td data-label="Last seen" class="ts-cell" title="{{ e.last_seen }}">
|
||||
<span class="event-age" data-ts="{{ e.last_seen }}">{{ e.last_seen }}</span>
|
||||
</td>
|
||||
<td>{{ e.consecutive_failures }}</td>
|
||||
<td>
|
||||
<td data-label="Failures">{{ e.consecutive_failures }}</td>
|
||||
<td data-label="Ticket">
|
||||
{% if e.ticket_id %}
|
||||
<a href="{{ config.ticket_api.web_url }}{{ e.ticket_id }}" target="_blank"
|
||||
class="ticket-link">#{{ e.ticket_id }}</a>
|
||||
{% else %}–{% endif %}
|
||||
{% else %}-{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
<td data-label="Actions">
|
||||
<button class="lt-btn lt-btn-ghost lt-btn-sm btn-suppress"
|
||||
data-sup-type="{{ 'unifi_device' if e.event_type == 'unifi_device_offline' else 'interface' if e.event_type == 'interface_down' else 'host' }}"
|
||||
data-sup-name="{{ e.target_name }}"
|
||||
@@ -177,6 +153,39 @@
|
||||
</div><!-- /.lt-frame -->
|
||||
</section>
|
||||
|
||||
<!-- ── Needs follow-up: tickets left open after their alert cleared ── -->
|
||||
<section class="g-section" id="followup"{% if not stale_tickets %} hidden{% endif %}>
|
||||
<div class="g-section-header">
|
||||
<h2 class="g-section-title">Needs Follow-up</h2>
|
||||
<span class="g-section-badge g-section-badge-alert" id="followup-badge">{{ stale_tickets | length }}</span>
|
||||
</div>
|
||||
<p class="followup-intro">These tickets are still open in Tinker, but their alert cleared over a day ago. Close them if the problem is fixed.</p>
|
||||
<div class="lt-frame">
|
||||
<span class="lt-frame-bl">╚</span>
|
||||
<span class="lt-frame-br">╝</span>
|
||||
<div class="lt-section-header">Tickets Left Open</div>
|
||||
<div class="lt-table-wrap">
|
||||
<table class="lt-table" id="followup-table">
|
||||
<caption class="lt-sr-only">Tickets still open after their alert cleared</caption>
|
||||
<thead>
|
||||
<tr><th>Ticket</th><th>Target</th><th>Alert</th><th>Cleared</th><th>Alerts on ticket</th></tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for t in stale_tickets %}
|
||||
<tr>
|
||||
<td><a href="{{ config.ticket_api.web_url }}{{ t.ticket_id }}" target="_blank" rel="noopener" class="ticket-link">#{{ t.ticket_id }}</a></td>
|
||||
<td><strong>{{ t.target_name }}</strong></td>
|
||||
<td>{{ t.event_type | replace('_', ' ') }}{% if t.target_detail %} <span class="lt-text-muted">{{ t.target_detail }}</span>{% endif %}</td>
|
||||
<td class="ts-cell" title="{{ t.cleared_at }}"><span class="event-age" data-ts="{{ t.cleared_at }}">{{ t.cleared_at }}</span></td>
|
||||
<td>{{ t.events }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- ── WAN / fiber ──────────────────────────────────────────────────── -->
|
||||
{% include "_modem_panel.html" %}
|
||||
|
||||
@@ -197,40 +206,32 @@
|
||||
{% 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>
|
||||
<span class="host-source source-{{ host.source }}">{{ host.source }}</span>
|
||||
{% if host.source != 'prometheus' %}<span class="host-source source-{{ host.source }}">{{ host.source }}</span>{% endif %}
|
||||
</div>
|
||||
</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">
|
||||
@@ -248,231 +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">╚</span>
|
||||
<span class="lt-frame-br">╝</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 %}
|
||||
|
||||
<!-- ── Network topology ───────────────────────────────── -->
|
||||
<section class="g-section">
|
||||
<div class="g-section-header">
|
||||
<h2 class="g-section-title">Network Topology</h2>
|
||||
<button type="button" class="topo-collapse-btn" id="topo-toggle-btn"
|
||||
aria-expanded="true" aria-controls="topo-collapsible-wrap">▴ Collapse</button>
|
||||
</div>
|
||||
<div class="topo-collapsible" id="topo-collapsible-wrap">
|
||||
|
||||
<div class="topology" id="topology-diagram">
|
||||
<div class="topo-v2">
|
||||
|
||||
{%- set topo_h = snapshot.hosts if snapshot.hosts else {} -%}
|
||||
|
||||
<!-- ══════════════════════════════════════════════════════════════
|
||||
TIER 1: Internet (WAN edge)
|
||||
══════════════════════════════════════════════════════════ -->
|
||||
<div class="topo-tier">
|
||||
<div class="topo-v2-node topo-v2-internet">
|
||||
<span class="topo-v2-icon">◈</span>
|
||||
<span class="topo-v2-label">INTERNET</span>
|
||||
<span class="topo-v2-sub">WAN uplink</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Fiber wire: Internet → AT&T gateway -->
|
||||
<div class="topo-vc">
|
||||
<div class="topo-vc-wire topo-vc-wire--wan"></div>
|
||||
<span class="topo-vc-label">AT&T Fiber</span>
|
||||
</div>
|
||||
|
||||
<!-- ══════════════════════════════════════════════════════════════
|
||||
TIER 1b: AT&T gateway (Rx filled in by updateModem)
|
||||
══════════════════════════════════════════════════════════ -->
|
||||
<div class="topo-tier">
|
||||
<div class="topo-v2-node topo-v2-router" id="topo-modem">
|
||||
<span class="topo-v2-icon">◈</span>
|
||||
<span class="topo-v2-label">BGW320</span>
|
||||
<span class="topo-v2-sub">AT&T Gateway</span>
|
||||
<span class="topo-v2-sub" id="topo-modem-rx">Rx –</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- WAN wire: gateway → UDM-Pro -->
|
||||
<div class="topo-vc">
|
||||
<div class="topo-vc-wire topo-vc-wire--wan"></div>
|
||||
<span class="topo-vc-label">WAN · Port 9 · 1G</span>
|
||||
</div>
|
||||
|
||||
<!-- ══════════════════════════════════════════════════════════════
|
||||
TIER 2: Router – UDM-Pro
|
||||
══════════════════════════════════════════════════════════ -->
|
||||
<div class="topo-tier">
|
||||
<div class="topo-v2-node topo-v2-router">
|
||||
<span class="topo-v2-icon">⬡</span>
|
||||
<span class="topo-v2-label">UDM-Pro</span>
|
||||
<span class="topo-v2-sub">Dream Machine Pro</span>
|
||||
<span class="topo-v2-sub">RU24</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- UDM-Pro → USW-Agg (10G SFP+) -->
|
||||
<div class="topo-vc">
|
||||
<div class="topo-vc-wire topo-vc-wire--10g"></div>
|
||||
<span class="topo-vc-label">10G SFP+</span>
|
||||
</div>
|
||||
|
||||
<!-- ══════════════════════════════════════════════════════════════
|
||||
TIER 3: USW-Aggregation
|
||||
══════════════════════════════════════════════════════════ -->
|
||||
<div class="topo-tier">
|
||||
<div class="topo-v2-node topo-v2-switch" id="topo-switch-agg">
|
||||
<span class="topo-v2-icon">⬡</span>
|
||||
<span class="topo-v2-label">USW-Agg</span>
|
||||
<span class="topo-v2-sub">Aggregation · RU22</span>
|
||||
<span class="topo-v2-sub">8 × 10G SFP+</span>
|
||||
<span class="topo-v2-vlan">VLAN90 · 10.10.90.x/24</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- USW-Agg → Pro 24 PoE (10G trunk) -->
|
||||
<div class="topo-vc">
|
||||
<div class="topo-vc-wire topo-vc-wire--10g"></div>
|
||||
<span class="topo-vc-label">10G trunk</span>
|
||||
</div>
|
||||
|
||||
<!-- ══════════════════════════════════════════════════════════════
|
||||
TIER 4: Pro 24 PoE
|
||||
══════════════════════════════════════════════════════════ -->
|
||||
<div class="topo-tier">
|
||||
<div class="topo-v2-node topo-v2-switch" id="topo-switch-poe">
|
||||
<span class="topo-v2-icon">⬡</span>
|
||||
<span class="topo-v2-label">Pro 24 PoE</span>
|
||||
<span class="topo-v2-sub">24-Port · RU23</span>
|
||||
<span class="topo-v2-sub">24 × 1G PoE</span>
|
||||
<span class="topo-v2-vlan">DHCP · mgmt</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Pro 24 PoE → host bus section -->
|
||||
<div class="topo-vc">
|
||||
<div class="topo-vc-wire topo-vc-wire--mgmt"></div>
|
||||
</div>
|
||||
|
||||
<!-- ══════════════════════════════════════════════════════════════
|
||||
TIER 4 connecting bus – two rails (10G green + 1G amber dashed)
|
||||
showing dual-homing for all 6 servers
|
||||
══════════════════════════════════════════════════════════ -->
|
||||
<div class="topo-bus-section">
|
||||
|
||||
<!-- 10G storage bus (Agg → VLAN90) -->
|
||||
<div class="topo-bus-10g">
|
||||
<span class="topo-bus-10g-label">← USW-Agg · 10G SFP+ · VLAN90 →</span>
|
||||
<div class="topo-bus-10g-line"></div>
|
||||
</div>
|
||||
|
||||
<!-- 1G management bus (PoE → DHCP) -->
|
||||
<div class="topo-bus-1g">
|
||||
<span class="topo-bus-1g-label">← Pro 24 PoE · 1G · DHCP mgmt →</span>
|
||||
<div class="topo-bus-1g-line"></div>
|
||||
</div>
|
||||
|
||||
<!-- ── Host nodes with drop wires ── -->
|
||||
<div class="topo-v2-hosts">
|
||||
{%- set all_defs = [
|
||||
('compute-storage-gpu-01', 'csg-01', 'RU4–12', 'Ceph · VLAN90', False),
|
||||
('compute-storage-01', 'cs-01', 'RU14–17', 'Ceph · VLAN90', False),
|
||||
('storage-01', 'sto-01', 'rack', 'Ceph · VLAN90', False),
|
||||
('monitor-01', 'mon-01', 'ZimaBoard', 'mgmt', False),
|
||||
('monitor-02', 'mon-02', 'ZimaBoard', 'mgmt', False),
|
||||
('large1', 'large1', 'off-rack', 'table', True),
|
||||
] -%}
|
||||
{%- for hname, hlabel, hsub, hvlan, off_rack in all_defs -%}
|
||||
{%- set st = topo_h[hname].status if hname in topo_h else 'unknown' -%}
|
||||
<div class="topo-v2-host-wrap">
|
||||
<!-- dual-homing wires: 10G solid green + 1G dashed amber -->
|
||||
<div class="topo-v2-host-wires">
|
||||
<div class="topo-v2-wire-10g" data-host="{{ hname }}" title="10G SFP+ → USW-Agg"></div>
|
||||
<div class="topo-v2-wire-1g" data-host="{{ hname }}" title="1G → Pro 24 PoE"></div>
|
||||
</div>
|
||||
<!-- host box -->
|
||||
<div class="topo-v2-node topo-v2-host topo-host topo-v2-status-{{ st }}{{ ' topo-v2-offrack' if off_rack else '' }} topo-v2-host--bus"
|
||||
data-host="{{ hname }}">
|
||||
<span class="topo-v2-icon">▣</span>
|
||||
<span class="topo-v2-label">{{ hlabel }}</span>
|
||||
<span class="topo-v2-sub">{{ hsub }}</span>
|
||||
<span class="topo-v2-vlan">{{ hvlan }}</span>
|
||||
<span class="topo-badge topo-badge-{{ st }}">{{ st if st != 'unknown' else '–' }}</span>
|
||||
</div>
|
||||
</div>
|
||||
{%- endfor -%}
|
||||
</div>
|
||||
|
||||
</div><!-- /topo-bus-section -->
|
||||
|
||||
<!-- ── Legend ── -->
|
||||
<div class="topo-legend">
|
||||
<div class="topo-legend-item"><span class="topo-legend-line-wan"></span> WAN / uplink</div>
|
||||
<div class="topo-legend-item"><span class="topo-legend-line-10g"></span> 10G SFP+ (Ceph / VLAN90)</div>
|
||||
<div class="topo-legend-item"><span class="topo-legend-line-1g"></span> 1G DHCP (mgmt)</div>
|
||||
<div class="topo-legend-item topo-legend-item--offrack">dashed border = off-rack</div>
|
||||
</div>
|
||||
|
||||
</div><!-- /topo-v2 -->
|
||||
</div>
|
||||
|
||||
</div><!-- /#topo-collapsible-wrap -->
|
||||
</section>
|
||||
|
||||
|
||||
<!-- ── 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' -%}
|
||||
@@ -487,12 +287,12 @@
|
||||
·
|
||||
<span class="lt-badge badge-resolved">{{ e.severity }}</span>
|
||||
· duration
|
||||
<span class="event-duration" data-first="{{ e.first_seen }}" data-resolved="{{ e.resolved_at }}">–</span>
|
||||
<span class="event-duration" data-first="{{ e.first_seen }}" data-resolved="{{ e.resolved_at }}">-</span>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</section>
|
||||
</details>
|
||||
{% endif %}
|
||||
|
||||
{% endblock %}
|
||||
@@ -501,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;
|
||||
@@ -512,30 +313,6 @@
|
||||
if (s.refreshInterval > 0) lt.autoRefresh.start(refreshAll, s.refreshInterval * 1000);
|
||||
};
|
||||
|
||||
// ── Topology collapse toggle ───────────────────────────────────
|
||||
(function() {
|
||||
const LS_KEY = 'gandalf_topo_collapsed';
|
||||
const btn = document.getElementById('topo-toggle-btn');
|
||||
const wrap = document.getElementById('topo-collapsible-wrap');
|
||||
if (!btn || !wrap) return;
|
||||
|
||||
function setCollapsed(v) {
|
||||
wrap.classList.toggle('is-collapsed', v);
|
||||
wrap.setAttribute('aria-hidden', v ? 'true' : 'false');
|
||||
btn.setAttribute('aria-expanded', v ? 'false' : 'true');
|
||||
btn.textContent = v ? '▾ Expand' : '▴ Collapse';
|
||||
try { localStorage.setItem(LS_KEY, v ? '1' : '0'); } catch(_) {}
|
||||
}
|
||||
|
||||
let saved = false;
|
||||
try { saved = localStorage.getItem(LS_KEY) === '1'; } catch(_) {}
|
||||
setCollapsed(saved);
|
||||
|
||||
btn.addEventListener('click', function() {
|
||||
setCollapsed(!wrap.classList.contains('is-collapsed'));
|
||||
});
|
||||
})();
|
||||
|
||||
function updateEventAges() {
|
||||
document.querySelectorAll('.event-age[data-ts]').forEach(el => {
|
||||
el.textContent = lt.time.ago(_toIso(el.dataset.ts));
|
||||
@@ -547,9 +324,9 @@
|
||||
|
||||
// ── Event duration (resolved_at - first_seen) ──────────────────
|
||||
function fmtDuration(firstTs, resolvedTs) {
|
||||
if (!firstTs || !resolvedTs) return '–';
|
||||
if (!firstTs || !resolvedTs) return '-';
|
||||
const secs = Math.floor((new Date(_toIso(resolvedTs)) - new Date(_toIso(firstTs))) / 1000);
|
||||
if (secs < 0) return '–';
|
||||
if (secs < 0) return '-';
|
||||
if (secs < 60) return `${secs}s`;
|
||||
if (secs < 3600) return `${Math.floor(secs/60)}m`;
|
||||
if (secs < 86400) return `${Math.floor(secs/3600)}h ${Math.floor((secs%3600)/60)}m`;
|
||||
@@ -595,28 +372,5 @@
|
||||
.observe(document.getElementById('events-table-wrap'), { childList: true, subtree: true });
|
||||
|
||||
initDeviceSearch();
|
||||
|
||||
// Topology hosts open their device page
|
||||
document.getElementById('topology-diagram')?.addEventListener('click', e => {
|
||||
const node = e.target.closest('.topo-host[data-host]');
|
||||
if (node) window.location.href = deviceUrl(node.dataset.host);
|
||||
});
|
||||
|
||||
// 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 %}
|
||||
+9
-3
@@ -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>
|
||||
@@ -21,8 +22,12 @@
|
||||
<div class="rack-bar">
|
||||
<div class="rack-tabs" id="rack-tabs" role="tablist" aria-label="Racks" hidden></div>
|
||||
<div class="rack-face" role="group" aria-label="Rack side">
|
||||
<button type="button" class="rack-face-btn active" data-face="front" aria-pressed="true">Front</button>
|
||||
<button type="button" class="rack-face-btn" data-face="rear" aria-pressed="false">Rear</button>
|
||||
<button type="button" class="rack-face-btn active" data-face="front" aria-pressed="true"
|
||||
title="The front posts, seen from the front">Front</button>
|
||||
<button type="button" class="rack-face-btn" data-face="behind" aria-pressed="false"
|
||||
title="Gear on the rear posts, seen from the front (what is behind the front gear)">Rear posts</button>
|
||||
<button type="button" class="rack-face-btn" data-face="rear" aria-pressed="false"
|
||||
title="The rack seen from behind">Rear</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -84,5 +89,6 @@
|
||||
{% block scripts %}
|
||||
<script>const RACK_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='rack.js') }}"></script>
|
||||
{% endblock %}
|
||||
@@ -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>
|
||||
|
||||
@@ -104,7 +104,7 @@
|
||||
{%- set _sup_badge = {'host':'badge-warning','interface':'badge-info','unifi_device':'badge-purple','all':'badge-critical'} -%}
|
||||
<td><span class="lt-badge {{ _sup_badge.get(s.target_type, 'badge-neutral') }}">{{ s.target_type }}</span></td>
|
||||
<td>{{ s.target_name or 'all' }}</td>
|
||||
<td>{{ s.target_detail or '–' }}</td>
|
||||
<td>{{ s.target_detail or '-' }}</td>
|
||||
<td>{{ s.reason }}</td>
|
||||
<td>{{ s.suppressed_by }}</td>
|
||||
<td class="ts-cell">{{ s.created_at }}</td>
|
||||
@@ -154,7 +154,7 @@
|
||||
<tr class="{% if not s.active %}row-resolved{% endif %}">
|
||||
<td>{{ s.target_type }}</td>
|
||||
<td>{{ s.target_name or 'all' }}</td>
|
||||
<td>{{ s.target_detail or '–' }}</td>
|
||||
<td>{{ s.target_detail or '-' }}</td>
|
||||
<td>{{ s.reason }}</td>
|
||||
<td>{{ s.suppressed_by }}</td>
|
||||
<td class="ts-cell">{{ s.created_at }}</td>
|
||||
@@ -243,7 +243,7 @@
|
||||
<tr id="sup-row-${s.id}">
|
||||
<td><span class="lt-badge ${SUP_BADGE[s.target_type] || 'badge-neutral'}">${lt.escHtml(s.target_type)}</span></td>
|
||||
<td>${lt.escHtml(s.target_name || 'all')}</td>
|
||||
<td>${lt.escHtml(s.target_detail || '–')}</td>
|
||||
<td>${lt.escHtml(s.target_detail || '-')}</td>
|
||||
<td>${lt.escHtml(s.reason)}</td>
|
||||
<td>${lt.escHtml(s.suppressed_by)}</td>
|
||||
<td class="ts-cell">${lt.escHtml(s.created_at || '')}</td>
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
{% extends "base.html" %}
|
||||
{% block title %}Topology{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="lt-page-header">
|
||||
<div>
|
||||
<h1 class="lt-page-title">Topology</h1>
|
||||
<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>
|
||||
|
||||
<div class="tp-toolbar no-print" role="toolbar" aria-label="Topology view">
|
||||
<div class="tp-filters" role="group" aria-label="Show">
|
||||
<label class="tp-filter">Unknown devices
|
||||
<select class="lt-select tp-select" data-filter="stubs" aria-label="Unknown devices">
|
||||
<option value="grouped">grouped per switch</option>
|
||||
<option value="all">one by one</option>
|
||||
<option value="none">hidden</option>
|
||||
</select></label>
|
||||
<label class="tp-filter"><input type="checkbox" data-filter="power"> Power gear</label>
|
||||
<label class="tp-filter"><input type="checkbox" data-filter="traffic"> Traffic</label>
|
||||
<label class="tp-filter" title="Each server's slower second cable. A problem cable is always shown."><input type="checkbox" data-filter="mgmt"> Server 1G links</label>
|
||||
<label class="tp-filter"><input type="checkbox" data-filter="alerts"> Alerts only</label>
|
||||
</div>
|
||||
<div class="tp-zoom" role="group" aria-label="Zoom">
|
||||
<button type="button" class="lt-btn lt-btn-secondary lt-btn-sm" data-zoom="out" aria-label="Zoom out" title="Zoom out (-)">−</button>
|
||||
<button type="button" class="lt-btn lt-btn-secondary lt-btn-sm" data-zoom="fit" title="Fit everything (0)">Fit</button>
|
||||
<button type="button" class="lt-btn lt-btn-secondary lt-btn-sm" data-zoom="in" aria-label="Zoom in" title="Zoom in (+)">+</button>
|
||||
</div>
|
||||
<span class="tp-updated" id="tp-updated" aria-live="polite"></span>
|
||||
</div>
|
||||
|
||||
<div class="tp-warnings" id="tp-warnings" role="status" hidden></div>
|
||||
<div class="tp-summary" id="tp-summary" aria-live="polite"></div>
|
||||
|
||||
<div class="tp-canvas" id="tp-canvas" tabindex="0" aria-label="Network topology diagram. Use plus, minus and zero to zoom, and Tab to move between devices and cables.">
|
||||
<svg class="tp-svg" id="tp-svg" xmlns="http://www.w3.org/2000/svg" role="group" aria-label="Network topology">
|
||||
<g id="tp-world"></g>
|
||||
</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">
|
||||
<span class="tp-key"><svg viewBox="0 0 40 12" aria-hidden="true"><path class="tp-key-line tp-m-dac" d="M2 6 H38"/></svg>DAC</span>
|
||||
<span class="tp-key"><svg viewBox="0 0 40 12" aria-hidden="true"><path class="tp-key-line tp-m-fibre" d="M2 6 H38"/></svg>Fibre (multimode)</span>
|
||||
<span class="tp-key"><svg viewBox="0 0 40 12" aria-hidden="true"><path class="tp-key-line tp-m-wanfibre" d="M2 6 H38"/></svg>Fibre (provider)</span>
|
||||
<span class="tp-key"><svg viewBox="0 0 40 12" aria-hidden="true"><path class="tp-key-line tp-m-sfp" d="M2 6 H38"/></svg>SFP+ module</span>
|
||||
<span class="tp-key"><svg viewBox="0 0 40 12" aria-hidden="true"><path class="tp-key-line tp-m-copper" d="M2 6 H38"/></svg>Copper</span>
|
||||
<span class="tp-key">Thicker = faster (10G, 1G, 100M)</span>
|
||||
<span class="tp-key"><svg viewBox="0 0 40 12" aria-hidden="true"><path class="tp-key-line tp-key-down" d="M2 6 H38"/></svg>Down</span>
|
||||
<span class="tp-key"><svg viewBox="0 0 40 12" aria-hidden="true"><path class="tp-key-line tp-key-ghost" d="M2 6 H38"/></svg>Last seen</span>
|
||||
<span class="tp-key"><span class="tp-key-warn" aria-hidden="true">⚠</span>Port name points at another device</span>
|
||||
</div>
|
||||
{% 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>
|
||||
{% endblock %}
|
||||
+325
-10
@@ -1,5 +1,7 @@
|
||||
"""Tests for app.py routes: database and LDAP are mocked."""
|
||||
import json
|
||||
import time
|
||||
from datetime import datetime, timedelta, timezone
|
||||
import os
|
||||
import sys
|
||||
from unittest.mock import patch
|
||||
@@ -37,6 +39,7 @@ def client():
|
||||
db.check_suppressed.return_value = False
|
||||
db.get_device_link.return_value = ''
|
||||
db.cutsheet_racks.return_value = []
|
||||
db.get_unused_interfaces.return_value = {}
|
||||
with patch.object(gandalf, '_cfg', CONFIG):
|
||||
yield gandalf.app.test_client()
|
||||
|
||||
@@ -92,10 +95,17 @@ 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', 'Network Topology',
|
||||
'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)
|
||||
assert 'topology-diagram' not in html and 'Network Topology' not in html
|
||||
assert 'href="/topology"' in html
|
||||
|
||||
def test_old_links_url_redirects_home(self, client):
|
||||
resp = client.get('/links', headers=AUTH)
|
||||
@@ -209,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
|
||||
@@ -381,8 +392,9 @@ class TestHealth:
|
||||
|
||||
|
||||
class TestPageTitles:
|
||||
@pytest.mark.parametrize('path,title', [('/', 'Dashboard — GANDALF'), ('/events', 'Alert History — GANDALF'),
|
||||
('/cutsheet', 'Cutsheet — GANDALF')])
|
||||
@pytest.mark.parametrize('path,title', [('/', 'Dashboard | GANDALF'), ('/events', 'Alert History | GANDALF'),
|
||||
('/cutsheet', 'Cutsheet | GANDALF'),
|
||||
('/topology', 'Topology | GANDALF')])
|
||||
def test_name_appears_once(self, client, path, title):
|
||||
gandalf._cutsheet_schema_ready = True
|
||||
html = client.get(path, headers=AUTH).get_data(as_text=True)
|
||||
@@ -490,6 +502,10 @@ class TestRackRacksShelvesLinks:
|
||||
item = client.get('/api/rack', headers=AUTH).get_json()['items'][0]
|
||||
assert not item['linked'] and item['url'] == '/cutsheet#item-1' and 'switch' not in item
|
||||
|
||||
def test_drawn_front_is_passed_through(self, client):
|
||||
self._items({'name': 'UNVR-Pro', 'kind': 'device', 'rack_u': 5, 'rack_height': 2, 'chassis': 'unvr-pro'})
|
||||
assert client.get('/api/rack', headers=AUTH).get_json()['items'][0]['chassis'] == 'unvr-pro'
|
||||
|
||||
def test_shelf_lists_what_is_on_it(self, client):
|
||||
self._items({'name': 'Shelf', 'kind': 'shelf', 'rack_u': 3, 'rack_height': 1},
|
||||
{'name': 'large1', 'kind': 'device', 'shelf': 'Shelf'},
|
||||
@@ -520,17 +536,36 @@ class TestRackFacesAndSettings:
|
||||
gandalf.db.cutsheet_load.return_value = {
|
||||
'items': [dict(base, id=n, **i) for n, i in enumerate(items, 1)], 'cables': [], 'port_labels': []}
|
||||
|
||||
def test_rear_face(self, client):
|
||||
def test_three_views(self, client):
|
||||
# A server through both posts, a PDU on the rear posts facing the front (as in the StarTech),
|
||||
# a fan tray on the rear posts facing the rear, and a switch on the front posts
|
||||
self._items({'name': 'Server', 'kind': 'device', 'rack_u': 5, 'rack_height': 4, 'mount': 'full'},
|
||||
{'name': 'PDU', 'kind': 'device', 'rack_u': 12, 'rack_height': 1, 'mount': 'rear'},
|
||||
{'name': 'Fans', 'kind': 'device', 'rack_u': 14, 'rack_height': 1, 'mount': 'rear',
|
||||
'facing': 'rear'},
|
||||
{'name': 'Switch', 'kind': 'device', 'rack_u': 12, 'rack_height': 1})
|
||||
front = client.get('/api/rack', headers=AUTH).get_json()
|
||||
rear = client.get('/api/rack?face=rear', headers=AUTH).get_json()
|
||||
assert [(i['name'], i['through']) for i in front['items']] == [('Switch', False), ('Server', False)]
|
||||
assert [(i['name'], i['through']) for i in rear['items']] == [('PDU', False), ('Server', True)]
|
||||
assert rear['face'] == 'rear' and rear['racks'][0]['rear'] == 2 and rear['racks'][0]['count'] == 3
|
||||
|
||||
def view(face):
|
||||
return [(i['name'], i['through']) for i in
|
||||
client.get(f'/api/rack?face={face}', headers=AUTH).get_json()['items']]
|
||||
assert view('front') == [('Switch', False), ('Server', False)]
|
||||
assert view('behind') == [('Fans', True), ('PDU', False), ('Server', False)]
|
||||
assert view('rear') == [('Fans', False), ('PDU', True), ('Server', True)]
|
||||
racks = client.get('/api/rack', headers=AUTH).get_json()['racks'][0]
|
||||
assert (racks['count'], racks['rear'], racks['behind']) == (4, 3, 2)
|
||||
assert client.get('/api/rack?face=side', headers=AUTH).status_code == 400
|
||||
|
||||
def test_shelf_contents_ordered_with_nics(self, client):
|
||||
self._items({'name': 'Shelf', 'kind': 'shelf', 'rack_u': 3, 'rack_height': 2, 'mount': 'rear'},
|
||||
{'name': 'b-box', 'kind': 'device', 'shelf': 'Shelf', 'slot': 1, 'chassis': 'zimaboard-832'},
|
||||
{'name': 'large1', 'kind': 'device', 'shelf': 'Shelf', 'slot': 2})
|
||||
data = client.get('/api/rack?face=behind', headers=AUTH).get_json()
|
||||
things = data['items'][0]['contents']
|
||||
assert [(c['name'], c['slot'], c['chassis']) for c in things] == [('b-box', 1, 'zimaboard-832'),
|
||||
('large1', 2, '')]
|
||||
assert things[1]['interfaces'] == [{'name': 'eth0', 'up': True, 'unused': False}]
|
||||
assert things[0]['device'] == 'b-box' and things[0]['ports'] == {}
|
||||
|
||||
def test_saved_racks_replace_config(self, client):
|
||||
self._items()
|
||||
gandalf.db.cutsheet_racks.return_value = [{'id': 4, 'name': 'StarTech 25U', 'units': 25, 'notes': 'open frame'}]
|
||||
@@ -560,3 +595,283 @@ class TestRackFacesAndSettings:
|
||||
assert client.put('/api/cutsheet/racks/1', json={'name': 'x', 'units': 2}, headers=user).status_code == 403
|
||||
gandalf.db.cutsheet_delete_rack.return_value = False
|
||||
assert client.delete('/api/cutsheet/racks/9', headers=AUTH).status_code == 404
|
||||
|
||||
|
||||
class TestUnusedInterfaces:
|
||||
def _url(self, iface='nic1'):
|
||||
gandalf._cutsheet_schema_ready = True
|
||||
return f'/api/device/compute-storage-01/interfaces/{iface}/unused'
|
||||
|
||||
def test_mark_and_clear(self, client):
|
||||
assert client.put(self._url(), json={'reason': ' never cabled '}, headers=AUTH).status_code == 200
|
||||
gandalf.db.set_unused_interface.assert_called_with('compute-storage-01', 'nic1', 'never cabled', 'jared')
|
||||
gandalf.db.clear_unused_interface.return_value = True
|
||||
resp = client.delete(self._url(), headers=AUTH)
|
||||
assert resp.get_json() == {'success': True, 'changed': True}
|
||||
|
||||
def test_needs_admin_json_and_a_sane_name(self, client):
|
||||
user = dict(AUTH, **{'Remote-Groups': 'staff'})
|
||||
with patch.object(gandalf, '_cfg', dict(CONFIG, auth=dict(CONFIG['auth'], allowed_groups=['admin', 'staff']))):
|
||||
assert client.put(self._url(), json={}, headers=user).status_code == 403
|
||||
assert client.put(self._url(), data='x', headers=AUTH).status_code == 400
|
||||
assert client.put(self._url('bad name!'), json={}, headers=AUTH).status_code in (400, 404)
|
||||
|
||||
def test_device_api_lists_them(self, client):
|
||||
gandalf._cutsheet_schema_ready = True
|
||||
gandalf.db.get_unused_interfaces.return_value = {'large1': {'enp36s0': {'reason': 'spare'}}}
|
||||
data = client.get('/api/device/large1', headers=AUTH).get_json()
|
||||
assert data['unused_interfaces'] == {'enp36s0': {'reason': 'spare'}}
|
||||
|
||||
|
||||
class TestMaintenance:
|
||||
SUP = {'id': 7, 'target_type': 'all', 'target_name': '', 'reason': 'UniFi Network update',
|
||||
'suppressed_by': 'jared', 'expires_at': '2026-11-12T20:00:00Z'}
|
||||
|
||||
def test_no_banner_and_a_start_button_by_default(self, client):
|
||||
html = client.get('/', headers=AUTH).get_data(as_text=True)
|
||||
assert 'maint-banner' not in html
|
||||
assert 'data-action="start-maintenance"' in html and 'id="maint-modal"' in html
|
||||
|
||||
def test_banner_on_every_page_while_on(self, client):
|
||||
gandalf.db.get_active_suppressions.return_value = [
|
||||
{'id': 3, 'target_type': 'host', 'target_name': 'large1', 'reason': 'x', 'expires_at': None},
|
||||
self.SUP,
|
||||
]
|
||||
for page in ('/', '/events', '/rack'):
|
||||
html = client.get(page, headers=AUTH).get_data(as_text=True)
|
||||
assert 'class="maint-banner"' in html, page
|
||||
assert 'datetime="2026-11-12T20:00:00Z"' in html and 'UniFi Network update' in html
|
||||
assert 'data-sup-id="7"' in html and 'data-action="start-maintenance"' not in html
|
||||
|
||||
def test_open_ended_maintenance_wins(self, client):
|
||||
gandalf.db.get_active_suppressions.return_value = [
|
||||
self.SUP, dict(self.SUP, id=9, expires_at=None, reason='Rewiring')]
|
||||
html = client.get('/', headers=AUTH).get_data(as_text=True)
|
||||
assert 'until it is ended' in html and 'data-sup-id="9"' in html
|
||||
|
||||
def test_viewers_see_the_banner_without_buttons(self, client):
|
||||
gandalf.db.get_active_suppressions.return_value = [self.SUP]
|
||||
viewer = dict(AUTH, **{'Remote-Groups': 'staff'})
|
||||
with patch.object(gandalf, '_cfg', dict(CONFIG, auth=dict(CONFIG['auth'], allowed_groups=['admin', 'staff']))):
|
||||
html = client.get('/', headers=viewer).get_data(as_text=True)
|
||||
assert 'class="maint-banner"' in html and 'data-action="end-maintenance"' not in html
|
||||
|
||||
def test_a_db_error_means_no_banner(self, client):
|
||||
gandalf.db.get_active_suppressions.side_effect = RuntimeError('db down')
|
||||
assert gandalf.inject_maintenance() == {'maintenance': None}
|
||||
|
||||
|
||||
class TestFollowUp:
|
||||
def _state(self, tickets, age_s=60):
|
||||
state = dict(STATE, open_tickets=json.dumps({'checked_at': time.time() - age_s, 'tickets': tickets}))
|
||||
gandalf.db.get_state.side_effect = lambda key, default=None: state.get(key, default)
|
||||
|
||||
def _event(self, days_old, ticket_id=None):
|
||||
first = (datetime.now(timezone.utc) - timedelta(days=days_old)).strftime('%Y-%m-%dT%H:%M:%SZ')
|
||||
return {'id': 1, 'event_type': 'interface_down', 'severity': 'critical', 'target_name': 'micro1',
|
||||
'target_detail': 'enp3s0', 'description': 'down', 'first_seen': first, 'last_seen': first,
|
||||
'consecutive_failures': 3, 'ticket_id': ticket_id}
|
||||
|
||||
def test_old_alert_is_stale_and_closed_ticket_is_flagged(self, client):
|
||||
self._state({'9': 'Open'})
|
||||
gandalf.db.get_active_events.return_value = [self._event(5, '8'), self._event(1, '9')]
|
||||
gandalf.db.get_cleared_tickets.return_value = []
|
||||
events = client.get('/api/status', headers=AUTH).get_json()['events']
|
||||
assert events[0]['stale_days'] == 5 and events[0]['ticket_closed'] is True
|
||||
assert events[1]['stale_days'] is None and events[1]['ticket_closed'] is False
|
||||
|
||||
def test_threshold_comes_from_config(self, client):
|
||||
self._state({})
|
||||
gandalf.db.get_active_events.return_value = [self._event(1.5)]
|
||||
gandalf.db.get_cleared_tickets.return_value = []
|
||||
cfg = dict(CONFIG, monitor={'stale_alert_days': 1})
|
||||
with patch.object(gandalf, '_cfg', cfg):
|
||||
events = client.get('/api/status', headers=AUTH).get_json()['events']
|
||||
assert events[0]['stale_days'] == 1
|
||||
|
||||
def test_tickets_left_open_are_listed(self, client):
|
||||
self._state({'281331508': 'Open'})
|
||||
left = [{'ticket_id': '281331508', 'event_type': 'host_unreachable', 'target_name': 'pbs',
|
||||
'target_detail': '', 'severity': 'critical', 'first_seen': '2026-10-14T12:02:05Z',
|
||||
'cleared_at': '2026-11-04T22:12:36Z', 'events': 3}]
|
||||
gandalf.db.get_cleared_tickets.return_value = left
|
||||
assert client.get('/api/status', headers=AUTH).get_json()['stale_tickets'] == left
|
||||
gandalf.db.get_cleared_tickets.assert_called_with(['281331508'], older_than_hours=24)
|
||||
html = client.get('/', headers=AUTH).get_data(as_text=True)
|
||||
assert '#281331508' in html and 'TO FOLLOW UP' in html
|
||||
assert '<section class="g-section" id="followup">' in html
|
||||
|
||||
def test_out_of_date_list_flags_nothing(self, client):
|
||||
self._state({}, age_s=3 * 3600)
|
||||
gandalf.db.get_active_events.return_value = [self._event(1, '8')]
|
||||
body = client.get('/api/status', headers=AUTH).get_json()
|
||||
assert body['stale_tickets'] == [] and body['events'][0]['ticket_closed'] is False
|
||||
gandalf.db.get_cleared_tickets.assert_not_called()
|
||||
|
||||
def test_no_list_yet_hides_the_panel(self, client):
|
||||
html = client.get('/', headers=AUTH).get_data(as_text=True)
|
||||
assert '<section class="g-section" id="followup" hidden>' in html
|
||||
assert 'TO FOLLOW UP' not in html
|
||||
|
||||
|
||||
class TestTopology:
|
||||
def test_page_needs_auth(self, client):
|
||||
assert client.get('/topology').status_code == 401
|
||||
assert client.get('/api/topology').status_code == 401
|
||||
|
||||
def test_page_loads_the_drawings_first(self, client):
|
||||
html = client.get('/topology', headers=AUTH).get_data(as_text=True)
|
||||
assert 'id="tp-canvas"' in html
|
||||
assert html.index('faceplates.js') < html.index('fronts.js') < html.index('topology.js')
|
||||
|
||||
def test_api_returns_the_graph(self, client):
|
||||
gandalf._cutsheet_schema_ready = True
|
||||
with patch.object(gandalf.db, 'cutsheet_load', return_value={'items': [], 'cables': []}):
|
||||
data = client.get('/api/topology', headers=AUTH).get_json()
|
||||
assert {'nodes', 'links', 'warnings', 'updated'} <= set(data)
|
||||
names = {n['name'] for n in data['nodes']}
|
||||
assert {'large1', 'USW Flex', 'Internet'} <= names
|
||||
|
||||
def test_api_survives_a_cutsheet_failure(self, client):
|
||||
gandalf._cutsheet_schema_ready = True
|
||||
with patch.object(gandalf.db, 'cutsheet_load', side_effect=RuntimeError('db down')):
|
||||
assert client.get('/api/topology', headers=AUTH).status_code == 200
|
||||
|
||||
def test_suppressed_alerts_are_not_drawn(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': []}), \
|
||||
patch.object(gandalf.db, 'get_active_events', return_value=[ev]), \
|
||||
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_internet_quality_from_unifi(self, client):
|
||||
now = time.time()
|
||||
quality = {'periods': [{'ts': now - (12 - i) * 300, 'state': 'loss'} for i in range(12)],
|
||||
'downtime': [], 'latencies': {}, 'updated': now}
|
||||
state = {'wan_quality': json.dumps(quality), 'modem_stats': json.dumps({'reachable': True})}
|
||||
with patch.object(gandalf.db, 'get_state', side_effect=lambda k, d=None: state.get(k, d)), \
|
||||
patch.object(gandalf.db, 'get_modem_history', return_value=[]), \
|
||||
patch.object(gandalf.db, 'cutsheet_load', side_effect=RuntimeError('db down')):
|
||||
data = client.get('/api/attention', headers=AUTH).get_json()
|
||||
modem = client.get('/api/modem', headers=AUTH).get_json()
|
||||
assert data['broken'][0]['text'] == 'Internet: packet loss in 12 of the last 12 five-minute periods'
|
||||
assert len(modem['wan_quality']['periods']) == 12
|
||||
|
||||
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_source_tag_only_for_hosts_without_node_exporter(self, client):
|
||||
snap = json.dumps({'hosts': {
|
||||
'large1': {'ip': '10.0.0.2', 'status': 'up', 'source': 'prometheus', 'interfaces': {'eth0': 'up'}},
|
||||
'pbs': {'ip': '10.0.0.3', 'status': 'up', 'source': 'ping', 'interfaces': {}}}, '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 'source-prometheus' not in html
|
||||
assert '<span class="host-source source-ping">ping</span>' in html
|
||||
|
||||
def test_alert_table_turns_into_cards_on_phones(self, client):
|
||||
ev = {'id': 1, 'event_type': 'host_down', 'severity': 'critical', 'target_name': 'pbs',
|
||||
'target_detail': '', 'description': 'pbs is down', 'consecutive_failures': 3,
|
||||
'first_seen': '2026-11-15 01:00:00', 'last_seen': '2026-11-15 02:00:00'}
|
||||
with patch.object(gandalf.db, 'get_active_events', return_value=[ev]):
|
||||
html = client.get('/', headers=AUTH).get_data(as_text=True)
|
||||
assert 'class="lt-table lt-table-responsive" id="events-table"' in html
|
||||
assert 'data-label="Target"><strong>pbs</strong>' 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
|
||||
@@ -0,0 +1,145 @@
|
||||
"""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': []}
|
||||
|
||||
|
||||
NOW = 1_000_000.0
|
||||
|
||||
|
||||
def _quality(states, downtime=(), latencies=None, updated=NOW):
|
||||
"""states: newest last, one per 5 minutes ending at NOW."""
|
||||
n = len(states)
|
||||
return {'periods': [{'ts': NOW - (n - i) * 300, 'state': s} for i, s in enumerate(states)],
|
||||
'downtime': [{'ts': NOW - ago, 'seconds': s} for ago, s in downtime],
|
||||
'latencies': latencies or {}, 'updated': updated}
|
||||
|
||||
|
||||
def _wan(q):
|
||||
return [e for e in attention.build([], [], None, wan_quality=q, now=NOW)['broken']
|
||||
if e['text'].startswith('Internet')]
|
||||
|
||||
|
||||
class TestWan:
|
||||
def test_healthy_says_nothing(self):
|
||||
assert _wan(_quality(['ok'] * 288)) == []
|
||||
|
||||
def test_latency_in_the_last_hour(self):
|
||||
[e] = _wan(_quality(['ok'] * 276 + ['latency', 'ok'] * 3 + ['latency'] * 3 + ['ok'] * 3,
|
||||
latencies={'google': 26, 'cloudflare': 12}))
|
||||
assert e['severity'] == 'warn' and e['href'] == '#modem-section'
|
||||
assert e['text'] == 'Internet: high latency in 6 of the last 12 five-minute periods'
|
||||
assert 'UniFi flagged 6 of the last 288' in e['detail']
|
||||
assert 'Now: cloudflare 12 ms, google 26 ms' in e['detail']
|
||||
|
||||
def test_a_couple_of_slow_periods_are_not_worth_a_line(self):
|
||||
assert _wan(_quality(['ok'] * 10 + ['latency'] * 2)) == []
|
||||
|
||||
def test_old_trouble_has_cleared(self):
|
||||
assert _wan(_quality(['latency'] * 100 + ['ok'] * 12)) == []
|
||||
|
||||
def test_packet_loss_is_broken(self):
|
||||
[e] = _wan(_quality(['ok'] * 9 + ['loss', 'latency', 'down']))
|
||||
assert e['severity'] == 'bad'
|
||||
assert e['text'] == 'Internet: packet loss in 2 of the last 12 five-minute periods'
|
||||
|
||||
def test_a_drop_in_the_last_hour(self):
|
||||
[e] = _wan(_quality(['ok'] * 12, downtime=[(900, 90), (7200, 30)]))
|
||||
assert e['text'] == 'Internet dropped for 90 s, 15 min ago'
|
||||
|
||||
def test_several_drops(self):
|
||||
[e] = _wan(_quality(['ok'] * 12, downtime=[(900, 90), (1800, 30)]))
|
||||
assert e['text'] == 'Internet dropped 2 times in the last hour, 120 s in all'
|
||||
|
||||
def test_stale_copy_is_ignored(self):
|
||||
assert _wan(_quality(['loss'] * 12, updated=NOW - 3600)) == []
|
||||
|
||||
def test_none_is_fine(self):
|
||||
assert _wan(None) == [] and _wan({}) == []
|
||||
|
||||
def test_internet_comes_before_alerts_of_the_same_severity(self):
|
||||
out = attention.build([_alert('x', 'warning')], [], None,
|
||||
wan_quality=_quality(['latency'] * 12), now=NOW)['broken']
|
||||
assert out[0]['text'].startswith('Internet')
|
||||
+36
-1
@@ -270,7 +270,7 @@ class TestRackLayout:
|
||||
|
||||
def test_past_the_top(self):
|
||||
out = cs.rack_layout([self._item('tall', 41, 3)], 42)
|
||||
assert out['placed'] == [] and out['outside'] == [{'name': 'tall', 'units': 'U41–43'}]
|
||||
assert out['placed'] == [] and out['outside'] == [{'name': 'tall', 'units': 'U41-43'}]
|
||||
|
||||
|
||||
class TestPortMarks:
|
||||
@@ -357,3 +357,38 @@ class TestRackFaces:
|
||||
for bad in ({'name': '', 'units': 25}, {'name': 'x'}, {'name': 'x', 'units': 61}, {'name': 'x', 'units': 0}):
|
||||
with pytest.raises(cs.ValidationError):
|
||||
cs.validate_rack(bad)
|
||||
|
||||
|
||||
class TestChassis:
|
||||
def test_known_drawing_kept_unknown_refused(self):
|
||||
assert cs.validate_item({'name': 'nvr', 'chassis': 'unvr-pro'})['chassis'] == 'unvr-pro'
|
||||
assert cs.validate_item({'name': 'x'})['chassis'] == ''
|
||||
with pytest.raises(cs.ValidationError):
|
||||
cs.validate_item({'name': 'x', 'chassis': 'tardis'})
|
||||
|
||||
def test_every_drawing_has_a_label(self):
|
||||
assert all(cs.CHASSIS.values())
|
||||
assert {'sliger-cx4712', 'rosewill-rsv-l4500u', 'unvr-pro', 'uacc-patch-24',
|
||||
'usw-pro-max-24-poe', 'usw-pro-max-48-poe', 'zimaboard-832', 'zimaboard-832-cx3',
|
||||
'resting', 'uacc-brush-1u', 'sliger-cx4712-red', 'sliger-cx4712-white',
|
||||
'sliger-cx4712-blue'} <= set(cs.CHASSIS)
|
||||
|
||||
|
||||
class TestFacingAndSlots:
|
||||
def test_facing_and_slot_validation(self):
|
||||
shelf = {'S': {'name': 'S', 'kind': 'shelf'}}
|
||||
assert cs.validate_item({'name': 'p', 'facing': 'rear'})['facing'] == 'rear'
|
||||
assert cs.validate_item({'name': 'p'})['facing'] == 'front'
|
||||
assert cs.validate_item({'name': 'z', 'shelf': 'S', 'slot': '2'}, shelf)['slot'] == 2
|
||||
with pytest.raises(cs.ValidationError):
|
||||
cs.validate_item({'name': 'p', 'facing': 'up'})
|
||||
with pytest.raises(cs.ValidationError):
|
||||
cs.validate_item({'name': 'p', 'slot': 1}) # a position needs a shelf
|
||||
|
||||
def test_rear_posts_facing_front_are_seen_from_the_front(self):
|
||||
items = [{'id': 1, 'name': 'pdu', 'kind': 'device', 'rack_u': 24, 'rack_height': 2, 'mount': 'rear'},
|
||||
{'id': 2, 'name': 'udm', 'kind': 'device', 'rack_u': 24, 'rack_height': 1}]
|
||||
assert [i['name'] for i in cs.rack_layout(items, 25, 'front')['placed']] == ['udm']
|
||||
behind = cs.rack_layout(items, 25, 'behind')['placed']
|
||||
assert [(i['name'], i['through']) for i in behind] == [('pdu', False)]
|
||||
assert [(i['name'], i['through']) for i in cs.rack_layout(items, 25, 'rear')['placed']] == [('pdu', True)]
|
||||
@@ -0,0 +1,86 @@
|
||||
"""Tests for db.py query helpers that do work beyond the SQL: the connection is faked."""
|
||||
import os
|
||||
import sys
|
||||
from contextlib import contextmanager
|
||||
from datetime import datetime, timedelta
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
|
||||
|
||||
import db # noqa: E402
|
||||
|
||||
NOW = datetime(2026, 11, 14, 12, 0, 0)
|
||||
|
||||
|
||||
def _fake_conn(rows):
|
||||
cur = MagicMock()
|
||||
cur.fetchall.return_value = rows
|
||||
cur.fetchone.return_value = {'now': NOW}
|
||||
conn = MagicMock()
|
||||
conn.cursor.return_value.__enter__.return_value = cur
|
||||
|
||||
@contextmanager
|
||||
def get_conn():
|
||||
yield conn
|
||||
return patch.object(db, 'get_conn', get_conn), cur
|
||||
|
||||
|
||||
def _event(tid, hours_ago_first, hours_ago_resolved, etype='host_unreachable', target='pbs'):
|
||||
return {
|
||||
'ticket_id': tid, 'event_type': etype, 'target_name': target, 'target_detail': '',
|
||||
'severity': 'critical', 'first_seen': NOW - timedelta(hours=hours_ago_first),
|
||||
'resolved_at': None if hours_ago_resolved is None else NOW - timedelta(hours=hours_ago_resolved),
|
||||
}
|
||||
|
||||
|
||||
class TestGetClearedTickets:
|
||||
def test_no_ids_skips_the_query(self):
|
||||
patcher, cur = _fake_conn([])
|
||||
with patcher:
|
||||
assert db.get_cleared_tickets([]) == []
|
||||
cur.execute.assert_not_called()
|
||||
|
||||
def test_only_tickets_whose_every_alert_cleared_long_enough_ago(self):
|
||||
rows = [
|
||||
_event('1', 300, 250), _event('1', 100, 48), # two outages, both long cleared
|
||||
_event('2', 50, 40), _event('2', 5, None), # still active
|
||||
_event('3', 10, 2), # cleared too recently
|
||||
]
|
||||
patcher, cur = _fake_conn(rows)
|
||||
with patcher:
|
||||
out = db.get_cleared_tickets(['3', '1', '2', '1'], older_than_hours=24)
|
||||
assert [r['ticket_id'] for r in out] == ['1']
|
||||
assert out[0]['events'] == 2
|
||||
assert out[0]['cleared_at'] == (NOW - timedelta(hours=48)).isoformat() + 'Z'
|
||||
assert out[0]['first_seen'] == (NOW - timedelta(hours=300)).isoformat() + 'Z'
|
||||
assert cur.execute.call_args_list[0].args[1] == ['1', '2', '3']
|
||||
|
||||
def test_newest_clearance_first(self):
|
||||
rows = [_event('1', 400, 300), _event('2', 100, 30, target='micro1')]
|
||||
patcher, _ = _fake_conn(rows)
|
||||
with patcher:
|
||||
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'
|
||||
@@ -1,4 +1,4 @@
|
||||
"""Tests for gandalf.diagnose — all pure static methods, no external deps."""
|
||||
"""Tests for gandalf.diagnose: all pure static methods, no external deps."""
|
||||
import sys
|
||||
import os
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
|
||||
|
||||
@@ -255,3 +255,49 @@ class TestWanHistory:
|
||||
h = {}
|
||||
modem.record_uptime_reset(h, 5000)
|
||||
assert h['restarts'] == [{'at': 5000, 'by': None, 'confirmed': True}]
|
||||
|
||||
|
||||
def _dashboard(health, downtime=(), latencies=None, group='WAN'):
|
||||
return {
|
||||
'wan_history': {'wan_history_details': [{
|
||||
'network_group': group,
|
||||
'health_history': [dict({'timestamp': ts * 1000, 'high_latency': False, 'packet_loss': False,
|
||||
'wan_downtime': False}, **flags) for ts, flags in health],
|
||||
'downtime_history': [{'timestamp': ts * 1000, 'downtime_in_seconds': s} for ts, s in downtime],
|
||||
}]},
|
||||
'wan': {'wan_details': [{'network_group': group, 'stats': {'service_latencies': [
|
||||
{'service_name': k, 'latency': v} for k, v in (latencies or {}).items()]}}]},
|
||||
}
|
||||
|
||||
|
||||
class TestWanQuality:
|
||||
def test_worst_flag_wins_and_periods_are_in_time_order(self):
|
||||
q = modem.wan_quality(_dashboard([
|
||||
(600, {'high_latency': True, 'packet_loss': True}),
|
||||
(0, {}),
|
||||
(300, {'high_latency': True}),
|
||||
(900, {'wan_downtime': True, 'packet_loss': True}),
|
||||
]), now=1000)
|
||||
assert [p['state'] for p in q['periods']] == ['ok', 'latency', 'loss', 'down']
|
||||
assert [p['ts'] for p in q['periods']] == [0, 300, 600, 900]
|
||||
assert q['updated'] == 1000 and q['wan'] == 'WAN'
|
||||
|
||||
def test_downtime_and_latencies(self):
|
||||
q = modem.wan_quality(_dashboard([(0, {})], downtime=[(500, 90)],
|
||||
latencies={'cloudflare': 12, 'google': 26}), now=1)
|
||||
assert q['downtime'] == [{'ts': 500, 'seconds': 90}]
|
||||
assert q['latencies'] == {'cloudflare': 12, 'google': 26}
|
||||
|
||||
def test_prefers_the_primary_wan(self):
|
||||
d = _dashboard([(0, {'high_latency': True})], group='WAN2')
|
||||
d['wan_history']['wan_history_details'].append(
|
||||
_dashboard([(0, {})])['wan_history']['wan_history_details'][0])
|
||||
assert modem.wan_quality(d, 0)['periods'][0]['state'] == 'ok'
|
||||
|
||||
@pytest.mark.parametrize('dashboard', [None, {}, {'wan_history': {}}, {'wan_history': {'wan_history_details': []}}])
|
||||
def test_missing_history_is_none(self, dashboard):
|
||||
assert modem.wan_quality(dashboard, 0) is None
|
||||
|
||||
def test_counts_since(self):
|
||||
periods = [{'ts': 0, 'state': 'latency'}, {'ts': 300, 'state': 'ok'}, {'ts': 600, 'state': 'loss'}]
|
||||
assert modem.quality_counts(periods, 300) == {'ok': 1, 'latency': 0, 'loss': 1, 'down': 0}
|
||||
+301
-1
@@ -31,6 +31,8 @@ def db():
|
||||
mock_db.cutsheet_load.return_value = {'items': [], 'cables': [], 'port_labels': []}
|
||||
mock_db.get_pending_recovery_notes.return_value = []
|
||||
mock_db.get_device_link.return_value = ''
|
||||
mock_db.get_incident_ticket.return_value = None
|
||||
mock_db.get_ticket_ids_between.return_value = []
|
||||
yield mock_db
|
||||
|
||||
|
||||
@@ -117,6 +119,19 @@ class TestDeadHostDetection:
|
||||
mon._process_interfaces({HOST_A: {'eth0': True}}, [])
|
||||
assert ('cluster_network_issue', 'test-cluster', '') in upserted(db)
|
||||
|
||||
def test_unused_interface_never_alerts(self, mon, db):
|
||||
mon._unused = {'alpha': {'eth1': {'reason': 'spare'}}}
|
||||
db.get_baseline.return_value = {'alpha': {'eth0': 'up', 'eth1': 'up'}, 'beta': {'eth0': 'up'}}
|
||||
mon._process_interfaces({HOST_A: {'eth0': True, 'eth1': False}, HOST_B: {'eth0': True}}, [])
|
||||
assert ('interface_down', 'alpha', 'eth1') not in upserted(db)
|
||||
assert not mon.tickets.create.called
|
||||
|
||||
def test_unused_interface_does_not_degrade_the_host(self, mon):
|
||||
mon._unused = {'alpha': {'eth1': {}}}
|
||||
snap = mon._collect_snapshot({HOST_A: {'eth0': True, 'eth1': False}, HOST_B: {'eth0': True}})
|
||||
assert snap['hosts']['alpha']['status'] == 'up'
|
||||
assert snap['hosts']['alpha']['interfaces'] == {'eth0': 'up', 'eth1': 'unused'}
|
||||
|
||||
def test_dead_host_shows_as_down_on_dashboard(self, mon):
|
||||
snap = mon._collect_snapshot({HOST_A: {'eth0': True}})
|
||||
assert snap['hosts']['alpha']['status'] == 'up'
|
||||
@@ -368,6 +383,47 @@ class TestWanLog:
|
||||
mon._process_wan_log([])
|
||||
assert not mon.tickets.create.called
|
||||
|
||||
def test_unifi_update_is_not_a_wan_event(self, mon, db):
|
||||
now = time.time()
|
||||
self._state(db, unifi_log_cursor=str(int(now * 1000)))
|
||||
self._mon(mon, [{'key': 'NETWORK_UPDATED', 'ts': now, 'device': '', 'wan': '',
|
||||
'app': 'UniFi Network', 'previous': '11.0.97', 'version': '11.0.99'}])
|
||||
mon._process_wan_log([])
|
||||
assert not mon.tickets.create.called
|
||||
saved = dict((c.args[0], c.args[1]) for c in db.set_state.call_args_list)
|
||||
assert saved[monitor.UNIFI_UPDATE_STATE]['label'] == 'UniFi Network 11.0.97 to 11.0.99'
|
||||
assert saved['wan_history'] == {'outages': [], 'restarts': []}
|
||||
|
||||
def test_update_comments_on_tickets_opened_just_before(self, mon, db):
|
||||
now = time.time()
|
||||
self._state(db, unifi_log_cursor=str(int(now * 1000)))
|
||||
db.get_ticket_ids_between.return_value = ['207521068']
|
||||
self._mon(mon, [{'key': 'NETWORK_UPDATED', 'ts': now, 'device': '', 'wan': '',
|
||||
'app': 'UniFi Network', 'previous': '11.0.97', 'version': '11.0.99'}])
|
||||
mon._process_wan_log([])
|
||||
start, end = db.get_ticket_ids_between.call_args.args[1:]
|
||||
assert (end - start).total_seconds() == monitor.UPDATE_LOOKBACK_S + monitor.UPDATE_HOLD_S
|
||||
tid, text = mon.tickets.comment.call_args.args
|
||||
assert tid == '207521068' and 'UniFi Network 11.0.97 to 11.0.99' in text
|
||||
|
||||
def test_update_in_the_same_read_holds_the_power_cycle_ticket(self, mon, db):
|
||||
now = time.time()
|
||||
state = {'unifi_log_cursor': str(int(now * 1000))}
|
||||
db.get_state.side_effect = lambda key, default=None: state.get(key, default)
|
||||
db.set_state.side_effect = lambda key, value: state.__setitem__(
|
||||
key, json.dumps(value) if isinstance(value, dict) else value)
|
||||
self._mon(mon, [
|
||||
{'key': modem_api.LOG_MODEM_RESTARTED, 'ts': now - 600, 'device': 'RPDU', 'wan': ''},
|
||||
{'key': 'NETWORK_UPDATED', 'ts': now, 'device': '', 'wan': '', 'app': 'UniFi Network'},
|
||||
])
|
||||
mon._process_wan_log([])
|
||||
assert not mon.tickets.create.called
|
||||
db.resolve_event.assert_called_with('modem_power_cycled', 'att-modem', '')
|
||||
|
||||
def test_hold_ends(self, mon, db):
|
||||
self._state(db, unifi_update=json.dumps({'label': 'x', 'hold_until': time.time() - 1}))
|
||||
assert mon._update_hold() is None
|
||||
|
||||
def test_uptime_going_backwards_records_a_restart(self, mon, db):
|
||||
self._state(db, modem_stats=json.dumps({'uptime_s': 5000}))
|
||||
mon._note_modem_restart({'uptime_s': 60})
|
||||
@@ -380,6 +436,101 @@ class TestWanLog:
|
||||
assert not db.set_state.called
|
||||
|
||||
|
||||
class TestWanIncident:
|
||||
"""Last night's sequence: the RPDU power-cycles the modem in the cycle the modem goes unreachable."""
|
||||
|
||||
def _cycle(self, mon, db):
|
||||
db.upsert_event.side_effect = [(30, True, 1, None), (29, False, 2, None)]
|
||||
mon.modem.poll.side_effect = modem_api.ModemUnreachable('Network is unreachable')
|
||||
with mon._wan_batch():
|
||||
mon._one_shot_ticket([], 'modem_power_cycled', 'RPDU power-cycled the modem.',
|
||||
'Modem auto power-cycled after internet loss', '3', 'Check the WAN panel.')
|
||||
mon._collect_modem([])
|
||||
|
||||
def test_one_ticket_led_by_the_most_urgent(self, mon, db):
|
||||
self._cycle(mon, db)
|
||||
assert mon.tickets.create.call_count == 1
|
||||
title, desc = mon.tickets.create.call_args.args
|
||||
assert 'WAN modem unreachable' in title
|
||||
assert mon.tickets.create.call_args.kwargs['priority'] == '2'
|
||||
assert '### Also seen in this incident' in desc and 'power-cycled' in desc
|
||||
assert sorted(c.args for c in db.set_ticket_id.call_args_list) == [(29, '123'), (30, '123')]
|
||||
|
||||
def test_recent_incident_gets_a_comment_instead(self, mon, db):
|
||||
db.get_incident_ticket.return_value = '555'
|
||||
mon.tickets.comment.return_value = True
|
||||
self._cycle(mon, db)
|
||||
assert not mon.tickets.create.called
|
||||
assert [c.args[0] for c in mon.tickets.comment.call_args_list] == ['555', '555']
|
||||
assert 'Also seen: WAN modem unreachable' in mon.tickets.comment.call_args_list[0].args[1]
|
||||
assert sorted(c.args for c in db.set_ticket_id.call_args_list) == [(29, '555'), (30, '555')]
|
||||
db.get_incident_ticket.assert_called_with('att-modem', monitor.WAN_INCIDENT_WINDOW_S)
|
||||
|
||||
def test_failed_comment_falls_back_to_a_ticket(self, mon, db):
|
||||
db.get_incident_ticket.return_value = '555'
|
||||
mon.tickets.comment.return_value = False
|
||||
self._cycle(mon, db)
|
||||
assert mon.tickets.create.call_count == 1
|
||||
|
||||
def test_outside_a_batch_tickets_open_at_once(self, mon, db):
|
||||
mon._one_shot_ticket([], 'wan_unstable', 'Unstable.', 'WAN connection unstable', '2', 'Look.')
|
||||
assert 'unstable' in mon.tickets.create.call_args.args[0]
|
||||
assert 'no recovery note' in mon.tickets.create.call_args.args[1]
|
||||
|
||||
def test_update_hold_skips_new_tickets(self, mon, db):
|
||||
db.get_state.side_effect = lambda key, default=None: (
|
||||
json.dumps({'label': 'UniFi Network 11.0.99', 'hold_until': time.time() + 60})
|
||||
if key == monitor.UNIFI_UPDATE_STATE else default)
|
||||
self._cycle(mon, db)
|
||||
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({
|
||||
@@ -408,6 +559,31 @@ class TestUnifiDeviceDetail:
|
||||
got = c.get_system_events(1000, modem_api.WAN_LOG_KEYS)
|
||||
assert got == [{'key': modem_api.LOG_MODEM_RESTARTED, 'ts': 2.0, 'device': 'RPDU', 'wan': ''}]
|
||||
|
||||
def test_system_log_reads_update_versions(self):
|
||||
c = monitor.UnifiClient({'controller': 'https://u.test', 'api_key': 'k'})
|
||||
page = MagicMock()
|
||||
page.json.side_effect = [
|
||||
{'data': [
|
||||
{'key': 'NETWORK_UPDATED', 'timestamp': 3000, 'parameters': {
|
||||
'APPLICATION': 'UniFi Network', 'PREVIOUS_VERSION': '11.0.97', 'VERSION': '11.0.99'}},
|
||||
{'key': 'FIRMWARE_UPDATE_AVAILABLE_V2', 'timestamp': 3000},
|
||||
{'key': 'MADE_CHANGES_ONE_SETTING_OBJECT', 'timestamp': 3000},
|
||||
]},
|
||||
{'data': []},
|
||||
]
|
||||
c.session.post = MagicMock(return_value=page)
|
||||
got = c.get_system_events(1000, modem_api.wanted_log_key)
|
||||
assert got == [{'key': 'NETWORK_UPDATED', 'ts': 3.0, 'device': '', 'wan': '',
|
||||
'app': 'UniFi Network', 'previous': '11.0.97', 'version': '11.0.99'}]
|
||||
|
||||
@pytest.mark.parametrize('key,expected', [
|
||||
('NETWORK_UPDATED', True), ('FIRMWARE_UPDATED_V2', True), ('PROTECT_UPDATED', True),
|
||||
('FIRMWARE_UPDATE_AVAILABLE_V2', False), ('MADE_CHANGES_ONE_SETTING_OBJECT', False),
|
||||
('NETWORK_WAN_FAILED_2', False),
|
||||
])
|
||||
def test_update_keys(self, key, expected):
|
||||
assert modem_api.is_update_key(key) is expected
|
||||
|
||||
def test_system_log_failure_is_none_not_empty(self):
|
||||
c = monitor.UnifiClient({'controller': 'https://u.test', 'api_key': 'k'})
|
||||
c.session.post = MagicMock(side_effect=OSError('boom'))
|
||||
@@ -512,9 +688,11 @@ class TestLldpCollection:
|
||||
{'metric': {'device': 'vmbr0', 'address': mac, 'instance': '10.0.0.1:9100'}},
|
||||
]
|
||||
switches = {'sw': {'ports': {'p': {'lldp': {'chassis_id': 'x', 'port_id': mac.upper()}}}}}
|
||||
collector._resolve_neighbors(switches, {}, {'10.0.0.1:9100': 'alpha'})
|
||||
host_macs = collector._resolve_neighbors(switches, {}, {'10.0.0.1:9100': 'alpha'})
|
||||
lldp = switches['sw']['ports']['p']['lldp']
|
||||
assert (lldp['system_name'], lldp['port_id']) == ('alpha', 'eth0')
|
||||
# Kept for the topology page: the physical NIC, not the bond or bridge
|
||||
assert host_macs == {mac: ('alpha', 'eth0')}
|
||||
|
||||
def test_client_list_failure_is_empty(self):
|
||||
c = monitor.UnifiClient({'controller': 'https://u.test', 'api_key': 'k'})
|
||||
@@ -748,3 +926,125 @@ class TestTicketClientComment:
|
||||
with patch.object(monitor.requests, 'post', side_effect=OSError('down')):
|
||||
assert c.comment('42', 'hi') is False
|
||||
assert not c.comments_denied
|
||||
|
||||
|
||||
class TestTicketClientCreate:
|
||||
def _client(self):
|
||||
return monitor.TicketClient({'url': 'http://t.test/create_ticket_api.php', 'api_key': 'k'})
|
||||
|
||||
def _post(self, body):
|
||||
resp = MagicMock(status_code=200)
|
||||
resp.json.return_value = body
|
||||
return patch.object(monitor.requests, 'post', return_value=resp)
|
||||
|
||||
def test_new_and_deduplicated_tickets_are_used(self):
|
||||
c = self._client()
|
||||
with self._post({'success': True, 'ticket_id': '5', 'action': 'deduplicated'}):
|
||||
assert c.create('t', 'd') == '5'
|
||||
with self._post({'success': True, 'ticket_id': '6'}):
|
||||
assert c.create('u', 'd') == '6'
|
||||
|
||||
def test_recurrence_on_a_closed_ticket_is_not_used_and_not_retried_each_poll(self):
|
||||
c = self._client()
|
||||
with self._post({'success': True, 'ticket_id': '993', 'action': 'recurrence_noted'}) as post:
|
||||
assert c.create('t', 'd') is None
|
||||
assert c.create('t', 'd') is None
|
||||
assert post.call_count == 1 # the second poll doesn't add another comment to the closed ticket
|
||||
with self._post({'success': True, 'ticket_id': '7', 'action': 'none'}) as post:
|
||||
assert c.create('other', 'd') == '7' # other alerts are unaffected
|
||||
|
||||
def test_retry_after_a_day(self):
|
||||
c = self._client()
|
||||
with self._post({'success': True, 'ticket_id': '993', 'action': 'recurrence_noted'}):
|
||||
c.create('t', 'd')
|
||||
c._closed_matches['t'] = ('993', time.time() - c.CLOSED_MATCH_RETRY_S - 1)
|
||||
with self._post({'success': True, 'ticket_id': '8', 'action': 'none'}):
|
||||
assert c.create('t', 'd') == '8'
|
||||
assert 't' not in c._closed_matches
|
||||
|
||||
|
||||
class TestTicketClientOpenTickets:
|
||||
def _client(self):
|
||||
return monitor.TicketClient({'url': 'http://t.test/create_ticket_api.php', 'api_key': 'k'})
|
||||
|
||||
def _page(self, tickets, pages):
|
||||
resp = MagicMock(status_code=200)
|
||||
resp.json.return_value = {'success': True, 'tickets': tickets, 'page': 1, 'pages': pages}
|
||||
return resp
|
||||
|
||||
def test_read_endpoint_sits_beside_create(self):
|
||||
assert self._client().read_url == 'http://t.test/api/tickets_api.php'
|
||||
|
||||
def test_reads_every_page_of_open_statuses(self):
|
||||
pages = [self._page([{'ticket_id': '1', 'status': 'Open'}], 2),
|
||||
self._page([{'ticket_id': 2, 'status': 'Pending'}], 2)]
|
||||
with patch.object(monitor.requests, 'get', side_effect=pages) as get:
|
||||
assert self._client().open_tickets() == {'1': 'Open', '2': 'Pending'}
|
||||
assert get.call_count == 2
|
||||
params = get.call_args.kwargs['params']
|
||||
assert params['status'] == 'Open,Pending,In Progress' and params['page'] == 2
|
||||
assert get.call_args.kwargs['headers'] == {'Authorization': 'Bearer k'}
|
||||
|
||||
def test_failure_means_unknown_not_empty(self):
|
||||
with patch.object(monitor.requests, 'get', side_effect=OSError('down')):
|
||||
assert self._client().open_tickets() is None
|
||||
bad = MagicMock(status_code=200)
|
||||
bad.json.return_value = {'success': False, 'error': 'nope'}
|
||||
with patch.object(monitor.requests, 'get', return_value=bad):
|
||||
assert self._client().open_tickets() is None
|
||||
|
||||
def test_unconfigured(self):
|
||||
assert monitor.TicketClient({}).open_tickets() is None
|
||||
|
||||
|
||||
class TestSyncOpenTickets:
|
||||
def test_saves_the_list_then_waits(self, mon, db):
|
||||
mon.tickets.open_tickets.return_value = {'7': 'Open'}
|
||||
mon._sync_open_tickets()
|
||||
mon._sync_open_tickets()
|
||||
assert mon.tickets.open_tickets.call_count == 1
|
||||
key, value = db.set_state.call_args.args
|
||||
assert key == monitor.OPEN_TICKETS_STATE and value['tickets'] == {'7': 'Open'}
|
||||
assert value['checked_at'] > 0
|
||||
|
||||
def test_failed_read_keeps_the_previous_list(self, mon, db):
|
||||
mon.tickets.open_tickets.return_value = None
|
||||
mon._sync_open_tickets()
|
||||
db.set_state.assert_not_called()
|
||||
|
||||
def test_refreshes_after_the_interval(self, mon, db):
|
||||
mon.tickets.open_tickets.return_value = {}
|
||||
mon._sync_open_tickets()
|
||||
mon._open_tickets_synced -= monitor.OPEN_TICKETS_SYNC_S + 1
|
||||
mon._sync_open_tickets()
|
||||
assert mon.tickets.open_tickets.call_count == 2
|
||||
|
||||
|
||||
class TestWanQualityCollection:
|
||||
def test_stores_the_timeline(self, mon, db):
|
||||
mon.unifi = MagicMock()
|
||||
mon.unifi.get_wan_dashboard.return_value = {'wan_history': {'wan_history_details': [
|
||||
{'network_group': 'WAN', 'health_history': [{'timestamp': 1000, 'high_latency': True}]}]}}
|
||||
mon._collect_wan_quality()
|
||||
key, value = db.set_state.call_args.args
|
||||
assert key == 'wan_quality'
|
||||
assert value['periods'] == [{'ts': 1.0, 'state': 'latency'}]
|
||||
|
||||
def test_unavailable_keeps_the_last_copy(self, mon, db):
|
||||
mon.unifi = MagicMock()
|
||||
mon.unifi.get_wan_dashboard.return_value = None
|
||||
mon._collect_wan_quality()
|
||||
assert not db.set_state.called
|
||||
|
||||
def test_client_reads_the_day(self):
|
||||
c = monitor.UnifiClient({'controller': 'https://udm.test', 'api_key': 'k'})
|
||||
c.session.get = MagicMock(return_value=MagicMock(json=lambda: {'wan_history': {}}))
|
||||
assert c.get_wan_dashboard() == {'wan_history': {}}
|
||||
url = c.session.get.call_args.args[0]
|
||||
assert url.endswith('/proxy/network/v2/api/site/default/aggregated-dashboard')
|
||||
assert c.session.get.call_args.kwargs['params'] == {'historySeconds': 86400}
|
||||
|
||||
def test_client_error_is_none(self):
|
||||
c = monitor.UnifiClient({'controller': 'https://udm.test', 'api_key': 'k'})
|
||||
c.session.get = MagicMock(side_effect=RuntimeError('boom'))
|
||||
assert c.get_wan_dashboard() is None
|
||||
@@ -0,0 +1,488 @@
|
||||
"""Tests for topology.build_graph, on a small network shaped like the real one."""
|
||||
import os
|
||||
import sys
|
||||
|
||||
import pytest
|
||||
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
|
||||
|
||||
import topology # noqa: E402
|
||||
|
||||
|
||||
def port(idx, name=None, up=True, speed=1000, neighbour='', port_id='', chassis='', uplink=False, sfp=None,
|
||||
tx=0.0, rx=0.0, source=None):
|
||||
lldp = {}
|
||||
if neighbour or chassis:
|
||||
lldp = {'system_name': neighbour, 'port_id': port_id, 'chassis_id': chassis, 'port_desc': '', 'mgmt_ips': []}
|
||||
if source:
|
||||
lldp['source'] = source
|
||||
p = {'port_idx': idx, 'up': up, 'speed_mbps': speed if up else 0, 'is_uplink': uplink, 'media': 'GE',
|
||||
'lldp': lldp, 'tx_bytes_rate': tx, 'rx_bytes_rate': rx, 'rx_errs_rate': 0.0, 'tx_errs_rate': 0.0,
|
||||
'rx_drops_rate': 0.0, 'tx_drops_rate': 0.0}
|
||||
if sfp:
|
||||
p['sfp'] = dict({'found': True, 'vendor': 'OEM', 'serial': 'SN1'}, **sfp)
|
||||
p['media'] = 'SFP+'
|
||||
return (name or f'Port {idx}'), p
|
||||
|
||||
|
||||
def ports(*items):
|
||||
return dict(items)
|
||||
|
||||
|
||||
def dac(peer=None, peer_port=None):
|
||||
s = {'kind': 'dac', 'part': 'SFP-H10GB-CU1M'}
|
||||
if peer:
|
||||
s['cable_peer'] = {'switch': peer, 'port_idx': peer_port}
|
||||
return s
|
||||
|
||||
|
||||
def network(poe_port_11='Port 11', pbs_up=True):
|
||||
"""Gateway -> aggregation -> PoE switch, two dual-homed hosts, an AP, a PDU and unknown devices."""
|
||||
switches = {
|
||||
'Dream Machine Pro': {'model': 'UDMPRO', 'ports': ports(
|
||||
port(1, neighbour='host-a', port_id='eno2', source='unifi-clients'),
|
||||
port(8), # up, nothing reported: a cable to something Gandalf can't see
|
||||
port(9, uplink=True, chassis='02:00:5e:00:00:09', port_id='02:00:5e:00:00:0a'),
|
||||
port(11, 'Downlink to USW-Aggregation', speed=10000, neighbour='8SFP-AGG', port_id='local Port 7',
|
||||
sfp=dac('8SFP-AGG', 7), tx=2000.0, rx=1000.0),
|
||||
)},
|
||||
'8SFP-AGG': {'model': 'USL8A', 'ports': ports(
|
||||
port(1, 'SFP+ 1', speed=10000, neighbour='host-a', port_id='eno1', sfp={'kind': 'dac', 'part': 'X'}),
|
||||
port(2, 'SFP+ 2', speed=10000, neighbour='host-b', port_id='enp1s0', sfp={'kind': '', 'part': 'L56'}),
|
||||
port(5, 'Downlink to 24RJ45-POE', speed=10000, neighbour='24RJ45-POE', port_id='Port 26',
|
||||
sfp=dac('24RJ45-POE', 26)),
|
||||
port(7, 'SFP+ 7', speed=10000, neighbour='Dream Machine Pro', port_id='02:00:5e:00:00:11',
|
||||
uplink=True, sfp=dac('Dream Machine Pro', 11), tx=1000.0, rx=2000.0),
|
||||
port(8, 'SFP+ 8', speed=10000, neighbour='host-c', port_id='nic4', sfp={'kind': 'optic', 'part': 'SR'}),
|
||||
)},
|
||||
'24RJ45-POE': {'model': 'US24PRO', 'ports': ports(
|
||||
port(1, 'Micro 2 Eth2', chassis='02:00:5e:00:01:01', port_id='02:00:5E:00:01:01'),
|
||||
port(3, 'Living Room Downlink', neighbour='USW Flex', port_id='02:00:5E:00:02:01'),
|
||||
port(4, neighbour='host-b', port_id='enp2s0', source='unifi-clients'),
|
||||
port(8, neighbour='192.0.2.44', port_id='eth0', chassis='02:00:5e:00:01:08', source='unifi-clients'),
|
||||
port(11, poe_port_11, neighbour='AP', port_id='02:00:5E:00:03:01'),
|
||||
port(12, up=False),
|
||||
port(15, 'PBS', up=pbs_up, neighbour='pbs' if pbs_up else '', port_id='enp0s25' if pbs_up else ''),
|
||||
port(19, neighbour='RPDU', port_id='02:00:5E:00:04:01', speed=100),
|
||||
port(26, 'SFP+ 2', speed=10000, neighbour='8SFP-AGG', port_id='Port 5', uplink=True,
|
||||
sfp=dac('8SFP-AGG', 5)),
|
||||
)},
|
||||
'USW Flex': {'model': 'USF5P', 'ports': ports(
|
||||
port(1, uplink=True, neighbour='24RJ45-POE', port_id='Port 3'),
|
||||
port(5, neighbour='UPS 2U Pro', port_id='Port 1', speed=100),
|
||||
)},
|
||||
'RPDU': {'model': 'USPPDUP', 'ports': ports(port(1, uplink=True, speed=100))},
|
||||
}
|
||||
unifi = [
|
||||
{'name': 'Dream Machine Pro', 'type': 'udm', 'model': 'UDMPRO', 'connected': True, 'mac': '', 'ip': ''},
|
||||
{'name': '8SFP-AGG', 'type': 'usw', 'model': 'USL8A', 'connected': True, 'mac': '', 'ip': ''},
|
||||
{'name': '24RJ45-POE', 'type': 'usw', 'model': 'US24PRO', 'connected': True, 'mac': '', 'ip': ''},
|
||||
{'name': 'USW Flex', 'type': 'usw', 'model': 'USF5P', 'connected': True, 'mac': '', 'ip': ''},
|
||||
{'name': 'AP', 'type': 'uap', 'model': 'UAL6', 'connected': True, 'mac': '', 'ip': ''},
|
||||
{'name': 'RPDU', 'type': 'usw', 'model': 'USPPDUP', 'connected': True, 'mac': '', 'ip': ''},
|
||||
{'name': 'UPS 2U Pro', 'type': 'usp', 'model': 'USPDA2B', 'connected': True, 'mac': '', 'ip': ''},
|
||||
{'name': 'USP Strip', 'type': 'uap', 'model': 'UP6', 'connected': True, 'mac': '', 'ip': ''},
|
||||
]
|
||||
hosts = {
|
||||
'host-a': {'status': 'up', 'interfaces': {'eno1': 'up', 'eno2': 'up', 'eno3': 'unused', 'vmbr0': 'up'}},
|
||||
'host-b': {'status': 'degraded',
|
||||
'interfaces': {'bond0': 'up', 'enp1s0': 'up', 'enp2s0': 'up', 'enp3s0': 'down'}},
|
||||
'host-c': {'status': 'up', 'interfaces': {'nic4': 'up'}},
|
||||
'pbs': {'status': 'up' if pbs_up else 'down', 'interfaces': {'enp0s25': 'up' if pbs_up else 'down'}},
|
||||
}
|
||||
snapshot = {'hosts': hosts, 'unifi': unifi}
|
||||
link_stats = {
|
||||
'hosts': {'192.0.2.44': {'eth0': {}}}, # an IP-only Prometheus target
|
||||
'unifi_switches': switches,
|
||||
'unifi_devices': {'Dream Machine Pro': {'wan': {'wan1': {'up': True}}},
|
||||
'RPDU': {'power_w': 120.5, 'outlets': [{'index': 1, 'name': 'AT&T Modem', 'on': True}]}},
|
||||
'updated': '2026-11-14 12:00:00 UTC',
|
||||
}
|
||||
modem = {'name': 'att-modem', 'model': 'BGW320-505', 'reachable': True, 'broadband_state': 'Up',
|
||||
'source': 'FIBER', 'line_speed_mbps': 10000, 'rates': {'rx_bytes': 5000.0, 'tx_bytes': 700.0},
|
||||
'wan_problems': []}
|
||||
return snapshot, link_stats, modem
|
||||
|
||||
|
||||
def build(events=(), items=(), cables=(), known=None, **kw):
|
||||
snapshot, link_stats, modem = network(**kw)
|
||||
return topology.build_graph(snapshot, link_stats, modem, list(events), list(items), list(cables), known)
|
||||
|
||||
|
||||
def find(graph, a, b):
|
||||
"""The links between two nodes, either way round."""
|
||||
return [lk for lk in graph['links'] if {lk['a']['node'], lk['b']['node']} == {a, b}]
|
||||
|
||||
|
||||
def node(graph, name):
|
||||
return next(n for n in graph['nodes'] if n['id'] == name)
|
||||
|
||||
|
||||
class TestSwitchCables:
|
||||
def test_cable_seen_from_both_ends_is_drawn_once(self):
|
||||
g = build()
|
||||
assert len(find(g, 'Dream Machine Pro', '8SFP-AGG')) == 1
|
||||
assert len(find(g, '8SFP-AGG', '24RJ45-POE')) == 1
|
||||
assert len(find(g, '24RJ45-POE', 'USW Flex')) == 1
|
||||
|
||||
def test_both_ports_of_a_switch_cable_are_known(self):
|
||||
g = build()
|
||||
(link,) = find(g, 'Dream Machine Pro', '8SFP-AGG')
|
||||
ends = {link['a']['node']: link['a']['port_idx'], link['b']['node']: link['b']['port_idx']}
|
||||
assert ends == {'Dream Machine Pro': 11, '8SFP-AGG': 7}
|
||||
(flex,) = find(g, '24RJ45-POE', 'USW Flex')
|
||||
assert {flex['a']['port_idx'], flex['b']['port_idx']} == {3, 1}
|
||||
|
||||
def test_gear_without_lldp_lands_on_its_uplink(self):
|
||||
(pdu,) = find(build(), '24RJ45-POE', 'RPDU')
|
||||
assert pdu['b'] == {'node': 'RPDU', 'port_idx': 1, 'port_name': 'Port 1', 'iface': ''}
|
||||
|
||||
def test_cables_point_away_from_the_internet(self):
|
||||
g = build()
|
||||
(link,) = find(g, 'Dream Machine Pro', '8SFP-AGG')
|
||||
assert link['a']['node'] == 'Dream Machine Pro'
|
||||
# The gateway sends 2000 B/s down the cable and gets 1000 back, whichever end measured it
|
||||
assert (link['a_to_b_bps'], link['b_to_a_bps']) == (2000.0, 1000.0)
|
||||
(down,) = find(g, '8SFP-AGG', '24RJ45-POE')
|
||||
assert down['a']['node'] == '8SFP-AGG'
|
||||
|
||||
def test_medium_and_module(self):
|
||||
g = build()
|
||||
assert find(g, 'Dream Machine Pro', '8SFP-AGG')[0]['medium'] == 'dac'
|
||||
assert find(g, '8SFP-AGG', 'host-c')[0]['medium'] == 'fibre'
|
||||
assert find(g, '8SFP-AGG', 'host-b')[0]['medium'] == 'sfp'
|
||||
assert find(g, '24RJ45-POE', 'host-b')[0]['medium'] == 'copper'
|
||||
assert find(g, 'Dream Machine Pro', '8SFP-AGG')[0]['sfp_part'] == 'SFP-H10GB-CU1M'
|
||||
|
||||
|
||||
class TestWanEdge:
|
||||
def test_gateway_to_modem_to_internet(self):
|
||||
g = build()
|
||||
(wan,) = find(g, 'Dream Machine Pro', 'att-modem')
|
||||
assert wan['wan'] and wan['b']['node'] == 'Dream Machine Pro' and wan['a']['node'] == 'att-modem'
|
||||
assert wan['b']['port_idx'] == 9
|
||||
(fibre,) = find(g, 'att-modem', topology.INTERNET)
|
||||
assert fibre['medium'] == 'fibre' and fibre['speed_mbps'] == 10000 and fibre['up']
|
||||
# Down from the internet is what the modem received
|
||||
assert fibre['a_to_b_bps'] == 5000.0
|
||||
|
||||
def test_the_wan_port_is_not_a_stub(self):
|
||||
assert 'stub:Dream Machine Pro:9' not in {n['id'] for n in build()['nodes']}
|
||||
|
||||
def test_without_a_modem_the_gateway_goes_straight_out(self):
|
||||
snapshot, link_stats, _ = network()
|
||||
g = topology.build_graph(snapshot, link_stats, None, [], [], [], None)
|
||||
assert len(find(g, 'Dream Machine Pro', topology.INTERNET)) == 1
|
||||
|
||||
def test_internet_status_follows_the_gateway_wan(self):
|
||||
snapshot, link_stats, modem = network()
|
||||
link_stats['unifi_devices']['Dream Machine Pro']['wan']['wan1']['up'] = False
|
||||
g = topology.build_graph(snapshot, link_stats, modem, [], [], [], None)
|
||||
assert node(g, topology.INTERNET)['status'] == 'down'
|
||||
|
||||
|
||||
class TestHosts:
|
||||
def test_dual_homed_host_has_two_cables(self):
|
||||
g = build()
|
||||
a = [lk for lk in g['links'] if 'host-a' in (lk['a']['node'], lk['b']['node'])]
|
||||
assert sorted((lk['speed_mbps'], lk['b']['iface']) for lk in a) == [(1000, 'eno2'), (10000, 'eno1')]
|
||||
|
||||
def test_physical_nics_only_with_the_cables_on_them(self):
|
||||
nics = {n['name']: n for n in node(build(), 'host-a')['interfaces']}
|
||||
assert set(nics) == {'eno1', 'eno2', 'eno3'}
|
||||
assert nics['eno3']['unused'] and 'links' not in nics['eno3']
|
||||
assert len(nics['eno1']['links']) == 1
|
||||
|
||||
def test_ip_only_target_is_a_stub_not_a_host(self):
|
||||
g = build()
|
||||
assert '192.0.2.44' not in {n['id'] for n in g['nodes'] if n['kind'] != 'stub'}
|
||||
stub = node(g, 'stub:24RJ45-POE:8')
|
||||
assert stub['name'] == '192.0.2.44' and stub['ip'] == '192.0.2.44' and stub['iface'] == 'eth0'
|
||||
|
||||
def test_chassis_comes_from_the_cutsheet_item(self):
|
||||
items = [{'name': 'Server A', 'device': 'host-a', 'chassis': 'sliger-cx4712-red'},
|
||||
{'name': 'host-b', 'device': '', 'chassis': 'zimaboard-832-cx3'}]
|
||||
g = build(items=items)
|
||||
assert node(g, 'host-a')['chassis'] == 'sliger-cx4712-red'
|
||||
assert node(g, 'host-b')['chassis'] == 'zimaboard-832-cx3'
|
||||
assert node(g, 'host-c')['chassis'] == ''
|
||||
|
||||
|
||||
class TestStubs:
|
||||
def test_unnamed_neighbour_is_a_stub_named_by_its_port(self):
|
||||
stub = node(build(), 'stub:24RJ45-POE:1')
|
||||
assert stub['kind'] == 'stub' and stub['name'] == 'Micro 2 Eth2'
|
||||
assert stub['mac'] == '02:00:5e:00:01:01' and not stub['anonymous']
|
||||
|
||||
def test_link_with_no_neighbour_is_an_anonymous_stub(self):
|
||||
stub = node(build(), 'stub:Dream Machine Pro:8')
|
||||
assert stub['anonymous'] and stub['name'] == 'unknown device'
|
||||
|
||||
def test_ports_with_no_link_are_left_out(self):
|
||||
assert 'stub:24RJ45-POE:12' not in {n['id'] for n in build()['nodes']}
|
||||
|
||||
|
||||
class TestNameMismatch:
|
||||
def test_port_named_after_another_device(self):
|
||||
(link,) = find(build(poe_port_11='Large1 Management'), '24RJ45-POE', 'AP')
|
||||
assert link['name_mismatch'] is None # no device called large1 in this network
|
||||
|
||||
def test_flags_when_the_named_device_exists(self):
|
||||
(link,) = find(build(poe_port_11='host-b management'), '24RJ45-POE', 'AP')
|
||||
assert link['name_mismatch'] == {'named': 'host-b', 'actual': 'AP', 'end': 'a'}
|
||||
|
||||
def test_downlink_and_generic_names_are_fine(self):
|
||||
g = build()
|
||||
assert all(lk['name_mismatch'] is None for lk in g['links'])
|
||||
|
||||
@pytest.mark.parametrize('name', ['Port 4', 'SFP+ 2', 'Uplink', 'Downlink to 24RJ45-POE'])
|
||||
def test_names_that_never_flag(self, name):
|
||||
known = {topology._norm(n): n for n in ('24RJ45-POE', 'host-a')}
|
||||
assert topology.name_mismatch(name, '24RJ45-POE', 'x', known) is None
|
||||
|
||||
def test_matches_ignore_case_spacing_and_dashes(self):
|
||||
known = {topology._norm('compute-storage-01'): 'compute-storage-01'}
|
||||
assert topology.name_mismatch('Compute Storage 01 mgmt', 'AP', 'sw', known)['named'] == 'compute-storage-01'
|
||||
|
||||
def test_a_stub_is_checked_against_what_was_seen(self):
|
||||
snapshot, link_stats, modem = network()
|
||||
link_stats['unifi_switches']['24RJ45-POE']['ports']['host-c'] = port(
|
||||
20, 'host-c', chassis='02:00:5e:00:09:09')[1]
|
||||
g = topology.build_graph(snapshot, link_stats, modem, [], [], [], None)
|
||||
(link,) = find(g, '24RJ45-POE', 'stub:24RJ45-POE:20')
|
||||
assert link['name_mismatch']['named'] == 'host-c'
|
||||
|
||||
|
||||
class TestGhosts:
|
||||
KNOWN = {'pbs': {'seen': '2026-11-14 20:49:08 UTC', 'uplinks': [
|
||||
{'switch': '24RJ45-POE', 'port': 'PBS', 'port_idx': 15, 'host_interface': 'enp0s25'}]}}
|
||||
|
||||
def test_missing_host_is_drawn_where_last_seen(self):
|
||||
g = build(known=self.KNOWN, pbs_up=False)
|
||||
(ghost,) = find(g, '24RJ45-POE', 'pbs')
|
||||
assert ghost['ghost'] and not ghost['up'] and ghost['seen'] == '2026-11-14 20:49:08 UTC'
|
||||
assert ghost['b'] == {'node': 'pbs', 'port_idx': None, 'port_name': '', 'iface': 'enp0s25'}
|
||||
|
||||
def test_no_ghost_while_the_host_is_linked(self):
|
||||
g = build(known=self.KNOWN)
|
||||
assert [lk['ghost'] for lk in find(g, '24RJ45-POE', 'pbs')] == [False]
|
||||
|
||||
def test_no_ghost_onto_a_port_now_used_by_something_else(self):
|
||||
known = {'pbs': {'seen': 'x', 'uplinks': [{'switch': '24RJ45-POE', 'port_idx': 4, 'host_interface': 'e'}]}}
|
||||
assert find(build(known=known, pbs_up=False), '24RJ45-POE', 'pbs') == []
|
||||
|
||||
|
||||
class TestDepth:
|
||||
def test_hops_from_the_internet(self):
|
||||
g = build()
|
||||
depths = {n['id']: n['depth'] for n in g['nodes']}
|
||||
assert depths[topology.INTERNET] == 0
|
||||
assert depths['att-modem'] == 1
|
||||
assert depths['Dream Machine Pro'] == 2
|
||||
assert depths['8SFP-AGG'] == 3
|
||||
assert depths['24RJ45-POE'] == 4
|
||||
assert depths['USW Flex'] == 5 and depths['AP'] == 5
|
||||
assert depths['UPS 2U Pro'] == 6
|
||||
# A host's depth is its nearest switch's plus one; hosts never pass the path on
|
||||
assert depths['host-a'] == 3
|
||||
|
||||
def test_unlinked_gear_has_no_depth(self):
|
||||
assert node(build(), 'USP Strip')['depth'] is None
|
||||
|
||||
def test_power_gear_is_marked(self):
|
||||
g = build()
|
||||
assert {n['id']: n['kind'] for n in g['nodes'] if n['power']} == {
|
||||
'RPDU': 'pdu', 'UPS 2U Pro': 'ups', 'USP Strip': 'strip'}
|
||||
assert node(g, 'RPDU')['power_w'] == 120.5
|
||||
|
||||
|
||||
class TestAlerts:
|
||||
def test_active_alerts_count_on_their_device(self):
|
||||
events = [
|
||||
{'id': 1, 'event_type': 'interface_down', 'severity': 'critical', 'target_name': 'host-b',
|
||||
'target_detail': 'enp3s0', 'description': ''},
|
||||
{'id': 2, 'event_type': 'unifi_port_errors', 'severity': 'warning', 'target_name': '24RJ45-POE',
|
||||
'target_detail': 'Port 9', 'description': ''},
|
||||
{'id': 3, 'event_type': 'host_down', 'severity': 'critical', 'target_name': 'host-a',
|
||||
'target_detail': '', 'description': '', 'is_suppressed': True},
|
||||
]
|
||||
g = build(events=events)
|
||||
b = node(g, 'host-b')
|
||||
assert (b['alert_count'], b['severity']) == (1, 'critical')
|
||||
assert next(n for n in b['interfaces'] if n['name'] == 'enp3s0')['alert'] == 'critical'
|
||||
assert node(g, '24RJ45-POE')['severity'] == 'warning'
|
||||
assert node(g, 'host-a')['alert_count'] == 0
|
||||
|
||||
def test_status_comes_from_the_snapshot(self):
|
||||
assert node(build(), 'host-b')['status'] == 'degraded'
|
||||
|
||||
|
||||
class TestCutsheetLabels:
|
||||
def test_cable_label_on_either_end(self):
|
||||
items = [{'name': 'Patch', 'device': '', 'chassis': ''}, {'name': 'UDM-Pro', 'device': 'Dream Machine Pro'}]
|
||||
cables = [{'id': 7, 'label': 'C07', 'a_device': 'UDM-Pro', 'a_port': '8', 'b_device': 'Patch',
|
||||
'b_port': '1', 'status': 'installed', 'cable_type': 'Cat6', 'color': 'Black'},
|
||||
{'id': 8, 'label': 'C08', 'a_device': 'host-a', 'a_port': 'eno2', 'b_device': '',
|
||||
'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',
|
||||
'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) == []
|
||||
@@ -147,3 +147,25 @@ def recovery_comment(event: dict, now: datetime, url: str = '') -> str:
|
||||
lines += ['', '_Gandalf leaves this ticket open. Close it once you know why it happened, '
|
||||
'or leave it open if it needs follow-up._']
|
||||
return '\n'.join(lines)
|
||||
|
||||
|
||||
def incident_comment(name: str, summary: str, checks: Sequence[str], when: str) -> str:
|
||||
"""A further report that belongs to the incident this ticket is already about."""
|
||||
lines = [f'**Also seen: {name}** ({when})', '', summary.strip()]
|
||||
if checks:
|
||||
lines += ['', '**What to check**'] + [f'{n}. {check}' for n, check in enumerate(checks, 1)]
|
||||
lines += ['', '_Gandalf added this here instead of opening another ticket, since it is part of '
|
||||
'the same incident._']
|
||||
return '\n'.join(lines)
|
||||
|
||||
|
||||
def update_comment(label: str, when: str, lookback_min: int, hold_min: int) -> str:
|
||||
"""Note on a ticket that a UniFi update finished around the time it was opened."""
|
||||
return '\n'.join([
|
||||
f'**UniFi update:** {label} finished at {when}.', '',
|
||||
f'This ticket was opened within {lookback_min} minutes of that update, which UniFi logs once '
|
||||
f'it is done. Updating the Network app or the gateway firmware can drop the WAN, and Smart '
|
||||
f'Power may then power-cycle the modem, so the update is the likely cause.', '',
|
||||
f'_Gandalf holds new modem and WAN tickets for {hold_min} minutes after an update; anything '
|
||||
f'still wrong after that gets its own ticket._',
|
||||
])
|
||||
+598
@@ -0,0 +1,598 @@
|
||||
"""The live network topology: every device and every physical cable between them.
|
||||
|
||||
Pure functions with no I/O. app.py passes in the monitor's cached state and the
|
||||
cutsheet, and the /topology page draws what build_graph returns.
|
||||
|
||||
The graph comes from the switches' point of view: each UniFi port with a neighbour
|
||||
is one end of a cable. The same switch-to-switch cable is seen from both ends, so
|
||||
those are merged into one link.
|
||||
"""
|
||||
import re
|
||||
from collections import deque
|
||||
from typing import Dict, List, Optional, Tuple
|
||||
|
||||
import devices
|
||||
|
||||
INTERNET = 'internet'
|
||||
|
||||
# How UniFi devices are drawn and grouped. Power gear goes in its own rail.
|
||||
_POWER_MODELS = {'USPPDUP': 'pdu', 'USPDA2B': 'ups', 'UP6': 'strip'}
|
||||
POWER_KINDS = ('pdu', 'ups', 'strip')
|
||||
|
||||
_SEVERITY_RANK = {'critical': 3, 'warning': 2, 'info': 1}
|
||||
_PORT_REF_RE = re.compile(r'(?:^|\s)port\s*(\d+)$', re.IGNORECASE)
|
||||
_TOKEN_RE = re.compile(r'[a-z0-9]+')
|
||||
|
||||
|
||||
def _norm(name: str) -> str:
|
||||
"""A name with case, spaces, dashes and underscores ignored: "Large1" == "large-1"."""
|
||||
return ''.join(_TOKEN_RE.findall((name or '').lower()))
|
||||
|
||||
|
||||
def _node_kind(entry: dict) -> str:
|
||||
if entry['kind'] == 'pdu':
|
||||
return _POWER_MODELS.get(entry.get('model', ''), 'pdu')
|
||||
return entry['kind']
|
||||
|
||||
|
||||
def _medium(port: dict) -> str:
|
||||
"""dac, fibre, sfp (a module that doesn't say which) or copper."""
|
||||
sfp = port.get('sfp') or {}
|
||||
if sfp.get('found') or sfp.get('part'):
|
||||
kind = sfp.get('kind') or ''
|
||||
if kind == 'dac':
|
||||
return 'dac'
|
||||
if kind == 'optic':
|
||||
return 'fibre'
|
||||
return 'sfp'
|
||||
if str(port.get('media') or '').upper().startswith('SFP'):
|
||||
return 'sfp' if port.get('up') else 'copper'
|
||||
return 'copper'
|
||||
|
||||
|
||||
def _rate(value) -> float:
|
||||
try:
|
||||
return max(float(value or 0), 0.0)
|
||||
except (TypeError, ValueError):
|
||||
return 0.0
|
||||
|
||||
|
||||
def _utilisation(a_to_b: float, b_to_a: float, speed_mbps) -> Optional[float]:
|
||||
try:
|
||||
speed = float(speed_mbps or 0)
|
||||
except (TypeError, ValueError):
|
||||
speed = 0.0
|
||||
if speed <= 0:
|
||||
return None
|
||||
return round(min(max(a_to_b, b_to_a) * 8 / (speed * 1e6), 1.0), 4)
|
||||
|
||||
|
||||
def _port_stats(port: dict) -> dict:
|
||||
sfp = port.get('sfp') or {}
|
||||
return {
|
||||
'speed_mbps': port.get('speed_mbps') or 0,
|
||||
'up': bool(port.get('up')),
|
||||
'medium': _medium(port),
|
||||
'sfp_part': sfp.get('part') or '',
|
||||
'sfp_vendor': sfp.get('vendor') or '',
|
||||
'sfp_serial': sfp.get('serial') or '',
|
||||
'errors': round(_rate(port.get('rx_errs_rate')) + _rate(port.get('tx_errs_rate')), 3),
|
||||
'drops': round(_rate(port.get('rx_drops_rate')) + _rate(port.get('tx_drops_rate')), 3),
|
||||
}
|
||||
|
||||
|
||||
def _end(node: str, port_name: str = '', port_idx=None, iface: str = '') -> dict:
|
||||
return {'node': node, 'port_idx': port_idx, 'port_name': port_name, 'iface': iface}
|
||||
|
||||
|
||||
def _far_port(switches: dict, here: str, port: dict, neighbour: str) -> Optional[int]:
|
||||
"""Which port on a neighbouring switch the cable from `port` lands on, if it can be told."""
|
||||
peer = (port.get('sfp') or {}).get('cable_peer') or {}
|
||||
if peer.get('switch') == neighbour and peer.get('port_idx') is not None:
|
||||
return peer['port_idx']
|
||||
far = switches.get(neighbour)
|
||||
if not far:
|
||||
return None
|
||||
ports = [p for p in (far.get('ports') or {}).values() if p.get('port_idx') is not None]
|
||||
# LLDP's port ID names the neighbour's own port ("Port 3", "local Port 7")
|
||||
m = _PORT_REF_RE.search(str((port.get('lldp') or {}).get('port_id') or '').strip())
|
||||
if m and any(p['port_idx'] == int(m.group(1)) for p in ports):
|
||||
return int(m.group(1))
|
||||
back = [p['port_idx'] for p in ports if (p.get('lldp') or {}).get('system_name') == here]
|
||||
if len(back) == 1:
|
||||
return back[0]
|
||||
# Gear that sends no LLDP of its own (a PDU): its single uplink
|
||||
uplinks = [p['port_idx'] for p in ports if p.get('is_uplink')]
|
||||
return uplinks[0] if len(uplinks) == 1 else None
|
||||
|
||||
|
||||
def _is_generic_port_name(name: str) -> bool:
|
||||
return bool(re.fullmatch(r'(port|sfp\+?|uplink|downlink)\s*\d*', (name or '').strip(), re.IGNORECASE))
|
||||
|
||||
|
||||
def name_mismatch(port_name: str, neighbour: str, own: str, known: Dict[str, str]) -> Optional[dict]:
|
||||
"""A port named after a different device than the one plugged into it.
|
||||
|
||||
known: {normalised name: display name} of every device. Runs of up to four words of
|
||||
the port name are compared with them, so "Large1 Management" names large1 and
|
||||
"Downlink to 24RJ45-POE" names 24RJ45-POE. Ports named only "Port 4" never match.
|
||||
"""
|
||||
if not port_name or _is_generic_port_name(port_name):
|
||||
return None
|
||||
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 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. 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, 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 '',
|
||||
'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 []:
|
||||
if ev.get('is_suppressed'):
|
||||
continue
|
||||
out.setdefault(ev.get('target_name') or '', []).append({
|
||||
'id': ev.get('id'), 'severity': ev.get('severity') or 'info',
|
||||
'type': ev.get('event_type') or '', 'detail': ev.get('target_detail') or '',
|
||||
'description': ev.get('description') or '',
|
||||
})
|
||||
return out
|
||||
|
||||
|
||||
def _worst(alerts: List[dict]) -> str:
|
||||
return max((a['severity'] for a in alerts), key=lambda s: _SEVERITY_RANK.get(s, 0), default='')
|
||||
|
||||
|
||||
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, 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 {}
|
||||
switches = link_stats.get('unifi_switches') or {}
|
||||
unifi_info = link_stats.get('unifi_devices') or {}
|
||||
alerts = _alerts_by_target(events)
|
||||
labels = _cable_labels(cutsheet_items, cutsheet_cables)
|
||||
chassis = {}
|
||||
for item in cutsheet_items or []:
|
||||
chassis.setdefault(item.get('device') or item['name'], item.get('chassis') or '')
|
||||
warnings: List[str] = []
|
||||
|
||||
# ── Nodes ────────────────────────────────────────────────────────────
|
||||
nodes: Dict[str, dict] = {}
|
||||
configured = set(snapshot.get('hosts') or {})
|
||||
for entry in devices.build_index(snapshot, link_stats, modem):
|
||||
name = entry['name']
|
||||
if entry['kind'] == 'host' and name not in configured:
|
||||
continue # IP-only Prometheus targets: shown only as a stub where a port sees them
|
||||
kind = _node_kind(entry)
|
||||
node = {
|
||||
'id': name, 'name': name, 'kind': kind, 'status': entry['status'], 'model': entry.get('model', ''),
|
||||
'ip': entry.get('ip', ''), 'url': f'/device/{name}', 'power': kind in POWER_KINDS,
|
||||
}
|
||||
if kind == 'host':
|
||||
node['chassis'] = chassis.get(name, '')
|
||||
node['interfaces'] = devices.physical_interfaces(name, snapshot)
|
||||
for nic in node['interfaces']:
|
||||
nic_alerts = [a for a in alerts.get(name, []) if a['detail'] == nic['name']]
|
||||
nic['alert'] = _worst(nic_alerts)
|
||||
elif name in switches or kind in ('router', 'switch'):
|
||||
node['ports'] = {
|
||||
str(p['port_idx']): {'name': pname, 'up': bool(p.get('up')), 'speed_mbps': p.get('speed_mbps') or 0,
|
||||
'is_uplink': bool(p.get('is_uplink')), 'media': p.get('media') or '',
|
||||
'poe_power': p.get('poe_power'), 'sfp': p.get('sfp') or None,
|
||||
'tx_bytes_rate': _rate(p.get('tx_bytes_rate')),
|
||||
'rx_bytes_rate': _rate(p.get('rx_bytes_rate')),
|
||||
'neighbour': (p.get('lldp') or {}).get('system_name') or ''}
|
||||
for pname, p in ((switches.get(name) or {}).get('ports') or {}).items()
|
||||
if p.get('port_idx') is not None
|
||||
}
|
||||
if kind in POWER_KINDS:
|
||||
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)
|
||||
node['severity'] = _worst(node_alerts)
|
||||
nodes[name] = node
|
||||
|
||||
router = next((n for n in nodes.values() if n['kind'] == 'router'), None)
|
||||
modem_name = (modem or {}).get('name') if (modem or {}).get('name') in nodes else None
|
||||
wan = ((unifi_info.get(router['name']) or {}).get('wan') or {}) if router else {}
|
||||
wan_up = any(w.get('up') for w in wan.values()) if wan else None
|
||||
if modem_name:
|
||||
wan_up = (modem or {}).get('broadband_state', '').lower() == 'up' if wan_up is None else wan_up
|
||||
nodes[INTERNET] = {
|
||||
'id': INTERNET, 'name': 'Internet', 'kind': INTERNET, 'model': '', 'ip': '', 'url': '',
|
||||
'status': 'unknown' if wan_up is None else ('up' if wan_up else 'down'),
|
||||
'alerts': alerts.get('WAN', [])[:10], 'alert_count': len(alerts.get('WAN', [])),
|
||||
'severity': _worst(alerts.get('WAN', [])), 'power': False,
|
||||
}
|
||||
known_names = {_norm(n['name']): n['name'] for n in nodes.values() if n['id'] != INTERNET}
|
||||
|
||||
# ── Links ────────────────────────────────────────────────────────────
|
||||
links: List[dict] = []
|
||||
claimed: Dict[Tuple[str, int], dict] = {}
|
||||
|
||||
def add_link(a: dict, b: dict, port: dict, **extra) -> dict:
|
||||
link = {'id': '', 'a': a, 'b': b, 'ghost': False, 'name_mismatch': None,
|
||||
'cable': labels.get((a['node'], str(a['port_idx'] if a['port_idx'] is not None else a['iface'])))
|
||||
or labels.get((b['node'], str(b['port_idx'] if b['port_idx'] is not None else b['iface']))),
|
||||
**_port_stats(port),
|
||||
'_tx': _rate(port.get('tx_bytes_rate')), '_rx': _rate(port.get('rx_bytes_rate'))}
|
||||
link.update(extra)
|
||||
links.append(link)
|
||||
for end in (a, b):
|
||||
if end['port_idx'] is not None and end['node'] in switches:
|
||||
claimed[(end['node'], end['port_idx'])] = link
|
||||
return link
|
||||
|
||||
def ordered_ports(sw: dict):
|
||||
return sorted(((pn, p) for pn, p in (sw.get('ports') or {}).items() if p.get('port_idx') is not None),
|
||||
key=lambda kv: kv[1]['port_idx'])
|
||||
|
||||
# The router's internet port goes to the modem, then the modem to the internet
|
||||
wan_port = None
|
||||
if router and router['name'] in switches:
|
||||
wan_port = next(((pn, p) for pn, p in ordered_ports(switches[router['name']]) if p.get('is_uplink')), None)
|
||||
upstream = modem_name or INTERNET
|
||||
if wan_port:
|
||||
pn, p = wan_port
|
||||
add_link(_end(router['name'], pn, p['port_idx']), _end(upstream, 'WAN' if modem_name else ''), p, wan=True)
|
||||
elif router:
|
||||
warnings.append(f'No internet port found on {router["name"]}')
|
||||
if modem_name:
|
||||
m = modem or {}
|
||||
rates = m.get('rates') or {}
|
||||
up = str(m.get('broadband_state') or '').lower() == 'up'
|
||||
links.append({
|
||||
'id': '', 'a': _end(INTERNET), 'b': _end(modem_name, str(m.get('source') or 'WAN').title()),
|
||||
'ghost': False, 'name_mismatch': None, 'cable': None, 'wan': True,
|
||||
'speed_mbps': m.get('line_speed_mbps') or 0, 'up': up,
|
||||
'medium': 'fibre' if str(m.get('source') or '').upper() == 'FIBER' else 'copper',
|
||||
'sfp_part': m.get('optics_part_no') or '', 'sfp_vendor': '', 'sfp_serial': '',
|
||||
'errors': round(_rate(rates.get('rx_errors')) + _rate(rates.get('tx_errors')), 3),
|
||||
'drops': round(_rate(rates.get('rx_drops')) + _rate(rates.get('tx_drops')), 3),
|
||||
# Seen from the modem's broadband side: rx comes down from the internet
|
||||
'_tx': _rate(rates.get('rx_bytes')), '_rx': _rate(rates.get('tx_bytes')),
|
||||
})
|
||||
elif not router:
|
||||
warnings.append('No UniFi gateway reported yet, so the internet edge is not drawn')
|
||||
|
||||
# Device-to-device and device-to-host cables, from every switch port with a neighbour
|
||||
for sw_name in sorted(switches):
|
||||
for pname, port in ordered_ports(switches[sw_name]):
|
||||
idx = port['port_idx']
|
||||
if (sw_name, idx) in claimed:
|
||||
continue
|
||||
lldp = port.get('lldp') or {}
|
||||
neighbour = lldp.get('system_name') or ''
|
||||
here = _end(sw_name, pname, idx)
|
||||
if neighbour in nodes and neighbour != sw_name:
|
||||
nb = nodes[neighbour]
|
||||
if nb['kind'] == 'host':
|
||||
far = _end(neighbour, iface=lldp.get('port_id') or '')
|
||||
else:
|
||||
far_idx = _far_port(switches, sw_name, port, neighbour)
|
||||
if far_idx is not None and (neighbour, far_idx) in claimed:
|
||||
continue # the other end already drew this cable
|
||||
far_port = next((pn for pn, p in ((switches.get(neighbour) or {}).get('ports') or {}).items()
|
||||
if p.get('port_idx') == far_idx), '') if far_idx is not None else ''
|
||||
far = _end(neighbour, far_port, far_idx)
|
||||
link = add_link(here, far, port)
|
||||
link['name_mismatch'] = name_mismatch(pname, neighbour, sw_name, known_names)
|
||||
if link['name_mismatch'] is None and far['port_name']:
|
||||
link['name_mismatch'] = name_mismatch(far['port_name'], sw_name, neighbour, known_names)
|
||||
if link['name_mismatch']:
|
||||
link['name_mismatch']['end'] = 'b'
|
||||
elif link['name_mismatch']:
|
||||
link['name_mismatch']['end'] = 'a'
|
||||
continue
|
||||
if port.get('is_uplink') and not neighbour:
|
||||
continue # leads upstream to gear already drawn (a PDU's management port)
|
||||
if not port.get('up') and not lldp:
|
||||
continue
|
||||
# Something is plugged in that Gandalf can't name: a grey stub
|
||||
stub_id = f'stub:{sw_name}:{idx}'
|
||||
mac = lldp.get('chassis_id') or ''
|
||||
label = neighbour or ('' if _is_generic_port_name(pname) else pname) or mac or 'unknown device'
|
||||
nodes[stub_id] = {
|
||||
'id': stub_id, 'name': label, 'kind': 'stub', 'status': 'up' if port.get('up') else 'down',
|
||||
'model': '', 'ip': neighbour if re.fullmatch(r'[\d.]+', neighbour) else '', 'mac': mac,
|
||||
'url': f'/device/{sw_name}#port-{idx}', 'switch': sw_name, 'port_idx': idx, 'port_name': pname,
|
||||
'iface': (lldp.get('port_id') or '') if neighbour else '', 'anonymous': not lldp,
|
||||
'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']:
|
||||
link['name_mismatch']['end'] = 'a'
|
||||
|
||||
# Gear with no live cable: draw where it was last plugged in
|
||||
linked = {e['node'] for link in links for e in (link['a'], link['b'])}
|
||||
for name, entry in sorted((known_uplinks or {}).items()):
|
||||
node = nodes.get(name)
|
||||
if not node or name in linked or node['kind'] == 'stub':
|
||||
continue
|
||||
for up in entry.get('uplinks') or []:
|
||||
sw, idx = up.get('switch'), up.get('port_idx')
|
||||
if sw not in nodes or idx is None or (sw, idx) in claimed:
|
||||
continue
|
||||
port = next((p for p in ((switches.get(sw) or {}).get('ports') or {}).values()
|
||||
if p.get('port_idx') == idx), {})
|
||||
far = (_end(name, iface=up.get('host_interface') or '') if node['kind'] == 'host'
|
||||
else _end(name, '', None))
|
||||
link = add_link(_end(sw, up.get('port') or '', idx), far, port,
|
||||
ghost=True, seen=entry.get('seen') or '')
|
||||
link['up'] = False
|
||||
|
||||
# ── Depth: hops from the internet over device-to-device cables ───────
|
||||
adjacency: Dict[str, set] = {}
|
||||
for link in links:
|
||||
a, b = link['a']['node'], link['b']['node']
|
||||
adjacency.setdefault(a, set()).add(b)
|
||||
adjacency.setdefault(b, set()).add(a)
|
||||
depth: Dict[str, int] = {INTERNET: 0}
|
||||
queue = deque([INTERNET])
|
||||
while queue:
|
||||
cur = queue.popleft()
|
||||
for nxt in sorted(adjacency.get(cur, ())):
|
||||
if nxt in depth:
|
||||
continue
|
||||
depth[nxt] = depth[cur] + 1
|
||||
# Hosts and stubs are leaves: they never carry the path on to another device
|
||||
if nodes[nxt]['kind'] not in ('host', 'stub'):
|
||||
queue.append(nxt)
|
||||
for node in nodes.values():
|
||||
node['depth'] = depth.get(node['id'])
|
||||
|
||||
# Orient each cable from the internet side (a) to the far side (b), and count traffic that way
|
||||
for i, link in enumerate(links):
|
||||
da = depth.get(link['a']['node'], 1 << 20)
|
||||
db_ = depth.get(link['b']['node'], 1 << 20)
|
||||
# Rates were measured at end a as added: the reporting switch port, or the internet side
|
||||
tx, rx = link.pop('_tx'), link.pop('_rx')
|
||||
if db_ < da:
|
||||
link['a'], link['b'] = link['b'], link['a']
|
||||
if link.get('name_mismatch') and link['name_mismatch'].get('end'):
|
||||
link['name_mismatch']['end'] = 'a' if link['name_mismatch']['end'] == 'b' else 'b'
|
||||
tx, rx = rx, tx
|
||||
link['a_to_b_bps'] = round(tx, 1)
|
||||
link['b_to_a_bps'] = round(rx, 1)
|
||||
link['utilisation'] = _utilisation(tx, rx, link['speed_mbps'])
|
||||
link['id'] = f'l{i}'
|
||||
|
||||
# Which host NIC each cable lands on, so the drawing can light the right socket
|
||||
for link in links:
|
||||
for end in (link['a'], link['b']):
|
||||
node = nodes[end['node']]
|
||||
if node['kind'] == 'host' and end['iface']:
|
||||
for nic in node.get('interfaces', []):
|
||||
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'),
|
||||
}
|
||||
Reference in new issue
Block a user