release 1.10.5: aptdeploy monpages job-only; full inventory on hacktivism
This commit is contained in:
parent
761e3d3c11
commit
1d71766a64
5 changed files with 15 additions and 8 deletions
2
VERSION
2
VERSION
|
|
@ -1 +1 @@
|
||||||
1.10.4
|
1.10.5
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@ Git tags: `vMAJOR.FEATURE.FIX` (e.g. `v1.8.0`). File `VERSION` omits the `v` pre
|
||||||
|
|
||||||
| Tag | Date (UTC) | Notes |
|
| 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.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.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. |
|
| **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. |
|
||||||
|
|
|
||||||
|
|
@ -194,17 +194,16 @@ build_urls() {
|
||||||
else
|
else
|
||||||
case "$inv" in
|
case "$inv" in
|
||||||
job)
|
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
|
_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|*)
|
full|auto|*)
|
||||||
# Always include this job’s paths (host-agent post-check).
|
# Always include this job’s paths (host-agent post-check).
|
||||||
_job_urls
|
_job_urls
|
||||||
# Stack inventory: GOA = landings + surface + aptdeploy; FP = only FP mon hosts.
|
# 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
|
if [ "$fam" = "goa" ] || [ "$fam" = "fp" ]; then
|
||||||
_catalog_urls "$fam"
|
_catalog_urls "$fam"
|
||||||
# On-disk discovery (err pages only exist after failed runs; extras welcome)
|
# On-disk discovery (err pages only exist after failed runs; extras welcome)
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,9 @@ export HTML_ERR_DIR="taler-monitoring-aptdeploy_err"
|
||||||
export HTML_URL_OK="/taler-monitoring-aptdeploy/"
|
export HTML_URL_OK="/taler-monitoring-aptdeploy/"
|
||||||
export HTML_URL_ERR="/taler-monitoring-aptdeploy_err/"
|
export HTML_URL_ERR="/taler-monitoring-aptdeploy_err/"
|
||||||
export PAGE_LABEL="taler-monitoring-aptdeploy"
|
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)
|
# Ensure all four apt-src containers (fresh rebuild + upgrade track)
|
||||||
if [ "${APT_DEPLOY_ENSURE:-1}" = "1" ] \
|
if [ "${APT_DEPLOY_ENSURE:-1}" = "1" ] \
|
||||||
|
|
|
||||||
|
|
@ -16,12 +16,16 @@ export INSIDE_MODE="${INSIDE_MODE:-local-podman}"
|
||||||
export LOCAL_STACK="${LOCAL_STACK:-1}"
|
export LOCAL_STACK="${LOCAL_STACK:-1}"
|
||||||
export CONTINUE_ON_ERROR="${CONTINUE_ON_ERROR:-1}"
|
export CONTINUE_ON_ERROR="${CONTINUE_ON_ERROR:-1}"
|
||||||
export RUN_TIMEOUT="${RUN_TIMEOUT:-600}"
|
export RUN_TIMEOUT="${RUN_TIMEOUT:-600}"
|
||||||
# stack checks only — aptdeploy has its own HTML path + timer:
|
# stack checks + full monpages inventory (landings + surface + aptdeploy bare/slash).
|
||||||
# run-aptdeploy-monitoring.sh → /taler-monitoring-aptdeploy* (taler.hacktivism.ch)
|
# 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 PHASES="${PHASES:-urls inside versions monpages}"
|
||||||
export MON_HOSTS="${MON_HOSTS:-bank.hacktivism.ch exchange.hacktivism.ch taler.hacktivism.ch}"
|
export MON_HOSTS="${MON_HOSTS:-bank.hacktivism.ch exchange.hacktivism.ch taler.hacktivism.ch}"
|
||||||
export HTML_OUT="${HTML_OUT:-$HOME/monitoring-sites-staging}"
|
export HTML_OUT="${HTML_OUT:-$HOME/monitoring-sites-staging}"
|
||||||
export DEPLOY_WWW_ROOT="${DEPLOY_WWW_ROOT:-/var/www/monitoring-sites}"
|
export DEPLOY_WWW_ROOT="${DEPLOY_WWW_ROOT:-/var/www/monitoring-sites}"
|
||||||
export APT_DEPLOY_ENSURE=0
|
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" "$@"
|
exec bash "$AGENT_DIR/run-host-report.sh" "$@"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue