feat: scheduled backups, availability tracking, PoE power metrics (v0.11.2 Beta)
P1 — Scheduled Backups - BackupService.createBackup() now accepts a `type` param (manual/scheduled) - PollerService: cronMatchesNow() parser + runScheduledBackups() + Redis 1h gate - Settings page: backup schedule toggle + cron expression input with examples P2 — Uptime/Availability Tracking - DB: device_availability table (went_offline_at, came_back_online_at, duration_seconds) - PollerService: inserts outage rows on offline detection, closes them on recovery - GET /api/metrics/device/:id/availability?range=30d endpoint - /api/metrics/summary now includes fleet 30-day uptime % - DeviceDetailPage: 30-day availability card (uptime %, outage count, longest outage) - DashboardPage HealthBar: Uptime 30d mini-stat P3 — PoE Power Draw Metrics - DeviceCollector.collectPoePower() queries /interface/ethernet/poe/monitor for switches - Writes poe_power measurement to InfluxDB (tags: device_id, port; fields: watts, current_ma, voltage_v) - GET /api/metrics/device/:id/poe endpoint (current per-port + 1h history) - SwitchPortDiagram: amber watt badge on PoE-active ports - HardwareTab: PoE budget section showing active ports and total watts Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
2GT-Rich
co-authored by
Claude Sonnet 4.6
Claude Sonnet 4.6
parent
e692a1d7cd
commit
6a4ab1fc5f
@@ -321,6 +321,12 @@ export default function HardwareTab({ deviceId }: { deviceId: number }) {
|
||||
refetchInterval: 30_000,
|
||||
});
|
||||
|
||||
const { data: poeData } = useQuery({
|
||||
queryKey: ['device-poe', deviceId],
|
||||
queryFn: () => metricsApi.devicePoe(deviceId).then((r) => r.data),
|
||||
refetchInterval: 30_000,
|
||||
});
|
||||
|
||||
if (isLoading) {
|
||||
return (
|
||||
<div className="flex items-center justify-center h-48">
|
||||
@@ -473,6 +479,31 @@ export default function HardwareTab({ deviceId }: { deviceId: number }) {
|
||||
))}
|
||||
</Section>
|
||||
)}
|
||||
|
||||
{poeData && poeData.ports.length > 0 && (
|
||||
<div className="lg:col-span-2">
|
||||
<Section title={`PoE Budget — ${poeData.totalWatts.toFixed(1)} W total`} icon={<Zap className="w-4 h-4" />} grid={false}>
|
||||
<div className="grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-4 gap-3">
|
||||
{poeData.ports.filter(p => p.watts > 0).map((p) => (
|
||||
<div key={p.port} className="rounded-lg p-3" style={{ background: 'var(--surface-2)' }}>
|
||||
<div className="text-xs font-mono text-gray-500 dark:text-slate-400 mb-1">{p.port}</div>
|
||||
<div className="text-lg font-bold text-yellow-500">{p.watts.toFixed(1)} W</div>
|
||||
<div className="text-xs text-gray-400 dark:text-slate-500">
|
||||
{p.voltage_v.toFixed(1)} V · {p.current_ma.toFixed(0)} mA
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
{poeData.ports.filter(p => p.watts === 0).length > 0 && (
|
||||
<div className="rounded-lg p-3 opacity-40" style={{ background: 'var(--surface-2)' }}>
|
||||
<div className="text-xs text-gray-500 dark:text-slate-400">
|
||||
{poeData.ports.filter(p => p.watts === 0).length} port(s) inactive
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</Section>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -56,10 +56,10 @@ function portState(port: SwitchPort): 'up' | 'down' | 'disabled' {
|
||||
}
|
||||
|
||||
function PortTile({
|
||||
port, selected, hovered, isMember,
|
||||
port, selected, hovered, isMember, watts,
|
||||
onClick, onMouseEnter, onMouseLeave, onDoubleClick,
|
||||
}: {
|
||||
port: SwitchPort; selected: boolean; hovered: boolean; isMember?: boolean;
|
||||
port: SwitchPort; selected: boolean; hovered: boolean; isMember?: boolean; watts?: number;
|
||||
onClick: (e: React.MouseEvent) => void;
|
||||
onMouseEnter: () => void; onMouseLeave: () => void; onDoubleClick: () => void;
|
||||
}) {
|
||||
@@ -74,7 +74,7 @@ function PortTile({
|
||||
onMouseEnter={onMouseEnter}
|
||||
onMouseLeave={onMouseLeave}
|
||||
onDoubleClick={onDoubleClick}
|
||||
title={`${port.name}${port.comment ? ` — ${port.comment}` : ''}${port.speed ? ` · ${port.speed}` : ''}`}
|
||||
title={`${port.name}${port.comment ? ` — ${port.comment}` : ''}${port.speed ? ` · ${port.speed}` : ''}${watts && watts > 0 ? ` · ${watts.toFixed(1)}W PoE` : ''}`}
|
||||
style={{
|
||||
width: 46, height: 46, borderRadius: 4, position: 'relative', flexShrink: 0,
|
||||
background: bg, border: `1px solid ${border}`,
|
||||
@@ -90,6 +90,15 @@ function PortTile({
|
||||
boxShadow: state === 'up' && !selected ? '0 0 6px var(--accent)' : 'none',
|
||||
}} />
|
||||
<span>{portLabel(port.name)}</span>
|
||||
{watts && watts > 0 ? (
|
||||
<span style={{
|
||||
position: 'absolute', bottom: 2, left: 0, right: 0, textAlign: 'center',
|
||||
fontSize: 7, fontWeight: 700, color: selected ? '#fff' : '#f59e0b',
|
||||
lineHeight: 1, letterSpacing: 0,
|
||||
}}>
|
||||
{watts.toFixed(0)}W
|
||||
</span>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -494,6 +503,16 @@ export default function SwitchPortDiagram({ deviceId, autoOpenBridge, onBridgeOp
|
||||
refetchInterval: 30_000,
|
||||
});
|
||||
|
||||
const { data: poeMetrics } = useQuery({
|
||||
queryKey: ['device-poe', deviceId],
|
||||
queryFn: () => metricsApi.devicePoe(deviceId).then((r) => r.data),
|
||||
refetchInterval: 30_000,
|
||||
});
|
||||
|
||||
const poeWattsMap = Object.fromEntries(
|
||||
(poeMetrics?.ports ?? []).map(p => [p.port, p.watts])
|
||||
);
|
||||
|
||||
// Auto-open bridge config panel when navigated from the VLANs tab warning
|
||||
useEffect(() => {
|
||||
if (!autoOpenBridge || !data?.ports) return;
|
||||
@@ -881,19 +900,19 @@ export default function SwitchPortDiagram({ deviceId, autoOpenBridge, onBridgeOp
|
||||
<div style={{ display: 'flex', flexDirection: 'column', gap: 4 }}>
|
||||
<div style={{ display: 'flex', gap: 4 }}>
|
||||
{topRowPorts.map(port => (
|
||||
<PortTile key={port.name} port={port} selected={selectedPorts.has(port.name)} hovered={hoveredPort === port.name} isMember={bondMemberMap.has(port.name)} onClick={e => togglePort(port.name, e)} onMouseEnter={() => setHoveredPort(port.name)} onMouseLeave={() => setHoveredPort(null)} onDoubleClick={() => canWrite && openEditPanel(port)} />
|
||||
<PortTile key={port.name} port={port} selected={selectedPorts.has(port.name)} hovered={hoveredPort === port.name} isMember={bondMemberMap.has(port.name)} watts={poeWattsMap[port.name]} onClick={e => togglePort(port.name, e)} onMouseEnter={() => setHoveredPort(port.name)} onMouseLeave={() => setHoveredPort(null)} onDoubleClick={() => canWrite && openEditPanel(port)} />
|
||||
))}
|
||||
</div>
|
||||
<div style={{ display: 'flex', gap: 4 }}>
|
||||
{bottomRowPorts.map(port => (
|
||||
<PortTile key={port.name} port={port} selected={selectedPorts.has(port.name)} hovered={hoveredPort === port.name} isMember={bondMemberMap.has(port.name)} onClick={e => togglePort(port.name, e)} onMouseEnter={() => setHoveredPort(port.name)} onMouseLeave={() => setHoveredPort(null)} onDoubleClick={() => canWrite && openEditPanel(port)} />
|
||||
<PortTile key={port.name} port={port} selected={selectedPorts.has(port.name)} hovered={hoveredPort === port.name} isMember={bondMemberMap.has(port.name)} watts={poeWattsMap[port.name]} onClick={e => togglePort(port.name, e)} onMouseEnter={() => setHoveredPort(port.name)} onMouseLeave={() => setHoveredPort(null)} onDoubleClick={() => canWrite && openEditPanel(port)} />
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
) : (
|
||||
<div style={{ display: 'flex', gap: 4 }}>
|
||||
{topRowPorts.map(port => (
|
||||
<PortTile key={port.name} port={port} selected={selectedPorts.has(port.name)} hovered={hoveredPort === port.name} isMember={bondMemberMap.has(port.name)} onClick={e => togglePort(port.name, e)} onMouseEnter={() => setHoveredPort(port.name)} onMouseLeave={() => setHoveredPort(null)} onDoubleClick={() => canWrite && openEditPanel(port)} />
|
||||
<PortTile key={port.name} port={port} selected={selectedPorts.has(port.name)} hovered={hoveredPort === port.name} isMember={bondMemberMap.has(port.name)} watts={poeWattsMap[port.name]} onClick={e => togglePort(port.name, e)} onMouseEnter={() => setHoveredPort(port.name)} onMouseLeave={() => setHoveredPort(null)} onDoubleClick={() => canWrite && openEditPanel(port)} />
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
@@ -908,7 +927,7 @@ export default function SwitchPortDiagram({ deviceId, autoOpenBridge, onBridgeOp
|
||||
</div>
|
||||
<div style={{ display: 'flex', gap: 4, flexWrap: 'wrap', maxWidth: individualSfpPorts.length * 52 }}>
|
||||
{individualSfpPorts.map(port => (
|
||||
<PortTile key={port.name} port={port} selected={selectedPorts.has(port.name)} hovered={hoveredPort === port.name} onClick={e => togglePort(port.name, e)} onMouseEnter={() => setHoveredPort(port.name)} onMouseLeave={() => setHoveredPort(null)} onDoubleClick={() => canWrite && openEditPanel(port)} />
|
||||
<PortTile key={port.name} port={port} selected={selectedPorts.has(port.name)} hovered={hoveredPort === port.name} watts={poeWattsMap[port.name]} onClick={e => togglePort(port.name, e)} onMouseEnter={() => setHoveredPort(port.name)} onMouseLeave={() => setHoveredPort(null)} onDoubleClick={() => canWrite && openEditPanel(port)} />
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
@@ -929,7 +948,7 @@ export default function SwitchPortDiagram({ deviceId, autoOpenBridge, onBridgeOp
|
||||
const lane = isSingleMode ? cage.singlePort! : cage.lanes[li];
|
||||
const visualPort: SwitchPort = (isSingleMode || isSingleCable) ? { ...refPort, running: refPort.running, disabled: refPort.disabled } : lane;
|
||||
return (
|
||||
<PortTile key={li} port={visualPort} selected={selectedPorts.has(lane.name)} hovered={hoveredPort === lane.name} onClick={e => togglePort(lane.name, e)} onMouseEnter={() => setHoveredPort(lane.name)} onMouseLeave={() => setHoveredPort(null)} onDoubleClick={() => canWrite && openEditPanel(lane)} />
|
||||
<PortTile key={li} port={visualPort} selected={selectedPorts.has(lane.name)} hovered={hoveredPort === lane.name} watts={poeWattsMap[lane.name]} onClick={e => togglePort(lane.name, e)} onMouseEnter={() => setHoveredPort(lane.name)} onMouseLeave={() => setHoveredPort(null)} onDoubleClick={() => canWrite && openEditPanel(lane)} />
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
@@ -943,7 +962,7 @@ export default function SwitchPortDiagram({ deviceId, autoOpenBridge, onBridgeOp
|
||||
<div className="mono" style={{ fontSize: 10, color: 'var(--ink-4)', letterSpacing: '.1em' }}>BRIDGE</div>
|
||||
<div style={{ display: 'flex', gap: 4 }}>
|
||||
{bridgePorts.map(port => (
|
||||
<PortTile key={port.name} port={port} selected={selectedPorts.has(port.name)} hovered={hoveredPort === port.name} onClick={e => togglePort(port.name, e)} onMouseEnter={() => setHoveredPort(port.name)} onMouseLeave={() => setHoveredPort(null)} onDoubleClick={() => canWrite && openEditPanel(port)} />
|
||||
<PortTile key={port.name} port={port} selected={selectedPorts.has(port.name)} hovered={hoveredPort === port.name} watts={poeWattsMap[port.name]} onClick={e => togglePort(port.name, e)} onMouseEnter={() => setHoveredPort(port.name)} onMouseLeave={() => setHoveredPort(null)} onDoubleClick={() => canWrite && openEditPanel(port)} />
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
@@ -955,7 +974,7 @@ export default function SwitchPortDiagram({ deviceId, autoOpenBridge, onBridgeOp
|
||||
<div className="mono" style={{ fontSize: 10, color: 'var(--ink-4)', letterSpacing: '.1em' }}>BOND</div>
|
||||
<div style={{ display: 'flex', gap: 4 }}>
|
||||
{bondPorts.map(port => (
|
||||
<PortTile key={port.name} port={port} selected={selectedPorts.has(port.name)} hovered={hoveredPort === port.name} onClick={e => togglePort(port.name, e)} onMouseEnter={() => setHoveredPort(port.name)} onMouseLeave={() => setHoveredPort(null)} onDoubleClick={() => canWrite && openEditPanel(port)} />
|
||||
<PortTile key={port.name} port={port} selected={selectedPorts.has(port.name)} hovered={hoveredPort === port.name} watts={poeWattsMap[port.name]} onClick={e => togglePort(port.name, e)} onMouseEnter={() => setHoveredPort(port.name)} onMouseLeave={() => setHoveredPort(null)} onDoubleClick={() => canWrite && openEditPanel(port)} />
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user