Upgrade grafana-sidecar 1.28.0 → 2.6.0 + container.py port (#332)
All checks were successful
Build Container / detect (push) Successful in 4s
Build Container / build-dagger (grafana-sidecar) (push) Successful in 1m50s

## Summary

- Upgrade grafana-sidecar from 1.28.0 to 2.6.0 (the 2.x memory regression #462 is resolved; ~35MB static overhead is acceptable)
- Port build from Dockerfile to native Dagger container.py
- Add liveness/readiness probes using the new /healthz endpoint on port 8080
- Update docs to reflect container.py migration and remove stale pin note

## Test plan

- [ ] Build container: `mise run container-build-and-release grafana-sidecar`
- [ ] Update kustomization tag with new image tag
- [ ] Deploy from branch: `argocd app set grafana --revision grafana-sidecar-2.6.0 && argocd app sync grafana`
- [ ] Verify sidecar health endpoint: `kubectl exec -n monitoring <pod> -c grafana-sc-dashboard -- wget -qO- http://localhost:8080/healthz`
- [ ] Verify dashboards load in Grafana UI
- [ ] `mise run services-check`

Reviewed-on: #332
This commit is contained in:
Erich Blume 2026-04-13 07:57:13 -07:00
commit 61fcd5d70a
7 changed files with 83 additions and 44 deletions

View file

@ -1,36 +0,0 @@
# Grafana dashboard sidecar - watches ConfigMaps and syncs into Grafana
# Two-stage build: Python venv (builder), runtime (Alpine)
ARG CONTAINER_APP_VERSION=1.28.0
FROM python:3.12-alpine3.22 AS base
FROM base AS builder
ARG CONTAINER_APP_VERSION
WORKDIR /app
RUN apk add --no-cache git gcc musl-dev
RUN git clone --depth 1 --branch ${CONTAINER_APP_VERSION} \
https://forge.ops.eblu.me/mirrors/kiwigrid-grafana-sidecar.git /tmp/k8s-sidecar
RUN python -m venv .venv && \
.venv/bin/pip install --no-cache-dir -U pip setuptools && \
.venv/bin/pip install --no-cache-dir -r /tmp/k8s-sidecar/src/requirements.txt && \
cp /tmp/k8s-sidecar/src/*.py /app/ && \
find /app/.venv \( -type d -a -name test -o -name tests \) \
-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -rf '{}' \+
FROM base
ARG CONTAINER_APP_VERSION
LABEL org.opencontainers.image.title="Grafana Sidecar"
LABEL org.opencontainers.image.description="K8s sidecar to sync ConfigMap dashboards into Grafana"
LABEL org.opencontainers.image.version="${CONTAINER_APP_VERSION}"
LABEL org.opencontainers.image.source="https://forge.eblu.me/eblume/blumeops"
LABEL org.opencontainers.image.vendor="blumeops"
ENV PYTHONUNBUFFERED=1
WORKDIR /app
COPY --from=builder /app /app
ENV PATH="/app/.venv/bin:$PATH"
USER 65534:65534
CMD ["python", "-u", "/app/sidecar.py"]

View file

@ -0,0 +1,63 @@
"""Grafana dashboard sidecar — native Dagger build.
Two-stage build: Python venv (builder), Python Alpine (runtime).
Source cloned from forge mirror.
"""
import dagger
from dagger import dag
from blumeops.containers import clone_from_forge, oci_labels
VERSION = "2.6.0"
PYTHON_BASE = "python:3.14-alpine3.23"
async def build(src: dagger.Directory) -> dagger.Container:
source = clone_from_forge("kiwigrid-grafana-sidecar", VERSION)
# Stage 1: Build Python venv with dependencies
builder = (
dag.container()
.from_(PYTHON_BASE)
.with_exec(["apk", "add", "--no-cache", "gcc", "musl-dev"])
.with_workdir("/app")
.with_exec(
["python", "-m", "venv", ".venv"],
)
.with_exec(
[".venv/bin/pip", "install", "--no-cache-dir", "-U", "pip", "setuptools"],
)
.with_file("/app/pyproject.toml", source.file("pyproject.toml"))
.with_directory("/app/src", source.directory("src"))
.with_exec([".venv/bin/pip", "install", "--no-cache-dir", "."])
# Strip test dirs and bytecode from venv to shrink the image
.with_exec(
[
"sh",
"-c",
"find /app/.venv"
" \\( -type d -a -name test -o -name tests \\)"
" -o \\( -type f -a -name '*.pyc' -o -name '*.pyo' \\)"
" -exec rm -rf {} +",
]
)
)
# Stage 2: Runtime
runtime = dag.container().from_(PYTHON_BASE)
runtime = oci_labels(
runtime,
title="Grafana Sidecar",
description="K8s sidecar to sync ConfigMap dashboards into Grafana",
version=VERSION,
)
return (
runtime.with_env_variable("PYTHONUNBUFFERED", "1")
.with_workdir("/app")
.with_directory("/app/.venv", builder.directory("/app/.venv"))
.with_env_variable("PATH", "/app/.venv/bin:$PATH")
.with_user("65534:65534")
.with_default_args(args=["python", "-u", "-m", "sidecar"])
)