Compare commits

..

No commits in common. "128af149753f0a0c4203670725131894d34ae070" and "36eae5df82210288c2c25d93e8c47a64ceb4279a" have entirely different histories.

2 changed files with 2 additions and 22 deletions

View File

@ -107,24 +107,7 @@ for d in config grafana grafana/provisioning kafka-data zk-data zk-log \
$SUDO mkdir -p "$OBMP_DATA_ROOT/$d" $SUDO mkdir -p "$OBMP_DATA_ROOT/$d"
done done
# Container processes run as assorted UIDs; lab-permissive perms. # Container processes run as assorted UIDs; lab-permissive perms.
# EXCEPT postgres/: postgres enforces its own perms and refuses to start if $SUDO chmod -R 777 "$OBMP_DATA_ROOT" 2>/dev/null || true
# its SSL key is group/world-accessible. A blanket 777 over an EXISTING data
# tree makes psql_server.key 0777 -> FATAL on every re-deploy (fresh installs
# are unaffected because the key is generated after this runs). Leave the
# postgres tree alone; the image entrypoint owns it.
for _p in "$OBMP_DATA_ROOT"/*; do
[ "$(basename "$_p")" = "postgres" ] && continue
$SUDO chmod -R 777 "$_p" 2>/dev/null || true
done
# Postgres bind dirs just need to exist and be reachable; the container
# entrypoint chowns/chmods PGDATA itself on init.
$SUDO chmod 777 "$OBMP_DATA_ROOT" "$OBMP_DATA_ROOT/postgres" 2>/dev/null || true
# Repair the re-deploy damage if a previous setup.sh already clobbered an
# initialized data dir: re-tighten the SSL key/cert so postgres will boot.
if [ -f "$OBMP_DATA_ROOT/postgres/data/psql_server.key" ]; then
$SUDO chmod 600 "$OBMP_DATA_ROOT/postgres/data/psql_server.key" \
"$OBMP_DATA_ROOT/postgres/data/psql_server.crt" 2>/dev/null || true
fi
# --- Grafana provisioning + dashboards -------------------------------------- # --- Grafana provisioning + dashboards --------------------------------------
# Provisioning YAML points Grafana at /var/lib/grafana/dashboards/... (bind- # Provisioning YAML points Grafana at /var/lib/grafana/dashboards/... (bind-

View File

@ -1,5 +1,2 @@
# 1.30+ required: older telegraf pins Docker API 1.24 in [[inputs.docker]], FROM telegraf:1.28-alpine
# which docker-ce >= 29 rejects (min supported API 1.40). Newer telegraf
# negotiates the API version with the daemon.
FROM telegraf:1.33-alpine
COPY telegraf.conf /etc/telegraf/telegraf.conf COPY telegraf.conf /etc/telegraf/telegraf.conf