diff --git a/.gitignore b/.gitignore index 0b03d58..7829721 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ secrets/ __pycache__/ *.pyc *.pyo +.worktrees/* +!.worktrees/.gitkeep diff --git a/.worktrees/.gitkeep b/.worktrees/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/CLAUDE.md b/CLAUDE.md index 1c2b556..fcd297d 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -70,6 +70,13 @@ Optional overrides (not required by `just start`): - `PROMTAIL_HOST_LABEL` — overrides the `host` label Promtail attaches to log streams. Defaults to the container's `$HOSTNAME`. +- `HOSTNAME` — Promtail's `promtail.yml` substitutes `${HOSTNAME:-hermes}` into + the Loki `host` label. The Promtail container inherits `HOSTNAME` from the + `hostname:` field set on the `promtail` service in `docker-compose.yml`. When + deploying on a new host, set `hostname:` in `docker-compose.yml` (or set the + `HOSTNAME` env var explicitly) so each host's logs are distinguishable in + Loki. If unset, Promtail falls back to the container's runtime ID, which + changes on every restart and is not human-readable. - `CONTAINER_CMD` — runtime used by `scripts/backup.sh` and `scripts/restore.sh`. Defaults to `docker` (auto-promoted to `podman` if `podman-compose` is on `$PATH`). Justfile recipes pass `CONTAINER_CMD={{container_cmd}}` diff --git a/pixi.toml b/pixi.toml index 7e3a8f9..e8febd8 100644 --- a/pixi.toml +++ b/pixi.toml @@ -1,4 +1,4 @@ -[project] +[workspace] name = "project-argus" version = "0.2.0" description = "Observability stack for the HomericIntelligence mesh" diff --git a/scripts/import-dashboards.sh b/scripts/import-dashboards.sh index ce1f371..28e6d78 100755 --- a/scripts/import-dashboards.sh +++ b/scripts/import-dashboards.sh @@ -27,7 +27,8 @@ fi for f in "${files[@]}"; do echo "Importing $(basename "$f") ..." payload=$(jq -n --slurpfile dash "$f" '{"dashboard": $dash[0], "overwrite": true, "folderId": 0}') - http_code=$(curl -s -o /tmp/grafana_import_resp.json -w "%{http_code}" \ + http_code=$(curl -s --connect-timeout 5 -m 10 \ + -o /tmp/grafana_import_resp.json -w "%{http_code}" \ -u "$GRAFANA_AUTH" \ -H "Content-Type: application/json" \ -d "$payload" \