From 27c9cb05004f8c73d1aa59d714133b12ffc3ce5b Mon Sep 17 00:00:00 2001
From: Grant Slater <github@firefishy.com>
Date: Wed, 8 Jul 2026 22:45:12 +0100
Subject: [PATCH] prometheus: Add EC2 cloudwatch for eu-north-1 (dev, civicrm)

---
 .../templates/default/cloudwatch.yml.erb      | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/cookbooks/prometheus/templates/default/cloudwatch.yml.erb b/cookbooks/prometheus/templates/default/cloudwatch.yml.erb
index 927f1c22d..238e0c3bd 100644
--- a/cookbooks/prometheus/templates/default/cloudwatch.yml.erb
+++ b/cookbooks/prometheus/templates/default/cloudwatch.yml.erb
@@ -208,6 +208,38 @@ discovery:
           statistics: [Sum]
         - name: StatusCheckFailed_System
           statistics: [Sum]
+    - type: AWS/EC2
+      regions:
+        - eu-north-1
+      roles:
+        - roleArn: "arn:aws:iam::654129064878:role/osm-cloudwatch-export-role" # osm-dev
+      period: 300
+      length: 300
+      metrics:
+        - name: CPUUtilization
+          statistics: [Average]
+        - name: DiskReadOps
+          statistics: [Sum]
+        - name: DiskWriteOps
+          statistics: [Sum]
+        - name: DiskReadBytes
+          statistics: [Sum]
+        - name: DiskWriteBytes
+          statistics: [Sum]
+        - name: NetworkIn
+          statistics: [Sum]
+        - name: NetworkOut
+          statistics: [Sum]
+        - name: NetworkPacketsIn
+          statistics: [Sum]
+        - name: NetworkPacketsOut
+          statistics: [Sum]
+        - name: StatusCheckFailed
+          statistics: [Sum]
+        - name: StatusCheckFailed_Instance
+          statistics: [Sum]
+        - name: StatusCheckFailed_System
+          statistics: [Sum]
     - type: AWS/EBS
       regions:
         - us-east-2
@@ -232,6 +264,30 @@ discovery:
           statistics: [Sum]
         - name: VolumeQueueLength
           statistics: [Average]
+    - type: AWS/EBS
+      regions:
+        - eu-north-1
+      roles:
+        - roleArn: "arn:aws:iam::654129064878:role/osm-cloudwatch-export-role" # osm-dev
+      period: 300
+      length: 300
+      metrics:
+        - name: VolumeReadOps
+          statistics: [Sum]
+        - name: VolumeWriteOps
+          statistics: [Sum]
+        - name: VolumeReadBytes
+          statistics: [Sum]
+        - name: VolumeWriteBytes
+          statistics: [Sum]
+        - name: VolumeTotalReadTime
+          statistics: [Sum]
+        - name: VolumeTotalWriteTime
+          statistics: [Sum]
+        - name: VolumeIdleTime
+          statistics: [Sum]
+        - name: VolumeQueueLength
+          statistics: [Average]
     - type: AWS/Billing
       regions:
         - us-east-1
-- 
2.47.3