From 341504f1ad63489ccd375bec9e3866987ce98380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A2ni=20Marques?= Date: Sun, 19 Jul 2026 01:51:13 +0200 Subject: [PATCH] release 1.10.11: force surface/aptdeploy job scope (MON_HOSTS) --- VERSION | 2 +- VERSIONS.md | 1 + host-agent/run-aptdeploy-monitoring.sh | 13 ++++++------- host-agent/run-host-report.sh | 2 ++ host-agent/run-surface-monitoring.sh | 10 +++++----- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/VERSION b/VERSION index 2ee4474..d90bb28 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.10.10 +1.10.11 diff --git a/VERSIONS.md b/VERSIONS.md index 6ca9de2..5140f11 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.11** | 2026-07-19 | **Bugfix:** surface/aptdeploy wrappers **force** MON_HOSTS+PHASES+MONPAGES_INVENTORY (env cannot expand job to bank/exchange); wrap more mon knobs. | | **v1.10.10** | 2026-07-19 | **Bugfix:** monpages bare code 21 is WARN again by default (slash form remains ERROR); bare redir still needs live Caddy `redir *` — set MONPAGES_BARE_STRICT=1 to enforce. | | **v1.10.9** | 2026-07-19 | **Bugfix:** stats policy INFO no longer says bare “ERROR” (false #first-error on www.stats-01); extract_errors only from `┌ ERROR` badges. | | **v1.10.8** | 2026-07-19 | **Docs/clarity:** only three public mon URL families (`/monitoring`, `/taler-monitoring-surface`, `/taler-monitoring-aptdeploy`) each bare+slash(+_err); suite name ≠ path; no `/taler-monitoring` page. | diff --git a/host-agent/run-aptdeploy-monitoring.sh b/host-agent/run-aptdeploy-monitoring.sh index dd8b245..bd7c46d 100755 --- a/host-agent/run-aptdeploy-monitoring.sh +++ b/host-agent/run-aptdeploy-monitoring.sh @@ -20,10 +20,10 @@ export SKIP_SSH=0 export CONTINUE_ON_ERROR="${CONTINUE_ON_ERROR:-1}" # four containers + checks; allow long wall export RUN_TIMEOUT="${RUN_TIMEOUT:-1800}" -# dedicated job: always aptdeploy only -export PHASES="${PHASES:-aptdeploy monpages}" -# Only merchant public front — not bank/exchange -export MON_HOSTS="${MON_HOSTS:-taler.hacktivism.ch}" +# dedicated job: always aptdeploy only (force — do not inherit main-timer env) +export PHASES="aptdeploy monpages" +# Public HTML only on taler.hacktivism.ch (not bank/exchange landings) +export MON_HOSTS="taler.hacktivism.ch" export HTML_OUT="${HTML_OUT:-$HOME/monitoring-sites-staging}" export DEPLOY_WWW_ROOT="${DEPLOY_WWW_ROOT:-/var/www/monitoring-sites}" @@ -32,9 +32,8 @@ 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}" +# monpages: only this job’s paths on taler.hacktivism.ch +export 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-host-report.sh b/host-agent/run-host-report.sh index cfabd66..825a563 100755 --- a/host-agent/run-host-report.sh +++ b/host-agent/run-host-report.sh @@ -39,6 +39,8 @@ _wrap_keys=( RUN_TIMEOUT STATE_NAME AGENT_LABEL MON_HOSTS TALER_DOMAIN DEPLOY_WWW_ROOT INSIDE_PODMAN INSIDE_MODE LOCAL_STACK SKIP_SSH CONTINUE_ON_ERROR AUTH401_CONTINUE APT_DEPLOY_ENSURE SURFACE_SCOPE TALER_DOMAIN_FROM_CLI STRICT_EXIT SOURCE_SUITE_PATH + MONPAGES_INVENTORY MONPAGES_CHECK_BARE MONPAGES_BARE_STRICT MONPAGES_REQUIRE_PUBLIC + CHECK_BANK MERCHANT_REQUIRED CHECK_LANDING ) for _k in "${_wrap_keys[@]}"; do if [ -n "${!_k+x}" ]; then diff --git a/host-agent/run-surface-monitoring.sh b/host-agent/run-surface-monitoring.sh index 04fbc02..f9d5098 100755 --- a/host-agent/run-surface-monitoring.sh +++ b/host-agent/run-surface-monitoring.sh @@ -27,10 +27,10 @@ export INSIDE_MODE="${INSIDE_MODE:-local-podman}" export CONTINUE_ON_ERROR="${CONTINUE_ON_ERROR:-1}" export RUN_TIMEOUT="${RUN_TIMEOUT:-2400}" -# All ecosystem checks → one surface HTML report -export PHASES="${PHASES:-surface mattermost mail versions monpages}" +# All ecosystem checks → one surface HTML report (force — do not inherit main-timer env) +export PHASES="surface mattermost mail versions monpages" -export MON_HOSTS="${MON_HOSTS:-taler.hacktivism.ch}" +export MON_HOSTS="taler.hacktivism.ch" export HTML_OUT="${HTML_OUT:-$HOME/monitoring-sites-staging}" export DEPLOY_WWW_ROOT="${DEPLOY_WWW_ROOT:-/var/www/monitoring-sites}" @@ -43,8 +43,8 @@ export PAGE_LABEL="taler-monitoring-surface" export SURFACE_SCOPE="${SURFACE_SCOPE:-ecosystem}" export TALER_DOMAIN_FROM_CLI=0 export APT_DEPLOY_ENSURE=0 -# monpages job-only for this path (surface HTML); not the 9 landings -export MONPAGES_INVENTORY="${MONPAGES_INVENTORY:-job}" +# monpages job-only for surface paths on taler.hacktivism.ch +export MONPAGES_INVENTORY="job" # package behind → ERROR (v1.8.0) export TALER_PKG_BEHIND="${TALER_PKG_BEHIND:-error}"