feat(F6-4): соответствие сервис-контейнер, исправления safe-update под yq v4

This commit is contained in:
root committed 2026-10-14 14:46:58 +03:00
1 parent a4ba2e4f29
commit cb8aebe711
9 files changed
+574 -33

No files matched your search

+58
View File
@@ -0,0 +1,58 @@
#!/bin/bash
# ============================================================
# apply-containers.sh — прописывает соответствие сервис → контейнер
# ============================================================
# Записывает в реестр обновлений поле container: по нему кнопка
# «Обновить» находит нужный контейнер, а исполнитель определяет версию.
#
# Автоподбор по подстроке ошибается там, где в одном CT живёт несколько
# сервисов с похожими именами: matrix подхватывал matrix-coturn,
# calibre — oauth2-proxy-calibre. Такие случаи перечислены явно.
#
# Запуск: bash apply-containers.sh
# ============================================================
set -uo pipefail
SERVICES_FILE="${SERVICES_FILE:-/root/buryan-infra/ops/update-manager/services.yaml}"
declare -A FIX=(
[matrix]=matrix-synapse
[calibre]=calibre-web
[authentik]=authentik-security-server-1
[npm]=npm-app-1
[uptime-kuma]=uptime_kuma
[openclaw]=openclaw
[n8n]=n8n
)
declare -A MAP
for svc in $(yq -r '.services | keys[]' "$SERVICES_FILE"); do
ct=$(yq -r ".services.${svc}.ct_id // \"\"" "$SERVICES_FILE")
[ -n "$ct" ] || continue
c="${FIX[$svc]:-}"
if [ -z "$c" ]; then
map=$(pct exec "$ct" -- docker ps --format '{{.Names}} {{.Image}}' 2>/dev/null)
[ -n "$map" ] || continue
c=$(echo "$map" | awk -v s="$svc" '$1 == s {print $1; exit}')
[ -z "$c" ] && c=$(echo "$map" | awk -v s="$svc" \
'index(tolower($1), tolower(s)) {print $1; exit}')
[ -z "$c" ] && c=$(echo "$map" | awk -v s="$svc" \
'index(tolower($2), tolower(s)) {print $1; exit}')
fi
[ -n "$c" ] || continue
MAP[$svc]="$c"
done
cp -n "$SERVICES_FILE" "$SERVICES_FILE.bak-$(date +%Y%m%d-%H%M%S)" 2>/dev/null || true
for svc in "${!MAP[@]}"; do
yq -i ".services.${svc}.container = \"${MAP[$svc]}\"" "$SERVICES_FILE"
printf '%-16s -> %s\n' "$svc" "${MAP[$svc]}"
done
echo
echo "итог: $(yq -r '[.services[] | select(.container != null)] | length' "$SERVICES_FILE") сервисов с контейнером из $(yq -r '.services | length' "$SERVICES_FILE")"
+51
View File
@@ -0,0 +1,51 @@
#!/bin/bash
# ============================================================
# map-containers.sh — сопоставление сервисов реестра и контейнеров
# ============================================================
# Реестр обновлений (services.yaml) оперирует именами сервисов, а уведомления
# о новых версиях приходят с именами контейнеров Docker. Чтобы кнопка
# «Обновить» приводила к нужному сервису, нужно соответствие между ними.
#
# Скрипт НИЧЕГО не меняет — только показывает, что с чем сопоставилось.
# Запуск: bash map-containers.sh
# ============================================================
set -uo pipefail
SERVICES_FILE="${SERVICES_FILE:-/root/buryan-infra/ops/update-manager/services.yaml}"
printf '%-22s %-5s %-26s %s\n' СЕРВИС CT КОНТЕЙНЕР ОСТАЛЬНЫЕ-В-CT
printf '%s\n' '-------------------------------------------------------------------------------------'
unmatched=0
for svc in $(yq -r '.services | keys[]' "$SERVICES_FILE"); do
ct=$(yq -r ".services.${svc}.ct_id // \"\"" "$SERVICES_FILE")
[ -n "$ct" ] || continue
map=$(pct exec "$ct" -- docker ps --format '{{.Names}} {{.Image}}' 2>/dev/null)
if [ -z "$map" ]; then
printf '%-22s %-5s %-26s %s\n' "$svc" "$ct" '— нет docker —' ''
continue
fi
# 1) точное совпадение имени контейнера
c=$(echo "$map" | awk -v s="$svc" '$1 == s {print $1; exit}')
# 2) имя контейнера содержит имя сервиса
[ -z "$c" ] && c=$(echo "$map" | awk -v s="$svc" \
'index(tolower($1), tolower(s)) {print $1; exit}')
# 3) образ содержит имя сервиса
[ -z "$c" ] && c=$(echo "$map" | awk -v s="$svc" \
'index(tolower($2), tolower(s)) {print $1; exit}')
others=$(echo "$map" | awk '{print $1}' | grep -vx "$c" | tr '\n' ' ')
if [ -n "$c" ]; then
printf '%-22s %-5s %-26s %s\n' "$svc" "$ct" "$c" "$others"
else
printf '%-22s %-5s %-26s %s\n' "$svc" "$ct" 'НЕ НАЙДЕН' "$others"
unmatched=$((unmatched + 1))
fi
done
echo
echo "без сопоставления: $unmatched"
View File
Whitespace-only changes.
+4 -4
View File
@@ -48,15 +48,15 @@ fi
SERVICE="$1"
CT_ID=$(yq -r ".services.${SERVICE}.ct_id // empty" "$SERVICES_FILE")
CT_ID=$(yq -r ".services.${SERVICE}.ct_id // \"\"" "$SERVICES_FILE")
[ -n "$CT_ID" ] || fail "сервис '$SERVICE' не найден в реестре $SERVICES_FILE"
IMAGE_HINT=$(yq -r ".services.${SERVICE}.image // empty" "$SERVICES_FILE")
HEALTH_URL=$(yq -r ".services.${SERVICE}.healthcheck.url // empty" "$SERVICES_FILE")
IMAGE_HINT=$(yq -r ".services.${SERVICE}.image // \"\"" "$SERVICES_FILE")
HEALTH_URL=$(yq -r ".services.${SERVICE}.healthcheck.url // \"\"" "$SERVICES_FILE")
HEALTH_TIMEOUT=$(yq -r ".services.${SERVICE}.healthcheck.timeout // 15" "$SERVICES_FILE")
HEALTH_RETRIES=$(yq -r ".services.${SERVICE}.healthcheck.retries // 3" "$SERVICES_FILE")
HEALTH_AUTH=$(yq -r ".services.${SERVICE}.healthcheck.auth_required // false" "$SERVICES_FILE")
ACCEPT_EXTRA=$(yq -r ".services.${SERVICE}.healthcheck.accept_codes // empty" "$SERVICES_FILE")
ACCEPT_EXTRA=$(yq -r ".services.${SERVICE}.healthcheck.accept_codes // \"\"" "$SERVICES_FILE")
CRITICAL=$(yq -r ".services.${SERVICE}.critical // false" "$SERVICES_FILE")
SERVICE_TYPE=$(yq -r ".services.${SERVICE}.type // \"docker\"" "$SERVICES_FILE")
+27 -28
View File
@@ -13,7 +13,7 @@ services:
retries: 3
critical: true
backup: snapshot
container: npm-app-1
authentik:
ct_id: 114
compose_path: /opt/authentik
@@ -23,7 +23,7 @@ services:
retries: 3
critical: true
backup: snapshot
container: authentik-security-server-1
gitea:
ct_id: 140
compose_path: /opt/gitea
@@ -33,7 +33,7 @@ services:
retries: 3
critical: true
backup: snapshot
container: gitea
vaultwarden:
ct_id: 109
compose_path: /opt/vaultwarden
@@ -43,7 +43,7 @@ services:
retries: 3
critical: true
backup: snapshot
container: vaultwarden
matrix:
ct_id: 155
compose_path: /opt/matrix
@@ -53,7 +53,7 @@ services:
retries: 3
critical: true
backup: snapshot
container: matrix-synapse
# === АВТОМАТИЗАЦИЯ ===
n8n:
ct_id: 108
@@ -64,7 +64,7 @@ services:
retries: 3
critical: true
backup: snapshot
container: n8n
# === MONITORING & UTILS ===
prometheus:
ct_id: 134
@@ -75,7 +75,7 @@ services:
retries: 3
critical: false
backup: snapshot
container: prometheus
grafana:
ct_id: 113
compose_path: /opt/grafana
@@ -85,7 +85,7 @@ services:
retries: 3
critical: false
backup: snapshot
container: grafana
uptime-kuma:
ct_id: 107
compose_path: /opt/uptime-kuma
@@ -95,7 +95,7 @@ services:
retries: 3
critical: false
backup: snapshot
container: uptime_kuma
# === PORTAL & DASHBOARDS ===
dashy:
ct_id: 102
@@ -106,7 +106,7 @@ services:
retries: 3
critical: false
backup: snapshot
container: dashy
# === FILES & DOCS ===
paperless:
ct_id: 105
@@ -117,7 +117,7 @@ services:
retries: 3
critical: false
backup: snapshot
container: paperless
syncthing:
ct_id: 139
compose_path: /opt/syncthing
@@ -127,7 +127,7 @@ services:
retries: 3
critical: false
backup: snapshot
container: syncthing
linkding:
ct_id: 127
compose_path: /opt/linkding
@@ -137,7 +137,7 @@ services:
retries: 3
critical: false
backup: snapshot
container: linkding
# === MEDIA STACK ===
jellyfin:
ct_id: 103
@@ -148,7 +148,7 @@ services:
retries: 3
critical: false
backup: snapshot
container: jellyfin
plex:
ct_id: 116
compose_path: /opt/plex
@@ -158,7 +158,7 @@ services:
retries: 3
critical: false
backup: snapshot
container: plex
sonarr:
ct_id: 117
compose_path: /opt/sonarr
@@ -168,7 +168,7 @@ services:
retries: 3
critical: false
backup: snapshot
container: sonarr
radarr:
ct_id: 118
compose_path: /opt/radarr
@@ -178,7 +178,7 @@ services:
retries: 3
critical: false
backup: snapshot
container: radarr
prowlarr:
ct_id: 119
compose_path: /opt/prowlarr
@@ -188,7 +188,7 @@ services:
retries: 3
critical: false
backup: snapshot
container: prowlarr
bazarr:
ct_id: 120
compose_path: /opt/bazarr
@@ -198,7 +198,7 @@ services:
retries: 3
critical: false
backup: snapshot
container: bazarr
overseerr:
ct_id: 121
compose_path: /opt/overseerr
@@ -208,7 +208,7 @@ services:
retries: 3
critical: false
backup: snapshot
container: overseerr
tautulli:
ct_id: 122
compose_path: /opt/tautulli
@@ -218,7 +218,7 @@ services:
retries: 3
critical: false
backup: snapshot
container: tautulli
navidrome:
ct_id: 125
compose_path: /opt/navidrome
@@ -228,7 +228,7 @@ services:
retries: 3
critical: false
backup: snapshot
container: navidrome
# === READING & FINANCE ===
calibre:
ct_id: 111
@@ -239,7 +239,7 @@ services:
retries: 3
critical: false
backup: snapshot
container: calibre-web
freshrss:
ct_id: 111
compose_path: /opt/freshrss
@@ -249,7 +249,7 @@ services:
retries: 3
critical: false
backup: snapshot
container: freshrss
mealie:
ct_id: 110
compose_path: /opt/mealie
@@ -259,20 +259,18 @@ services:
retries: 3
critical: false
backup: snapshot
container: mealie
# === NATIVE SERVICES (не Docker, apt-based) ===
postgres-rbac:
ct_id: 151
type: native
critical: true
backup: pgdump # pg_dump всей БД перед обновлением
backup: pgdump # pg_dump всей БД перед обновлением
headscale:
ct_id: 201
type: native
critical: false
backup: snapshot
# === EXPERIMENTAL ===
openclaw:
ct_id: 115
@@ -283,3 +281,4 @@ services:
retries: 3
critical: false
backup: snapshot
container: openclaw
@@ -0,0 +1,285 @@
# Реестр сервисов для Update Manager (полный спектр)
# Поле 'critical' определяет приоритет отката
# 'type': docker (по умолчанию) | native (apt/binary)
services:
# === КРИТИЧЕСКАЯ ИНФРАСТРУКТУРА ===
npm:
ct_id: 101
compose_path: /opt/npm
healthcheck:
url: http://192.168.1.101:81/api/nginx/proxy-hosts
timeout: 10
retries: 3
critical: true
backup: snapshot
authentik:
ct_id: 114
compose_path: /opt/authentik
healthcheck:
url: http://192.168.1.114:9000/-/health/live/
timeout: 15
retries: 3
critical: true
backup: snapshot
gitea:
ct_id: 140
compose_path: /opt/gitea
healthcheck:
url: http://192.168.1.140:3000/api/v1/version
timeout: 15
retries: 3
critical: true
backup: snapshot
vaultwarden:
ct_id: 109
compose_path: /opt/vaultwarden
healthcheck:
url: http://192.168.1.109:8081/alive
timeout: 10
retries: 3
critical: true
backup: snapshot
matrix:
ct_id: 155
compose_path: /opt/matrix
healthcheck:
url: http://192.168.1.155:8008/health
timeout: 15
retries: 3
critical: true
backup: snapshot
# === АВТОМАТИЗАЦИЯ ===
n8n:
ct_id: 108
compose_path: /opt/n8n
healthcheck:
url: http://192.168.1.108:5678/healthz
timeout: 15
retries: 3
critical: true
backup: snapshot
# === MONITORING & UTILS ===
prometheus:
ct_id: 134
compose_path: /opt/prometheus
healthcheck:
url: http://192.168.1.134:9090/-/healthy
timeout: 10
retries: 3
critical: false
backup: snapshot
grafana:
ct_id: 113
compose_path: /opt/grafana
healthcheck:
url: http://192.168.1.113:3000/api/health
timeout: 10
retries: 3
critical: false
backup: snapshot
uptime-kuma:
ct_id: 107
compose_path: /opt/uptime-kuma
healthcheck:
url: http://192.168.1.107:3001/api/status-page/heartbeat
timeout: 10
retries: 3
critical: false
backup: snapshot
# === PORTAL & DASHBOARDS ===
dashy:
ct_id: 102
compose_path: /opt/dashy
healthcheck:
url: http://192.168.1.102:8080/
timeout: 10
retries: 3
critical: false
backup: snapshot
# === FILES & DOCS ===
paperless:
ct_id: 105
compose_path: /opt/paperless
healthcheck:
url: http://192.168.1.105:8000/api/status/
timeout: 15
retries: 3
critical: false
backup: snapshot
syncthing:
ct_id: 139
compose_path: /opt/syncthing
healthcheck:
url: http://192.168.1.139:8384/rest/system/version
timeout: 10
retries: 3
critical: false
backup: snapshot
linkding:
ct_id: 127
compose_path: /opt/linkding
healthcheck:
url: http://192.168.1.127:3000/
timeout: 10
retries: 3
critical: false
backup: snapshot
# === MEDIA STACK ===
jellyfin:
ct_id: 103
compose_path: /opt/jellyfin
healthcheck:
url: http://192.168.1.103:8096/health
timeout: 10
retries: 3
critical: false
backup: snapshot
plex:
ct_id: 116
compose_path: /opt/plex
healthcheck:
url: http://192.168.1.116:32400/identity
timeout: 10
retries: 3
critical: false
backup: snapshot
sonarr:
ct_id: 117
compose_path: /opt/sonarr
healthcheck:
url: http://192.168.1.117:8989/api/v3/system/status
timeout: 10
retries: 3
critical: false
backup: snapshot
radarr:
ct_id: 118
compose_path: /opt/radarr
healthcheck:
url: http://192.168.1.118:7878/api/v3/system/status
timeout: 10
retries: 3
critical: false
backup: snapshot
prowlarr:
ct_id: 119
compose_path: /opt/prowlarr
healthcheck:
url: http://192.168.1.119:9696/api/v1/system/status
timeout: 10
retries: 3
critical: false
backup: snapshot
bazarr:
ct_id: 120
compose_path: /opt/bazarr
healthcheck:
url: http://192.168.1.120:6767/api/system/status
timeout: 10
retries: 3
critical: false
backup: snapshot
overseerr:
ct_id: 121
compose_path: /opt/overseerr
healthcheck:
url: http://192.168.1.121:5055/api/v1/status
timeout: 10
retries: 3
critical: false
backup: snapshot
tautulli:
ct_id: 122
compose_path: /opt/tautulli
healthcheck:
url: http://192.168.1.122:8181/status
timeout: 10
retries: 3
critical: false
backup: snapshot
navidrome:
ct_id: 125
compose_path: /opt/navidrome
healthcheck:
url: http://192.168.1.125:4533/ping
timeout: 10
retries: 3
critical: false
backup: snapshot
# === READING & FINANCE ===
calibre:
ct_id: 111
compose_path: /opt/calibre-web
healthcheck:
url: http://192.168.1.111:8083/
timeout: 10
retries: 3
critical: false
backup: snapshot
freshrss:
ct_id: 111
compose_path: /opt/freshrss
healthcheck:
url: http://192.168.1.111:8090/
timeout: 10
retries: 3
critical: false
backup: snapshot
mealie:
ct_id: 110
compose_path: /opt/mealie
healthcheck:
url: http://192.168.1.110:9925/api/app/about
timeout: 10
retries: 3
critical: false
backup: snapshot
# === NATIVE SERVICES (не Docker, apt-based) ===
postgres-rbac:
ct_id: 151
type: native
critical: true
backup: pgdump # pg_dump всей БД перед обновлением
headscale:
ct_id: 201
type: native
critical: false
backup: snapshot
# === EXPERIMENTAL ===
openclaw:
ct_id: 115
compose_path: /opt/openclaw
healthcheck:
url: http://192.168.1.115:8080/
timeout: 10
retries: 3
critical: false
backup: snapshot
+116
View File
@@ -0,0 +1,116 @@
# Реестр сервисов для Update Manager
# Поле 'critical' определяет приоритет отката (critical: true = немедленный откат при fail)
services:
# === CRITICAL ===
authentik:
ct_id: 114
compose_path: /opt/authentik
image: ghcr.io/goauthentik/server
healthcheck:
url: http://192.168.1.114:9000/-/health/live/
timeout: 10
retries: 3
critical: true
backup: snapshot # pct snapshot перед обновлением
n8n:
ct_id: 108
compose_path: /opt/automation-lxc/n8n
image: n8nio/n8n
healthcheck:
url: http://192.168.1.108:5678/healthz
timeout: 15
retries: 3
critical: true
backup: snapshot
# === MEDIA (non-critical, good for testing) ===
jellyfin:
ct_id: 103
compose_path: /opt/jellyfin
image: jellyfin/jellyfin
healthcheck:
url: http://192.168.1.103:8096/health
timeout: 10
retries: 3
critical: false
backup: snapshot
dashy:
ct_id: 102
compose_path: /opt/dashy
image: lissy93/dashy
healthcheck:
url: http://192.168.1.102:8080/
timeout: 10
retries: 3
critical: false
backup: snapshot
gitea:
ct_id: 140
compose_path: /opt/gitea
image: gitea/gitea
healthcheck:
url: http://192.168.1.140:3000/api/v1/version
timeout: 15
retries: 3
critical: true
backup: snapshot
# === UTILITIES ===
npm:
ct_id: 101
compose_path: /opt/npm
image: jc21/nginx-proxy-manager
healthcheck:
url: http://192.168.1.101:81/api/nginx/proxy-hosts
timeout: 10
retries: 3
critical: false
backup: snapshot
vaultwarden:
ct_id: 109
compose_path: /opt/vaultwarden
image: vaultwarden/server
healthcheck:
url: http://192.168.1.109:80/alive
timeout: 10
retries: 3
critical: true
backup: snapshot
paperless:
ct_id: 105
compose_path: /opt/paperless
image: ghcr.io/paperless-ngx/paperless-ngx
healthcheck:
url: http://192.168.1.105:8000/api/status/
timeout: 15
retries: 3
critical: false
backup: snapshot
syncthing:
ct_id: 139
compose_path: /opt/syncthing
image: lscr.io/linuxserver/syncthing
healthcheck:
url: http://192.168.1.139:8384/rest/system/version
timeout: 10
retries: 3
critical: false
backup: snapshot
linkding:
ct_id: 127
compose_path: /opt/linkding
image: sissbruecker/linkding
healthcheck:
url: http://192.168.1.127:9090/health
timeout: 10
retries: 3
critical: false
backup: snapshot
+30 -1
View File
@@ -20,6 +20,7 @@ set -uo pipefail
REPO_ROOT="/root/buryan-infra"
SAFE_UPDATE="$REPO_ROOT/ops/update-manager/safe-update.sh"
SERVICES_FILE="$REPO_ROOT/ops/update-manager/services.yaml"
LOG_FILE="$REPO_ROOT/ops/update-manager/runner.log"
PG_HOST="${PG_HOST:-192.168.1.151}"
@@ -49,6 +50,20 @@ q_set() { # $1 = значение результата, $2 = SQL с :'res'
psql -h "$PG_HOST" -U "$PG_USER" -d "$PG_DB" -v res="$1" -tAc "$2" 2>>"$LOG_FILE"
}
resolve_service() {
# Уведомления приходят с именами контейнеров, а реестр оперирует именами
# сервисов. Переводим одно в другое: сначала проверяем прямое совпадение,
# затем ищем сервис, у которого этот контейнер указан в поле container.
local name="$1"
if yq -e ".services.${name}" "$SERVICES_FILE" >/dev/null 2>&1; then
echo "$name"
return 0
fi
yq -r --arg c "$name" \
'.services | to_entries[] | select(.value.container == $c) | .key' \
"$SERVICES_FILE" 2>/dev/null | head -1
}
notify() { # $1 = текст сообщения
local token
token=$(grep -m1 '^ALERT_TOKEN=' /root/bots-tokens.env 2>/dev/null | cut -d= -f2-)
@@ -86,6 +101,20 @@ log "взята задача $id: $service -> $newver (CT $ct)"
q "UPDATE update_queue SET status='running', started_at=now(), attempts=attempts+1 WHERE id=$id" >/dev/null
# Уведомления приходят с именем контейнера — переводим в имя сервиса реестра
TARGET=$(resolve_service "$service")
if [ -z "$TARGET" ]; then
q_set "сервис '$service' не найден в реестре $SERVICES_FILE" \
"UPDATE update_queue SET status='failed', finished_at=now(), result=:'res' WHERE id=$id" >/dev/null
notify "🚨 Обновление <b>$service</b>: сервис не найден в реестре обновлений. Добавьте его в <code>services.yaml</code>."
log "не удалось сопоставить '$service' с реестром"
exit 1
fi
if [ "$TARGET" != "$service" ]; then
log "сервис '$service' сопоставлен с реестровой записью '$TARGET'"
fi
if [ ! -x "$SAFE_UPDATE" ]; then
q_set "не найден safe-update.sh" \
"UPDATE update_queue SET status='failed', finished_at=now(), result=:'res' WHERE id=$id" >/dev/null
@@ -95,7 +124,7 @@ if [ ! -x "$SAFE_UPDATE" ]; then
fi
# --- 3. Выполняем -----------------------------------------------------------
out=$("$SAFE_UPDATE" "$service" 2>&1)
out=$("$SAFE_UPDATE" "$TARGET" 2>&1)
rc=$?
if [ "$rc" -eq 0 ]; then
+3
View File
@@ -40,3 +40,6 @@
[2026-10-09 16:05:54]
[2026-10-09 16:05:54] ✅ Обновление успешно!
[2026-10-09 16:05:54] New version: 4c697a48a247
[2026-10-09 16:05:54] ✅ Версия зафиксирована в Git
[2026-10-09 16:05:54]
[2026-10-09 16:05:54] 🎉 ГОТОВО! Сервис gitea обновлён и зафиксирован.