allen/kit-busrouter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: unified fleet telemetry — canonical format, GPS/IP geo, WAN health dashboard

Browse Source 
- Rewrite telemetry-synology.sh: canonical GL format (modem_0001/wan keys),
  self-contained metrics (no aiwanbal), Eyeride GPS with IP geo fallback
- Add /api/fleet-telemetry to hub: joins tunnel status with fleet Postgres
- Update dashboard.html: per-device WAN health bars, GPS, signal strength
- Fix hub/ingest.sh normalisation: remap old wan1/wan2 → modem_0001/wan
- Bump SPK version: 0.1-0001 → 0.5.0-0001 for GL parity

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
kitadmin
2026-07-23 01:47:02 +00:00
parent d86a7e49b5
commit db04341f7c
6 changed files with 596 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hub/dashboard.html
+107 -10
View File
@@ -23,18 +23,36 @@ body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
.stat-card .lbl { font-size: 10px; color: var(--dim); text-transform: uppercase; margin-top: 2px; }
.stat-card .num.online { color: var(--green); }
.stat-card .num.offline { color: var(--red); }
.grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(400px, 1fr)); gap: 16px; }
.grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(420px, 1fr)); gap: 16px; }
.card { background: var(--card); border: 1px solid var(--border); border-radius: 8px; padding: 16px; }
.card h2 { font-size: 16px; margin-bottom: 12px; display: flex; justify-content: space-between; align-items: center; }
.card h2 { font-size: 16px; margin-bottom: 8px; display: flex; justify-content: space-between; align-items: center; }
.badge { font-size: 11px; padding: 2px 8px; border-radius: 12px; font-weight: 600; }
.badge-gl { background: rgba(88,166,255,0.15); color: var(--blue); }
.badge-synology { background: rgba(210,153,34,0.15); color: var(--amber); }
.badge-ver { background: rgba(139,148,158,0.15); color: var(--dim); font-size: 10px; }
.dot { display: inline-block; width: 8px; height: 8px; border-radius: 50%; margin-right: 4px; }
.dot-up { background: var(--green); }
.dot-down { background: var(--red); }
.row { display: flex; justify-content: space-between; padding: 5px 0; font-size: 13px; border-bottom: 1px solid rgba(255,255,255,0.04); }
.row { display: flex; justify-content: space-between; padding: 4px 0; font-size: 13px; border-bottom: 1px solid rgba(255,255,255,0.04); }
.row .label { color: var(--dim); }
.row .val { font-family: monospace; font-size: 12px; }
.wan-section { margin-top: 8px; padding-top: 8px; border-top: 1px solid var(--border); }
.wan-section .title { font-size: 11px; color: var(--dim); text-transform: uppercase; letter-spacing: 1px; margin-bottom: 6px; }
.wan-bar { display: flex; align-items: center; gap: 8px; margin-bottom: 4px; font-size: 12px; }
.wan-bar .member { font-family: monospace; min-width: 90px; font-size: 11px; }
.wan-bar .score { font-weight: 700; min-width: 32px; text-align: right; }
.wan-bar .score.good { color: var(--green); }
.wan-bar .score.warn { color: var(--amber); }
.wan-bar .score.bad { color: var(--red); }
.wan-bar .metric { color: var(--dim); font-size: 11px; }
.wan-bar .signal { font-size: 10px; }
.wan-bar .signal.good { color: var(--green); }
.wan-bar .signal.warn { color: var(--amber); }
.wan-bar .signal.bad { color: var(--red); }
.active-dot { display: inline-block; width: 6px; height: 6px; border-radius: 50%; background: var(--green); margin-right: 4px; flex-shrink: 0; }
.gps-line { font-size: 11px; color: var(--dim); margin-top: 4px; }
.gps-line a { color: var(--blue); text-decoration: none; }
.gps-line a:hover { text-decoration: underline; }
.access { margin-top: 12px; padding-top: 12px; border-top: 1px solid var(--border); }
.access .title { font-size: 11px; color: var(--dim); text-transform: uppercase; letter-spacing: 1px; margin-bottom: 8px; }
.cmd { background: #0d1117; padding: 6px 10px; border-radius: 4px; font-family: monospace;
@@ -43,6 +61,7 @@ body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
.cmd a:hover { text-decoration: underline; }
.empty { color: var(--dim); text-align: center; padding: 60px 20px; font-size: 14px; }
.refresh { color: var(--dim); font-size: 11px; text-align: right; margin-top: 20px; }
.telem-warn { font-size: 10px; color: var(--amber); margin-left: 8px; }
</style>
</head>
<body>
@@ -59,8 +78,8 @@ body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
var HUB = window.location.origin;
function loadFleet() {
fetch(HUB + '/api/fleet')
.then(function(r) { return r.ok ? r.json() : Promise.reject(r.status); })
fetch(HUB + '/api/fleet-telemetry')
.then(function(r) { return r.ok ? r.json() : fetch(HUB + '/api/fleet').then(function(r2) { return r2.json(); }); })
.then(function(data) { render(data); })
.catch(function(e) {
document.getElementById('fleet').innerHTML =
@@ -69,18 +88,55 @@ function loadFleet() {
document.getElementById('refresh').textContent = 'Last updated: ' + new Date().toLocaleTimeString();
}
function scoreClass(s) {
if (s == null) return '';
if (s >= 70) return 'good';
if (s >= 40) return 'warn';
return 'bad';
}
function signalClass(rsrp) {
if (rsrp == null) return '';
if (rsrp >= -85) return 'good';
if (rsrp >= -105) return 'warn';
return 'bad';
}
function signalBars(rsrp) {
if (rsrp == null) return '—';
if (rsrp >= -85) return '▂▄▆█';
if (rsrp >= -95) return '▂▄▆_';
if (rsrp >= -105) return '▂▄__';
if (rsrp >= -115) return '▂___';
return '____';
}
function fmtLatency(ms) { return ms != null ? ms + ' ms' : '—'; }
function fmtLoss(pct) { return pct != null ? pct + '%' : '—'; }
function fmtScore(s) { return s != null ? s : '—'; }
function fmtUptime(s) {
if (s == null) return '—';
var h = Math.floor(s / 3600);
var m = Math.floor((s % 3600) / 60);
if (h >= 24) { var d = Math.floor(h / 24); return d + 'd ' + (h % 24) + 'h'; }
return h + 'h ' + m + 'm';
}
function render(data) {
var devices = data.devices || [];
var online = devices.filter(function(d) { return d.tunnel_up; }).length;
var telemOnline = data.telemetry_online || 0;
document.getElementById('stats').innerHTML =
'<div class="stat-card"><div class="num">' + devices.length +
'</div><div class="lbl">Registered</div></div>' +
'<div class="stat-card"><div class="num online">' + online +
'</div><div class="lbl">Online</div></div>' +
'</div><div class="lbl">Tunnel Online</div></div>' +
'<div class="stat-card"><div class="num offline">' + (devices.length - online) +
'</div><div class="lbl">Offline</div></div>' +
'<div class="stat-card"><div class="num">' + (data.hub || '') +
'</div><div class="lbl">Tunnel Offline</div></div>' +
'<div class="stat-card"><div class="num" style="font-size:20px">' + telemOnline +
'</div><div class="lbl">Telemetry Active</div></div>' +
'<div class="stat-card"><div class="num" style="font-size:18px">' + (data.hub || '') +
'</div><div class="lbl">Hub</div></div>';
var el = document.getElementById('fleet');
@@ -90,21 +146,62 @@ function render(data) {
}
el.innerHTML = devices.map(function(d) {
var isSynology = d.device_id.startsWith('x');
var isSynology = d.platform === 'synology' || d.device_id.startsWith('x');
var badge = isSynology
? '<span class="badge badge-synology">Synology</span>'
: '<span class="badge badge-gl">GL-XE3000</span>';
var verBadge = d.version ? '<span class="badge badge-ver">v' + esc(d.version) + '</span>' : '';
var status = d.tunnel_up
? '<span><span class="dot dot-up"></span>ONLINE</span>'
: '<span><span class="dot dot-down"></span>OFFLINE</span>';
var telemWarn = d.tunnel_up && !d.online_telemetry
? '<span class="telem-warn">(no telemetry)</span>' : '';
var ssh = 'ssh -p ' + d.tunnel_port + ' kitadmin@' + data.hub;
var web = d.dashboard_url;
// WAN health bars
var wanHtml = '';
var wans = d.wan_summary || [];
if (wans.length) {
wanHtml = '<div class="wan-section"><div class="title">WAN Health</div>';
for (var i = 0; i < wans.length; i++) {
var w = wans[i];
var activeMarker = w.active ? '<span class="active-dot"></span>' : '<span style="display:inline-block;width:6px;margin-right:4px"></span>';
var bars = signalBars(w.rsrp_dbm);
wanHtml += '<div class="wan-bar">' +
activeMarker +
'<span class="member">' + esc(w.member) + '</span>' +
'<span class="score ' + scoreClass(w.score) + '">' + fmtScore(w.score) + '</span>' +
'<span class="metric">' + fmtLatency(w.latency_ms) + ' / ' + fmtLoss(w.loss_pct) + ' loss</span>' +
(w.rsrp_dbm != null
? '<span class="signal ' + signalClass(w.rsrp_dbm) + '" title="RSRP: ' + w.rsrp_dbm + ' dBm">' + bars + ' ' + w.rsrp_dbm + ' dBm</span>'
: '') +
(w.carrier ? '<span class="metric" style="margin-left:4px">' + esc(w.carrier) + '</span>' : '') +
(w.technology && w.technology !== 'unknown' ? '<span class="metric">' + esc(w.technology) + '</span>' : '') +
'</div>';
}
wanHtml += '</div>';
}
// GPS line
var gpsHtml = '';
if (d.gps && d.gps.lat != null && d.gps.lon != null) {
var fixLabel = d.gps.fix === 1 ? ' (IP approx)' : (d.gps.fix >= 2 ? ' (GPS)' : '');
gpsHtml = '<div class="gps-line">📍 ' +
Number(d.gps.lat).toFixed(4) + ', ' + Number(d.gps.lon).toFixed(4) + fixLabel +
' — <a href="https://maps.google.com/?q=' + d.gps.lat + ',' + d.gps.lon + '" target="_blank">Google Maps</a>' +
'</div>';
}
return '<div class="card">' +
'<h2>' + esc(d.device_id) + ' ' + badge + ' <span style="font-size:13px">' + status + '</span></h2>' +
'<h2>' + esc(d.device_id) + ' ' + badge + verBadge + ' <span style="font-size:13px">' + status + telemWarn + '</span></h2>' +
'<div class="row"><span class="label">Tunnel Port</span><span class="val">' + d.tunnel_port + '</span></div>' +
'<div class="row"><span class="label">Assigned</span><span class="val">' + (d.assigned || '--') + '</span></div>' +
(d.uptime_s ? '<div class="row"><span class="label">Uptime</span><span class="val">' + fmtUptime(d.uptime_s) + '</span></div>' : '') +
(d.autonomous != null ? '<div class="row"><span class="label">Autonomous</span><span class="val">' + (d.autonomous ? '✅ Enabled' : '❌ Disabled') + '</span></div>' : '') +
wanHtml +
gpsHtml +
(d.tunnel_up
? '<div class="access">' +
'<div class="title">Direct Access</div>' +