feat: drill-down filters on overview and outdated agent version highlight

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
PTah
2026-06-10 09:21:21 +10:00
parent e65daa8c3b
commit f9d56621f6
14 changed files with 595 additions and 36 deletions
+80
View File
@@ -0,0 +1,80 @@
"""Сравнение версий агентов (ssh-monitor / rdp-login-monitor, формат X.Y.Z-SAC)."""
from __future__ import annotations
import re
from dataclasses import dataclass
from sqlalchemy import select
from sqlalchemy.orm import Session
from app.models import Host
_VERSION_RE = re.compile(r"^(\d+)\.(\d+)\.(\d+)(?:-SAC)?$", re.IGNORECASE)
_DEFAULT_LAG_THRESHOLD = 3
@dataclass(frozen=True, order=True)
class ParsedAgentVersion:
major: int
minor: int
patch: int
def parse_agent_version(raw: str | None) -> ParsedAgentVersion | None:
if not raw:
return None
text = raw.strip()
match = _VERSION_RE.match(text)
if not match:
return None
return ParsedAgentVersion(
major=int(match.group(1)),
minor=int(match.group(2)),
patch=int(match.group(3)),
)
def agent_version_lag(host: ParsedAgentVersion, latest: ParsedAgentVersion) -> int | None:
"""Отставание от latest: patch при том же major.minor, иначе None (любое отставание)."""
if host > latest:
return 0
if host.major != latest.major or host.minor != latest.minor:
return None
return latest.patch - host.patch
def is_agent_version_outdated(
host_version: str | None,
latest_version: str | None,
*,
lag_threshold: int = _DEFAULT_LAG_THRESHOLD,
) -> bool:
host = parse_agent_version(host_version)
latest = parse_agent_version(latest_version)
if host is None or latest is None or host >= latest:
return False
lag = agent_version_lag(host, latest)
if lag is None:
return True
return lag >= lag_threshold
def latest_agent_versions_by_product(db: Session) -> dict[str, str]:
rows = db.execute(
select(Host.product, Host.product_version).where(
Host.product_version.isnot(None),
Host.product_version != "",
)
).all()
best: dict[str, ParsedAgentVersion] = {}
best_raw: dict[str, str] = {}
for product, version in rows:
parsed = parse_agent_version(version)
if parsed is None:
continue
current = best.get(product)
if current is None or parsed > current:
best[product] = parsed
best_raw[product] = version.strip()
return best_raw
+36
View File
@@ -62,3 +62,39 @@ def count_stale_hosts(db: Session, stale_minutes: int) -> int:
for host_id in host_ids
if agent_status(hb_map.get(host_id), stale_minutes=stale_minutes) == "stale"
)
def apply_agent_status_host_filter(
stmt,
count_stmt,
agent_status_filter: str,
*,
stale_minutes: int,
):
"""Ограничить выборку Host по online / stale / unknown (как в agent_status)."""
from datetime import timedelta
hb_subq = (
select(Event.host_id, func.max(Event.received_at).label("last_hb"))
.where(Event.type == HEARTBEAT_TYPE)
.group_by(Event.host_id)
.subquery()
)
cutoff = datetime.now(timezone.utc) - timedelta(minutes=stale_minutes)
if agent_status_filter == "online":
join = stmt.join(hb_subq, Host.id == hb_subq.c.host_id)
count_join = count_stmt.join(hb_subq, Host.id == hb_subq.c.host_id)
cond = hb_subq.c.last_hb >= cutoff
return join.where(cond), count_join.where(cond)
if agent_status_filter == "stale":
join = stmt.join(hb_subq, Host.id == hb_subq.c.host_id)
count_join = count_stmt.join(hb_subq, Host.id == hb_subq.c.host_id)
cond = hb_subq.c.last_hb < cutoff
return join.where(cond), count_join.where(cond)
if agent_status_filter == "unknown":
join = stmt.outerjoin(hb_subq, Host.id == hb_subq.c.host_id)
count_join = count_stmt.outerjoin(hb_subq, Host.id == hb_subq.c.host_id)
cond = hb_subq.c.last_hb.is_(None)
return join.where(cond), count_join.where(cond)
return stmt, count_stmt