Add AT&T modem monitoring and device pages; replace Link Debug
Lint / Python (flake8) (pull_request) Successful in 2m6s
Lint / JS (eslint) (pull_request) Successful in 18s
Lint / Notify on failure (pull_request) Skipped
Lint / Deploy (pull_request) Skipped
Security / Python Security (bandit) (pull_request) Successful in 2m11s
Test / Python Tests (pytest) (pull_request) Successful in 2m20s
Lint / JS (eslint) (push) Successful in 10s
Lint / Python (flake8) (push) Successful in 1m58s
Lint / Notify on failure (push) Skipped
Security / Python Security (bandit) (push) Successful in 1m58s
Lint / Deploy (push) Successful in 4s
Test / Python Tests (pytest) (push) Successful in 58s
Lint / Python (flake8) (pull_request) Successful in 2m6s
Lint / JS (eslint) (pull_request) Successful in 18s
Lint / Notify on failure (pull_request) Skipped
Lint / Deploy (pull_request) Skipped
Security / Python Security (bandit) (pull_request) Successful in 2m11s
Test / Python Tests (pytest) (pull_request) Successful in 2m20s
Lint / JS (eslint) (push) Successful in 10s
Lint / Python (flake8) (push) Successful in 1m58s
Lint / Notify on failure (push) Skipped
Security / Python Security (bandit) (push) Successful in 1m58s
Lint / Deploy (push) Successful in 4s
Test / Python Tests (pytest) (push) Successful in 58s
Modem and WAN: - Poll the BGW320 status pages read-only for light levels, PON and WAN state, with a WAN / Fiber panel, 7-day Rx trend, and alerts on WAN down, optical limits, and Rx drift - Read WAN outages and Smart Power restarts from the UniFi system log, since outages can be over between 5 minute polls Device pages: - Add device search to the dashboard and a page per host, switch, router, AP, PDU, or modem - Move all Link Debug data into expandable rows there; /links redirects - Collect UDM ports and UniFi device details (firmware, load, WAN, outlets) - Reorder the dashboard Monitoring fixes: - Alert when a configured host stops reporting: its series disappear rather than reporting down, so a dead host never raised an alert - Alert on Prometheus outages instead of blanking the dashboard - Treat a failed Pulse ping as unknown rather than host unreachable - Stop new switch ports reporting lifetime bytes as one interval's rate - Run database sessions in UTC: other server time zones shifted displayed ages and timed suppression expiries Also log every avatar 404 reason, add a favicon, and correct the WAN link labels (1G on Port 9, not 10G SFP+). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit was merged in pull request #4.
This commit is contained in:
1 parent
e1716d5228
commit
e32499b7f6
25 files changed
+3120
-821
No files matched your search
@@ -34,6 +34,9 @@ def _new_conn(cfg: dict):
|
||||
cursorclass=pymysql.cursors.DictCursor,
|
||||
connect_timeout=10,
|
||||
charset='utf8mb4',
|
||||
# All app code treats database times as UTC. Without this, a server in another
|
||||
# time zone shifts displayed ages and timed suppression expiries by its offset.
|
||||
init_command="SET time_zone='+00:00'",
|
||||
)
|
||||
|
||||
|
||||
@@ -145,6 +148,24 @@ def upsert_event(
|
||||
return cur.lastrowid, True, 1, None
|
||||
|
||||
|
||||
def get_events_for_target(target_name: str, limit: int = 25) -> list:
|
||||
"""Return a device's events, unresolved first, then most recent."""
|
||||
with get_conn() as conn:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"""SELECT * FROM network_events WHERE target_name=%s
|
||||
ORDER BY resolved_at IS NOT NULL, COALESCE(resolved_at, last_seen) DESC
|
||||
LIMIT %s""",
|
||||
(target_name, limit),
|
||||
)
|
||||
rows = cur.fetchall()
|
||||
for r in rows:
|
||||
for k in ('first_seen', 'last_seen', 'resolved_at'):
|
||||
if r.get(k) and hasattr(r[k], 'isoformat'):
|
||||
r[k] = r[k].isoformat() + 'Z'
|
||||
return rows
|
||||
|
||||
|
||||
def resolve_event(event_type: str, target_name: str, target_detail: str = '') -> None:
|
||||
detail = target_detail or ''
|
||||
with get_conn() as conn:
|
||||
@@ -332,6 +353,80 @@ def purge_old_resolved_events(days: int = 90) -> int:
|
||||
return n
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# WAN modem optical history
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def ensure_modem_schema() -> None:
|
||||
"""Create the modem history table so deploys need no manual migration."""
|
||||
with get_conn() as conn:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"""CREATE TABLE IF NOT EXISTS modem_samples (
|
||||
sampled_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP PRIMARY KEY,
|
||||
rx_power_dbm DECIMAL(5,1) NULL,
|
||||
tx_power_dbm DECIMAL(5,1) NULL,
|
||||
temp_c DECIMAL(5,1) NULL
|
||||
) ENGINE=InnoDB"""
|
||||
)
|
||||
|
||||
|
||||
def record_modem_sample(rx_power_dbm, tx_power_dbm, temp_c) -> None:
|
||||
with get_conn() as conn:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"""INSERT INTO modem_samples (sampled_at, rx_power_dbm, tx_power_dbm, temp_c)
|
||||
VALUES (NOW(), %s, %s, %s)
|
||||
ON DUPLICATE KEY UPDATE rx_power_dbm=VALUES(rx_power_dbm),
|
||||
tx_power_dbm=VALUES(tx_power_dbm), temp_c=VALUES(temp_c)""",
|
||||
(rx_power_dbm, tx_power_dbm, temp_c),
|
||||
)
|
||||
|
||||
|
||||
def get_modem_rx_values(days: int = 7) -> list:
|
||||
"""Return recent Rx power readings (dBm) for computing a drift baseline."""
|
||||
with get_conn() as conn:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"""SELECT rx_power_dbm FROM modem_samples
|
||||
WHERE rx_power_dbm IS NOT NULL
|
||||
AND sampled_at > DATE_SUB(NOW(), INTERVAL %s DAY)""",
|
||||
(days,),
|
||||
)
|
||||
return [float(r['rx_power_dbm']) for r in cur.fetchall()]
|
||||
|
||||
|
||||
def get_modem_history(hours: int = 168, bucket_seconds: int = 3600) -> list:
|
||||
"""Return optical history averaged into time buckets, oldest first."""
|
||||
with get_conn() as conn:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"""SELECT FLOOR(UNIX_TIMESTAMP(sampled_at) / %s) * %s AS ts,
|
||||
ROUND(AVG(rx_power_dbm), 1) AS rx_avg,
|
||||
MIN(rx_power_dbm) AS rx_min,
|
||||
ROUND(AVG(tx_power_dbm), 1) AS tx_avg,
|
||||
ROUND(AVG(temp_c), 1) AS temp_avg
|
||||
FROM modem_samples
|
||||
WHERE sampled_at > DATE_SUB(NOW(), INTERVAL %s HOUR)
|
||||
GROUP BY ts ORDER BY ts""",
|
||||
(bucket_seconds, bucket_seconds, hours),
|
||||
)
|
||||
return [
|
||||
{k: (float(v) if v is not None else None) for k, v in row.items()}
|
||||
for row in cur.fetchall()
|
||||
]
|
||||
|
||||
|
||||
def purge_old_modem_samples(days: int = 90) -> int:
|
||||
with get_conn() as conn:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
'DELETE FROM modem_samples WHERE sampled_at < DATE_SUB(NOW(), INTERVAL %s DAY)',
|
||||
(days,),
|
||||
)
|
||||
return cur.rowcount
|
||||
|
||||
|
||||
def check_suppressed(suppressions: list, target_type: str, target_name: str, target_detail: str = '') -> bool:
|
||||
"""Check suppression against a pre-loaded list (avoids per-call DB queries)."""
|
||||
for s in suppressions:
|
||||
|
||||
Reference in new issue
Block a user