hernani/taler-monitoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

release 1.9.4: restore aptdeploy mon pages in GOA inventory

Browse source
This commit is contained in:
Hernâni Marques 2026-07-19 01:16:07 +02:00
parent ea95fb3d8d
commit 229ef9383e
No known key found for this signature in database
GPG key ID: CB5738652768F7E9
5 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
check_monitoring_pages.sh
View file

@ -99,16 +99,17 @@ _host_allowed() {
esac
}
# Public page layout (v1.8.0+ simplified):
# Public page layout (v1.9.4+):
# • 9 landing stacks → /monitoring/ (+ /monitoring_err/ when present)
# • ecosystem software/versions inventory → only
# https://taler.hacktivism.ch/taler-monitoring-surface/
# https://taler.hacktivism.ch/taler-monitoring-surface_err/
# Legacy /taler-monitoring-{mail,mattermost,aptdeploy}* are NOT first-class pages.
# • ecosystem software/versions → taler.hacktivism.ch/taler-monitoring-surface(+_err)/
# • apt-src deploy tests → taler.hacktivism.ch/taler-monitoring-aptdeploy(+_err)/
# Legacy /taler-monitoring-{mail,mattermost}* stay folded into surface (no first-class pages).
_path_allowed() {
case "$1" in
monitoring|monitoring_err|taler-monitoring-surface|taler-monitoring-surface_err) return 0 ;;
monitoring|monitoring_err|\
taler-monitoring-surface|taler-monitoring-surface_err|\
taler-monitoring-aptdeploy|taler-monitoring-aptdeploy_err) return 0 ;;
*) return 1 ;;
esac
}
@ -147,8 +148,9 @@ _catalog_urls() {
for h in bank.hacktivism.ch exchange.hacktivism.ch taler.hacktivism.ch; do
printf 'https://%s/monitoring/\n' "$h"
done
# ecosystem surface only (versions / software found in Taler universe)
# ecosystem surface (versions / software) + apt-src deploy mon page
printf 'https://taler.hacktivism.ch/taler-monitoring-surface/\n'
printf 'https://taler.hacktivism.ch/taler-monitoring-aptdeploy/\n'
;;
fp)
for h in $MON_HOSTS; do
@ -158,12 +160,13 @@ _catalog_urls() {
done
;;
all|nine)
# optional: all nine landings + surface
# optional: all nine landings + surface + aptdeploy
while IFS= read -r h; do
[ -n "$h" ] || continue
printf 'https://%s/monitoring/\n' "$h"
done < <(_landing_nine)
printf 'https://taler.hacktivism.ch/taler-monitoring-surface/\n'
printf 'https://taler.hacktivism.ch/taler-monitoring-aptdeploy/\n'
;;
esac
}
@ -192,15 +195,16 @@ build_urls() {
case "$inv" in
job)
_job_urls
# v1.9.0: normal GOA runs always require surface page (content-checked)
# 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; FP = only FP mon hosts.
# Stack inventory: GOA = landings + surface + aptdeploy; FP = only FP mon hosts.
if [ "$fam" = "goa" ] || [ "$fam" = "fp" ]; then
_catalog_urls "$fam"
# On-disk discovery (err pages only exist after failed runs; extras welcome)
@ -489,7 +493,7 @@ if [ "$ec" -ne 0 ]; then
echo " FP: only FP mon hosts are checked — wire Infomaniak vhost for /monitoring*"
fi
if [ "$_fam" = "goa" ]; then
echo " GOA: bank/exchange/taler /monitoring/ + taler-monitoring-surface (v1.8+ layout)"
echo " GOA: bank/exchange/taler /monitoring/ + surface + aptdeploy (v1.9.4+ layout)"
fi
# Staging vs public diagnosis (host-agent sets MONPAGES_STAGING_BASE / HTML_OUT)
_stg="${MONPAGES_STAGING_BASE:-${HTML_OUT:-${HTML_BASE:-$HOME/monitoring-sites-staging}}}"