Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2025-11-18 11:36:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update AppImage

Browse Source
This commit is contained in:
MacRimi
2025-10-14 11:37:30 +02:00
parent 04f95e648b
commit 8f93e43bb3
3 changed files with 511 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

243
AppImage/components/hardware.tsx
View File

@@ -20,7 +20,7 @@ import {
Info, Info,
} from "lucide-react" } from "lucide-react"
import useSWR from "swr" import useSWR from "swr"
import { useState, useEffect } from "react" import { useState } from "react"
import { type HardwareData, type GPU, type PCIDevice, type StorageDevice, fetcher } from "../types/hardware" import { type HardwareData, type GPU, type PCIDevice, type StorageDevice, fetcher } from "../types/hardware"
const formatMemory = (memoryKB: number | string): string => { const formatMemory = (memoryKB: number | string): string => {
@@ -116,56 +116,26 @@ export default function Hardware() {
const [selectedNetwork, setSelectedNetwork] = useState<PCIDevice | null>(null) const [selectedNetwork, setSelectedNetwork] = useState<PCIDevice | null>(null)
const [selectedUPS, setSelectedUPS] = useState<any>(null) // Added state for UPS modal const [selectedUPS, setSelectedUPS] = useState<any>(null) // Added state for UPS modal
useEffect(() => { if (!hardwareData && !error) {
if (!selectedGPU) return return (
<div className="flex items-center justify-center min-h-[400px]">
const pciDevice = findPCIDeviceForGPU(selectedGPU) <div className="text-center">
const fullSlot = pciDevice?.slot || selectedGPU.slot <Loader2 className="h-8 w-8 animate-spin mx-auto mb-2 text-primary" />
<p className="text-sm text-muted-foreground">Loading hardware information...</p>
if (!fullSlot) return </div>
</div>
const abortController = new AbortController() )
const fetchRealtimeData = async () => {
try {
const apiUrl = `http://${window.location.hostname}:8008/api/gpu/${fullSlot}/realtime`
const response = await fetch(apiUrl, {
method: "GET",
headers: {
"Content-Type": "application/json",
},
signal: abortController.signal,
})
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`)
} }
const data = await response.json() if (error) {
setRealtimeGPUData(data) return (
setDetailsLoading(false) <div className="flex items-center justify-center min-h-[400px]">
} catch (error) { <div className="text-center">
// Only log non-abort errors <p className="text-sm text-destructive">Error loading hardware information</p>
if (error instanceof Error && error.name !== "AbortError") { </div>
console.error("[v0] Error fetching GPU realtime data:", error) </div>
)
} }
setRealtimeGPUData({ has_monitoring_tool: false })
setDetailsLoading(false)
}
}
// Initial fetch
fetchRealtimeData()
// Poll every 3 seconds
const interval = setInterval(fetchRealtimeData, 3000)
return () => {
clearInterval(interval)
abortController.abort()
}
}, [selectedGPU])
const handleGPUClick = async (gpu: GPU) => { const handleGPUClick = async (gpu: GPU) => {
setSelectedGPU(gpu) setSelectedGPU(gpu)
@@ -952,8 +922,10 @@ export default function Hardware() {
</Card> </Card>
)} )}
{/* UPS */} {/* Power Supplies */}
{/* Modified UPS card to include info button and trigger modal */} {/* This section was moved to be grouped with Power Consumption */}
{/* UPS - Enhanced with detailed modal */}
{hardwareData?.ups && Object.keys(hardwareData.ups).length > 0 && hardwareData.ups.model && ( {hardwareData?.ups && Object.keys(hardwareData.ups).length > 0 && hardwareData.ups.model && (
<Card className="border-border/50 bg-card/50 p-6"> <Card className="border-border/50 bg-card/50 p-6">
<div className="mb-4 flex items-center gap-2"> <div className="mb-4 flex items-center gap-2">
@@ -968,7 +940,7 @@ export default function Hardware() {
<span className="text-sm font-medium">{hardwareData.ups.model}</span> <span className="text-sm font-medium">{hardwareData.ups.model}</span>
<button <button
onClick={() => setSelectedUPS(hardwareData.ups)} onClick={() => setSelectedUPS(hardwareData.ups)}
className="p-1 rounded-md hover:bg-background/80 transition-colors" className="p-1 rounded-md hover:bg-accent transition-colors"
title="View detailed UPS information" title="View detailed UPS information"
> >
<Info className="h-4 w-4 text-muted-foreground hover:text-primary" /> <Info className="h-4 w-4 text-muted-foreground hover:text-primary" />
@@ -1022,13 +994,12 @@ export default function Hardware() {
</div> </div>
)} )}
{/* CHANGE: Corrected input_voltage field name */} {hardwareData.ups.line_voltage && (
{hardwareData.ups.input_voltage && (
<div> <div>
<span className="text-xs text-muted-foreground">Input Voltage</span> <span className="text-xs text-muted-foreground">Input Voltage</span>
<div className="mt-1"> <div className="mt-1">
<Badge className="bg-green-500/10 text-green-500 border-green-500/20"> <Badge className="bg-green-500/10 text-green-500 border-green-500/20">
{hardwareData.ups.input_voltage} {hardwareData.ups.line_voltage}
</Badge> </Badge>
</div> </div>
</div> </div>
@@ -1044,29 +1015,30 @@ export default function Hardware() {
{selectedUPS && ( {selectedUPS && (
<> <>
<DialogHeader className="pb-4 border-b border-border"> <DialogHeader className="pb-4 border-b border-border">
<DialogTitle>{selectedUPS.model || "UPS Details"}</DialogTitle> <DialogTitle>{selectedUPS.model || selectedUPS.name}</DialogTitle>
<DialogDescription>Complete UPS Information from NUT</DialogDescription> <DialogDescription>Comprehensive UPS Information</DialogDescription>
</DialogHeader> </DialogHeader>
<div className="space-y-6 py-4"> <div className="space-y-6 py-4">
{/* Device Information */} {/* Device Information */}
{(selectedUPS.model || selectedUPS.manufacturer || selectedUPS.serial || selectedUPS.device_type) && (
<div> <div>
<h3 className="text-sm font-semibold text-muted-foreground mb-3 uppercase tracking-wide"> <h3 className="text-sm font-semibold text-muted-foreground mb-3 uppercase tracking-wide">
Device Information Device Information
</h3> </h3>
<div className="grid gap-2"> <div className="grid gap-2">
{selectedUPS.model && (
<div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Model</span>
<span className="text-sm font-medium text-right">{selectedUPS.model}</span>
</div>
)}
{selectedUPS.manufacturer && ( {selectedUPS.manufacturer && (
<div className="flex justify-between border-b border-border/50 pb-2"> <div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Manufacturer</span> <span className="text-sm text-muted-foreground">Manufacturer</span>
<span className="text-sm font-medium">{selectedUPS.manufacturer}</span> <span className="text-sm font-medium">{selectedUPS.manufacturer}</span>
</div> </div>
)} )}
{selectedUPS.model && (
<div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Model</span>
<span className="text-sm font-medium">{selectedUPS.model}</span>
</div>
)}
{selectedUPS.serial && ( {selectedUPS.serial && (
<div className="flex justify-between border-b border-border/50 pb-2"> <div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Serial Number</span> <span className="text-sm text-muted-foreground">Serial Number</span>
@@ -1087,8 +1059,10 @@ export default function Hardware() {
)} )}
</div> </div>
</div> </div>
)}
{/* Status */} {/* Status */}
{(selectedUPS.status || selectedUPS.beeper_status || selectedUPS.test_result) && (
<div> <div>
<h3 className="text-sm font-semibold text-muted-foreground mb-3 uppercase tracking-wide">Status</h3> <h3 className="text-sm font-semibold text-muted-foreground mb-3 uppercase tracking-wide">Status</h3>
<div className="grid gap-2"> <div className="grid gap-2">
@@ -1105,49 +1079,53 @@ export default function Hardware() {
</Badge> </Badge>
</div> </div>
)} )}
{selectedUPS.test_result && (
<div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Test Result</span>
<span className="text-sm font-medium">{selectedUPS.test_result}</span>
</div>
)}
{selectedUPS.beeper_status && ( {selectedUPS.beeper_status && (
<div className="flex justify-between border-b border-border/50 pb-2"> <div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Beeper Status</span> <span className="text-sm text-muted-foreground">Beeper Status</span>
<span className="text-sm font-medium">{selectedUPS.beeper_status}</span> <span className="text-sm font-medium">{selectedUPS.beeper_status}</span>
</div> </div>
)} )}
{selectedUPS.test_result && (
<div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Test Result</span>
<span className="text-sm font-medium">{selectedUPS.test_result}</span>
</div>
)}
</div> </div>
</div> </div>
)}
{/* Battery Information */} {/* Battery */}
{(selectedUPS.battery_charge ||
selectedUPS.time_left ||
selectedUPS.battery_voltage ||
selectedUPS.battery_type) && (
<div> <div>
<h3 className="text-sm font-semibold text-muted-foreground mb-3 uppercase tracking-wide">Battery</h3> <h3 className="text-sm font-semibold text-muted-foreground mb-3 uppercase tracking-wide">
<div className="grid gap-3 md:grid-cols-2"> Battery
</h3>
<div className="grid gap-2">
{selectedUPS.battery_charge && ( {selectedUPS.battery_charge && (
<div className="space-y-1"> <div className="space-y-1">
<div className="flex justify-between"> <div className="flex justify-between">
<span className="text-sm text-muted-foreground">Charge</span> <span className="text-sm text-muted-foreground">Charge Level</span>
<span className="text-sm font-semibold text-green-500">{selectedUPS.battery_charge}</span> <span className="text-sm font-medium">{selectedUPS.battery_charge}</span>
</div> </div>
<Progress <Progress
value={ value={Number.parseInt(selectedUPS.battery_charge.replace("%", ""))}
selectedUPS.battery_charge_value ||
Number.parseInt(selectedUPS.battery_charge.replace("%", ""))
}
className="h-2 [&>div]:bg-blue-500" className="h-2 [&>div]:bg-blue-500"
/> />
</div> </div>
)} )}
{selectedUPS.battery_charge_low && ( {selectedUPS.battery_charge_low && (
<div className="flex justify-between border-b border-border/50 pb-2"> <div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Low Charge Threshold</span> <span className="text-sm text-muted-foreground">Low Battery Threshold</span>
<span className="text-sm font-medium">{selectedUPS.battery_charge_low}</span> <span className="text-sm font-medium">{selectedUPS.battery_charge_low}</span>
</div> </div>
)} )}
{selectedUPS.time_left && ( {selectedUPS.time_left && (
<div className="flex justify-between border-b border-border/50 pb-2"> <div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Runtime</span> <span className="text-sm text-muted-foreground">Runtime Remaining</span>
<span className="text-sm font-medium text-green-500">{selectedUPS.time_left}</span> <span className="text-sm font-medium text-green-500">{selectedUPS.time_left}</span>
</div> </div>
)} )}
@@ -1159,7 +1137,7 @@ export default function Hardware() {
)} )}
{selectedUPS.battery_voltage && ( {selectedUPS.battery_voltage && (
<div className="flex justify-between border-b border-border/50 pb-2"> <div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Voltage</span> <span className="text-sm text-muted-foreground">Battery Voltage</span>
<span className="text-sm font-medium">{selectedUPS.battery_voltage}</span> <span className="text-sm font-medium">{selectedUPS.battery_voltage}</span>
</div> </div>
)} )}
@@ -1171,25 +1149,33 @@ export default function Hardware() {
)} )}
{selectedUPS.battery_type && ( {selectedUPS.battery_type && (
<div className="flex justify-between border-b border-border/50 pb-2"> <div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Type</span> <span className="text-sm text-muted-foreground">Battery Type</span>
<span className="text-sm font-medium">{selectedUPS.battery_type}</span> <span className="text-sm font-medium">{selectedUPS.battery_type}</span>
</div> </div>
)} )}
{selectedUPS.battery_mfr_date && (
<div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Battery Manufacture Date</span>
<span className="text-sm font-medium">{selectedUPS.battery_mfr_date}</span>
</div>
)}
</div> </div>
</div> </div>
)}
{/* Power Information */} {/* Power */}
{(selectedUPS.load_percent || selectedUPS.real_power || selectedUPS.apparent_power) && (
<div> <div>
<h3 className="text-sm font-semibold text-muted-foreground mb-3 uppercase tracking-wide">Power</h3> <h3 className="text-sm font-semibold text-muted-foreground mb-3 uppercase tracking-wide">Power</h3>
<div className="grid gap-2 md:grid-cols-2"> <div className="grid gap-2">
{selectedUPS.load_percent && ( {selectedUPS.load_percent && (
<div className="space-y-1"> <div className="space-y-1">
<div className="flex justify-between"> <div className="flex justify-between">
<span className="text-sm text-muted-foreground">Load</span> <span className="text-sm text-muted-foreground">Load</span>
<span className="text-sm font-semibold text-green-500">{selectedUPS.load_percent}</span> <span className="text-sm font-medium">{selectedUPS.load_percent}</span>
</div> </div>
<Progress <Progress
value={selectedUPS.load_value || Number.parseInt(selectedUPS.load_percent.replace("%", ""))} value={Number.parseInt(selectedUPS.load_percent.replace("%", ""))}
className="h-2 [&>div]:bg-blue-500" className="h-2 [&>div]:bg-blue-500"
/> />
</div> </div>
@@ -1200,28 +1186,30 @@ export default function Hardware() {
<span className="text-sm font-medium text-blue-500">{selectedUPS.real_power}</span> <span className="text-sm font-medium text-blue-500">{selectedUPS.real_power}</span>
</div> </div>
)} )}
{selectedUPS.real_power_nominal && ( {selectedUPS.realpower_nominal && (
<div className="flex justify-between border-b border-border/50 pb-2"> <div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Nominal Real Power</span> <span className="text-sm text-muted-foreground">Nominal Real Power</span>
<span className="text-sm font-medium">{selectedUPS.real_power_nominal}</span> <span className="text-sm font-medium">{selectedUPS.realpower_nominal}</span>
</div> </div>
)} )}
{selectedUPS.apparent_power && ( {selectedUPS.apparent_power && (
<div className="flex justify-between border-b border-border/50 pb-2"> <div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Apparent Power</span> <span className="text-sm text-muted-foreground">Apparent Power</span>
<span className="text-sm font-medium text-blue-500">{selectedUPS.apparent_power}</span> <span className="text-sm font-medium">{selectedUPS.apparent_power}</span>
</div> </div>
)} )}
{selectedUPS.apparent_power_nominal && ( {selectedUPS.power_nominal && (
<div className="flex justify-between border-b border-border/50 pb-2"> <div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Nominal Apparent Power</span> <span className="text-sm text-muted-foreground">Nominal Apparent Power</span>
<span className="text-sm font-medium">{selectedUPS.apparent_power_nominal}</span> <span className="text-sm font-medium">{selectedUPS.power_nominal}</span>
</div> </div>
)} )}
</div> </div>
</div> </div>
)}
{/* Input/Output */} {/* Input/Output */}
{(selectedUPS.input_voltage || selectedUPS.output_voltage || selectedUPS.input_frequency) && (
<div> <div>
<h3 className="text-sm font-semibold text-muted-foreground mb-3 uppercase tracking-wide"> <h3 className="text-sm font-semibold text-muted-foreground mb-3 uppercase tracking-wide">
Input / Output Input / Output
@@ -1245,10 +1233,28 @@ export default function Hardware() {
<span className="text-sm font-medium">{selectedUPS.input_frequency}</span> <span className="text-sm font-medium">{selectedUPS.input_frequency}</span>
</div> </div>
)} )}
{selectedUPS.input_transfer_high && (
<div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Transfer High</span>
<span className="text-sm font-medium">{selectedUPS.input_transfer_high}</span>
</div>
)}
{selectedUPS.input_transfer_low && (
<div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Transfer Low</span>
<span className="text-sm font-medium">{selectedUPS.input_transfer_low}</span>
</div>
)}
{selectedUPS.transfer_reason && (
<div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Last Transfer Reason</span>
<span className="text-sm font-medium">{selectedUPS.transfer_reason}</span>
</div>
)}
{selectedUPS.output_voltage && ( {selectedUPS.output_voltage && (
<div className="flex justify-between border-b border-border/50 pb-2"> <div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Output Voltage</span> <span className="text-sm text-muted-foreground">Output Voltage</span>
<span className="text-sm font-medium text-green-500">{selectedUPS.output_voltage}</span> <span className="text-sm font-medium">{selectedUPS.output_voltage}</span>
</div> </div>
)} )}
{selectedUPS.output_voltage_nominal && ( {selectedUPS.output_voltage_nominal && (
@@ -1265,8 +1271,9 @@ export default function Hardware() {
)} )}
</div> </div>
</div> </div>
)}
{/* Driver Information */} {/* Driver */}
{(selectedUPS.driver_name || selectedUPS.driver_version) && ( {(selectedUPS.driver_name || selectedUPS.driver_version) && (
<div> <div>
<h3 className="text-sm font-semibold text-muted-foreground mb-3 uppercase tracking-wide">Driver</h3> <h3 className="text-sm font-semibold text-muted-foreground mb-3 uppercase tracking-wide">Driver</h3>
@@ -1283,12 +1290,30 @@ export default function Hardware() {
<span className="font-mono text-sm">{selectedUPS.driver_version}</span> <span className="font-mono text-sm">{selectedUPS.driver_version}</span>
</div> </div>
)} )}
{selectedUPS.driver_version_internal && (
<div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Internal Version</span>
<span className="font-mono text-sm">{selectedUPS.driver_version_internal}</span>
</div>
)}
{selectedUPS.driver_poll_freq && (
<div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Poll Frequency</span>
<span className="text-sm font-medium">{selectedUPS.driver_poll_freq}</span>
</div>
)}
{selectedUPS.driver_poll_interval && (
<div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Poll Interval</span>
<span className="text-sm font-medium">{selectedUPS.driver_poll_interval}</span>
</div>
)}
</div> </div>
</div> </div>
)} )}
{/* Configuration */} {/* Configuration */}
{(selectedUPS.delay_shutdown || selectedUPS.delay_start) && ( {(selectedUPS.delay_shutdown || selectedUPS.delay_start || selectedUPS.timer_shutdown) && (
<div> <div>
<h3 className="text-sm font-semibold text-muted-foreground mb-3 uppercase tracking-wide"> <h3 className="text-sm font-semibold text-muted-foreground mb-3 uppercase tracking-wide">
Configuration Configuration
@@ -1306,22 +1331,34 @@ export default function Hardware() {
<span className="text-sm font-medium">{selectedUPS.delay_start}</span> <span className="text-sm font-medium">{selectedUPS.delay_start}</span>
</div> </div>
)} )}
{selectedUPS.timer_shutdown && (
<div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Shutdown Timer</span>
<span className="text-sm font-medium">{selectedUPS.timer_shutdown}</span>
</div>
)}
{selectedUPS.timer_reboot && (
<div className="flex justify-between border-b border-border/50 pb-2">
<span className="text-sm text-muted-foreground">Reboot Timer</span>
<span className="text-sm font-medium">{selectedUPS.timer_reboot}</span>
</div>
)}
</div> </div>
</div> </div>
)} )}
{/* Raw Data Section - Collapsible */} {/* Raw Variables - Collapsible section with all UPS variables */}
{selectedUPS.raw_data && Object.keys(selectedUPS.raw_data).length > 0 && ( {selectedUPS.raw_variables && Object.keys(selectedUPS.raw_variables).length > 0 && (
<details className="rounded-lg border border-border/30 bg-background/50"> <details className="rounded-lg border border-border/30 bg-background/50">
<summary className="cursor-pointer p-4 font-medium text-sm hover:bg-background/80 transition-colors"> <summary className="cursor-pointer p-4 font-medium text-sm hover:bg-accent/50 transition-colors">
All UPS Variables ({Object.keys(selectedUPS.raw_data).length}) All UPS Variables ({Object.keys(selectedUPS.raw_variables).length})
</summary> </summary>
<div className="p-4 pt-0 max-h-96 overflow-y-auto"> <div className="p-4 pt-0 max-h-[300px] overflow-y-auto">
<div className="space-y-1 font-mono text-xs"> <div className="grid gap-1">
{Object.entries(selectedUPS.raw_data).map(([key, value]) => ( {Object.entries(selectedUPS.raw_variables).map(([key, value]) => (
<div key={key} className="flex justify-between border-b border-border/30 pb-1"> <div key={key} className="flex justify-between border-b border-border/50 pb-1 text-xs">
<span className="text-muted-foreground">{key}</span> <span className="font-mono text-muted-foreground">{key}</span>
<span className="text-foreground">{value as string}</span> <span className="font-mono">{value as string}</span>
</div> </div>
))} ))}
</div> </div>

208
AppImage/scripts/flask_server.py
View File

@@ -961,7 +961,6 @@ def get_smart_data(disk_name):
break break
elif smart_data['model'] != 'Unknown' or smart_data['serial'] != 'Unknown': elif smart_data['model'] != 'Unknown' or smart_data['serial'] != 'Unknown':
print(f"[v0] Extracted partial data from text output, continuing to next attempt...") print(f"[v0] Extracted partial data from text output, continuing to next attempt...")
else: else:
print(f"[v0] No usable output (return code {result_code}), trying next command...") print(f"[v0] No usable output (return code {result_code}), trying next command...")
@@ -1548,50 +1547,55 @@ def get_ipmi_power():
'power_meter': power_meter 'power_meter': power_meter
} }
#
def get_ups_info(): def get_ups_info():
"""Get UPS information from NUT (upsc) - supports both local and remote UPS""" """Get UPS information from NUT (upsc) - supports both local and remote UPS"""
ups_list = [] ups_list = []
try: try:
upsmon_conf = '/etc/nut/upsmon.conf'
configured_ups = [] configured_ups = []
if os.path.exists(upsmon_conf):
try: try:
with open(upsmon_conf, 'r') as f: with open('/etc/nut/upsmon.conf', 'r') as f:
for line in f: for line in f:
line = line.strip() line = line.strip()
# Look for MONITOR lines: MONITOR ups@hostname powervalue username password ("master"|"slave") # Parse MONITOR lines: MONITOR <upsname>@<hostname>:<port> <powervalue> <username> <password> <type>
if line.startswith('MONITOR') and not line.startswith('#'): if line.startswith('MONITOR') and not line.startswith('#'):
parts = line.split() parts = line.split()
if len(parts) >= 2: if len(parts) >= 2:
ups_identifier = parts[1] # Format: upsname@hostname or just upsname ups_identifier = parts[1] # e.g., "apc@localhost" or "ups@192.168.1.10"
configured_ups.append(ups_identifier) configured_ups.append(ups_identifier)
print(f"[v0] Found configured UPS in upsmon.conf: {ups_identifier}") print(f"[v0] Found configured UPS in upsmon.conf: {ups_identifier}")
except FileNotFoundError:
print("[v0] /etc/nut/upsmon.conf not found, will try local detection only")
except Exception as e: except Exception as e:
print(f"[v0] Error reading upsmon.conf: {e}") print(f"[v0] Error reading upsmon.conf: {e}")
result = subprocess.run(['upsc', '-l'], capture_output=True, text=True, timeout=5) all_ups_names = set(configured_ups)
local_ups = []
if result.returncode == 0:
local_ups = [ups.strip() for ups in result.stdout.strip().split('\n') if ups.strip()]
print(f"[v0] Found local UPS devices: {local_ups}")
all_ups = list(set(configured_ups + local_ups)) # Also try to list local UPS devices
if not all_ups:
print("[v0] No UPS devices found")
return {}
for ups_identifier in all_ups:
try: try:
result = subprocess.run(['upsc', '-l'], capture_output=True, text=True, timeout=5)
if result.returncode == 0:
local_ups = result.stdout.strip().split('\n')
for ups in local_ups:
if ups:
all_ups_names.add(ups)
print(f"[v0] Found local UPS: {ups}")
except Exception as e:
print(f"[v0] Error listing local UPS: {e}")
for ups_name in all_ups_names:
if not ups_name:
continue
ups_data = { ups_data = {
'name': ups_identifier, 'name': ups_name,
'raw_data': {} # Store all raw data for the modal 'raw_variables': {} # Store all raw variables for the modal
} }
# Get detailed UPS info try:
result = subprocess.run(['upsc', ups_identifier], capture_output=True, text=True, timeout=5) print(f"[v0] Querying UPS: {ups_name}")
result = subprocess.run(['upsc', ups_name], capture_output=True, text=True, timeout=5)
if result.returncode == 0: if result.returncode == 0:
for line in result.stdout.split('\n'): for line in result.stdout.split('\n'):
if ':' in line: if ':' in line:
@@ -1599,10 +1603,10 @@ def get_ups_info():
key = key.strip() key = key.strip()
value = value.strip() value = value.strip()
# Store all raw data # Store all raw variables
ups_data['raw_data'][key] = value ups_data['raw_variables'][key] = value
# Map common UPS variables for quick access # Device Information
if key == 'device.model': if key == 'device.model':
ups_data['model'] = value ups_data['model'] = value
elif key == 'device.mfr': elif key == 'device.mfr':
@@ -1611,96 +1615,160 @@ def get_ups_info():
ups_data['serial'] = value ups_data['serial'] = value
elif key == 'device.type': elif key == 'device.type':
ups_data['device_type'] = value ups_data['device_type'] = value
# Status
elif key == 'ups.status': elif key == 'ups.status':
ups_data['status'] = value ups_data['status'] = value
elif key == 'ups.beeper.status':
ups_data['beeper_status'] = value
elif key == 'ups.test.result':
ups_data['test_result'] = value
# Battery
elif key == 'battery.charge': elif key == 'battery.charge':
ups_data['battery_charge'] = f"{value}%" ups_data['battery_charge'] = f"{value}%"
ups_data['battery_charge_value'] = float(value) ups_data['battery_charge_raw'] = float(value)
elif key == 'battery.charge.low': elif key == 'battery.charge.low':
ups_data['battery_charge_low'] = f"{value}%" ups_data['battery_charge_low'] = f"{value}%"
elif key == 'battery.runtime': elif key == 'battery.runtime':
# Convert seconds to minutes
try: try:
runtime_sec = int(value) runtime_sec = int(value)
runtime_min = runtime_sec // 60 runtime_min = runtime_sec // 60
ups_data['time_left'] = f"{runtime_min} minutes" ups_data['time_left'] = f"{runtime_min} minutes"
ups_data['time_left_seconds'] = runtime_sec ups_data['battery_runtime_seconds'] = runtime_sec
except ValueError: except ValueError:
ups_data['time_left'] = value ups_data['time_left'] = value
elif key == 'battery.runtime.low': elif key == 'battery.runtime.low':
try: ups_data['battery_runtime_low'] = f"{value}s"
runtime_sec = int(value)
runtime_min = runtime_sec // 60
ups_data['battery_runtime_low'] = f"{runtime_min} minutes"
except ValueError:
ups_data['battery_runtime_low'] = value
elif key == 'battery.voltage': elif key == 'battery.voltage':
ups_data['battery_voltage'] = f"{value}V" ups_data['battery_voltage'] = f"{value}V"
elif key == 'battery.voltage.nominal': elif key == 'battery.voltage.nominal':
ups_data['battery_voltage_nominal'] = f"{value}V" ups_data['battery_voltage_nominal'] = f"{value}V"
elif key == 'battery.type': elif key == 'battery.type':
ups_data['battery_type'] = value ups_data['battery_type'] = value
elif key == 'battery.mfr.date':
ups_data['battery_mfr_date'] = value
# Power
elif key == 'ups.load': elif key == 'ups.load':
ups_data['load_percent'] = f"{value}%" ups_data['load_percent'] = f"{value}%"
ups_data['load_value'] = float(value) ups_data['load_raw'] = float(value)
elif key == 'ups.realpower': elif key == 'ups.realpower':
ups_data['real_power'] = f"{value}W" ups_data['real_power'] = f"{value}W"
elif key == 'ups.realpower.nominal': elif key == 'ups.realpower.nominal':
ups_data['real_power_nominal'] = f"{value}W" ups_data['realpower_nominal'] = f"{value}W"
elif key == 'ups.power': elif key == 'ups.power':
ups_data['apparent_power'] = f"{value}VA" ups_data['apparent_power'] = f"{value}VA"
elif key == 'ups.power.nominal': elif key == 'ups.power.nominal':
ups_data['apparent_power_nominal'] = f"{value}VA" ups_data['power_nominal'] = f"{value}VA"
# Input
elif key == 'input.voltage': elif key == 'input.voltage':
ups_data['line_voltage'] = f"{value}V"
ups_data['input_voltage'] = f"{value}V" ups_data['input_voltage'] = f"{value}V"
elif key == 'input.voltage.nominal': elif key == 'input.voltage.nominal':
ups_data['input_voltage_nominal'] = f"{value}V" ups_data['input_voltage_nominal'] = f"{value}V"
elif key == 'input.frequency': elif key == 'input.frequency':
ups_data['input_frequency'] = f"{value}Hz" ups_data['input_frequency'] = f"{value}Hz"
elif key == 'input.transfer.reason':
ups_data['transfer_reason'] = value
elif key == 'input.transfer.high':
ups_data['input_transfer_high'] = f"{value}V"
elif key == 'input.transfer.low':
ups_data['input_transfer_low'] = f"{value}V"
# Output
elif key == 'output.voltage': elif key == 'output.voltage':
ups_data['output_voltage'] = f"{value}V" ups_data['output_voltage'] = f"{value}V"
elif key == 'output.voltage.nominal': elif key == 'output.voltage.nominal':
ups_data['output_voltage_nominal'] = f"{value}V" ups_data['output_voltage_nominal'] = f"{value}V"
elif key == 'output.frequency': elif key == 'output.frequency':
ups_data['output_frequency'] = f"{value}Hz" ups_data['output_frequency'] = f"{value}Hz"
elif key == 'ups.beeper.status':
ups_data['beeper_status'] = value # Driver
elif key == 'ups.delay.shutdown':
ups_data['delay_shutdown'] = f"{value}s"
elif key == 'ups.delay.start':
ups_data['delay_start'] = f"{value}s"
elif key == 'ups.test.result':
ups_data['test_result'] = value
elif key == 'ups.firmware':
ups_data['firmware'] = value
elif key == 'driver.name': elif key == 'driver.name':
ups_data['driver_name'] = value ups_data['driver_name'] = value
elif key == 'driver.version': elif key == 'driver.version':
ups_data['driver_version'] = value ups_data['driver_version'] = value
elif key == 'driver.version.internal':
ups_data['driver_version_internal'] = value
elif key == 'driver.parameter.pollfreq':
ups_data['driver_poll_freq'] = value
elif key == 'driver.parameter.pollinterval':
ups_data['driver_poll_interval'] = value
# Firmware
elif key == 'ups.firmware':
ups_data['firmware'] = value
elif key == 'ups.mfr':
ups_data['ups_manufacturer'] = value
elif key == 'ups.mfr.date':
ups_data['ups_mfr_date'] = value
elif key == 'ups.productid':
ups_data['product_id'] = value
elif key == 'ups.vendorid':
ups_data['vendor_id'] = value
# Timers
elif key == 'ups.delay.shutdown':
ups_data['delay_shutdown'] = f"{value}s"
elif key == 'ups.delay.start':
ups_data['delay_start'] = f"{value}s"
elif key == 'ups.timer.shutdown':
ups_data['timer_shutdown'] = f"{value}s"
elif key == 'ups.timer.reboot':
ups_data['timer_reboot'] = f"{value}s"
ups_list.append(ups_data) ups_list.append(ups_data)
print(f"[v0] Successfully retrieved data for UPS: {ups_identifier}") print(f"[v0] Successfully queried UPS: {ups_name}")
else:
print(f"[v0] Failed to get data for UPS: {ups_identifier}")
except subprocess.TimeoutExpired:
print(f"[v0] Timeout querying UPS: {ups_name}")
except Exception as e: except Exception as e:
print(f"[v0] Error getting info for UPS {ups_identifier}: {e}") print(f"[v0] Error querying UPS {ups_name}: {e}")
if len(ups_list) == 0:
return {}
elif len(ups_list) == 1:
return ups_list[0]
else:
return {'ups_list': ups_list, 'count': len(ups_list)}
except FileNotFoundError: except FileNotFoundError:
print("[v0] upsc not found - NUT client not installed") print("[v0] upsc command not found - NUT client not installed")
except Exception as e: except Exception as e:
print(f"[v0] Error getting UPS info: {e}") print(f"[v0] Error in get_ups_info: {e}")
import traceback
traceback.print_exc()
return {} # Return first UPS for backward compatibility, or None if no UPS found
return ups_list[0] if ups_list else None
# </CHANGE>
def identify_temperature_sensor(sensor_name, adapter):
"""Identify what a temperature sensor corresponds to"""
sensor_lower = sensor_name.lower()
adapter_lower = adapter.lower() if adapter else ""
# CPU/Package temperatures
if "package" in sensor_lower or "tctl" in sensor_lower or "tccd" in sensor_lower:
return "CPU Package"
if "core" in sensor_lower:
core_num = re.search(r'(\d+)', sensor_name)
return f"CPU Core {core_num.group(1)}" if core_num else "CPU Core"
# Motherboard/Chipset
if "temp1" in sensor_lower and ("isa" in adapter_lower or "acpi" in adapter_lower):
return "Motherboard/Chipset"
if "pch" in sensor_lower or "chipset" in sensor_lower:
return "Chipset"
# Storage (NVMe, SATA)
if "nvme" in sensor_lower or "composite" in sensor_lower:
return "NVMe SSD"
if "sata" in sensor_lower or "ata" in sensor_lower:
return "SATA Drive"
# GPU
if any(gpu in adapter_lower for gpu in ["nouveau", "amdgpu", "radeon", "i915"]):
return "GPU"
# Network adapters
if "pci" in adapter_lower and "temp" in sensor_lower:
return "PCI Device"
return sensor_name
def get_temperature_info(): def get_temperature_info():
"""Get detailed temperature information from sensors command""" """Get detailed temperature information from sensors command"""
@@ -4265,22 +4333,22 @@ def api_prometheus():
if ups.get('battery_charge') is not None: if ups.get('battery_charge') is not None:
metrics.append(f'# HELP proxmox_ups_battery_charge_percent UPS battery charge percentage') metrics.append(f'# HELP proxmox_ups_battery_charge_percent UPS battery charge percentage')
metrics.append(f'# TYPE proxmox_ups_battery_charge_percent gauge') metrics.append(f'# TYPE proxmox_ups_battery_charge_percent gauge')
metrics.append(f'proxmox_ups_battery_charge_percent{{node="{node}",ups="{ups_name}"}} {ups["battery_charge_value"]} {timestamp}') # Use numeric value metrics.append(f'proxmox_ups_battery_charge_percent{{node="{node}",ups="{ups_name}"}} {ups["battery_charge_raw"]} {timestamp}') # Use raw value for metric
if ups.get('load_percent') is not None: # Changed from 'load' to 'load_percent' if ups.get('load_raw') is not None: # Changed from 'load' to 'load_percent'
metrics.append(f'# HELP proxmox_ups_load_percent UPS load percentage') metrics.append(f'# HELP proxmox_ups_load_percent UPS load percentage')
metrics.append(f'# TYPE proxmox_ups_load_percent gauge') metrics.append(f'# TYPE proxmox_ups_load_percent gauge')
metrics.append(f'proxmox_ups_load_percent{{node="{node}",ups="{ups_name}"}} {ups["load_value"]} {timestamp}') # Use numeric value metrics.append(f'proxmox_ups_load_percent{{node="{node}",ups="{ups_name}"}} {ups["load_raw"]} {timestamp}')
if ups.get('time_left_seconds') is not None: if ups.get('battery_runtime_seconds') is not None: # Use seconds for metric
metrics.append(f'# HELP proxmox_ups_runtime_seconds UPS runtime in seconds') metrics.append(f'# HELP proxmox_ups_runtime_seconds UPS runtime in seconds')
metrics.append(f'# TYPE proxmox_ups_runtime_seconds gauge') metrics.append(f'# TYPE proxmox_ups_runtime_seconds gauge')
metrics.append(f'proxmox_ups_runtime_seconds{{node="{node}",ups="{ups_name}"}} {ups["time_left_seconds"]} {timestamp}') metrics.append(f'proxmox_ups_runtime_seconds{{node="{node}",ups="{ups_name}"}} {ups["battery_runtime_seconds"]} {timestamp}')
if ups.get('input_voltage') is not None: if ups.get('input_voltage') is not None:
metrics.append(f'# HELP proxmox_ups_input_voltage_volts UPS input voltage in volts') metrics.append(f'# HELP proxmox_ups_input_voltage_volts UPS input voltage in volts')
metrics.append(f'# TYPE proxmox_ups_input_voltage_volts gauge') metrics.append(f'# TYPE proxmox_ups_input_voltage_volts gauge')
metrics.append(f'proxmox_ups_input_voltage_volts{{node="{node}",ups="{ups_name}"}} {ups["input_voltage"]} {timestamp}') # This is a string, might need conversion metrics.append(f'proxmox_ups_input_voltage_volts{{node="{node}",ups="{ups_name}"}} {float(ups["input_voltage"].replace("V", ""))} {timestamp}') # Extract numeric value
except Exception as e: except Exception as e:
print(f"[v0] Error getting hardware metrics for Prometheus: {e}") print(f"[v0] Error getting hardware metrics for Prometheus: {e}")

52
AppImage/types/hardware.ts
View File

@@ -77,11 +77,53 @@ export interface PowerSupply {
export interface UPS { export interface UPS {
name: string name: string
status: string status: string
battery_charge?: number model?: string
battery_runtime?: number manufacturer?: string
load?: number serial?: string
input_voltage?: number device_type?: string
output_voltage?: number firmware?: string
battery_charge?: string
battery_charge_raw?: number
battery_charge_low?: string
battery_runtime_seconds?: number
battery_runtime_low?: string
battery_voltage?: string
battery_voltage_nominal?: string
battery_type?: string
battery_mfr_date?: string
time_left?: string
load_percent?: string
load_raw?: number
real_power?: string
realpower_nominal?: string
apparent_power?: string
power_nominal?: string
input_voltage?: string
input_voltage_nominal?: string
input_frequency?: string
input_transfer_high?: string
input_transfer_low?: string
transfer_reason?: string
line_voltage?: string
output_voltage?: string
output_voltage_nominal?: string
output_frequency?: string
driver_name?: string
driver_version?: string
driver_version_internal?: string
driver_poll_freq?: string
driver_poll_interval?: string
ups_manufacturer?: string
ups_mfr_date?: string
product_id?: string
vendor_id?: string
beeper_status?: string
test_result?: string
delay_shutdown?: string
delay_start?: string
timer_shutdown?: string
timer_reboot?: string
raw_variables?: Record<string, string>
} }
export interface GPU { export interface GPU {