feat(per-instance-hook-scoping): scope observability + backup hooks by instance
This commit is contained in:
@@ -129,9 +129,10 @@ def post_backup_start(
|
||||
|
||||
@router.get("/jobs")
|
||||
def get_backup_jobs(
|
||||
service_id: str | None = None,
|
||||
store: SettingsStore = Depends(get_settings_store),
|
||||
) -> list[dict[str, Any]]:
|
||||
jobs = store.list_backup_jobs()
|
||||
jobs = store.list_backup_jobs(service_id=service_id)
|
||||
return jobs
|
||||
|
||||
|
||||
@@ -155,9 +156,10 @@ def get_backup_runs(
|
||||
job_id: str | None = None,
|
||||
status: str | None = None,
|
||||
limit: int = 50,
|
||||
service_id: str | None = None,
|
||||
store: SettingsStore = Depends(get_settings_store),
|
||||
) -> list[BackupRunResponse]:
|
||||
runs = store.list_backup_runs(job_id=job_id, status=status, limit=limit)
|
||||
runs = store.list_backup_runs(job_id=job_id, status=status, limit=limit, service_id=service_id)
|
||||
return [BackupRunResponse(**run) for run in runs]
|
||||
|
||||
|
||||
@@ -177,9 +179,12 @@ def get_backup_alerts(
|
||||
job_id: str | None = None,
|
||||
acknowledged: bool | None = None,
|
||||
severity: str | None = None,
|
||||
service_id: str | None = None,
|
||||
store: SettingsStore = Depends(get_settings_store),
|
||||
) -> list[BackupAlertResponse]:
|
||||
alerts = store.list_backup_alerts(job_id=job_id, acknowledged=acknowledged, severity=severity)
|
||||
alerts = store.list_backup_alerts(
|
||||
job_id=job_id, acknowledged=acknowledged, severity=severity, service_id=service_id,
|
||||
)
|
||||
return [BackupAlertResponse(**alert) for alert in alerts]
|
||||
|
||||
|
||||
|
||||
@@ -1075,10 +1075,16 @@ class SettingsStore:
|
||||
row = conn.execute("SELECT * FROM backup_jobs WHERE id = ?", (job_id,)).fetchone()
|
||||
return self._row_to_job(row) if row else None
|
||||
|
||||
def list_backup_jobs(self) -> list[dict[str, Any]]:
|
||||
def list_backup_jobs(self, service_id: str | None = None) -> list[dict[str, Any]]:
|
||||
self.init_schema()
|
||||
where = ""
|
||||
params: list[Any] = []
|
||||
if service_id:
|
||||
where = "WHERE service_id = ?"
|
||||
params.append(service_id)
|
||||
sql = f"SELECT * FROM backup_jobs {where} ORDER BY created_at DESC"
|
||||
with self.connect() as conn:
|
||||
rows = conn.execute("SELECT * FROM backup_jobs ORDER BY created_at DESC").fetchall()
|
||||
rows = conn.execute(sql, params).fetchall()
|
||||
return [self._row_to_job(row) for row in rows]
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
@@ -1167,6 +1173,7 @@ class SettingsStore:
|
||||
job_id: str | None = None,
|
||||
status: str | None = None,
|
||||
limit: int = 50,
|
||||
service_id: str | None = None,
|
||||
) -> list[dict[str, Any]]:
|
||||
self.init_schema()
|
||||
clauses: list[str] = []
|
||||
@@ -1177,6 +1184,9 @@ class SettingsStore:
|
||||
if status:
|
||||
clauses.append("status = ?")
|
||||
params.append(status)
|
||||
if service_id:
|
||||
clauses.append("job_id IN (SELECT id FROM backup_jobs WHERE service_id = ?)")
|
||||
params.append(service_id)
|
||||
where = f"WHERE {' AND '.join(clauses)}" if clauses else ""
|
||||
sql = f"SELECT * FROM backup_runs {where} ORDER BY created_at DESC LIMIT ?"
|
||||
params.append(max(1, min(int(limit), 200)))
|
||||
@@ -1257,6 +1267,7 @@ class SettingsStore:
|
||||
job_id: str | None = None,
|
||||
acknowledged: bool | None = None,
|
||||
severity: str | None = None,
|
||||
service_id: str | None = None,
|
||||
) -> list[dict[str, Any]]:
|
||||
self.init_schema()
|
||||
clauses: list[str] = []
|
||||
@@ -1270,6 +1281,9 @@ class SettingsStore:
|
||||
if severity:
|
||||
clauses.append("severity = ?")
|
||||
params.append(severity)
|
||||
if service_id:
|
||||
clauses.append("job_id IN (SELECT id FROM backup_jobs WHERE service_id = ?)")
|
||||
params.append(service_id)
|
||||
where = f"WHERE {' AND '.join(clauses)}" if clauses else ""
|
||||
sql = f"SELECT * FROM backup_alerts {where} ORDER BY created_at DESC"
|
||||
with self.connect() as conn:
|
||||
|
||||
Reference in New Issue
Block a user