2026-08-16 15:34:37 +00:00
|
|
|
---
|
|
|
|
|
# Grafana data backup via restic to Hetzner Object Storage (DEV-486,
|
|
|
|
|
# DEV-482 Option 4). Step 3 of the Option 4 rollout.
|
|
|
|
|
#
|
|
|
|
|
# Streams the RWO PVC `grafana-storage` (mounted read-only) into
|
|
|
|
|
# `s3:${S3_ENDPOINT}/${S3_BUCKET}/restic/grafana`, a client-side
|
feat(monitoring): retire legacy backup-volumes CronJob + backup-storage PVC (DEV-489)
The restic pipeline (loki/grafana/k8s-resources) is proven end-to-end
after the DEV-488 restore drill, so the legacy rsync/tar pipeline into
the 100 Gi local-path `backup-storage` PVC is removed.
- Delete `apps/monitoring/backup-volumes-cronjob.yaml`.
- Remove the DEV-483 bridge `nodeSelector: k3s-worker-2` from
`apps/monitoring/loki-deployment.yaml`. Loki's data protection now
runs via `backup-loki-restic`, which follows the pod via podAffinity
regardless of which node the RWO CSI volume attaches on. The
`Recreate` rollout strategy stays — it is unrelated (avoids the
attach-deadlock during a rollout). Resolves the RWO/nodeSelector
attach race that was blocking DEV-478 weekly OS updates.
- Update `apps/monitoring/README.md` to drop the `backup-volumes`
section, link the restic restore runbook, and record the pin
removal.
- Clean stale coexistence comments in the restic/prometheus CronJob
manifests now that the legacy job is gone.
Cluster-side (already applied out-of-band, since these manifests are
`kubectl apply`-based, not Argo-managed):
- `kubectl -n monitoring delete cronjob backup-volumes` -> NotFound.
- `kubectl -n monitoring delete pvc backup-storage` -> gone; local-path
PV `pvc-d0db0ba9-8f89-4f66-9e65-d573ebe1085a` reclaimed automatically
(Delete policy). Two stale pre-DEV-487 `backup-k8s-resources` job
pods that still referenced the PVC were deleted to release the
`pvc-protection` finalizer.
- `kubectl -n monitoring apply -f loki-deployment.yaml` -> Recreate
rollout, new pod Ready in ~60s, no nodeSelector on the new spec.
- No `VolumeAttachment` for the retired PV.
- Restic CronJobs (`backup-loki-restic`, `backup-grafana-restic`,
`backup-k8s-resources`, `prometheus-backup`) intact.
Pre-delete snapshots retained on k3s-cp-1 under
`/root/dev489-snapshots-20260816T155411Z/` for post-mortem.
Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-08-16 15:58:43 +00:00
|
|
|
# encrypted restic repository.
|
2026-08-16 15:34:37 +00:00
|
|
|
#
|
|
|
|
|
# `grafana-storage` is a local-path PV anchored on k3s-worker-2, so
|
|
|
|
|
# the grafana pod is already pinned there; a plain nodeSelector on
|
|
|
|
|
# the same host is enough (no podAffinity like the loki job needed).
|
|
|
|
|
apiVersion: batch/v1
|
|
|
|
|
kind: CronJob
|
|
|
|
|
metadata:
|
|
|
|
|
name: backup-grafana-restic
|
|
|
|
|
namespace: monitoring
|
|
|
|
|
labels:
|
|
|
|
|
app: backup
|
|
|
|
|
type: grafana
|
|
|
|
|
backend: restic
|
|
|
|
|
spec:
|
|
|
|
|
schedule: "15 3 * * *"
|
|
|
|
|
concurrencyPolicy: Forbid
|
|
|
|
|
successfulJobsHistoryLimit: 3
|
|
|
|
|
failedJobsHistoryLimit: 3
|
|
|
|
|
jobTemplate:
|
|
|
|
|
metadata:
|
|
|
|
|
labels:
|
|
|
|
|
app: backup
|
|
|
|
|
type: grafana
|
|
|
|
|
backend: restic
|
|
|
|
|
spec:
|
|
|
|
|
backoffLimit: 2
|
|
|
|
|
activeDeadlineSeconds: 3600
|
|
|
|
|
template:
|
|
|
|
|
metadata:
|
|
|
|
|
labels:
|
|
|
|
|
app: backup
|
|
|
|
|
type: grafana
|
|
|
|
|
backend: restic
|
|
|
|
|
spec:
|
|
|
|
|
restartPolicy: OnFailure
|
|
|
|
|
nodeSelector:
|
|
|
|
|
kubernetes.io/hostname: k3s-worker-2
|
|
|
|
|
containers:
|
|
|
|
|
- name: restic
|
2026-08-16 16:20:06 +00:00
|
|
|
image: harbor.basicstack.de/library/restic:0.17.3
|
|
|
|
|
# Mirrored from docker.io/restic/restic:0.17.3 (DEV-493) —
|
|
|
|
|
# deterministic ingress via Harbor. Retag procedure in
|
|
|
|
|
# docs/monitoring/restic-restore.md § "Tag-bump procedure".
|
2026-08-16 15:34:37 +00:00
|
|
|
env:
|
|
|
|
|
- name: AWS_ACCESS_KEY_ID
|
|
|
|
|
valueFrom:
|
|
|
|
|
secretKeyRef:
|
|
|
|
|
name: monitoring-s3-backup
|
|
|
|
|
key: access-key
|
|
|
|
|
- name: AWS_SECRET_ACCESS_KEY
|
|
|
|
|
valueFrom:
|
|
|
|
|
secretKeyRef:
|
|
|
|
|
name: monitoring-s3-backup
|
|
|
|
|
key: secret-key
|
|
|
|
|
- name: RESTIC_PASSWORD
|
|
|
|
|
valueFrom:
|
|
|
|
|
secretKeyRef:
|
|
|
|
|
name: monitoring-s3-backup
|
|
|
|
|
key: restic-password
|
|
|
|
|
- name: S3_ENDPOINT
|
|
|
|
|
valueFrom:
|
|
|
|
|
secretKeyRef:
|
|
|
|
|
name: monitoring-s3-backup
|
|
|
|
|
key: endpoint
|
|
|
|
|
- name: S3_BUCKET
|
|
|
|
|
valueFrom:
|
|
|
|
|
secretKeyRef:
|
|
|
|
|
name: monitoring-s3-backup
|
|
|
|
|
key: bucket
|
|
|
|
|
- name: RESTIC_REPOSITORY
|
|
|
|
|
value: "s3:$(S3_ENDPOINT)/$(S3_BUCKET)/restic/grafana"
|
|
|
|
|
command:
|
|
|
|
|
- /bin/sh
|
|
|
|
|
- -c
|
|
|
|
|
- |
|
|
|
|
|
set -eu
|
|
|
|
|
echo "=== backup-grafana-restic started at $(date -u +%FT%TZ) ==="
|
|
|
|
|
echo "Repository: ${RESTIC_REPOSITORY}"
|
|
|
|
|
|
|
|
|
|
# First-run tolerance: init if the repo isn't there yet.
|
|
|
|
|
if restic snapshots >/dev/null 2>&1; then
|
|
|
|
|
echo "Repo exists, skipping init."
|
|
|
|
|
else
|
|
|
|
|
echo "Repo missing, initialising..."
|
|
|
|
|
restic init
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
echo "--- restic backup /source ---"
|
|
|
|
|
restic backup /source \
|
|
|
|
|
--tag grafana \
|
|
|
|
|
--host k3s \
|
|
|
|
|
--exclude '*.tmp'
|
|
|
|
|
|
|
|
|
|
echo "--- restic forget/prune ---"
|
|
|
|
|
restic forget --tag grafana \
|
|
|
|
|
--keep-daily 7 \
|
|
|
|
|
--keep-weekly 4 \
|
|
|
|
|
--keep-monthly 6 \
|
|
|
|
|
--prune
|
|
|
|
|
|
|
|
|
|
echo "--- restic check --read-data-subset=5% ---"
|
|
|
|
|
CHECK_STATUS=0
|
|
|
|
|
restic check --read-data-subset=5% || CHECK_STATUS=$?
|
|
|
|
|
echo "restic check exit: ${CHECK_STATUS}"
|
|
|
|
|
|
2026-08-16 16:07:55 +00:00
|
|
|
echo "--- restic stats (repo size) ---"
|
|
|
|
|
REPO_SIZE_BYTES=$(restic stats --json --mode raw-data 2>/dev/null \
|
|
|
|
|
| grep -oE '"total_size":[0-9]+' \
|
|
|
|
|
| head -1 \
|
|
|
|
|
| cut -d: -f2)
|
|
|
|
|
REPO_SIZE_BYTES=${REPO_SIZE_BYTES:-0}
|
|
|
|
|
echo "restic repo size: ${REPO_SIZE_BYTES} bytes"
|
|
|
|
|
|
feat(observability): wire node-exporter textfile collector for backup metrics (DEV-494)
Turns the four monitoring backup CronJobs' .prom output into scrapeable
Prometheus series so the DEV-490 alerts finally evaluate against live data.
- apps/observability/patches/node-exporter-textfile-collector.yaml:
strategic-merge patch on the kube-prometheus-stack node-exporter DS
that adds `--collector.textfile.directory=/host/textfile_collector`
and mounts `/var/lib/node_exporter/textfile_collector` read-only.
Chart isn't tracked in ArgoCD, so we keep the patch under version
control and re-apply after any helm upgrade (see patches/README.md).
- apps/monitoring/backup-{loki,grafana,k8s-resources,prometheus}-*-cronjob.yaml:
swap `emptyDir` /metrics for a `hostPath` on the same directory
(`DirectoryOrCreate`). Write via `.prom.tmp` + `mv` so node-exporter
never reads a truncated sample.
- apps/monitoring/backup-restic-alerts.yaml: `time() - max(...) > 28h`
for all four freshness alerts so a stale `.prom` left on a node the
job has since left does not fire the freshness pager.
- apps/monitoring/README.md: drop the "once wired" caveat; document
the on-node directory, atomic write, cross-node staleness rationale.
Verified end-to-end with a synthetic `kubectl create job
--from=cronjob/backup-k8s-resources`: pod ran on k3s-worker-4,
.prom file materialized in /var/lib/node_exporter/textfile_collector,
and Prometheus returned all four metric families
(`backup_k8s_resources_success=1`, `..._timestamp_seconds`,
`..._check_status=0`, `restic_repo_size_bytes{repo="k8s-resources"}=13692516`).
`time() - max(backup_k8s_resources_timestamp_seconds)` returned ~84s
against a fresh run. `promtool check rules` + `promtool test rules`
still pass (9 rules, 5 scenarios).
Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-08-16 16:21:56 +00:00
|
|
|
# Textfile-collector metrics; identical wiring to the
|
|
|
|
|
# loki sibling. See that file for the atomic-write
|
|
|
|
|
# rationale (DEV-494).
|
2026-08-16 15:34:37 +00:00
|
|
|
{
|
|
|
|
|
echo "backup_grafana_success $([ ${CHECK_STATUS} -eq 0 ] && echo 1 || echo 0)"
|
|
|
|
|
echo "backup_grafana_timestamp_seconds $(date +%s)"
|
|
|
|
|
echo "backup_grafana_check_status ${CHECK_STATUS}"
|
2026-08-16 16:07:55 +00:00
|
|
|
echo "restic_repo_size_bytes{repo=\"grafana\"} ${REPO_SIZE_BYTES}"
|
feat(observability): wire node-exporter textfile collector for backup metrics (DEV-494)
Turns the four monitoring backup CronJobs' .prom output into scrapeable
Prometheus series so the DEV-490 alerts finally evaluate against live data.
- apps/observability/patches/node-exporter-textfile-collector.yaml:
strategic-merge patch on the kube-prometheus-stack node-exporter DS
that adds `--collector.textfile.directory=/host/textfile_collector`
and mounts `/var/lib/node_exporter/textfile_collector` read-only.
Chart isn't tracked in ArgoCD, so we keep the patch under version
control and re-apply after any helm upgrade (see patches/README.md).
- apps/monitoring/backup-{loki,grafana,k8s-resources,prometheus}-*-cronjob.yaml:
swap `emptyDir` /metrics for a `hostPath` on the same directory
(`DirectoryOrCreate`). Write via `.prom.tmp` + `mv` so node-exporter
never reads a truncated sample.
- apps/monitoring/backup-restic-alerts.yaml: `time() - max(...) > 28h`
for all four freshness alerts so a stale `.prom` left on a node the
job has since left does not fire the freshness pager.
- apps/monitoring/README.md: drop the "once wired" caveat; document
the on-node directory, atomic write, cross-node staleness rationale.
Verified end-to-end with a synthetic `kubectl create job
--from=cronjob/backup-k8s-resources`: pod ran on k3s-worker-4,
.prom file materialized in /var/lib/node_exporter/textfile_collector,
and Prometheus returned all four metric families
(`backup_k8s_resources_success=1`, `..._timestamp_seconds`,
`..._check_status=0`, `restic_repo_size_bytes{repo="k8s-resources"}=13692516`).
`time() - max(backup_k8s_resources_timestamp_seconds)` returned ~84s
against a fresh run. `promtool check rules` + `promtool test rules`
still pass (9 rules, 5 scenarios).
Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-08-16 16:21:56 +00:00
|
|
|
} > /metrics/backup_grafana.prom.tmp
|
|
|
|
|
mv /metrics/backup_grafana.prom.tmp /metrics/backup_grafana.prom
|
2026-08-16 15:34:37 +00:00
|
|
|
|
|
|
|
|
echo "=== backup-grafana-restic finished at $(date -u +%FT%TZ) ==="
|
|
|
|
|
exit ${CHECK_STATUS}
|
|
|
|
|
volumeMounts:
|
|
|
|
|
- name: grafana-data
|
|
|
|
|
mountPath: /source
|
|
|
|
|
readOnly: true
|
|
|
|
|
- name: metrics
|
|
|
|
|
mountPath: /metrics
|
|
|
|
|
- name: cache
|
|
|
|
|
mountPath: /root/.cache/restic
|
|
|
|
|
resources:
|
|
|
|
|
requests:
|
|
|
|
|
cpu: 100m
|
|
|
|
|
memory: 128Mi
|
|
|
|
|
limits:
|
|
|
|
|
cpu: 1500m
|
|
|
|
|
memory: 1Gi
|
|
|
|
|
volumes:
|
|
|
|
|
- name: grafana-data
|
|
|
|
|
persistentVolumeClaim:
|
|
|
|
|
claimName: grafana-storage
|
|
|
|
|
- name: metrics
|
feat(observability): wire node-exporter textfile collector for backup metrics (DEV-494)
Turns the four monitoring backup CronJobs' .prom output into scrapeable
Prometheus series so the DEV-490 alerts finally evaluate against live data.
- apps/observability/patches/node-exporter-textfile-collector.yaml:
strategic-merge patch on the kube-prometheus-stack node-exporter DS
that adds `--collector.textfile.directory=/host/textfile_collector`
and mounts `/var/lib/node_exporter/textfile_collector` read-only.
Chart isn't tracked in ArgoCD, so we keep the patch under version
control and re-apply after any helm upgrade (see patches/README.md).
- apps/monitoring/backup-{loki,grafana,k8s-resources,prometheus}-*-cronjob.yaml:
swap `emptyDir` /metrics for a `hostPath` on the same directory
(`DirectoryOrCreate`). Write via `.prom.tmp` + `mv` so node-exporter
never reads a truncated sample.
- apps/monitoring/backup-restic-alerts.yaml: `time() - max(...) > 28h`
for all four freshness alerts so a stale `.prom` left on a node the
job has since left does not fire the freshness pager.
- apps/monitoring/README.md: drop the "once wired" caveat; document
the on-node directory, atomic write, cross-node staleness rationale.
Verified end-to-end with a synthetic `kubectl create job
--from=cronjob/backup-k8s-resources`: pod ran on k3s-worker-4,
.prom file materialized in /var/lib/node_exporter/textfile_collector,
and Prometheus returned all four metric families
(`backup_k8s_resources_success=1`, `..._timestamp_seconds`,
`..._check_status=0`, `restic_repo_size_bytes{repo="k8s-resources"}=13692516`).
`time() - max(backup_k8s_resources_timestamp_seconds)` returned ~84s
against a fresh run. `promtool check rules` + `promtool test rules`
still pass (9 rules, 5 scenarios).
Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-08-16 16:21:56 +00:00
|
|
|
hostPath:
|
|
|
|
|
# node-exporter's textfile-collector directory
|
|
|
|
|
# (DEV-494). See sibling loki cronjob for detail.
|
|
|
|
|
path: /var/lib/node_exporter/textfile_collector
|
|
|
|
|
type: DirectoryOrCreate
|
2026-08-16 15:34:37 +00:00
|
|
|
- name: cache
|
|
|
|
|
emptyDir: {}
|