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
135 lines
4.6 KiB
Python
135 lines
4.6 KiB
Python
"""Health-evidence selection policy.
|
|
|
|
The policy is deliberately small and pure. Storage retains every provider
|
|
claim; this module decides which *current component-scoped* claim can answer
|
|
the direct-health question. It keeps aggregate AppOps health useful in the
|
|
inspector without ever treating it as a component probe.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from datetime import UTC, datetime, timedelta
|
|
|
|
from .models import (
|
|
EvidenceFreshness,
|
|
EvidenceProvider,
|
|
EvidenceScope,
|
|
HealthEvidence,
|
|
HealthResolution,
|
|
HealthResolutionReason,
|
|
HealthStatus,
|
|
)
|
|
|
|
_PROVIDER_PRIORITY = {
|
|
EvidenceProvider.MANUAL: 100,
|
|
EvidenceProvider.PROBE: 90,
|
|
EvidenceProvider.DOCKER: 80,
|
|
EvidenceProvider.APPOPS: 40,
|
|
EvidenceProvider.RUNTIME: 20,
|
|
}
|
|
|
|
|
|
def appops_health_status(value: str | None) -> HealthStatus | None:
|
|
"""Keep AppOps aggregate health scoped to the application it describes."""
|
|
|
|
return {
|
|
"unhealthy": HealthStatus.DOWN,
|
|
"down": HealthStatus.DOWN,
|
|
"warning": HealthStatus.DEGRADED,
|
|
"degraded": HealthStatus.DEGRADED,
|
|
"healthy": HealthStatus.HEALTHY,
|
|
}.get((value or "").casefold())
|
|
|
|
|
|
def utc_now() -> datetime:
|
|
return datetime.now(UTC)
|
|
|
|
|
|
def freshness_for(evidence: HealthEvidence, *, now: datetime | None = None) -> EvidenceFreshness:
|
|
"""Return freshness without mutating the persisted observation.
|
|
|
|
The bounded stale window is solely explanatory: stale and expired claims
|
|
are both excluded from health selection. Showing the distinction helps an
|
|
operator understand whether a provider is merely late or genuinely old.
|
|
"""
|
|
|
|
now = now or utc_now()
|
|
if evidence.valid_until >= now:
|
|
return EvidenceFreshness.FRESH
|
|
ttl = max(evidence.valid_until - evidence.observed_at, timedelta(seconds=1))
|
|
return (
|
|
EvidenceFreshness.STALE if evidence.valid_until + ttl >= now else EvidenceFreshness.EXPIRED
|
|
)
|
|
|
|
|
|
def with_freshness(evidence: HealthEvidence, *, now: datetime | None = None) -> HealthEvidence:
|
|
return evidence.model_copy(update={"freshness": freshness_for(evidence, now=now)})
|
|
|
|
|
|
def resolve_health(
|
|
evidence: list[HealthEvidence], *, now: datetime | None = None
|
|
) -> HealthResolution:
|
|
"""Resolve current direct health from independently persisted evidence."""
|
|
|
|
now = now or utc_now()
|
|
annotated = [with_freshness(item, now=now) for item in evidence]
|
|
eligible = [
|
|
item
|
|
for item in annotated
|
|
if item.active
|
|
and item.scope == EvidenceScope.COMPONENT
|
|
and item.freshness == EvidenceFreshness.FRESH
|
|
]
|
|
if not eligible:
|
|
component_claims = [
|
|
item for item in annotated if item.scope == EvidenceScope.COMPONENT and item.active
|
|
]
|
|
app_claims = [
|
|
item for item in annotated if item.scope == EvidenceScope.APPLICATION and item.active
|
|
]
|
|
if component_claims:
|
|
reason_code = (
|
|
HealthResolutionReason.STALE_EVIDENCE
|
|
if any(item.freshness == EvidenceFreshness.STALE for item in component_claims)
|
|
else HealthResolutionReason.EXPIRED_EVIDENCE
|
|
)
|
|
elif app_claims:
|
|
reason_code = HealthResolutionReason.APPLICATION_SCOPED_ONLY
|
|
else:
|
|
reason_code = HealthResolutionReason.NO_CURRENT_COMPONENT_EVIDENCE
|
|
explanation = (
|
|
"Alleen bewijs op applicatieniveau is actueel; het wordt getoond als herkomst en niet "
|
|
"gebruikt als componentgezondheid."
|
|
if app_claims
|
|
else "Er is geen actueel gezondheidsbewijs op componentniveau."
|
|
)
|
|
return HealthResolution(reason_code=reason_code, explanation=explanation, evidence=annotated)
|
|
|
|
ordered = sorted(
|
|
eligible,
|
|
key=lambda item: (
|
|
_PROVIDER_PRIORITY[item.provider],
|
|
item.confidence,
|
|
item.observed_at,
|
|
item.received_at,
|
|
item.id,
|
|
),
|
|
reverse=True,
|
|
)
|
|
selected = ordered[0]
|
|
conflict = len({item.status for item in eligible}) > 1
|
|
scope_note = " Tegenstrijdige actuele componentsignalen worden hieronder bewaard." if conflict else ""
|
|
return HealthResolution(
|
|
status=selected.status,
|
|
selected_evidence_id=selected.id,
|
|
selected_provider=selected.provider,
|
|
confidence=selected.confidence,
|
|
reason_code=HealthResolutionReason.SELECTED_COMPONENT_EVIDENCE,
|
|
explanation=(
|
|
f"{selected.provider.value} gekozen uit actueel bewijs op componentniveau "
|
|
f"(zekerheid {selected.confidence:.2f}).{scope_note}"
|
|
),
|
|
conflict=conflict,
|
|
evidence=annotated,
|
|
)
|