Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2026-08-01 21:36:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

update 1.2.2.2 beta

Browse Source
This commit is contained in:
MacRimi
2026-06-25 17:29:55 +02:00
parent 484f0ce897
commit a56afecccf
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppImage/ProxMenux-1.2.2.2-beta.AppImage
BIN
View File
Binary file not shown.
AppImage/ProxMenux-Monitor.AppImage.sha256
+1 -1
View File
@@ -1 +1 @@
82e84f7428c85a14c0eb4f8e779699548274858f22af3ffc913892634280c8b5 ProxMenux-1.2.2.2-beta.AppImage 4e84314fc310aba70a73aa76f6bd0e7ae7d5ea3bdc63c2e357fce7c2097423fd ProxMenux-1.2.2.2-beta.AppImage
AppImage/scripts/health_monitor.py
+18 -4
View File
@@ -1305,7 +1305,9 @@ class HealthMonitor:
t_status = temp_status.get('status', 'OK') t_status = temp_status.get('status', 'OK')
checks['cpu_temperature'] = { checks['cpu_temperature'] = {
'status': t_status, 'status': t_status,
'detail': 'Temperature elevated' if t_status != 'OK' else 'Normal' 'detail': 'Temperature elevated' if t_status != 'OK' else 'Normal',
'error_key': 'cpu_temperature',
'dismissable': True,
} }
else: else:
checks['cpu_temperature'] = { checks['cpu_temperature'] = {
@@ -1601,6 +1603,10 @@ class HealthMonitor:
error_key = f'disk_space_{mount_point}' error_key = f'disk_space_{mount_point}'
if fs_status['status'] != 'OK': if fs_status['status'] != 'OK':
issues.append(f"{mount_point}: {fs_status['reason']}") issues.append(f"{mount_point}: {fs_status['reason']}")
# Carry error_key into the check dict so
# _apply_dismiss_aware_status can flag this
# row as dismissed once acknowledged.
fs_status['error_key'] = error_key
storage_details[mount_point] = fs_status storage_details[mount_point] = fs_status
# Record persistent error for notifications # Record persistent error for notifications
usage = psutil.disk_usage(mount_point) usage = psutil.disk_usage(mount_point)
@@ -1632,10 +1638,16 @@ class HealthMonitor:
if zfs_pool_issues: if zfs_pool_issues:
for pool_name, pool_info in zfs_pool_issues.items(): for pool_name, pool_info in zfs_pool_issues.items():
issues.append(f'{pool_name}: {pool_info["reason"]}') issues.append(f'{pool_name}: {pool_info["reason"]}')
# Carry error_key into pool_info BEFORE pushing into
# storage_details, so _apply_dismiss_aware_status can
# mark the row as dismissed once acknowledged. real_pool
# gets computed twice (here + below) but both paths land
# on the same key.
real_pool = pool_info.get('pool_name', pool_name)
pool_info['error_key'] = f'zfs_pool_{real_pool}'
storage_details[pool_name] = pool_info storage_details[pool_name] = pool_info
# Record error for notification system # Record error for notification system
real_pool = pool_info.get('pool_name', pool_name)
zfs_error_key = f'zfs_pool_{real_pool}' zfs_error_key = f'zfs_pool_{real_pool}'
zfs_reason = f'ZFS pool {real_pool}: {pool_info["reason"]}' zfs_reason = f'ZFS pool {real_pool}: {pool_info["reason"]}'
try: try:
@@ -3032,7 +3044,8 @@ class HealthMonitor:
interface_details[interface] = { interface_details[interface] = {
'status': 'CRITICAL', 'status': 'CRITICAL',
'reason': alert_reason or 'Interface DOWN', 'reason': alert_reason or 'Interface DOWN',
'dismissable': True 'dismissable': True,
'error_key': error_key,
} }
else: else:
active_interfaces.add(interface) active_interfaces.add(interface)
@@ -3063,7 +3076,8 @@ class HealthMonitor:
checks[iface] = { checks[iface] = {
'status': detail.get('status', 'OK'), 'status': detail.get('status', 'OK'),
'detail': detail.get('reason', 'DOWN'), 'detail': detail.get('reason', 'DOWN'),
'dismissable': detail.get('dismissable', False) 'dismissable': detail.get('dismissable', True),
'error_key': detail.get('error_key') or iface,
} }
checks['connectivity'] = connectivity_check checks['connectivity'] = connectivity_check