From fd5ed0a1d37f0b1d237977a9ca468422713c04f4 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 11 Jun 2026 19:17:53 -0300
Subject: [PATCH 1/3] feat: garage metrics coop-cloud/garage#8

---
 .env.sample        |  6 ++++++
 compose.garage.yml |  6 ++++++
 config.alloy.tmpl  | 15 +++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 compose.garage.yml

diff --git a/.env.sample b/.env.sample
index b68f7c4..ae0fc97 100644
--- a/.env.sample
+++ b/.env.sample
@@ -88,3 +88,9 @@ SECRET_BASIC_AUTH_VERSION=v1
 #ALERT_BACKUP_NOT_SUCCESSFULL_ENABLED=true
 #ALERT_NODE_DISK_SPACE_ENABLED=true
 #ALERT_NODE_MEMORY_USAGE_ENABLED=true
+
+# Garage metrics
+# SECRET_GARAGE_METRICS_TOKEN_VERSION=v1
+# GARAGE_METRICS_HOSTNAME=
+# GARAGE_INSECURE_SKIP_VERIFY=false
+# COMPOSE_FILE="$COMPOSE_FILE:compose.garage.yml"
diff --git a/compose.garage.yml b/compose.garage.yml
new file mode 100644
index 0000000..e5a4de0
--- /dev/null
+++ b/compose.garage.yml
@@ -0,0 +1,6 @@
+---
+version: "3.8"
+secrets:
+  garage_metrics_token:
+    external: true
+    name: ${STACK_NAME}_garage_metrics_token_${SECRET_GARAGE_METRICS_TOKEN_VERSION}
diff --git a/config.alloy.tmpl b/config.alloy.tmpl
index 2083ce6..55169d3 100644
--- a/config.alloy.tmpl
+++ b/config.alloy.tmpl
@@ -29,6 +29,21 @@ prometheus.scrape "default" {
   forward_to = [prometheus.remote_write.prometheus.receiver]
 }
 
+{{ if ne (env "GARAGE_METRICS_HOSTNAME") "" }}
+prometheus.scrape "garage" {
+  bearer_token = "{{ secret "garage_metrics_token" }}"
+  job_name = "garage"
+  scheme = "https"
+
+  targets = [{ __address__ = "{{ env "GARAGE_METRICS_HOSTNAME" }}:443" }]
+  forward_to = [prometheus.remote_write.prometheus.receiver]
+
+  tls_config {
+    insecure_skip_verify = {{ env "GARAGE_INSECURE_SKIP_VERIFY" }}
+  }
+}
+{{ end }}
+
 prometheus.remote_write "prometheus" {
   endpoint {
     url = "{{ env "PROMETHEUS_REMOTE_WRITE_URL" }}"
-- 
2.49.0


From 1561b97c543fad8c03e20bd2687f1722fd882c86 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 11 Jun 2026 19:33:58 -0300
Subject: [PATCH 2/3] fix: enable secret

---
 compose.garage.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/compose.garage.yml b/compose.garage.yml
index e5a4de0..0b6aea3 100644
--- a/compose.garage.yml
+++ b/compose.garage.yml
@@ -1,5 +1,9 @@
 ---
 version: "3.8"
+services:
+  app:
+    secrets:
+      - garage_metrics_token
 secrets:
   garage_metrics_token:
     external: true
-- 
2.49.0


From 7f9a1beed1e1d7c9a3d341d3f5c8b8c61718ecb9 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 11 Jun 2026 19:38:19 -0300
Subject: [PATCH 3/3] fix: shorter secret name toolshed/abra#867

---
 compose.garage.yml | 6 +++---
 config.alloy.tmpl  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compose.garage.yml b/compose.garage.yml
index 0b6aea3..092852f 100644
--- a/compose.garage.yml
+++ b/compose.garage.yml
@@ -3,8 +3,8 @@ version: "3.8"
 services:
   app:
     secrets:
-      - garage_metrics_token
+      - garage_token
 secrets:
-  garage_metrics_token:
+  garage_token:
     external: true
-    name: ${STACK_NAME}_garage_metrics_token_${SECRET_GARAGE_METRICS_TOKEN_VERSION}
+    name: ${STACK_NAME}_garage_token_${SECRET_GARAGE_METRICS_TOKEN_VERSION}
diff --git a/config.alloy.tmpl b/config.alloy.tmpl
index 55169d3..cbeed3f 100644
--- a/config.alloy.tmpl
+++ b/config.alloy.tmpl
@@ -31,7 +31,7 @@ prometheus.scrape "default" {
 
 {{ if ne (env "GARAGE_METRICS_HOSTNAME") "" }}
 prometheus.scrape "garage" {
-  bearer_token = "{{ secret "garage_metrics_token" }}"
+  bearer_token = "{{ secret "garage_token" }}"
   job_name = "garage"
   scheme = "https"
 
-- 
2.49.0