diff --git a/VERSION b/VERSION index 18b3114..db77e0e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.10.4 +1.10.5 diff --git a/VERSIONS.md b/VERSIONS.md index 7b0bad9..56645f3 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -17,6 +17,7 @@ Git tags: `vMAJOR.FEATURE.FIX` (e.g. `v1.8.0`). File `VERSION` omits the `v` pre | Tag | Date (UTC) | Notes | |-----|------------|--------| +| **v1.10.5** | 2026-07-19 | **Fix:** aptdeploy monpages **job-only** (own `/taler-monitoring-aptdeploy*`); full GOA mon inventory + bare URL checks stay on **hacktivism** general run — no bank/exchange/surface monpages noise on aptdeploy HTML. | | **v1.10.4** | 2026-07-19 | **Fix:** suite **auto-upgrade strict** (`SUITE_UPDATE_STRICT=1` default — abort on fetch fail); monpages ERROR on **bootstrap** HTML; ship mytops-stage timer/service units; host-agent refuses stale tree. | | **v1.10.3** | 2026-07-19 | **Bugfix:** sticky ERROR only from check badges (`┌ ERROR`) / `ERROR monpages`; ignore git `HEAD is now at …` commit subjects that mention ERROR. | | **v1.10.2** | 2026-07-19 | **Bugfix:** sticky ERROR count — classify with word-boundary `\bERROR\b` (not substring); avoids false red from git “wrote-errors” commit lines and similar. | diff --git a/check_monitoring_pages.sh b/check_monitoring_pages.sh index 3a0e7aa..fd27b64 100755 --- a/check_monitoring_pages.sh +++ b/check_monitoring_pages.sh @@ -194,17 +194,16 @@ build_urls() { else case "$inv" in job) + # Only this host-agent job’s HTML paths (MON_HOSTS + HTML_URL_OK/_ERR). + # Specialized timers (aptdeploy, surface) must not inherit GOA full catalog + # (no bank/exchange /monitoring bare-URL noise on the aptdeploy page). _job_urls - # GOA: always require surface + aptdeploy pages (content-checked) - if [ "$fam" = "goa" ]; then - printf 'https://taler.hacktivism.ch/taler-monitoring-surface/\n' - printf 'https://taler.hacktivism.ch/taler-monitoring-aptdeploy/\n' - fi ;; full|auto|*) # Always include this job’s paths (host-agent post-check). _job_urls # Stack inventory: GOA = landings + surface + aptdeploy; FP = only FP mon hosts. + # Full inventory belongs on the general stack run (run-hacktivism-monitoring). if [ "$fam" = "goa" ] || [ "$fam" = "fp" ]; then _catalog_urls "$fam" # On-disk discovery (err pages only exist after failed runs; extras welcome) diff --git a/host-agent/run-aptdeploy-monitoring.sh b/host-agent/run-aptdeploy-monitoring.sh index 33fa2dd..dd8b245 100755 --- a/host-agent/run-aptdeploy-monitoring.sh +++ b/host-agent/run-aptdeploy-monitoring.sh @@ -32,6 +32,9 @@ export HTML_ERR_DIR="taler-monitoring-aptdeploy_err" export HTML_URL_OK="/taler-monitoring-aptdeploy/" export HTML_URL_ERR="/taler-monitoring-aptdeploy_err/" export PAGE_LABEL="taler-monitoring-aptdeploy" +# monpages: only this job’s /taler-monitoring-aptdeploy* — not bank/exchange +# landings or surface (those belong to run-hacktivism-monitoring / surface timer). +export MONPAGES_INVENTORY="${MONPAGES_INVENTORY:-job}" # Ensure all four apt-src containers (fresh rebuild + upgrade track) if [ "${APT_DEPLOY_ENSURE:-1}" = "1" ] \ diff --git a/host-agent/run-hacktivism-monitoring.sh b/host-agent/run-hacktivism-monitoring.sh index 037cf63..02132b8 100755 --- a/host-agent/run-hacktivism-monitoring.sh +++ b/host-agent/run-hacktivism-monitoring.sh @@ -16,12 +16,16 @@ export INSIDE_MODE="${INSIDE_MODE:-local-podman}" export LOCAL_STACK="${LOCAL_STACK:-1}" export CONTINUE_ON_ERROR="${CONTINUE_ON_ERROR:-1}" export RUN_TIMEOUT="${RUN_TIMEOUT:-600}" -# stack checks only — aptdeploy has its own HTML path + timer: -# run-aptdeploy-monitoring.sh → /taler-monitoring-aptdeploy* (taler.hacktivism.ch) +# stack checks + full monpages inventory (landings + surface + aptdeploy bare/slash). +# Specialized pages also have their own timers; full outside-in inventory lives here. +# run-aptdeploy-monitoring.sh → monpages job-only for /taler-monitoring-aptdeploy* +# run-surface-monitoring.sh → monpages job-only for /taler-monitoring-surface* export PHASES="${PHASES:-urls inside versions monpages}" export MON_HOSTS="${MON_HOSTS:-bank.hacktivism.ch exchange.hacktivism.ch taler.hacktivism.ch}" export HTML_OUT="${HTML_OUT:-$HOME/monitoring-sites-staging}" export DEPLOY_WWW_ROOT="${DEPLOY_WWW_ROOT:-/var/www/monitoring-sites}" export APT_DEPLOY_ENSURE=0 +# full GOA mon catalog (not job-only) +export MONPAGES_INVENTORY="${MONPAGES_INVENTORY:-auto}" exec bash "$AGENT_DIR/run-host-report.sh" "$@"