Phase 2: Docker and OIDC auth

backend/src/media_library_viewer_api/routers/monitoring.py

@@ -2,13 +2,16 @@
 
 from __future__ import annotations
 
+import logging
 import time
 from typing import Any
 
 from fastapi import APIRouter, Depends
 
-from media_library_viewer_api.dependencies import get_ssh_client
 from media_library_viewer_api.clients.ssh import RemoteSSHClient
+from media_library_viewer_api.dependencies import get_ssh_client
+
+logger = logging.getLogger(__name__)
 from media_library_viewer_api.clients.resources import (
     disk_space,
     read_resource_metrics,
@@ -26,19 +29,26 @@ router = APIRouter(prefix="/api/monitoring", tags=["monitoring"])
 @router.get("/status")
 def get_status(ssh: RemoteSSHClient = Depends(get_ssh_client)) -> dict[str, str]:
     """Return collector running status."""
-    return {"status": resource_collector_status(ssh)}
+    status = resource_collector_status(ssh)
+    logger.info("Monitoring status requested: %s", status)
+    return {"status": status}
 
 
 @router.get("/metrics")
 def get_metrics(
-    max_lines: int = 1000,
-    last_seconds: int = 3600,
+    max_lines: int = 70_000,
+    last_seconds: int | None = None,
     ssh: RemoteSSHClient = Depends(get_ssh_client),
 ) -> dict[str, Any]:
     """Return resource metric samples from the remote collector."""
     rows = read_resource_metrics(ssh, max_lines=max_lines)
-    cutoff_ts = time.time() - last_seconds
-    filtered = [row for row in rows if float(row.get("ts", 0)) >= cutoff_ts]
+    if last_seconds is None:
+        filtered = rows
+        cutoff_ts = 0.0
+    else:
+        cutoff_ts = time.time() - last_seconds
+        filtered = [row for row in rows if float(row.get("ts", 0)) >= cutoff_ts]
+    logger.info("Monitoring metrics requested total=%s filtered=%s last_seconds=%s", len(rows), len(filtered), last_seconds)
     return {
         "samples": filtered,
         "total_samples": len(rows),
@@ -52,6 +62,7 @@ def get_disk_space(ssh: RemoteSSHClient = Depends(get_ssh_client)) -> dict[str,
     """Return disk space for the configured media root."""
     settings = get_settings()
     path = settings.media_root or "/"
+    logger.info("Monitoring disk requested path=%s", path)
     return disk_space(ssh, path)
 
 
@@ -59,6 +70,7 @@ def get_disk_space(ssh: RemoteSSHClient = Depends(get_ssh_client)) -> dict[str,
 def post_start(ssh: RemoteSSHClient = Depends(get_ssh_client)) -> dict[str, str]:
     """Start the remote resource collector."""
     message = start_resource_collector(ssh)
+    logger.info("Monitoring collector start result: %s", message)
     return {"message": message}
 
 
@@ -66,6 +78,7 @@ def post_start(ssh: RemoteSSHClient = Depends(get_ssh_client)) -> dict[str, str]
 def post_stop(ssh: RemoteSSHClient = Depends(get_ssh_client)) -> dict[str, str]:
     """Stop the remote resource collector."""
     message = stop_resource_collector(ssh)
+    logger.info("Monitoring collector stop result: %s", message)
     return {"message": message}
 
 
@@ -73,10 +86,13 @@ def post_stop(ssh: RemoteSSHClient = Depends(get_ssh_client)) -> dict[str, str]:
 def post_restart(ssh: RemoteSSHClient = Depends(get_ssh_client)) -> dict[str, str]:
     """Restart the remote resource collector."""
     message = restart_resource_collector(ssh)
+    logger.info("Monitoring collector restart result: %s", message)
     return {"message": message}
 
 
 @router.get("/diagnostics")
 def get_diagnostics(ssh: RemoteSSHClient = Depends(get_ssh_client)) -> dict[str, str]:
     """Return collector debug info for troubleshooting."""
-    return {"diagnostics": resource_collector_debug_info(ssh)}
+    diagnostics = resource_collector_debug_info(ssh)
+    logger.info("Monitoring diagnostics requested")
+    return {"diagnostics": diagnostics}