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

Update notification service

Browse Source
This commit is contained in:
MacRimi
2026-02-26 20:58:40 +01:00
parent 17eecfca9d
commit 0693acc07b
3 changed files with 61 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
AppImage/scripts/flask_notification_routes.py
View File

@@ -686,16 +686,6 @@ def proxmox_webhook():
else:
return _reject(400, 'empty_payload', 400)
# DEBUG: Capture raw webhook payload for parser analysis
import json as _json
try:
with open('/tmp/proxmenux_webhook_payload.log', 'a') as _f:
_f.write(f"\n{'='*80}\n{time.strftime('%Y-%m-%d %H:%M:%S')}\n")
_f.write(_json.dumps(payload, indent=2, default=str, ensure_ascii=False))
_f.write('\n')
except Exception:
pass
result = notification_manager.process_webhook(payload)
# Always return 200 to PVE -- a non-200 makes PVE report the webhook as broken.
# The 'accepted' field in the JSON body indicates actual processing status.

54
AppImage/scripts/notification_events.py
View File

@@ -571,11 +571,9 @@ class TaskWatcher:
self._thread: Optional[threading.Thread] = None
self._hostname = _hostname()
self._last_position = 0
# Track active vzdump jobs. While a vzdump is running, VM/CT
# start/stop/shutdown events are backup-induced (mode=stop/snapshot)
# and should NOT generate notifications.
self._active_vzdump_ts: float = 0 # timestamp of last vzdump start
self._VZDUMP_WINDOW = 14400 # 4h max backup window
# Cache for active vzdump detection
self._vzdump_active_cache: float = 0 # timestamp of last positive check
self._vzdump_cache_ttl = 5 # cache result for 5s
def start(self):
if self._running:
@@ -596,6 +594,29 @@ class TaskWatcher:
def stop(self):
self._running = False
def _is_vzdump_active(self) -> bool:
"""Check if a vzdump (backup) job is currently running.
Reads /var/log/pve/tasks/active which lists all running PVE tasks.
Result is cached for a few seconds to avoid excessive file reads.
"""
now = time.time()
if now - self._vzdump_active_cache < self._vzdump_cache_ttl:
return True # Recently confirmed active
active_file = '/var/log/pve/tasks/active'
try:
with open(active_file, 'r') as f:
for line in f:
# UPID format: UPID:node:pid:pstart:starttime:type:id:user:
if ':vzdump:' in line:
self._vzdump_active_cache = now
return True
except (OSError, IOError):
pass
return False
def _watch_loop(self):
"""Poll the task index file for new entries."""
while self._running:
@@ -656,22 +677,7 @@ class TaskWatcher:
event_type, default_severity = event_info
# ── Track active vzdump jobs ──
# When a vzdump starts, record its timestamp. While active, we
# suppress start/stop/shutdown of individual VMs -- those are just
# the backup stopping and restarting guests (mode=stop).
if task_type == 'vzdump':
if not status:
# vzdump just started
self._active_vzdump_ts = time.time()
else:
# vzdump finished -- clear after a small grace period
# (VMs may still be restarting)
def _clear_vzdump():
time.sleep(30)
self._active_vzdump_ts = 0
threading.Thread(target=_clear_vzdump, daemon=True,
name='clear-vzdump').start()
# Check if task failed
is_error = status and status != 'OK' and status != ''
@@ -721,10 +727,8 @@ class TaskWatcher:
# Exception: if a VM/CT FAILS to start after backup, that IS important.
_BACKUP_NOISE = {'vm_start', 'vm_stop', 'vm_shutdown', 'vm_restart',
'ct_start', 'ct_stop'}
vzdump_age = time.time() - self._active_vzdump_ts if self._active_vzdump_ts else float('inf')
if event_type in _BACKUP_NOISE and vzdump_age < self._VZDUMP_WINDOW:
# Allow through only if it's a FAILURE (e.g. VM failed to start)
if not is_error:
if event_type in _BACKUP_NOISE and not is_error:
if self._is_vzdump_active():
return
self._queue.put(NotificationEvent(

54
AppImage/scripts/notification_templates.py
View File

@@ -49,28 +49,38 @@ def _parse_vzdump_message(message: str) -> Optional[Dict[str, Any]]:
break
if header_idx >= 0:
for line in lines[header_idx + 1:]:
stripped = line.strip()
if not stripped or stripped.startswith('Total') or stripped.startswith('Logs') or stripped.startswith('='):
break
m = re.match(
r'\s*(\d+)\s+' # VMID
r'(\S+)\s+' # Name
r'(\S+)\s+' # Status (ok/error)
r'(\S+)\s+' # Time
r'([\d.]+\s+\S+)\s+' # Size (e.g. "1.423 GiB")
r'(\S+)', # Filename
line
)
if m:
vms.append({
'vmid': m.group(1),
'name': m.group(2),
'status': m.group(3),
'time': m.group(4),
'size': m.group(5),
'filename': m.group(6).split('/')[-1],
})
# Use column positions from the header to slice each row.
# Header: "VMID Name Status Time Size Filename"
header = lines[header_idx]
col_starts = []
for col_name in ['VMID', 'Name', 'Status', 'Time', 'Size', 'Filename']:
idx = header.find(col_name)
if idx >= 0:
col_starts.append(idx)
if len(col_starts) == 6:
for line in lines[header_idx + 1:]:
stripped = line.strip()
if not stripped or stripped.startswith('Total') or stripped.startswith('Logs') or stripped.startswith('='):
break
# Pad line to avoid index errors
padded = line.ljust(col_starts[-1] + 50)
vmid = padded[col_starts[0]:col_starts[1]].strip()
name = padded[col_starts[1]:col_starts[2]].strip()
status = padded[col_starts[2]:col_starts[3]].strip()
time_val = padded[col_starts[3]:col_starts[4]].strip()
size = padded[col_starts[4]:col_starts[5]].strip()
filename = padded[col_starts[5]:].strip()
if vmid and vmid.isdigit():
vms.append({
'vmid': vmid,
'name': name,
'status': status,
'time': time_val,
'size': size,
'filename': filename,
})
# ── Strategy 2: log-style (PBS / Proxmox Backup Server) ──
# Parse from the full vzdump log lines.