From 8e9efc4f918add92eb7f561bdd435d4dbb53eb44 Mon Sep 17 00:00:00 2001
From: Lewis Buckley <lewis@37signals.com>
Date: Thu, 2 Oct 2025 16:44:17 +0100
Subject: [PATCH 1/3] Use labels so the OTel collector on the host can scrape
 containers

---
 config/deploy.staging.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/config/deploy.staging.yml b/config/deploy.staging.yml
index c0b6502e4..8ea76fc72 100644
--- a/config/deploy.staging.yml
+++ b/config/deploy.staging.yml
@@ -3,9 +3,13 @@ servers:
     hosts:
       - fizzy-staging-app-01
       - fizzy-staging-app-101
+    labels:
+      otel_scrape_enabled: true
   jobs:
     hosts:
       - fizzy-staging-app-01
+    labels:
+      otel_scrape_enabled: true
 
 proxy:
   ssl: false
@@ -25,6 +29,9 @@ accessories:
       username: robot$harbor-bot
       password:
         - BASECAMP_REGISTRY_PASSWORD
+    labels:
+      role: beamer
+      service: fizzy-beamer
     options:
       user: 1000 # Match the UID of the Rails app, for volume permissions
       publish:

From 4a6a6f479297f6b6943ec392b421a7df722c1159 Mon Sep 17 00:00:00 2001
From: Lewis Buckley <lewis@37signals.com>
Date: Thu, 2 Oct 2025 16:51:40 +0100
Subject: [PATCH 2/3] Prefix labels to avoid reserved labels role / service

---
 config/deploy.staging.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/deploy.staging.yml b/config/deploy.staging.yml
index 8ea76fc72..ed9f699f0 100644
--- a/config/deploy.staging.yml
+++ b/config/deploy.staging.yml
@@ -30,8 +30,8 @@ accessories:
       password:
         - BASECAMP_REGISTRY_PASSWORD
     labels:
-      role: beamer
-      service: fizzy-beamer
+      otel_role: beamer
+      otel_service: fizzy-beamer
     options:
       user: 1000 # Match the UID of the Rails app, for volume permissions
       publish:

From 05b7b15da2b69a000fa888bb750135b11bd8860f Mon Sep 17 00:00:00 2001
From: Lewis Buckley <lewis@37signals.com>
Date: Thu, 2 Oct 2025 17:02:35 +0100
Subject: [PATCH 3/3] Enable beamer scrape too

---
 config/deploy.staging.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/deploy.staging.yml b/config/deploy.staging.yml
index ed9f699f0..08b9673ba 100644
--- a/config/deploy.staging.yml
+++ b/config/deploy.staging.yml
@@ -32,6 +32,7 @@ accessories:
     labels:
       otel_role: beamer
       otel_service: fizzy-beamer
+      otel_scrape_enabled: true
     options:
       user: 1000 # Match the UID of the Rails app, for volume permissions
       publish: