diff --git a/stacks/dbaas/modules/dbaas/main.tf b/stacks/dbaas/modules/dbaas/main.tf index 1b43b475..d9742e2d 100644 --- a/stacks/dbaas/modules/dbaas/main.tf +++ b/stacks/dbaas/modules/dbaas/main.tf @@ -341,8 +341,8 @@ resource "kubernetes_cron_job_v1" "mysql-backup" { command = ["/bin/bash", "-c", <<-EOT set -euxo pipefail _t0=$(date +%s) - _rb0=$(awk '/^read_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) - _wb0=$(awk '/^write_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) + _rb0=$(awk '/^read_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) + _wb0=$(awk '/^write_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) export now=$(date +"%Y_%m_%d_%H_%M") mysqldump --all-databases -u root --host mysql.dbaas.svc.cluster.local | gzip -9 > /backup/dump_$now.sql.gz @@ -353,8 +353,8 @@ resource "kubernetes_cron_job_v1" "mysql-backup" { find . -name "dump_*.sql" -type f -mtime +14 -delete # clean up old uncompressed _dur=$(($(date +%s) - _t0)) - _rb1=$(awk '/^read_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) - _wb1=$(awk '/^write_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) + _rb1=$(awk '/^read_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) + _wb1=$(awk '/^write_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) echo "=== Backup IO Stats ===" echo "duration: $${_dur}s" echo "read: $(( (_rb1 - _rb0) / 1048576 )) MiB" @@ -1097,8 +1097,8 @@ resource "kubernetes_cron_job_v1" "postgresql-backup" { command = ["/bin/bash", "-c", <<-EOT set -euxo pipefail _t0=$(date +%s) - _rb0=$(awk '/^read_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) - _wb0=$(awk '/^write_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) + _rb0=$(awk '/^read_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) + _wb0=$(awk '/^write_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) export now=$(date +"%Y_%m_%d_%H_%M") PGPASSWORD=$PGPASSWORD pg_dumpall -h postgresql.dbaas -U postgres | gzip -9 > /backup/dump_$now.sql.gz @@ -1109,8 +1109,8 @@ resource "kubernetes_cron_job_v1" "postgresql-backup" { find . -name "dump_*.sql" -type f -mtime +14 -delete # clean up old uncompressed _dur=$(($(date +%s) - _t0)) - _rb1=$(awk '/^read_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) - _wb1=$(awk '/^write_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) + _rb1=$(awk '/^read_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) + _wb1=$(awk '/^write_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) echo "=== Backup IO Stats ===" echo "duration: $${_dur}s" echo "read: $(( (_rb1 - _rb0) / 1048576 )) MiB" diff --git a/stacks/immich/main.tf b/stacks/immich/main.tf index 40174d62..3c5614db 100644 --- a/stacks/immich/main.tf +++ b/stacks/immich/main.tf @@ -685,8 +685,8 @@ resource "kubernetes_cron_job_v1" "postgresql-backup" { image = "postgres:16.4-bullseye" command = ["/bin/sh", "-c", <<-EOT _t0=$(date +%s) - _rb0=$(awk '/^read_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) - _wb0=$(awk '/^write_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) + _rb0=$(awk '/^read_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) + _wb0=$(awk '/^write_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) export now=$(date +"%Y_%m_%d_%H_%M") pg_dumpall -h immich-postgresql -U immich > /backup/dump_$now.sql @@ -696,8 +696,8 @@ resource "kubernetes_cron_job_v1" "postgresql-backup" { find . -name "dump_*.sql" -type f -mtime +14 -delete # 14 day retention of backups _dur=$(($(date +%s) - _t0)) - _rb1=$(awk '/^read_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) - _wb1=$(awk '/^write_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) + _rb1=$(awk '/^read_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) + _wb1=$(awk '/^write_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) echo "=== Backup IO Stats ===" echo "duration: $${_dur}s" echo "read: $(( (_rb1 - _rb0) / 1048576 )) MiB" diff --git a/stacks/infra-maintenance/modules/infra-maintenance/main.tf b/stacks/infra-maintenance/modules/infra-maintenance/main.tf index 00d1c920..4f39bc04 100644 --- a/stacks/infra-maintenance/modules/infra-maintenance/main.tf +++ b/stacks/infra-maintenance/modules/infra-maintenance/main.tf @@ -105,8 +105,8 @@ resource "kubernetes_cron_job_v1" "backup-etcd" { args = [<<-EOT set -eu _t0=$(date +%s) - _rb0=$(awk '/^read_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) - _wb0=$(awk '/^write_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) + _rb0=$(awk '/^read_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) + _wb0=$(awk '/^write_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) TIMESTAMP=$(date +%Y%m%d-%H%M%S) ETCDCTL_API=3 etcdctl \ @@ -117,8 +117,8 @@ resource "kubernetes_cron_job_v1" "backup-etcd" { snapshot save /backup/etcd-snapshot-$TIMESTAMP.db _dur=$(($(date +%s) - _t0)) - _rb1=$(awk '/^read_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) - _wb1=$(awk '/^write_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) + _rb1=$(awk '/^read_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) + _wb1=$(awk '/^write_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) echo "=== Backup IO Stats ===" echo "duration: $${_dur}s" echo "read: $(( (_rb1 - _rb0) / 1048576 )) MiB" diff --git a/stacks/redis/modules/redis/main.tf b/stacks/redis/modules/redis/main.tf index 15ab3097..49b19fda 100644 --- a/stacks/redis/modules/redis/main.tf +++ b/stacks/redis/modules/redis/main.tf @@ -284,8 +284,8 @@ resource "kubernetes_cron_job_v1" "redis-backup" { command = ["/bin/sh", "-c", <<-EOT set -eux _t0=$(date +%s) - _rb0=$(awk '/^read_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) - _wb0=$(awk '/^write_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) + _rb0=$(awk '/^read_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) + _wb0=$(awk '/^write_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) TIMESTAMP=$(date +%Y%m%d-%H%M) # Trigger a fresh RDB save on the master @@ -297,8 +297,8 @@ resource "kubernetes_cron_job_v1" "redis-backup" { find /backup -name 'redis-*.rdb' -type f -mtime +28 -delete _dur=$(($(date +%s) - _t0)) - _rb1=$(awk '/^read_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) - _wb1=$(awk '/^write_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) + _rb1=$(awk '/^read_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) + _wb1=$(awk '/^write_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) echo "=== Backup IO Stats ===" echo "duration: $${_dur}s" echo "read: $(( (_rb1 - _rb0) / 1048576 )) MiB" diff --git a/stacks/vault/main.tf b/stacks/vault/main.tf index e4f58988..bb777571 100644 --- a/stacks/vault/main.tf +++ b/stacks/vault/main.tf @@ -267,8 +267,8 @@ resource "kubernetes_cron_job_v1" "vault_backup" { args = [join("", [ "set -eu; ", "_t0=$(date +%s); ", - "_rb0=$(awk '/^read_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0); ", - "_wb0=$(awk '/^write_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0); ", + "_rb0=$(awk '/^read_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0); ", + "_wb0=$(awk '/^write_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0); ", "export VAULT_ADDR=http://vault-active.vault.svc.cluster.local:8200 && ", "export VAULT_TOKEN=$(cat /vault/token/vault-root-token) && ", "TIMESTAMP=$(date +%Y%m%d-%H%M%S) && ", @@ -276,8 +276,8 @@ resource "kubernetes_cron_job_v1" "vault_backup" { "find /backup -name '*.db' -mtime +30 -delete && ", "echo \"Backup done: vault-raft-$TIMESTAMP.db\" && ls -lh /backup/ && ", "_dur=$(( $(date +%s) - _t0 )); ", - "_rb1=$(awk '/^read_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0); ", - "_wb1=$(awk '/^write_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0); ", + "_rb1=$(awk '/^read_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0); ", + "_wb1=$(awk '/^write_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0); ", "echo '=== Backup IO Stats ==='; ", "echo \"duration: $${_dur}s\"; ", "echo \"read: $(( (_rb1 - _rb0) / 1048576 )) MiB\"; ", diff --git a/stacks/vaultwarden/modules/vaultwarden/main.tf b/stacks/vaultwarden/modules/vaultwarden/main.tf index bc1ea77c..b909b005 100644 --- a/stacks/vaultwarden/modules/vaultwarden/main.tf +++ b/stacks/vaultwarden/modules/vaultwarden/main.tf @@ -248,8 +248,8 @@ resource "kubernetes_cron_job_v1" "vaultwarden-backup" { set -euxo pipefail apk add --no-cache sqlite _t0=$(date +%s) - _rb0=$(awk '/^read_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) - _wb0=$(awk '/^write_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) + _rb0=$(awk '/^read_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) + _wb0=$(awk '/^write_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) now=$(date +"%Y_%m_%d_%H_%M") # Pre-flight: verify source DB is healthy before backing up @@ -275,8 +275,8 @@ resource "kubernetes_cron_job_v1" "vaultwarden-backup" { find /backup -maxdepth 1 -mindepth 1 -type d -mtime +30 -exec rm -rf {} + _dur=$(($(date +%s) - _t0)) - _rb1=$(awk '/^read_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) - _wb1=$(awk '/^write_bytes/{print $2}' /proc/self/io 2>/dev/null || echo 0) + _rb1=$(awk '/^read_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) + _wb1=$(awk '/^write_bytes/{print $2}' /proc/$$/io 2>/dev/null || echo 0) echo "=== Backup IO Stats ===" echo "duration: $${_dur}s" echo "read: $(( (_rb1 - _rb0) / 1048576 )) MiB"