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

fix 1.23.5: per-job mon page publish (no full-tree rsync --delete)

Browse source 
Shared /var/www/monitoring-sites is multi-agent. Full-tree --delete wiped
sibling families (e.g. monitoring-max-ladder after main/surface runs).
Publish only HTML_OK_DIR/HTML_ERR_DIR per host; apply-monitoring-live merges.
This commit is contained in:
Hernâni Marques 2026-07-22 03:35:05 +02:00
parent 9b065c10ab
commit f38142cbd3
No known key found for this signature in database
7 changed files with 61 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
host-agent/ROOT-APPLY-MONITORING.md
View file

@ -35,11 +35,14 @@ merchant API as JSON **code 21**).
That script:
1. `rsync` staging HTML → `/var/www/monitoring-sites/` (incl. surface + aptdeploy)
1. **Merge**-rsync staging HTML → `/var/www/monitoring-sites/` (no full-tree `--delete`; preserves sibling agent pages missing from staging)
2. Makes tree writable for `hernani` (group `caddy` + ACL) so later runs self-sync
3. Installs prepared Caddyfile → `/etc/caddy/Caddyfile`, validates, reloads Caddy
4. Smoke-curls all monitoring URLs (must **not** be JSON `code:21`)
**Per-job publish (v1.23.5+):** host-agent timers only update their own page dirs
(`HTML_OK_DIR` / `HTML_ERR_DIR`). They must not wipe other families under the same host.
## Paths (only three families — suite name ≠ URL)
There is **no** public page `/taler-monitoring`. Each family needs **bare and slash**
@ -60,7 +63,8 @@ HTML is generated as **hernani** into
## Manual equivalent
```bash
rsync -a --delete $DEPLOY_STAGING (or $HOME/monitoring-sites-staging)/ /var/www/monitoring-sites/
# merge only — no --delete (shared multi-agent tree)
rsync -a $DEPLOY_STAGING (or $HOME/monitoring-sites-staging)/ /var/www/monitoring-sites/
chown -R hernani:caddy /var/www/monitoring-sites && chmod -R g+rwX /var/www/monitoring-sites
sudo $KOOPA_CADDY_DIR/apply.sh # or apply-monitoring-live.sh
```
@ -70,7 +74,7 @@ Expect **200** (HTML with sticky bar). Not merchant JSON `code:21`.
## After each monitoring run (if www is not hernani-writable)
```bash
rsync -a --delete $DEPLOY_STAGING (or $HOME/monitoring-sites-staging)/ /var/www/monitoring-sites/
rsync -a $DEPLOY_STAGING (or $HOME/monitoring-sites-staging)/ /var/www/monitoring-sites/
chown -R caddy:caddy /var/www/monitoring-sites
```