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

Update notification service

Browse Source
This commit is contained in:
MacRimi
2026-03-30 22:26:20 +02:00
parent 43f2ce52a5
commit 80afa789e7
5 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AppImage/scripts/health_monitor.py
View File

@@ -3148,7 +3148,7 @@ class HealthMonitor:
if inode: if inode:
inode_hint = 'root directory' if inode == '2' else f'inode #{inode}' inode_hint = 'root directory' if inode == '2' else f'inode #{inode}'
reason += f'\nAffected: {inode_hint}' reason += f'\nAffected: {inode_hint}'
reason += f'\nAction: Run "fsck /dev/{device}" (unmount first)' # Note: Action/recommendations are provided by AI when AI Suggestions is enabled
return reason return reason
# Out of memory # Out of memory

13
AppImage/scripts/health_persistence.py
View File

@@ -2154,10 +2154,12 @@ class HealthPersistence:
conn = self._get_conn() conn = self._get_conn()
cursor = conn.cursor() cursor = conn.cursor()
# Get all active (non-dismissed) observations # Get all active (non-dismissed) observations with device info from disk_registry
cursor.execute(''' cursor.execute('''
SELECT id, device_name, serial FROM disk_observations SELECT do.id, dr.device_name, dr.serial
WHERE dismissed = 0 FROM disk_observations do
JOIN disk_registry dr ON do.disk_registry_id = dr.id
WHERE do.dismissed = 0
''') ''')
observations = cursor.fetchall() observations = cursor.fetchall()
@@ -2171,14 +2173,15 @@ class HealthPersistence:
if not os.path.exists(dev_path) and not os.path.exists(base_path): if not os.path.exists(dev_path) and not os.path.exists(base_path):
cursor.execute(''' cursor.execute('''
UPDATE disk_observations SET dismissed = 1 UPDATE disk_observations SET dismissed = 1
WHERE id = ? WHERE id = ?
''', (obs_id,)) ''', (obs_id,))
dismissed_count += 1 dismissed_count += 1
conn.commit() conn.commit()
conn.close() conn.close()
print(f"[HealthPersistence] Cleaned up {dismissed_count} orphan observations") if dismissed_count > 0:
print(f"[HealthPersistence] Cleaned up {dismissed_count} orphan observations")
return dismissed_count return dismissed_count
except Exception as e: except Exception as e:
print(f"[HealthPersistence] Error cleaning orphan observations: {e}") print(f"[HealthPersistence] Error cleaning orphan observations: {e}")

8
AppImage/scripts/notification_events.py
View File

@@ -609,12 +609,10 @@ class JournalWatcher:
if inode: if inode:
inode_hint = 'root directory' if inode == '2' else f'inode #{inode}' inode_hint = 'root directory' if inode == '2' else f'inode #{inode}'
parts.append(f'Affected: {inode_hint}') parts.append(f'Affected: {inode_hint}')
if smart_health == 'FAILED': # Note: Specific recommendations are provided by AI when AI Suggestions is enabled
parts.append(f'Action: Disk is failing. Run "fsck /dev/{device}" (unmount first) and plan replacement') # Only include SMART status note (not an action)
elif smart_health == 'PASSED': if smart_health == 'PASSED':
parts.append(f'Note: SMART reports disk is healthy. This may be a transient error.') parts.append(f'Note: SMART reports disk is healthy. This may be a transient error.')
else:
parts.append(f'Action: Run "fsck /dev/{device}" (unmount first) and check "smartctl -a /dev/{base_dev}"')
enriched = '\n'.join(parts) enriched = '\n'.join(parts)
else: else:

3
AppImage/scripts/notification_manager.py
View File

@@ -775,6 +775,7 @@ class NotificationManager:
default_detail = 'detailed' if ch_name == 'email' else 'standard' default_detail = 'detailed' if ch_name == 'email' else 'standard'
detail_level = self._config.get(detail_level_key, default_detail) detail_level = self._config.get(detail_level_key, default_detail)
# Rich format (emojis) is a user preference per channel
rich_key = f'{ch_name}.rich_format' rich_key = f'{ch_name}.rich_format'
use_rich_format = self._config.get(rich_key, 'false') == 'true' use_rich_format = self._config.get(rich_key, 'false') == 'true'
@@ -1857,7 +1858,7 @@ class NotificationManager:
return {'checked': False, 'migrated': False, 'message': str(e)} return {'checked': False, 'migrated': False, 'message': str(e)}
# ─── Singleton (for server mode) ───────────────────────────────── # ─── Singleton (for server mode) ────────────<EFBFBD><EFBFBD>────────────────────
notification_manager = NotificationManager() notification_manager = NotificationManager()

36
AppImage/scripts/notification_templates.py
View File

