From c93e37acffbf4c16961b33a8192a168310e01f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Sch=C3=A4fer?= Date: Fri, 14 Aug 2026 16:14:42 +0200 Subject: [PATCH 1/2] maintenance: enable grafana SMTP --- internal/service/assets/docker-compose.yaml.tmpl | 4 ++++ internal/service/deploy.go | 2 ++ 2 files changed, 6 insertions(+) diff --git a/internal/service/assets/docker-compose.yaml.tmpl b/internal/service/assets/docker-compose.yaml.tmpl index 1c31676..ced28ef 100644 --- a/internal/service/assets/docker-compose.yaml.tmpl +++ b/internal/service/assets/docker-compose.yaml.tmpl @@ -6,6 +6,9 @@ services: environment: - GF_SERVER_ROOT_URL={{ .RootUrl }}/grafana - GF_SERVER_SERVE_FROM_SUB_PATH=true + - GF_SMTP_ENABLED=true + - GF_SMTP_FROM_ADDRESS=grafana@{{ .Hostname }} + - GF_SMTP_SKIP_VERIFY=true volumes: - /var/lib/finch/grafana:/var/lib/grafana - /var/lib/finch/grafana/alerting:/etc/grafana/provisioning/alerting @@ -13,6 +16,7 @@ services: - sh - -euc - | + export GF_SMTP_HOST="$(ip route | awk '/default/ {print $3; exit}'):25" mkdir -p /etc/grafana/provisioning/datasources cat < /etc/grafana/provisioning/datasources/ds.yaml apiVersion: 1 diff --git a/internal/service/deploy.go b/internal/service/deploy.go index 5fe2719..c79f57f 100644 --- a/internal/service/deploy.go +++ b/internal/service/deploy.go @@ -391,6 +391,7 @@ func (s *Service) __deployCopyComposeFile() error { } data := struct { + Hostname string RootUrl string AlloyConfigHash string GrafanaConfigHash string @@ -398,6 +399,7 @@ func (s *Service) __deployCopyComposeFile() error { MimirConfigHash string PyroscopeConfigHash string }{ + Hostname: s.config.Hostname, RootUrl: fmt.Sprintf("https://%s", s.config.Hostname), AlloyConfigHash: s.__configHash(alloyRendered.Bytes()), GrafanaConfigHash: s.__configHash(grafanaChunks...), From 7f7f1fe7acc2b26ef02df047502b45dea0aa5b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Sch=C3=A4fer?= Date: Fri, 14 Aug 2026 16:15:05 +0200 Subject: [PATCH 2/2] maintenance: disable grafana metrics --- internal/service/assets/docker-compose.yaml.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/service/assets/docker-compose.yaml.tmpl b/internal/service/assets/docker-compose.yaml.tmpl index ced28ef..ddcb0ee 100644 --- a/internal/service/assets/docker-compose.yaml.tmpl +++ b/internal/service/assets/docker-compose.yaml.tmpl @@ -9,6 +9,7 @@ services: - GF_SMTP_ENABLED=true - GF_SMTP_FROM_ADDRESS=grafana@{{ .Hostname }} - GF_SMTP_SKIP_VERIFY=true + - GF_METRICS_ENABLED=false volumes: - /var/lib/finch/grafana:/var/lib/grafana - /var/lib/finch/grafana/alerting:/etc/grafana/provisioning/alerting