Public changes compared with the previous published export: 89 files changed. Affected areas: - backend/app: 21 files - dependencies: 5 files - deployment and CI: 6 files - documentation: 2 files - frontend: 3 files - frontend/src: 20 files - project files: 1 file - tests: 30 files - unraid: 1 file Changed files: - Updated: ".env.example" - Updated: "Dockerfile.unraid" - Updated: "README.md" - Updated: "backend/Dockerfile" - Added: "backend/app/alerts.py" - Updated: "backend/app/auth.py" - Added: "backend/app/backups.py" - Updated: "backend/app/config_io.py" - Updated: "backend/app/demo.py" - Updated: "backend/app/discovery.py" - Updated: "backend/app/discovery_store.py" - Updated: "backend/app/docker_discovery.py" - Updated: "backend/app/events.py" - Updated: "backend/app/evidence.py" - Updated: "backend/app/health.py" - Updated: "backend/app/incidents.py" - Added: "backend/app/loops.py" - Updated: "backend/app/main.py" - Updated: "backend/app/models.py" - Updated: "backend/app/observation.py" - Updated: "backend/app/probes.py" - Added: "backend/app/response_cache.py" - Updated: "backend/app/scheduler.py" - Updated: "backend/app/semantic.py" - Updated: "backend/app/store.py" - Updated: "backend/pyproject.toml" - Updated: "backend/tests/test_api.py" - Updated: "backend/tests/test_config_io.py" - Updated: "backend/tests/test_demo.py" - Updated: "backend/tests/test_discovery_v120.py" - Updated: "backend/tests/test_health.py" - Updated: "backend/tests/test_probes.py" - Updated: "backend/tests/test_scheduler.py" - Updated: "backend/tests/test_v130_probe_reachability.py" - Updated: "backend/tests/test_v160_evidence_changes.py" - Added: "backend/tests/test_v163_alerts.py" - Added: "backend/tests/test_v163_backups.py" - Added: "backend/tests/test_v163_data_integrity.py" - Added: "backend/tests/test_v163_efficiency.py" - Added: "backend/tests/test_v163_health_performance.py" - Added: "backend/tests/test_v163_loops.py" - Added: "backend/tests/test_v163_management.py" - Added: "backend/tests/test_v163_realtime.py" - Added: "backend/tests/test_v163_security.py" - Added: "backend/tests/test_v163_semantic_etag.py" - Added: "compose.demo.yaml" - Updated: "compose.yaml" - Added: "docker-compose.broker.yml" - Updated: "docker-compose.yml" - Updated: "docs/ARCHITECTURE.md" - Added: "frontend/e2e/a11y.spec.ts" - Updated: "frontend/e2e/demo.spec.ts" - Updated: "frontend/index.html" - Updated: "frontend/nginx.conf" - Updated: "frontend/package-lock.json" - Updated: "frontend/package.json" - Updated: "frontend/playwright.config.ts" - Updated: "frontend/src/App.tsx" - Updated: "frontend/src/LivingEdge.tsx" - Added: "frontend/src/activityView.test.ts" - Added: "frontend/src/activityView.ts" - Updated: "frontend/src/api.ts" - Added: "frontend/src/apiAuth.test.ts" - Added: "frontend/src/components/ActionsMenu.tsx" - Added: "frontend/src/components/ConfirmDialog.test.tsx" - Added: "frontend/src/components/ConfirmDialog.tsx" - Added: "frontend/src/components/StatusIcon.tsx" - Updated: "frontend/src/demo/DemoWalkthrough.test.ts" - Updated: "frontend/src/demo/DemoWalkthrough.tsx" - Added: "frontend/src/elk-worker-url.d.ts" - Added: "frontend/src/labels.ts" - Updated: "frontend/src/main.tsx" - Added: "frontend/src/realtime/refreshPlan.test.ts" - Added: "frontend/src/realtime/refreshPlan.ts" - Updated: "frontend/src/realtime/useRealtimeEvents.ts" - Added: "frontend/src/routing/urlState.test.ts" - Added: "frontend/src/routing/urlState.ts" - Updated: "frontend/src/styles.css" - Added: "frontend/src/topology/GraphListView.test.tsx" - Added: "frontend/src/topology/GraphListView.tsx" - Updated: "frontend/src/topology/ServiceNode.tsx" - Updated: "frontend/src/topology/TopologyCommandBar.tsx" - Added: "frontend/src/topology/semanticGraph.test.ts" - Updated: "frontend/src/topology/semanticGraph.ts" - Added: "frontend/src/topologyLayout.test.ts" - Updated: "frontend/src/topologyLayout.ts" - Updated: "package-lock.json" - Updated: "package.json" - Updated: "unraid/my-servicemap.xml" Export provenance/manifests refreshed; excluded from the change summary. Publish curated ServiceMap source from af46f684e468dffd3a5190e28d3b572d4c26bfd7
74 lines
2.8 KiB
Python
74 lines
2.8 KiB
Python
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import logging
|
|
from time import monotonic
|
|
|
|
from .probes import probe_many
|
|
from .store import Store
|
|
|
|
logger = logging.getLogger("servicemap.scheduler")
|
|
|
|
|
|
async def scheduled_probe_loop(
|
|
store: Store,
|
|
*,
|
|
interval_seconds: int,
|
|
timeout_seconds: float,
|
|
retries: int,
|
|
concurrency: int,
|
|
retention_days: int,
|
|
event_retention_days: int | None = None,
|
|
) -> None:
|
|
next_due: dict[str, float] = {}
|
|
while True:
|
|
sleep_seconds = interval_seconds
|
|
try:
|
|
# The Explore demo is deliberately synthetic. Pausing scheduled
|
|
# probes while it is active keeps its seeded incident and history
|
|
# deterministic and avoids any dependency on external services.
|
|
if not getattr(store, "demo_active", lambda: False)():
|
|
services = store.list_services()
|
|
now = monotonic()
|
|
due = [
|
|
service
|
|
for service in services
|
|
if service.enabled
|
|
and service.monitoring_enabled
|
|
and now >= next_due.get(service.id, 0)
|
|
]
|
|
if due:
|
|
results = await probe_many(
|
|
due,
|
|
timeout_seconds=None,
|
|
retries=None,
|
|
concurrency=concurrency,
|
|
trigger="scheduled",
|
|
default_timeout_seconds=timeout_seconds,
|
|
default_retries=retries,
|
|
)
|
|
for result in results:
|
|
store.save_probe(result)
|
|
for service in due:
|
|
next_due[service.id] = now + (service.interval_seconds or interval_seconds)
|
|
next_intervals = [
|
|
service.interval_seconds or interval_seconds
|
|
for service in services
|
|
if service.enabled and service.monitoring_enabled
|
|
]
|
|
sleep_seconds = min([interval_seconds, *next_intervals]) if next_intervals else interval_seconds
|
|
else:
|
|
sleep_seconds = interval_seconds
|
|
if event_retention_days is None:
|
|
store.prune_probes(retention_days)
|
|
else:
|
|
# Events have their own (longer) retention; pruning them at the
|
|
# probe retention silently shortened the journal.
|
|
store.prune_probes(retention_days, event_retention_days)
|
|
except asyncio.CancelledError:
|
|
raise
|
|
except Exception: # pragma: no cover - defensive daemon boundary
|
|
logger.exception("Scheduled probe cycle failed")
|
|
|
|
await asyncio.sleep(max(1, sleep_seconds))
|