@@ -398,7 +398,7 @@ def _format_system_startup(data: Dict[str, Any]) -> Tuple[str, str]:
return title, body return title, body
# ─── Severity Icons ────<EFBFBD><EFBFBD><EFBFBD>───────────────────────────────────────── # ─── Severity Icons ──────────────────────────────────────────────
SEVERITY_ICONS = { SEVERITY_ICONS = {
'CRITICAL': '\U0001F534', 'CRITICAL': '\U0001F534',
@@ -1165,12 +1165,12 @@ def get_default_enabled_events() -> Dict[str, bool]:
# Category-level header icons # Category-level header icons
CATEGORY_EMOJI = { CATEGORY_EMOJI = {
'vm_ct': '\U0001F5A5\uFE0F', # desktop computer 'vm_ct': '\U0001F5A5\uFE0F', # desktop computer
'backup': '\U0001F4BE', # floppy disk (backup) 'backup': '\U0001F4BE', # floppy disk (backup)
'resources': '\U0001F4CA', # bar chart 'resources': '\U0001F4CA', # bar chart
'storage': '\U0001F4BD', # minidisc / hard disk 'storage': '\U0001F4BD', # minidisc / hard disk
'network': '\U0001F310', # globe with meridians 'network': '\U0001F310', # globe with meridians
'security': '\U0001F6E1\uFE0F', # shield 'security': '\U0001F6E1\uFE0F', # shield
'cluster': '\U0001F517', # chain link 'cluster': '\U0001F517', # chain link
'services': '\u2699\uFE0F', # gear 'services': '\u2699\uFE0F', # gear
'health': '\U0001FA7A', # stethoscope 'health': '\U0001FA7A', # stethoscope
@@ -1181,9 +1181,9 @@ CATEGORY_EMOJI = {
# Event-specific title icons (override category default when present) # Event-specific title icons (override category default when present)
EVENT_EMOJI = { EVENT_EMOJI = {
# VM / CT # VM / CT
'vm_start': '\u25B6\uFE0F', # play button 'vm_start': '\u25B6\uFE0F', # play button
'vm_stop': '\u23F9\uFE0F', # stop button 'vm_stop': '\u23F9\uFE0F', # stop button
'vm_shutdown': '\u23CF\uFE0F', # eject 'vm_shutdown': '\u23CF\uFE0F', # eject
'vm_fail': '\U0001F4A5', # collision (crash) 'vm_fail': '\U0001F4A5', # collision (crash)
'vm_restart': '\U0001F504', # cycle 'vm_restart': '\U0001F504', # cycle
'ct_start': '\u25B6\uFE0F', 'ct_start': '\u25B6\uFE0F',
@@ -1197,7 +1197,7 @@ EVENT_EMOJI = {
'replication_fail': '\u274C', 'replication_fail': '\u274C',
'replication_complete': '\u2705', 'replication_complete': '\u2705',
# Backups # Backups
'backup_start': '\U0001F4BE\U0001F680', # 💾🚀 floppy + rocket 'backup_start': '\U0001F4BE\U0001F680', # 💾🚀 floppy + rocket
'backup_complete': '\U0001F4BE\u2705', # 💾✅ floppy + check 'backup_complete': '\U0001F4BE\u2705', # 💾✅ floppy + check
'backup_fail': '\U0001F4BE\u274C', # 💾❌ floppy + cross 'backup_fail': '\U0001F4BE\u274C', # 💾❌ floppy + cross
'snapshot_complete': '\U0001F4F8', # camera with flash 'snapshot_complete': '\U0001F4F8', # camera with flash
@@ -1310,22 +1310,30 @@ def enrich_with_emojis(event_type: str, title: str, body: str,
# This helps when everything comes concatenated # This helps when everything comes concatenated
preprocessed = body preprocessed = body
# Patterns that should start on a new line (with emoji prefix) # First, clean up duplicated device references like "/dev/sda: /dev/sda: /dev/sda [SAT]"
# Convert to just "/dev/sda [SAT]" or "/dev/sda:"
preprocessed = re.sub(r'(/dev/\w+):\s*\1:\s*\1', r'\1', preprocessed)
preprocessed = re.sub(r'(/dev/\w+):\s*\1', r'\1', preprocessed)
# Patterns that should start on a new line
line_break_patterns = [ line_break_patterns = [
(r';\s*/dev/', '\n/dev/'), # ;/dev/sdb -> newline + /dev/sdb (r';\s*/dev/', '\n/dev/'), # ;/dev/sdb -> newline + /dev/sdb
(r'Device:', '\nDevice:'), # Device: on new line (r'(?<=[a-z])\s+/dev/', '\n/dev/'), # "sectors /dev/sdb" -> newline before /dev/
(r'Error:', '\nError:'), # Error: on new line (r'(?<=\))\s*/dev/', '\n/dev/'), # ") /dev/sdb" -> newline before /dev/
(r'Action:', '\nAction:'), # Action: on new line (r'\bDevice:', '\nDevice:'), # Device: on new line
(r'Affected:', '\nAffected:'), # Affected: on new line (r'\bError:', '\nError:'), # Error: on new line
(r'\bAction:', '\nAction:'), # Action: on new line
(r'\bAffected:', '\nAffected:'), # Affected: on new line
(r'Device not currently', '\nDevice not currently'), # Note about missing device (r'Device not currently', '\nDevice not currently'), # Note about missing device
(r'SMART:', '\nSMART:'), # SMART status (r'\bSMART:', '\nSMART:'), # SMART status
] ]
for pattern, replacement in line_break_patterns: for pattern, replacement in line_break_patterns:
preprocessed = re.sub(pattern, replacement, preprocessed) preprocessed = re.sub(pattern, replacement, preprocessed)
# Clean up multiple newlines # Clean up multiple newlines and leading newlines
preprocessed = re.sub(r'\n{3,}', '\n\n', preprocessed) preprocessed = re.sub(r'\n{3,}', '\n\n', preprocessed)
preprocessed = re.sub(r'^\n+', '', preprocessed)
preprocessed = preprocessed.strip() preprocessed = preprocessed.strip()
# ── Extended emoji mappings for health/disk messages ── # ── Extended emoji mappings for health/disk messages ──