From c535bfd9fb248ac9768f2fcfb029aaa384d8b6f3 Mon Sep 17 00:00:00 2001 From: Jared Vititoe Date: Sun, 15 Nov 2026 14:56:13 -0500 Subject: [PATCH 1/3] Dashboard: one Needs attention list from every page; say what GANDALF stands for attention.build gathers alerts, power faults, cutsheet mismatches, UniFi port names, undocumented links, labels to print and rack overlaps into Broken now and Tidy up, each linking to where it is fixed. /api/attention serves it; the dashboard renders it and refreshes it with everything else. The header, help dialog, footer and page description spell out Global Advanced Network Detection And Link Facilitator. Co-Authored-By: Claude Opus 5.5 --- app.py | 27 +++++++++ attention.py | 122 ++++++++++++++++++++++++++++++++++++++++ static/app.js | 35 ++++++++++++ static/cutsheet.js | 2 + static/style.css | 67 ++++++++++++++++++++++ templates/base.html | 8 ++- templates/index.html | 9 +++ tests/test_app.py | 30 ++++++++++ tests/test_attention.py | 86 ++++++++++++++++++++++++++++ 9 files changed, 383 insertions(+), 3 deletions(-) create mode 100644 attention.py create mode 100644 tests/test_attention.py diff --git a/app.py b/app.py index 27ff38a..3421f8a 100644 --- a/app.py +++ b/app.py @@ -22,6 +22,7 @@ from urllib.parse import quote, urlparse from flask import Flask, jsonify, make_response, redirect, render_template, request, send_file, url_for +import attention import cutsheet import db import devices @@ -1335,6 +1336,32 @@ def api_topology(): return jsonify(_topology_graph(events, sheet, feeds)) +@app.route('/api/attention') +@require_auth +def api_attention(): + """Everything that needs looking at, from every page, for the dashboard (see attention.build).""" + return jsonify(_attention()) + + +def _attention() -> dict: + events = db.get_active_events(limit=_PAGE_LIMIT) + _annotate_suppressions(events, db.get_active_suppressions()) + view, racks, feeds = None, {}, [] + try: + view = _cutsheet_view() + feeds = db.get_power_feeds() + all_racks = _racks(view['items']) + for rack in all_racks: + here = [i for i in view['items'] if not i.get('shelf') + and (i.get('rack') or all_racks[0]['name']) == rack['name']] + racks[rack['name']] = cutsheet.rack_layout(here, rack['units']) + except Exception as e: + logger.error(f'Cutsheet unavailable for the attention list: {e}') + sheet = {'items': (view or {}).get('items') or [], 'cables': (view or {}).get('cables') or []} + power = _topology_graph(events, sheet, feeds).get('power') or [] + return attention.build(events, power, view, racks) + + def _topology_graph(events: list, sheet: dict, feeds: list) -> dict: return topology.build_graph( _state_json('network_snapshot'), _state_json('link_stats'), _state_json('modem_stats'), diff --git a/attention.py b/attention.py new file mode 100644 index 0000000..fc00f65 --- /dev/null +++ b/attention.py @@ -0,0 +1,122 @@ +"""What needs looking at, gathered from every page into one list for the dashboard. + +Two groups: 'broken' is something not working right now; 'tidy' is housekeeping, where +the network works but the records or names don't match it. Each entry links to the page +where it is fixed. Pure functions, so the rules are easy to test. +""" +from typing import Dict, List, Optional + +GROUPS = ('broken', 'tidy') + + +def _plural(n: int, one: str, many: Optional[str] = None) -> str: + return f'{n} {one if n == 1 else (many or one + "s")}' + + +def _entry(group: str, severity: str, text: str, href: str, detail: str = '') -> dict: + return {'group': group, 'severity': severity, 'text': text, 'href': href, 'detail': detail} + + +def _alerts(events: List[dict]) -> List[dict]: + live = [e for e in events if not e.get('is_suppressed') and e.get('severity') != 'info'] + if not live: + return [] + critical = sum(1 for e in live if e.get('severity') == 'critical') + targets = sorted({str(e.get('target_name') or '') for e in live if e.get('target_name')}, key=str.lower) + text = _plural(len(live), 'active alert') + if critical: + text += f' ({critical} critical)' + shown = ', '.join(targets[:4]) + (f' and {len(targets) - 4} more' if len(targets) > 4 else '') + return [_entry('broken', 'bad' if critical else 'warn', text, '#events-table-wrap', shown)] + + +def _power(power: List[dict]) -> List[dict]: + out = [] + for src in power or []: + name = src.get('node') or '' + if src.get('stale_since'): + out.append(_entry('broken', 'warn', f'{name}: outlet watts are frozen', '/topology', + 'UniFi keeps sending the same per-outlet readings; the total is still live. ' + 'Restarting the unit usually clears it.')) + for o in src.get('outlets') or []: + if not o.get('on') and o.get('target'): + out.append(_entry('broken', 'bad', f'{name} outlet {o.get("index")} is off, and it feeds {o["target"]}', + '/topology')) + idle = [] + for src in power or []: + for o in src.get('outlets') or []: + # Drawing real power, but nothing in Gandalf says what is plugged in + if o.get('on') and not o.get('target') and o.get('match') != 'cleared' and (o.get('power_w') or 0) >= 5: + idle.append(f'{src.get("node")} {o.get("index")}') + if idle: + out.append(_entry('tidy', 'info', f'{_plural(len(idle), "powered outlet")} with no device assigned', + '/topology', ', '.join(idle[:6]) + (' ...' if len(idle) > 6 else ''))) + return out + + +def _cutsheet(view: dict) -> List[dict]: + out = [] + cables = [c for c in view.get('cables') or [] if c.get('status') != 'retired'] + bad = [c for c in cables if c.get('problem')] + if bad: + names = ', '.join(c.get('label') or f'#{c["id"]}' for c in bad[:5]) + out.append(_entry('broken', 'bad', f'{_plural(len(bad), "cable")} not where the cutsheet says', + '/cutsheet?problems=1#cs-cables-section', names)) + + names = view.get('port_names') or [] + wrong = [r for r in names if r.get('kind') in ('wrong', 'moved')] + if wrong: + out.append(_entry('tidy', 'warn', f'{_plural(len(wrong), "UniFi port name")} pointing at the wrong device', + '/cutsheet#cs-portnames-section', + ', '.join(f'{r["switch"]} port {r["port_idx"]} "{r["port_name"]}"' for r in wrong[:3]))) + empty = [r for r in names if r.get('kind') == 'empty'] + if empty: + out.append(_entry('tidy', 'info', f'{_plural(len(empty), "named port")} with nothing plugged in', + '/cutsheet#cs-portnames-section', + ', '.join(f'"{r["port_name"]}"' for r in empty[:4]))) + + missing = view.get('suggestions') or [] + if missing: + out.append(_entry('tidy', 'info', f'{_plural(len(missing), "live link")} not on the cutsheet', + '/cutsheet#cs-suggest-section')) + + labels = view.get('labels') or {} + todo = len(labels.get('cables') or []) + len(labels.get('ports') or []) + if todo: + out.append(_entry('tidy', 'info', f'{_plural(todo, "label")} to print and stick on', + '/cutsheet#cs-labels-section')) + return out + + +def _rack(issues: Dict[str, dict]) -> List[dict]: + out = [] + for rack, r in (issues or {}).items(): + for o in r.get('overlaps') or []: + out.append(_entry('tidy', 'warn', f'{o["name"]} overlaps {", ".join(o["with"])} at {o["units"]}', + '/cutsheet#cs-items-section', rack)) + for o in r.get('outside') or []: + out.append(_entry('tidy', 'warn', f'{o["name"]} at {o["units"]} is outside {rack}', + '/cutsheet#cs-items-section')) + return out + + +def build(events: List[dict], power: List[dict], cutsheet_view: Optional[dict], + rack_issues: Optional[Dict[str, dict]] = None) -> dict: + """{'broken': [entry], 'tidy': [entry]}, worst first within each group. + + events: active alerts, annotated with 'is_suppressed'. power: topology.build_power output. + cutsheet_view: the cutsheet API view (cables with 'problem', suggestions, port_names, + labels), or None when the cutsheet couldn't be loaded. rack_issues: {rack: rack_layout()}. + Entry: {group, severity: bad|warn|info, text, href, detail}. + """ + entries = _alerts(events) + _power(power) + if cutsheet_view is not None: + entries += _cutsheet(cutsheet_view) + entries += _rack(rack_issues or {}) + rank = {'bad': 0, 'warn': 1, 'info': 2} + out = {g: [] for g in GROUPS} + for e in entries: + out[e['group']].append(e) + for g in GROUPS: + out[g].sort(key=lambda e: rank[e['severity']]) + return out diff --git a/static/app.js b/static/app.js index 4c50b1b..34c606e 100644 --- a/static/app.js +++ b/static/app.js @@ -43,6 +43,7 @@ async function refreshAll() { lt.api.get('/api/network'), lt.api.get('/api/status'), refreshModem(), + refreshAttention(), ]); if (netResult.status === 'fulfilled') { const net = netResult.value; @@ -68,6 +69,40 @@ async function refreshAll() { } } +// ── Needs attention ─────────────────────────────────────────────────── +const ATTENTION_GROUPS = [ + { key: 'broken', title: 'Broken now', clear: 'Nothing broken' }, + { key: 'tidy', title: 'Tidy up', clear: 'Records match the network' }, +]; + +async function refreshAttention() { + const body = document.getElementById('attention-body'); + if (!body) return; + try { + renderAttention(body, await lt.api.get('/api/attention')); + } catch (e) { + body.innerHTML = `

Couldn't gather the list: ${lt.escHtml(e.message || e)}

`; + } +} + +function renderAttention(body, data) { + const esc = lt.escHtml; + body.innerHTML = ATTENTION_GROUPS.map(g => { + const rows = data[g.key] || []; + const list = rows.length + ? `` + : `

✓ ${g.clear}

`; + return `
+

${g.title}${rows.length ? ` ${rows.length}` : ''}

+ ${list} +
`; + }).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' && diff --git a/static/cutsheet.js b/static/cutsheet.js index 95f51b3..63511da 100644 --- a/static/cutsheet.js +++ b/static/cutsheet.js @@ -757,6 +757,8 @@ function openFromQuery() { 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); diff --git a/static/style.css b/static/style.css index 99d9895..6ce3fe0 100644 --- a/static/style.css +++ b/static/style.css @@ -1680,3 +1680,70 @@ body.fp-marks-off .fp-svg .fp-mark { display: none; } .tp-pop select { width: 100%; } .tp-pop-hint { color: var(--text-muted); font-size: .9em; margin: 6px 0 8px; } .tp-pop-actions { display: flex; justify-content: flex-end; gap: 6px; } + +/* ── Needs attention (dashboard) ─────────────────────────────────── */ +.attention-groups { display: grid; grid-template-columns: 1fr 1fr; gap: 14px; } +.attention-group { + background: var(--bg-card); + border: 1px solid var(--border-color); + padding: 10px 14px 12px; + min-width: 0; +} +.attention-group-title { + font-size: .78em; + font-weight: bold; + letter-spacing: .08em; + text-transform: uppercase; + color: var(--text-secondary); + margin: 0 0 8px; +} +.attention-group-broken .attention-group-title { color: var(--accent-red); } +.attention-count { + display: inline-block; + min-width: 1.6em; + padding: 0 5px; + margin-left: 4px; + border: 1px solid currentColor; + text-align: center; + font-size: .9em; +} +.attention-list { list-style: none; margin: 0; padding: 0; } +.attention-item { + position: relative; + padding: 5px 0 5px 16px; + border-top: 1px solid var(--border-color); + font-size: .86em; +} +.attention-item:first-child { border-top: 0; } +.attention-item::before { + content: ''; + position: absolute; + left: 2px; + top: .85em; + width: 7px; + height: 7px; + border-radius: 50%; + background: var(--text-muted); +} +.attention-bad::before { background: var(--accent-red); } +.attention-warn::before { background: var(--accent-amber); } +.attention-info::before { background: var(--accent-cyan); } +.attention-link { color: var(--text-primary); text-decoration: none; } +.attention-link:hover, .attention-link:focus-visible { color: var(--accent-cyan); text-decoration: underline; } +.attention-detail { + display: block; + color: var(--text-muted); + font-size: .9em; + overflow-wrap: anywhere; +} +.attention-clear { color: var(--accent-green); font-size: .86em; margin: 0; } +.attention-empty { color: var(--text-muted); font-size: .86em; margin: 0; } +@media (max-width: 768px) { + .attention-groups { grid-template-columns: 1fr; } +} + +/* ── Brand: what GANDALF stands for ──────────────────────────────── */ +.g-brand-expansion { letter-spacing: .08em; line-height: 1.35; } +.g-brand-expansion b { color: var(--accent-cyan); font-weight: 700; } +.g-help-about { font-size: .86em; color: var(--text-secondary); margin: 0 0 12px; line-height: 1.5; } +.g-help-about b { color: var(--accent-cyan); } diff --git a/templates/base.html b/templates/base.html index a4617d2..5d9c8a4 100644 --- a/templates/base.html +++ b/templates/base.html @@ -5,6 +5,7 @@ + {% block title %}Network Monitor{% endblock %} | GANDALF @@ -30,7 +31,7 @@ @@ -229,7 +230,7 @@ | - GANDALF | TDS v1.2 + GANDALF: Global Advanced Network Detection And Link Facilitator | TDS v1.2 {% if user.groups and 'admin' in user.groups and not maintenance %} @@ -331,6 +332,7 @@
+

GANDALF: Global Advanced Network Detection And Link Facilitator. It watches the UniFi switches and the hosts' links, works out what is plugged in where, and raises a ticket when something breaks.

diff --git a/templates/index.html b/templates/index.html index 3eeaf72..1b0d63d 100644 --- a/templates/index.html +++ b/templates/index.html @@ -30,6 +30,14 @@ + +
+

Needs attention

+
+

Checking every page…

+
+
+
// 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; diff --git a/tests/test_app.py b/tests/test_app.py index e87b70e..f40c508 100644 --- a/tests/test_app.py +++ b/tests/test_app.py @@ -792,3 +792,33 @@ class TestPowerFeedApi: resp = client.put('/api/topology/power/RPDU/7', data='target=large1', headers=AUTH, content_type='application/x-www-form-urlencoded') assert resp.status_code == 400 + + +class TestAttention: + def test_needs_auth(self, client): + assert client.get('/api/attention').status_code == 401 + + def test_gathers_every_page(self, client): + gandalf._cutsheet_schema_ready = True + ev = {'id': 1, 'event_type': 'host_down', 'severity': 'critical', 'target_name': 'large1', + 'target_detail': '', 'description': ''} + with patch.object(gandalf.db, 'cutsheet_load', return_value={'items': [], 'cables': [], 'port_labels': []}), \ + patch.object(gandalf.db, 'get_active_events', return_value=[ev]), \ + patch.object(gandalf.db, 'get_power_feeds', return_value=[]), \ + patch.object(gandalf.db, 'cutsheet_racks', return_value=[]), \ + patch.object(gandalf.db, 'check_suppressed', return_value=False): + data = client.get('/api/attention', headers=AUTH).get_json() + assert set(data) == {'broken', 'tidy'} + assert data['broken'][0]['text'] == '1 active alert (1 critical)' + + def test_survives_a_cutsheet_failure(self, client): + gandalf._cutsheet_schema_ready = True + with patch.object(gandalf.db, 'cutsheet_load', side_effect=RuntimeError('db down')): + resp = client.get('/api/attention', headers=AUTH) + assert resp.status_code == 200 + assert set(resp.get_json()) == {'broken', 'tidy'} + + def test_dashboard_has_the_list_and_says_what_gandalf_stands_for(self, client): + html = client.get('/', headers=AUTH).get_data(as_text=True) + assert 'id="attention-body"' in html + assert 'Global Advanced Network Detection And Link Facilitator' in html diff --git a/tests/test_attention.py b/tests/test_attention.py new file mode 100644 index 0000000..5703e06 --- /dev/null +++ b/tests/test_attention.py @@ -0,0 +1,86 @@ +"""The dashboard's "Needs attention" list (attention.py).""" +import attention + + +def _alert(target, severity='critical', **kw): + return dict({'target_name': target, 'severity': severity, 'is_suppressed': False}, **kw) + + +def _outlet(index, on=True, target=None, power_w=10.0, match=None): + return {'index': index, 'on': on, 'target': target, 'power_w': power_w, + 'match': match or ('name' if target else 'none')} + + +class TestAlerts: + def test_one_line_for_all_alerts_with_the_targets(self): + out = attention.build([_alert('pbs'), _alert('24RJ45-POE', 'warning')], [], None) + [line] = out['broken'] + assert line['text'] == '2 active alerts (1 critical)' + assert line['severity'] == 'bad' + assert line['detail'] == '24RJ45-POE, pbs' + assert line['href'] == '#events-table-wrap' + + def test_suppressed_and_info_alerts_are_left_out(self): + events = [_alert('pbs', is_suppressed=True), _alert('large1', 'info')] + assert attention.build(events, [], None)['broken'] == [] + + def test_warnings_only_is_amber(self): + [line] = attention.build([_alert('x', 'warning')], [], None)['broken'] + assert line['severity'] == 'warn' and line['text'] == '1 active alert' + + +class TestPower: + def test_frozen_readings_and_an_off_outlet_feeding_a_device(self): + power = [{'node': 'RPDU', 'stale_since': '2026-11-15 05:26:54 UTC', + 'outlets': [_outlet(19, on=False, target='pbs'), _outlet(3, on=False)]}] + broken = attention.build([], power, None)['broken'] + assert [b['text'] for b in broken] == ['RPDU outlet 19 is off, and it feeds pbs', + 'RPDU: outlet watts are frozen'] + + def test_powered_outlets_with_nothing_assigned(self): + power = [{'node': 'RPDU', 'outlets': [ + _outlet(1, target='large1'), _outlet(2, power_w=40), _outlet(3, power_w=1), + _outlet(4, power_w=40, match='cleared'), _outlet(5, on=False, power_w=0)]}] + [line] = attention.build([], power, None)['tidy'] + assert line['text'] == '1 powered outlet with no device assigned' + assert line['detail'] == 'RPDU 2' + + +class TestCutsheet: + VIEW = { + 'cables': [{'id': 1, 'label': 'C01', 'status': 'installed', 'problem': True}, + {'id': 2, 'label': 'C02', 'status': 'retired', 'problem': True}, + {'id': 3, 'label': 'C03', 'status': 'installed', 'problem': False}], + 'suggestions': [{}, {}, {}], + 'port_names': [{'kind': 'wrong', 'switch': 'POE', 'port_idx': 11, 'port_name': 'Large1 Management'}, + {'kind': 'empty', 'switch': 'POE', 'port_idx': 20, 'port_name': 'WAP'}, + {'kind': 'unnamed', 'switch': 'POE', 'port_idx': 4, 'port_name': 'Port 4'}], + 'labels': {'cables': [{}, {}], 'ports': [{}]}, + } + + def test_every_cutsheet_todo(self): + out = attention.build([], [], self.VIEW) + assert [b['text'] for b in out['broken']] == ['1 cable not where the cutsheet says'] + assert out['broken'][0]['detail'] == 'C01' + assert out['broken'][0]['href'].startswith('/cutsheet?problems=1') + tidy = {t['text']: t for t in out['tidy']} + assert set(tidy) == {'1 UniFi port name pointing at the wrong device', '1 named port with nothing plugged in', + '3 live links not on the cutsheet', '3 labels to print and stick on'} + assert tidy['1 UniFi port name pointing at the wrong device']['detail'] == 'POE port 11 "Large1 Management"' + # Worst first + assert out['tidy'][0]['severity'] == 'warn' + + def test_unnamed_ports_alone_are_not_worth_a_line(self): + view = {'port_names': [{'kind': 'unnamed', 'switch': 'POE', 'port_idx': 4, 'port_name': 'Port 4'}]} + assert attention.build([], [], view) == {'broken': [], 'tidy': []} + + +class TestRack: + def test_overlaps_and_items_outside_the_rack(self): + racks = {'Rack 1': {'overlaps': [{'name': 'NAS', 'units': 'U5-6', 'with': ['storage-01']}], + 'outside': [{'name': 'Shelf', 'units': 'U43'}]}} + texts = [t['text'] for t in attention.build([], [], None, racks)['tidy']] + assert texts == ['NAS overlaps storage-01 at U5-6', 'Shelf at U43 is outside Rack 1'] + + def test_nothing_to_report(self): + assert attention.build([], [], {}, {}) == {'broken': [], 'tidy': []} From 4646d9be90cbbfd2e7415aed585f98943e428b37 Mon Sep 17 00:00:00 2001 From: Jared Vititoe Date: Sun, 15 Nov 2026 14:59:15 -0500 Subject: [PATCH 2/3] Cutsheet: tabs for Cables, To do, Patch panels, Inventory and History The 9-section page becomes five tabs; counts sit on the tabs instead of a row of chips. To do holds undocumented links, UniFi port names and labels to make. The text-only rack list is gone (the rack page draws it). Patch panels list only ports with a cable or label, with a Show all toggle. Links to a section, cable or item open the tab that holds it, so dashboard and rack links still land. ?problems=1 ticks Problems only. Printing still prints every tab, or just the labels. Co-Authored-By: Claude Opus 5.5 --- static/cutsheet.js | 110 +++++++++++++-------- static/style.css | 23 +++-- templates/cutsheet.html | 208 +++++++++++++++++++++------------------- 3 files changed, 190 insertions(+), 151 deletions(-) diff --git a/static/cutsheet.js b/static/cutsheet.js index 63511da..9524906 100644 --- a/static/cutsheet.js +++ b/static/cutsheet.js @@ -67,16 +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) => - `${n} ${esc(text)}`; - 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(portFixes(), 'port names to fix', portFixes() ? 'cs-chip-warn' : '', 'cs-portnames-section'), - chip(labels, 'labels to make', labels ? 'cs-chip-warn' : '', 'cs-labels-section'), - ].join(''); + document.getElementById('cs-summary').innerHTML = + `${matches} of ${cables.length} match what Gandalf sees` + + (problems ? ` · ${problems} ${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) { @@ -209,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'); @@ -220,10 +226,14 @@ function renderPanels() { for (const l of _cs.port_labels) labels[`${l.item_id}|${l.port}`] = l; wrap.innerHTML = panels.map(p => { const rows = []; + const all = _panelsShowAll.has(p.id); + let used = 0; for (let n = 1; n <= (p.port_count || 0); n++) { const front = cableAt(p.name, n, 'front'); const rear = cableAt(p.name, n, 'rear'); const lab = labels[`${p.id}|${n}`]; + if (front || rear || lab) used += 1; + else if (!all) continue; const cell = (c, side) => c ? `${esc(c.label || 'unlabeled')} → ${farEnd(c, p.name, n, side)}` : '-'; @@ -236,17 +246,24 @@ function renderPanels() {
`); } - return ` -
- ╚╝ -
${esc(p.name)}${p.rack_u ? ` · U${esc(p.rack_u)}` : ''}${p.location ? ` · ${esc(p.location)}` : ''}
+ const total = p.port_count || 0; + const toggle = total && used < total + ? `` + : ''; + const table = rows.length ? `
ShortcutAction
${cell(rear, 'rear')}
${rows.join('')}
Ports on ${esc(p.name)}
PortLabelFront (patch cord)Rear (run)
-
+ ` : ''; + return ` +
+ ╚╝ +
${esc(p.name)}${p.rack_u ? ` · U${esc(p.rack_u)}` : ''}${p.location ? ` · ${esc(p.location)}` : ''}
+

${used} of ${total} ports have a cable or label${used ? '' : '; nothing documented yet'}. ${toggle}

+ ${table}
`; }).join(''); } @@ -282,27 +299,6 @@ function renderLabels() { ${unlabeled.length ? `

${unlabeled.length} more cable(s) have no ID yet.

` : ''}`; } -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 = ` -
- ${placed.map(i => { - const top = i.rack_u + (i.rack_height || 1) - 1; - return ` -
- ${i.rack_height > 1 ? `U${esc(top)}-${esc(i.rack_u)}` : `U${esc(i.rack_u)}`} - ${deviceLink(i.name)} - ${esc(KIND_TEXT[i.kind] || i.kind)} -
`; - }).join('')} -
`; -} - function rackText(i) { if (i.shelf) return `on ${esc(i.shelf)}${i.slot ? `, position ${esc(i.slot)}` : ''}`; if (!i.rack_u) return '-'; @@ -380,7 +376,6 @@ function render() { renderPortNames(); renderPanels(); renderLabels(); - renderRack(); renderItems(); renderHistory(); renderDatalists(); @@ -396,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; @@ -706,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') { diff --git a/static/style.css b/static/style.css index 6ce3fe0..ed26e49 100644 --- a/static/style.css +++ b/static/style.css @@ -1094,7 +1094,6 @@ polygon.fp-led-off { fill: #6b6c71; } .cs-trace-status { margin-top: 10px; font-size: .88rem; line-height: 1.6; } .cs-trace-found { font-size: 1rem; margin-bottom: 6px; } .cs-actions { display: flex; flex-wrap: wrap; gap: 8px; align-items: center; } -.cs-summary { display: flex; flex-wrap: wrap; gap: 8px; margin: 0 0 18px; } .cs-chip { padding: 5px 10px; border: 1px solid var(--border-color, #234); border-radius: 3px; font-size: .82rem; color: inherit; text-decoration: none; } .cs-chip b { font-size: .95rem; } @@ -1102,6 +1101,16 @@ polygon.fp-led-off { fill: #6b6c71; } .cs-chip-bad { border-color: var(--status-critical, #e0312b); } .cs-chip-bad b { color: var(--status-critical, #e0312b); } .cs-chip-warn b { color: var(--accent-amber, #f0a020); } +.cs-summary { font-size: .82rem; color: var(--text-secondary); margin: 0 0 10px; } +.cs-summary .cs-ok { color: var(--accent-green); } +.cs-summary .cs-bad { color: var(--accent-red); } +/* Tabs: wrap on phones rather than scroll the page sideways */ +.cs-tabs { flex-wrap: wrap; } +.cs-tab-count { color: var(--text-secondary); font-weight: 400; margin-left: 2px; } +.cs-tab-count:empty { display: none; } +.cs-tab-count-bad { color: var(--accent-red); } +.cs-tab-count-warn { color: var(--accent-amber); } +.cs-panel-use { font-size: .8rem; color: var(--text-secondary); margin: 6px 12px 8px; } .cs-portname-group { margin: 0 0 12px; } .cs-portname-group > summary { cursor: pointer; list-style-position: inside; margin-bottom: 8px; } .cs-portname-group code { white-space: nowrap; } @@ -1130,12 +1139,6 @@ polygon.fp-led-off { fill: #6b6c71; } .cs-label-text { font-family: var(--font-mono, monospace); font-size: 1.05rem; font-weight: 700; letter-spacing: .05em; } .cs-label-copies { font-size: .8rem; color: var(--text-muted, #8aa); } .cs-label-where { grid-column: 1 / -1; font-size: .74rem; color: var(--text-muted, #8aa); } -.cs-rack { display: flex; flex-direction: column; gap: 3px; max-width: 560px; } -.cs-rack-unit { display: grid; grid-template-columns: 70px 1fr auto; gap: 10px; align-items: center; - min-height: calc(var(--u, 1) * 26px); padding: 4px 10px; border: 1px solid var(--border-color, #234); - border-radius: 2px; background: rgba(255,255,255,.02); } -.cs-rack-u { font-family: var(--font-mono, monospace); font-size: .78rem; color: var(--text-muted, #8aa); } -.cs-rack-kind { font-size: .74rem; color: var(--text-muted, #8aa); } .cs-end { border: 1px solid var(--border-color, #234); border-radius: 3px; padding: 4px 12px 0; margin: 0 0 12px; } .cs-end legend { font-size: .78rem; padding: 0 6px; color: var(--text-muted, #8aa); text-transform: uppercase; } .cs-side[hidden] { display: none; } @@ -1153,11 +1156,11 @@ polygon.fp-led-off { fill: #6b6c71; } .cs-table td.cs-id { font-size: 1rem; } .cs-row-problem { box-shadow: inset 3px 0 0 var(--status-critical, #e0312b); } .cs-row-problem td:first-child { box-shadow: none; } - .cs-rack-unit { grid-template-columns: 56px 1fr; } - .cs-rack-kind { display: none; } } @media print { .no-print, .lt-header, .lt-nav-drawer, .lt-nav-drawer-overlay { display: none !important; } + /* Printing shows every tab, or only the labels */ + .lt-tab-panel { display: block !important; } body.cs-print-labels .g-section:not(#cs-labels-section), body.cs-print-labels .lt-page-header, body.cs-print-labels .cs-summary { display: none !important; } .cs-label-card { break-inside: avoid; border-color: #000; color: #000; } @@ -1747,3 +1750,5 @@ body.fp-marks-off .fp-svg .fp-mark { display: none; } .g-brand-expansion b { color: var(--accent-cyan); font-weight: 700; } .g-help-about { font-size: .86em; color: var(--text-secondary); margin: 0 0 12px; line-height: 1.5; } .g-help-about b { color: var(--accent-cyan); } +/* A tab holding one section already says what it is: skip the repeated heading */ +.lt-tab-panel > .g-section:only-child > .g-section-header { display: none; } diff --git a/templates/cutsheet.html b/templates/cutsheet.html index 6bc5598..42d8930 100644 --- a/templates/cutsheet.html +++ b/templates/cutsheet.html @@ -5,7 +5,7 @@

Cutsheet

-

Where every cable is meant to go, checked against what Gandalf sees on the network.

+

Where every cable is meant to go, checked against the live network.

{% if can_edit %} @@ -17,111 +17,119 @@
-
+
+ + + + + +
-
-
-

Cables

- 0 -
-
- - - -
-
-
- -
-
-

Undocumented links

- 0 -
-

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.

-
-
- -
-
-

Port names in UniFi

- 0 -
-

Switch port names that no longer fit what is plugged in, as a checklist. Rename them in UniFi: Gandalf only reports them and never changes UniFi.

-
-
- -
-
-

Patch panels

-
- {% if can_edit %} -
- ╚╝ -
Trace a cord
-
-

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.

-
-
- - -
-
- - -
-
- - -
-
-
+
+
+
+

Cables

+ 0
-
- {% endif %} -
-
+

+
+ + + +
+
+ + -
-
-

Labels to make

- 0 - -
-

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.

-
-
+
+
+
+

Undocumented links

+ 0 +
+

Live switch ports no cable record mentions. Add pre-fills what Gandalf knows.

+
+
-
-
-

Rack

-
-
-

Open the rack drawing →

-
+
+
+

Port names in UniFi

+ 0 +
+

Names that no longer fit what is plugged in. Rename them in UniFi; Gandalf never changes UniFi.

+
+
-
-
-

Inventory

- 0 -
-

Things Gandalf can't discover: patch panels, wall jacks, shelves, and rack positions for devices.

-
-
+
+
+

Labels to make

+ 0 + +
+

Cable IDs go on both ends of the cord, panel labels on the port. Tick each once it's stuck on.

+
+
+
-
-
-

History

-
-
-
+
+
+
+

Patch panels

+
+ {% if can_edit %} +
+ ╚╝ +
Trace a cord
+
+

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.

+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+ {% endif %} +
+
+
+ +
+
+
+

Inventory

+ 0 +
+

Things Gandalf can't discover: patch panels, wall jacks, shelves and rack positions. See them in the rack drawing →

+
+
+
+ +
+
+
+

History

+
+
+
+
From abac6983b2adbfd676d6527dd83f1741db411d39 Mon Sep 17 00:00:00 2001 From: Jared Vititoe Date: Sun, 15 Nov 2026 15:04:34 -0500 Subject: [PATCH 3/3] Calmer dashboard and navigation, short page intros Dashboard: the stat cards are gone (Needs attention says it better); host cards fold unused NICs into one line and move Suppress to a small icon; UniFi devices become a compact list; recently resolved alerts fold. Navigation keeps Dashboard, Topology, Rack and Cutsheet in view with Alert history and Suppressions under More; the phone drawer groups them the same way and gains Start maintenance, and the phone header hides the user name and the Ctrl+K hint so GANDALF fits. Rack and topology intros are one line with the how-to behind a ?; the topology problem bar is one line until opened. README updated. Co-Authored-By: Claude Opus 5.5 --- README.md | 40 +++++++--- static/app.js | 63 +++++----------- static/style.css | 63 ++++++++++++++++ static/topology.js | 15 +++- templates/base.html | 88 ++++++++++++---------- templates/events.html | 2 +- templates/index.html | 144 +++++++----------------------------- templates/rack.html | 3 +- templates/suppressions.html | 2 +- templates/topology.html | 3 +- tests/test_app.py | 25 ++++++- 11 files changed, 230 insertions(+), 218 deletions(-) diff --git a/README.md b/README.md index ebec010..b4ef7ca 100644 --- a/README.md +++ b/README.md @@ -106,17 +106,30 @@ Ping-only (no node_exporter): **pbs** (10.10.10.3) ## Pages ### Dashboard (`/`) +- **Needs attention** at the top gathers what every page would flag into two lists, each line linking to + where it is fixed: + - *Broken now*: active alerts (one line, with the devices), an outlet that is off but feeds a device, + frozen outlet readings, and cables not where the cutsheet says. + - *Tidy up*: UniFi port names pointing at the wrong device or at an empty port, live links not on the + cutsheet, labels to print, powered outlets with no device assigned, and rack items that overlap or sit + outside the rack. + + Served by `GET /api/attention` (`attention.py`) and refreshed with the rest of the page. - Device search (see Device pages below) -- Active alerts first, then the WAN / Fiber panel, hosts, UniFi devices, and recently resolved alerts -- Real-time host status grid with per-NIC link state (UP / DOWN / degraded) -- WAN / Fiber panel: WAN and PON state, Rx/Tx power, optics temperature, throughput, errors, gateway uptime and last restart, 7-day Rx trend, recent WAN outages -- UniFi device table (switches, APs, gateway) - Active alerts table with severity, target, consecutive failures, ticket link +- WAN / Fiber panel: WAN and PON state, Rx/Tx power, optics temperature, throughput, errors, gateway uptime and last restart, 7-day Rx trend, recent WAN outages +- Hosts with per-NIC link state; NICs marked unused fold into a "+N unused" line +- UniFi devices as a compact list (name and model; offline ones turn red with a suppress button) +- Recently resolved alerts, folded until opened - Follow-up flags (see Follow-up below): a ⏳ badge on alerts active for days, a "ticket closed" badge when the ticket was closed but the alert is still active, and a Needs Follow-up panel of tickets left open after their alert cleared. A "TO FOLLOW UP" chip in the status bar counts them all. -- Quick-suppress modal: apply timed or manual suppression from any alert row -- Auto-refreshes every 30 seconds via `/api/status` + `/api/network` +- Quick-suppress modal: apply timed or manual suppression from any alert row or host card +- Auto-refreshes every 30 seconds via `/api/status` + `/api/network` + `/api/attention` + +The header spells out the name; the navigation keeps Dashboard, Topology, Rack and Cutsheet in view, with +Alert history and Suppressions under **More** (and in the command palette, Ctrl+K). On a phone the drawer +holds every page and Start maintenance. ### Alert history (`/events`) Every alert Gandalf raised in the last 24 hours to 90 days, including ones that cleared before anyone @@ -185,9 +198,11 @@ The rack front, drawn from the rack units set on cutsheet items, top first. The whole network as the switches see it now, top down: the internet, the modem, the gateway, then each switch by how many hops it is from the gateway, the gear and unknown devices below them, and the servers along the bottom. Power gear (PDU, UPS, power strip) sits in a rail on the right. -- **What needs a look** is listed above the diagram: devices down, degraded or with active alerts, - cables down or last seen elsewhere, ports named after the wrong device, and cables with errors. - Click one to jump to it. With nothing to report it says all clear. Problem cables are drawn in full +- **What needs a look** sits above the diagram as one line ("7 to look at" and the first two): + devices down, degraded or with active alerts, cables down or last seen elsewhere, ports named after + the wrong device, and cables with errors. Open it to list them all and click one to jump to it; it + remembers whether it was open. With nothing to report it says all clear. The how-to hides behind the + **?** next to the page intro. Problem cables are drawn in full colour with a glow and always shown, whatever the filters; healthy cables are drawn quietly. - **A card per device**, all the same height so the whole network reads at a glance: name, state (coloured edge and dot), and a picture: UniFi gear shows its real faceplate (the same drawings as the @@ -339,8 +354,13 @@ entry in `FACEPLATES`. Where every cable is meant to go, checked against what Gandalf actually sees. Anyone who can log in can view it; only the `admin` group can edit, and every change is logged with who made it and when. +The page has five tabs, each with its count: **Cables**, **To do** (undocumented links, port names +in UniFi, labels to make), **Patch panels**, **Inventory** and **History**. A link to a section, cable +or item (`/cutsheet#cable-7`, `#cs-portnames-section`) opens the tab that holds it, and +`/cutsheet?problems=1` opens the cables with problems. Printing prints every tab. + - **Inventory**: things discovery can't see: patch panels, wall jacks, shelves, and rack positions - for devices (use a device's exact Gandalf name). Panels and jacks are passive: a cable on a + for devices (use a device's exact Gandalf name). The rack page draws them. Panels and jacks are passive: a cable on a port's front continues through the same port's rear. - **Cables**: two endpoints each (device or item, port, and front/rear for panels and jacks), plus ID, type, length, color, status (`planned`, `installed`, `dark`, `retired`) and notes. Leave the diff --git a/static/app.js b/static/app.js index 34c606e..86a6fe1 100644 --- a/static/app.js +++ b/static/app.js @@ -140,16 +140,6 @@ function updateStatusBar(summary, lastCheck, daemonOk, followUps = 0, hasStaleTi alertBadge.style.display = total ? '' : 'none'; } - // Update stat cards - const scCrit = document.getElementById('stat-critical-val'); - const scWarn = document.getElementById('stat-warning-val'); - const scRes = document.getElementById('stat-resolved-val'); - if (scCrit) scCrit.textContent = critCount; - if (scWarn) scWarn.textContent = warnCount; - if (scRes && summary.resolved_24h !== null && summary.resolved_24h !== undefined) scRes.textContent = summary.resolved_24h; - const statCritCard = document.getElementById('stat-critical'); - if (statCritCard) statCritCard.classList.toggle('lt-stat-card--alert', critCount > 0); - // Stale data banner: warn if last_check is older than 15 minutes let staleBanner = document.getElementById('stale-banner'); if (lastCheck) { @@ -173,9 +163,6 @@ function updateStatusBar(summary, lastCheck, daemonOk, followUps = 0, hasStaleTi } function updateHostGrid(hosts) { - const scHosts = document.getElementById('stat-hosts-val'); - if (scHosts) scHosts.textContent = Object.keys(hosts).length; - for (const [name, host] of Object.entries(hosts)) { const card = document.querySelector(`.host-card[data-host="${CSS.escape(name)}"]`); if (!card) continue; @@ -188,15 +175,17 @@ function updateHostGrid(hosts) { const ifaceList = card.querySelector('.iface-list'); if (ifaceList && host.interfaces && Object.keys(host.interfaces).length > 0) { - ifaceList.innerHTML = Object.entries(host.interfaces) - .sort(([a], [b]) => a.localeCompare(b)) - .map(([iface, state]) => ` + // NICs marked unused fold into one line, so the card shows what is cabled + const all = Object.entries(host.interfaces).sort(([a], [b]) => a.localeCompare(b)); + const inUse = all.filter(([, state]) => state !== 'unused'); + const unused = all.length - inUse.length; + ifaceList.innerHTML = inUse.map(([iface, state]) => `
- + ${lt.escHtml(iface)} - ${state} + ${lt.escHtml(state)}
- `).join(''); + `).join('') + (unused ? `
+${unused} unused
` : ''); } } } @@ -452,30 +441,18 @@ function updateModem(data) { } function updateUnifiTable(devices) { - const tbody = document.querySelector('#unifi-table tbody'); - if (!tbody || !devices.length) return; - - tbody.innerHTML = devices.map(d => { - const statusClass = d.connected ? '' : 'row-critical'; - const dotClass = d.connected ? 'dot-up' : 'dot-down'; - const statusText = d.connected ? 'ONLINE' : 'OFFLINE'; - const suppressBtn = !d.connected - ? `` - : ''; - return ` - - ${statusText} - ${lt.escHtml(d.name)} - ${lt.escHtml(d.type)} - ${lt.escHtml(d.model)} - ${lt.escHtml(d.ip)} - ${suppressBtn} - `; - }).join(''); + const grid = document.getElementById('unifi-grid'); + if (!grid || !devices.length) return; + const esc = lt.escHtml; + grid.innerHTML = devices.map(d => ` +
  • + + ${esc(d.name)} + ${esc(d.model)} + ${d.connected ? '' : ``} +
  • `).join(''); } function updateEventsTable(events, totalActive) { diff --git a/static/style.css b/static/style.css index ed26e49..8c26cbd 100644 --- a/static/style.css +++ b/static/style.css @@ -1752,3 +1752,66 @@ body.fp-marks-off .fp-svg .fp-mark { display: none; } .g-help-about b { color: var(--accent-cyan); } /* A tab holding one section already says what it is: skip the repeated heading */ .lt-tab-panel > .g-section:only-child > .g-section-header { display: none; } + +/* ── Dashboard: calmer host cards and device list ────────────────── */ +.host-suppress { margin-left: auto; padding: 0 6px; opacity: .45; } +.host-suppress:hover, .host-suppress:focus-visible { opacity: 1; } +.iface-unused { font-size: .74em; color: var(--text-muted); padding: 2px 0 0 14px; } +.unifi-grid { + list-style: none; margin: 0; padding: 0; + display: grid; grid-template-columns: repeat(auto-fill, minmax(220px, 1fr)); gap: 6px; +} +.unifi-chip { + display: flex; align-items: center; gap: 8px; min-width: 0; + padding: 6px 10px; border: 1px solid var(--border-color); background: var(--bg-card); + font-size: .84em; +} +.unifi-chip-down { border-color: var(--accent-red); } +.unifi-chip-name { color: var(--text-primary); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } +.unifi-chip-model { margin-left: auto; color: var(--text-muted); font-size: .86em; } +.unifi-chip .btn-suppress { padding: 0 6px; } +.resolved-fold > summary { cursor: pointer; list-style: none; } +.resolved-fold > summary::-webkit-details-marker { display: none; } +.resolved-fold > summary::after { content: '▸ show'; margin-left: auto; font-size: .72em; color: var(--text-muted); } +.resolved-fold[open] > summary::after { content: '▾ hide'; } + +/* ── Navigation: More menu ───────────────────────────────────────── */ +.g-nav-more { position: relative; } +.g-nav-more > summary { list-style: none; cursor: pointer; } +.g-nav-more > summary::-webkit-details-marker { display: none; } +.g-nav-more-menu { + position: absolute; top: calc(100% + 6px); left: 0; z-index: 60; + display: flex; flex-direction: column; min-width: 180px; + background: var(--bg-secondary); border: 1px solid var(--border-color); + box-shadow: 0 8px 24px rgba(0,0,0,.35); +} +.g-nav-more-link { + padding: 9px 14px; font-size: .72rem; letter-spacing: .12em; text-transform: uppercase; + color: var(--text-secondary); text-decoration: none; +} +.g-nav-more-link:hover, .g-nav-more-link:focus-visible { color: var(--accent-cyan); background: rgba(0,212,255,.05); } +.g-nav-more-link.active { color: var(--accent-orange); } +.g-drawer-group { + display: block; margin: 14px 0 4px; padding: 0 16px; font-size: .66rem; + letter-spacing: .14em; text-transform: uppercase; color: var(--text-muted); +} + +/* ── Page intros: the how-to sits behind a small "?" ─────────────── */ +.g-howto { display: inline; } +.g-howto > summary { + display: inline-flex; align-items: center; justify-content: center; + width: 1.5em; height: 1.5em; margin-left: 4px; cursor: pointer; list-style: none; + border: 1px solid var(--border-color); border-radius: 50%; color: var(--accent-cyan); font-size: .9em; +} +.g-howto > summary::-webkit-details-marker { display: none; } +.g-howto[open] > span { display: block; margin-top: 6px; color: var(--text-secondary); max-width: 70ch; } +.tp-summary-toggle { background: none; border: 0; padding: 0; font: inherit; font-weight: 700; cursor: pointer; color: inherit; } +.tp-summary-bad .tp-summary-toggle { color: var(--red); } +.tp-summary-warn .tp-summary-toggle { color: var(--amber); } +.tp-summary-text { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; min-width: 0; flex: 1 1 0; } + +/* ── Phone header: room for the GANDALF name ─────────────────────── */ +@media (max-width: 767px) { + .lt-header-user, .lt-cmd-hint-btn, .lt-header-right [data-action="start-maintenance"] { display: none; } +} +.g-drawer-action { background: none; border: 0; width: 100%; text-align: left; font: inherit; cursor: pointer; } diff --git a/static/topology.js b/static/topology.js index 6a752a5..d9e1fb7 100644 --- a/static/topology.js +++ b/static/topology.js @@ -8,6 +8,7 @@ const PER_MM = 1100 / 482.6; const NODE_GAP = 90; const REFRESH_MS = 30000; const FILTER_KEY = 'gandalf.topology.filters'; +const PROBLEMS_KEY = 'gandalf.topology.problemsOpen'; const DEFAULT_FILTERS = { stubs: 'grouped', power: true, traffic: true, mgmt: false, alerts: false }; const STUB_MODES = ['grouped', 'all', 'none']; @@ -20,6 +21,7 @@ const state = { expanded: new Set(), // switches whose unknown devices are shown one by one selected: null, pinned: null, // the device a touch screen tapped to trace + problemsOpen: (() => { try { return localStorage.getItem(PROBLEMS_KEY) === '1'; } catch (_) { return false; } })(), }; // Whether the last press was a mouse, pen or finger: touch has no hover, so taps trace instead let lastPointer = 'mouse'; @@ -1323,6 +1325,12 @@ function initEvents() { if (e.key === 'Escape') closeOutletEditor(); }); document.getElementById('tp-summary').addEventListener('click', e => { + if (e.target.closest('[data-action="toggle-problems"]')) { + state.problemsOpen = !state.problemsOpen; + try { localStorage.setItem(PROBLEMS_KEY, state.problemsOpen ? '1' : '0'); } catch (_) { /* private mode */ } + renderSummary(); + return; + } const chip = e.target.closest('.tp-problem-chip'); if (!chip) return; if (chip.dataset.focusNode) focusOn('node', chip.dataset.focusNode); @@ -1422,8 +1430,11 @@ function renderSummary() { return; } box.className = `tp-summary ${problems.some(p => p.severity === 'bad') ? 'tp-summary-bad' : 'tp-summary-warn'}`; - box.innerHTML = `⚠ ${problems.length} to look at - ${problems.map(p => ``).join('')}`; + // One line by default: the dashboard already lists these; open it to jump to each on the map + const open = state.problemsOpen; + box.innerHTML = ` + ${open ? '' : `${esc(problems.slice(0, 2).map(p => p.text).join(' · '))}${problems.length > 2 ? ' ...' : ''}`} + ${!open ? '' : problems.map(p => ``).join('')}`; } // Centre the view on a device or cable and show what is wrong with it diff --git a/templates/base.html b/templates/base.html index 5d9c8a4..dabad7c 100644 --- a/templates/base.html +++ b/templates/base.html @@ -38,22 +38,26 @@ Dashboard - History - Cutsheet - Rack Topology + Rack + Cutsheet + More + Alert history {% if user.groups and 'admin' in user.groups %} Suppressions + {% if not maintenance %} + + {% endif %} {% endif %} @@ -85,40 +89,34 @@ Global Advanced Network
    Detection And Link Facilitator
    - + @@ -419,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]'); diff --git a/templates/events.html b/templates/events.html index 78cdd7e..5096736 100644 --- a/templates/events.html +++ b/templates/events.html @@ -5,7 +5,7 @@

    Alert History

    -

    Every alert Gandalf raised, including the ones that cleared on their own. Resolved alerts are kept 90 days.

    +

    Every alert raised, including ones that cleared on their own; kept 90 days.

    diff --git a/templates/index.html b/templates/index.html index 1b0d63d..3938266 100644 --- a/templates/index.html +++ b/templates/index.html @@ -38,44 +38,6 @@ - -
    -
    - -
    - {{ summary.critical or 0 }} - Critical -
    -
    -
    - -
    - {{ summary.warning or 0 }} - Warning -
    -
    -
    - -
    - {{ snapshot.hosts | length }} - Hosts -
    -
    -
    - -
    - {{ recent_resolved | length }} - Resolved 24h -
    -
    -
    - {% endif %} {% if recent_resolved %} -
    -
    +
    +

    Recently Resolved

    {{ recent_resolved | length }} in last 24h -
    +
    {% for e in recent_resolved %} {%- set dot_cls = 'lt-timeline-item--green' if e.severity == 'info' else 'lt-timeline-item--dim' -%} @@ -369,7 +292,7 @@
    {% endfor %} -
    + {% endif %} {% endblock %} @@ -449,22 +372,5 @@ .observe(document.getElementById('events-table-wrap'), { childList: true, subtree: true }); initDeviceSearch(); - - // Stat card clicks: filter events table by severity - document.querySelectorAll('.lt-stat-card[data-stat-filter]').forEach(card => { - card.addEventListener('click', () => { - const sev = card.dataset.statFilter; - document.querySelectorAll('.sev-pills .pill').forEach(p => { - p.classList.remove('active'); - p.setAttribute('aria-pressed', 'false'); - }); - const matchPill = document.querySelector(`.sev-pills .pill[data-sev="${sev}"]`); - if (matchPill) { matchPill.classList.add('active'); matchPill.setAttribute('aria-pressed', 'true'); } - _filterSev = sev; - applyEventsFilter(); - document.getElementById('events-table-wrap')?.scrollIntoView({ behavior: 'smooth', block: 'start' }); - }); - card.addEventListener('keydown', e => { if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); card.click(); } }); - }); {% endblock %} diff --git a/templates/rack.html b/templates/rack.html index 63f2739..e71dd7a 100644 --- a/templates/rack.html +++ b/templates/rack.html @@ -5,7 +5,8 @@

    Rack

    -

    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.

    +
    The rack, drawn from 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.
    diff --git a/templates/suppressions.html b/templates/suppressions.html index 923cbab..744a215 100644 --- a/templates/suppressions.html +++ b/templates/suppressions.html @@ -6,7 +6,7 @@

    Alert Suppressions

    -

    Manage maintenance windows and per-target alert suppression rules.

    +

    Maintenance windows and alert suppression rules.

    diff --git a/templates/topology.html b/templates/topology.html index 2a1a1d7..bb11dcb 100644 --- a/templates/topology.html +++ b/templates/topology.html @@ -5,7 +5,8 @@

    Topology

    -

    Every device and cable as the switches see them right now. Drag to pan, scroll or pinch to zoom. Hover a device to trace its path to the internet and its power (on a touch screen, tap it once to trace and again to open it); click a cable for its details, or a group of unknown devices to open it.

    +
    Every device and cable, as the switches see them now. +
    ?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.
    diff --git a/tests/test_app.py b/tests/test_app.py index f40c508..e7eae05 100644 --- a/tests/test_app.py +++ b/tests/test_app.py @@ -95,10 +95,12 @@ class TestPagesAndNav: def test_home_section_order(self, client): html = client.get('/', headers=AUTH).get_data(as_text=True) order = [html.index(m) for m in ( - 'id="device-search"', 'Alert Queue', 'WAN / Fiber', 'g-section-title">Hosts<', - 'Device Inventory', + 'id="attention"', 'id="device-search"', 'Alert Queue', 'WAN / Fiber', 'g-section-title">Hosts<', + 'id="unifi-grid"', )] assert order == sorted(order) + # The needs-attention list replaced the stat cards + assert 'lt-stat-card' not in html def test_dashboard_topology_moved_to_its_own_page(self, client): html = client.get('/', headers=AUTH).get_data(as_text=True) @@ -822,3 +824,22 @@ class TestAttention: html = client.get('/', headers=AUTH).get_data(as_text=True) assert 'id="attention-body"' in html assert 'Global Advanced Network Detection And Link Facilitator' in html + + +class TestCalmDashboard: + def test_unused_nics_fold_into_one_line(self, client): + snap = json.dumps({'hosts': {'large1': {'ip': '10.0.0.2', 'status': 'up', 'source': 'prometheus', + 'interfaces': {'eth0': 'up', 'eth1': 'unused', 'eth2': 'unused'}}}, + 'unifi': []}) + state = dict(STATE, network_snapshot=snap) + with patch.object(gandalf.db, 'get_state', side_effect=lambda k, d=None: state.get(k, d)): + html = client.get('/', headers=AUTH).get_data(as_text=True) + assert '>eth0<' in html and '>eth1<' not in html + assert '+2 unused' in html + + def test_resolved_alerts_are_folded(self, client): + ev = {'target_name': 'large1', 'target_detail': '', 'severity': 'warning', 'event_type': 'host_down', + 'first_seen': '2026-11-15 01:00:00 UTC', 'resolved_at': '2026-11-15 02:00:00 UTC'} + with patch.object(gandalf.db, 'get_recent_resolved', return_value=[ev]): + html = client.get('/', headers=AUTH).get_data(as_text=True) + assert '
    ' in html