c5787a7a7f
The Admin stack now has a usable operator UI for managing the fleet.
End-to-end verified locally: Client pushes → Admin dashboard reflects
the activity within the CA refresh window.
Backend (Admin-only)
- FleetQueryService: dashboard headline (totals, active count, today's
measurements + kWh from the hourly_per_device CA) and per-customer
detail (sites, devices, last 50 measurements, last 20 ingest events).
- /api/fleet/dashboard and /api/fleet/customers/{id}/detail endpoints.
- DTOs added; Program.cs wires the service + endpoints under RunMode=Admin.
Frontend
- DashboardPage now branches on RunMode — Admin renders the fleet
headline (statistic cards + customer summary table with lag tags),
Client keeps the existing placeholder.
- AdminCustomerDetailPage drills into one customer: descriptions card +
tabs for Recent ingest (with rejection counts, batch sizes, time-spread
for visible firmware-replay waves), Recent measurements, Sites, Devices.
- AdminCustomersPage rows are clickable → /admin/customers/:id (skips
the click when target is a button/popover so action buttons still work).
- App.tsx adds the /admin/customers/:id route, RequireRole-gated.
Grafana
- grafana/dashboards-admin/fleet-overview.json — 4 stat panels (active
customers, total, last-24h samples, today's kWh) plus 2 time series
(per-customer active power, per-customer hourly kWh). Reads from
fleet.hourly_per_device CA.
- grafana/dashboards-admin/customer-drilldown.json — parameterized by
$customer (template variable querying fleet.Customers). Per-device
active power, cumulative kWh, recent ingest events table.
Docs
- README: Phase 15 section describing the new admin UI surface +
pointer to dashboard-admin folder.
- OPERATIONS: new "Fleet aggregator (Admin stack)" section covering
one-time provisioning (Admin portal + Admin Grafana), end-to-end
customer-onboarding workflow (register on Admin → drop token in
customer .env → restart → verify in UI/SQL), common ops (rotate
token, disable, investigate, compression stats, force CA refresh,
decommission), and Admin-DB backup notes.
- README decommissioning note now mentions deleting from fleet.Customers
if the customer was registered for aggregation.
Verified end-to-end
- Phase 14's Client + Admin stacks rebuilt with Phase 15 code.
- /api/fleet/dashboard returns correct totals (1 customer, 1 active,
measurements + kWh derived from CA).
- /api/fleet/customers/{id}/detail returns sites, devices, recent
measurements, recent ingest events.
- Ingested a fresh measurement on Client → after CA refresh, totals
in Admin dashboard advance correctly.
- All 53 tests still passing.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
109 lines
4.2 KiB
JSON
109 lines
4.2 KiB
JSON
{
|
|
"annotations": { "list": [] },
|
|
"editable": true,
|
|
"fiscalYearStartMonth": 0,
|
|
"graphTooltip": 0,
|
|
"id": null,
|
|
"links": [],
|
|
"liveNow": false,
|
|
"panels": [
|
|
{
|
|
"id": 1,
|
|
"type": "timeseries",
|
|
"title": "Active power per device — $customer_code",
|
|
"datasource": { "type": "postgres", "uid": "timescaledb" },
|
|
"gridPos": { "x": 0, "y": 0, "w": 24, "h": 9 },
|
|
"fieldConfig": {
|
|
"defaults": {
|
|
"unit": "kwatt",
|
|
"color": { "mode": "palette-classic" },
|
|
"custom": { "drawStyle": "line", "lineWidth": 2, "fillOpacity": 10, "showPoints": "never", "spanNulls": false }
|
|
}
|
|
},
|
|
"options": { "tooltip": { "mode": "multi", "sort": "desc" }, "legend": { "displayMode": "list", "placement": "bottom", "showLegend": true } },
|
|
"targets": [
|
|
{
|
|
"refId": "A",
|
|
"datasource": { "type": "postgres", "uid": "timescaledb" },
|
|
"format": "time_series",
|
|
"rawSql": "SELECT h.bucket AS time, d.\"Name\" AS metric, h.avg_kw AS value FROM fleet.hourly_per_device h JOIN fleet.\"Devices\" d ON d.\"CustomerId\" = h.\"CustomerId\" AND d.\"Id\" = h.\"DeviceId\" WHERE h.\"CustomerId\" = '$customer' AND $__timeFilter(h.bucket) ORDER BY 1"
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"id": 2,
|
|
"type": "timeseries",
|
|
"title": "Cumulative kWh imported per device",
|
|
"datasource": { "type": "postgres", "uid": "timescaledb" },
|
|
"gridPos": { "x": 0, "y": 9, "w": 24, "h": 9 },
|
|
"fieldConfig": {
|
|
"defaults": {
|
|
"unit": "kwatth",
|
|
"color": { "mode": "palette-classic" },
|
|
"custom": { "drawStyle": "line", "lineWidth": 2, "fillOpacity": 5, "showPoints": "never" }
|
|
}
|
|
},
|
|
"options": { "tooltip": { "mode": "multi", "sort": "desc" }, "legend": { "displayMode": "list", "placement": "bottom", "showLegend": true } },
|
|
"targets": [
|
|
{
|
|
"refId": "A",
|
|
"datasource": { "type": "postgres", "uid": "timescaledb" },
|
|
"format": "time_series",
|
|
"rawSql": "SELECT m.\"Time\" AS time, d.\"Name\" AS metric, m.\"EnergyImportedKwh\" AS value FROM fleet.\"PowerMeasurements\" m JOIN fleet.\"Devices\" d ON d.\"CustomerId\" = m.\"CustomerId\" AND d.\"Id\" = m.\"DeviceId\" WHERE m.\"CustomerId\" = '$customer' AND $__timeFilter(m.\"Time\") AND m.\"EnergyImportedKwh\" IS NOT NULL ORDER BY m.\"Time\""
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"id": 3,
|
|
"type": "table",
|
|
"title": "Recent ingest events",
|
|
"datasource": { "type": "postgres", "uid": "timescaledb" },
|
|
"gridPos": { "x": 0, "y": 18, "w": 24, "h": 8 },
|
|
"targets": [
|
|
{
|
|
"refId": "A",
|
|
"datasource": { "type": "postgres", "uid": "timescaledb" },
|
|
"format": "table",
|
|
"rawSql": "SELECT \"ReceivedAt\" AS \"Received\", \"BatchType\" AS \"Type\", \"RowsAccepted\" AS \"Accepted\", \"RowsRejected\" AS \"Rejected\", \"BatchBytes\" AS \"Bytes\", \"TimeSpread\" AS \"Spread\", \"Error\" AS \"Error\" FROM fleet.\"IngestEvents\" WHERE \"CustomerId\" = '$customer' ORDER BY \"ReceivedAt\" DESC LIMIT 25"
|
|
}
|
|
]
|
|
}
|
|
],
|
|
"refresh": "30s",
|
|
"schemaVersion": 38,
|
|
"tags": ["fleet", "admin", "drilldown"],
|
|
"templating": {
|
|
"list": [
|
|
{
|
|
"name": "customer",
|
|
"label": "Customer",
|
|
"type": "query",
|
|
"datasource": { "type": "postgres", "uid": "timescaledb" },
|
|
"query": "SELECT \"Code\" || ' — ' || \"Name\" AS __text, \"Id\"::text AS __value FROM fleet.\"Customers\" ORDER BY \"Code\"",
|
|
"refresh": 1,
|
|
"multi": false,
|
|
"includeAll": false,
|
|
"current": {}
|
|
},
|
|
{
|
|
"name": "customer_code",
|
|
"label": "Customer (display)",
|
|
"type": "query",
|
|
"datasource": { "type": "postgres", "uid": "timescaledb" },
|
|
"query": "SELECT \"Code\" AS __text, \"Code\" AS __value FROM fleet.\"Customers\" WHERE \"Id\"::text = '$customer'",
|
|
"refresh": 2,
|
|
"hide": 2,
|
|
"multi": false,
|
|
"includeAll": false,
|
|
"current": {}
|
|
}
|
|
]
|
|
},
|
|
"time": { "from": "now-24h", "to": "now" },
|
|
"timepicker": {},
|
|
"timezone": "",
|
|
"title": "Customer Drilldown",
|
|
"uid": "customer-drilldown",
|
|
"version": 1
|
|
}
|