Please access Gandalf through ' 'auth.lotusguild.org.
', 401, @@ -211,7 +211,7 @@ def require_auth(f): safe_user = html.escape(user['username']) safe_groups = html.escape(', '.join(allowed)) return ( - f'Your account ({safe_user}) is not in an allowed group ' f'({safe_groups}).
', 403, @@ -602,7 +602,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 +814,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 +832,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}') @@ -942,6 +942,7 @@ def _cutsheet_view() -> dict: 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) 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') @@ -1174,6 +1175,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 '' @@ -1414,4 +1416,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 diff --git a/cutsheet.py b/cutsheet.py index b3614a2..cd9be22 100644 --- a/cutsheet.py +++ b/cutsheet.py @@ -26,6 +26,16 @@ ITEM_KINDS = ('patch_panel', 'wall_jack', 'device', 'shelf', 'other') # a unit; a full-depth one (a server) takes the unit on both sides. MOUNTS = ('front', 'rear', 'full') 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)', + 'sliger-cx4712': 'Sliger CX4712 4U (10-bay)', + 'rosewill-rsv-l4500u': 'Rosewill RSV-L4500U 4U (15-bay)', + '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 +109,12 @@ 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), '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['mount'] not in MOUNTS: raise ValidationError(f'mount must be one of {", ".join(MOUNTS)}') if item['shelf']: @@ -605,7 +618,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 diff --git a/db.py b/db.py index 666697c..90eed8c 100644 --- a/db.py +++ b/db.py @@ -678,6 +678,7 @@ _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 '', notes TEXT NULL, created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, @@ -768,7 +769,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', 'notes') # Columns added to cutsheet_items after its first release: (name, definition) _ITEM_COLUMNS_ADDED = ( ('rack', "VARCHAR(100) NOT NULL DEFAULT ''"), @@ -776,6 +777,7 @@ _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 ''"), ) _CABLE_FIELDS = ('label', 'a_device', 'a_port', 'a_side', 'b_device', 'b_port', 'b_side', 'cable_type', 'length_m', 'color', 'status', 'label_applied', 'notes') diff --git a/diagnose.py b/diagnose.py index 594bfdb..c8d6719 100644 --- a/diagnose.py +++ b/diagnose.py @@ -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} diff --git a/monitor.py b/monitor.py index cf46eb5..6894ece 100644 --- a/monitor.py +++ b/monitor.py @@ -427,7 +427,7 @@ class TicketClient: def create(self, title: str, description: str, priority: str = '2') -> Optional[str]: 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 try: resp = requests.post( @@ -453,7 +453,7 @@ class TicketClient: logger.info(f'Created ticket #{tid}: {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: @@ -814,7 +814,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] = {} @@ -1213,11 +1213,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 +1256,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( @@ -1824,7 +1824,7 @@ 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}' ) @@ -1832,13 +1832,13 @@ class NetworkMonitor: try: logger.info('Starting network check cycle') - # 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', []) diff --git a/schema.sql b/schema.sql index fbfc6cf..0b6a8bd 100644 --- a/schema.sql +++ b/schema.sql @@ -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 diff --git a/static/app.js b/static/app.js index 53b8da0..b586c4f 100644 --- a/static/app.js +++ b/static/app.js @@ -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); @@ -116,7 +116,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'; @@ -275,7 +275,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 +283,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 +298,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}`); } @@ -391,7 +391,7 @@ function updateModem(data) { if (topo) topo.classList.add('topo-v2-status-down'); body.innerHTML = `| #${esc(o.index)} | -${esc(o.name || '–')} | -${o.power_w === null || o.power_w === undefined ? '–' : `${o.power_w.toFixed(1)} W`} | +${esc(o.name || '-')} | +${o.power_w === null || o.power_w === undefined ? '-' : `${o.power_w.toFixed(1)} W`} | ${o.auto_power_cycle ? 'auto power-cycle' : ''} |
| ${esc(e.severity)}${e.is_suppressed && !e.resolved_at ? '🔕 sup' : ''} | ${esc(e.event_type.replace(/_/g, ' '))} | -${esc(e.target_detail || '–')} | +${esc(e.target_detail || '-')} | ${esc(e.description || '')} | ${esc(lt.time.ago(_toIso(e.first_seen)))} | ${e.resolved_at ? `resolved ${esc(lt.time.ago(_toIso(e.resolved_at)))}` : 'active'} | diff --git a/static/events.js b/static/events.js index aaae2e0..c51a6e4 100644 --- a/static/events.js +++ b/static/events.js @@ -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 '–'; + if (!id) return '-'; const base = (typeof GANDALF_CONFIG !== 'undefined' && GANDALF_CONFIG.ticket_web_url) || ''; return base ? `#${esc(id)}` : `#${esc(id)}`; } @@ -157,7 +157,7 @@ function renderTable(data) { const next = end < data.total; document.getElementById('ev-pager').innerHTML = (prev || next) ? ` - ${data.offset + 1}–${end} of ${data.total} + ${data.offset + 1}-${end} of ${data.total} ` : ''; } diff --git a/static/faceplates.js b/static/faceplates.js index 4974235..f2cab7c 100644 --- a/static/faceplates.js +++ b/static/faceplates.js @@ -225,7 +225,21 @@ function fpQuadScreen(x, y, s) { `; } -const fpBrand = (x, y, text) => `||||||||||||
| RX Pause | ${pause.rx_pause ? 'On' : 'Off'} | |||||||||||||||||
| TX Pause | ${pause.tx_pause ? 'On' : 'Off'} | |||||||||||||||||
| RX Ring | ${ring.rx_current != null ? ring.rx_current : '–'} / ${ring.rx_max != null ? ring.rx_max : '–'} max | |||||||||||||||||
| TX Ring | ${ring.tx_current != null ? ring.tx_current : '–'} / ${ring.tx_max != null ? ring.tx_max : '–'} max | |||||||||||||||||
| RX Ring | ${ring.rx_current != null ? ring.rx_current : '-'} / ${ring.rx_max != null ? ring.rx_max : '-'} max | |||||||||||||||||
| TX Ring | ${ring.tx_current != null ? ring.tx_current : '-'} / ${ring.tx_max != null ? ring.tx_max : '-'} max |
| Status | ${swPort.up ? 'UP' : 'DOWN'} |
| Speed | ${swPort.speed_mbps ? fmtShortSpeed(swPort.speed_mbps) + 'bps' : '–'} |
| Duplex | ${swPort.full_duplex ? 'Full' : (swPort.up ? 'Half' : '–')} |
| Speed | ${swPort.speed_mbps ? fmtShortSpeed(swPort.speed_mbps) + 'bps' : '-'} |
| Duplex | ${swPort.full_duplex ? 'Full' : (swPort.up ? 'Half' : '-')} |
| TX Err | ${fmtErrors(swPort.tx_errs_rate)} |
| RX Err | ${fmtErrors(swPort.rx_errs_rate)} |
| PoE | ${swPort.poe_power.toFixed(1)}W |