From 6c92319de16d70a02efabb29a4ea2d84e83b8acc Mon Sep 17 00:00:00 2001
From: Grant Slater <github@firefishy.com>
Date: Thu, 12 Oct 2023 04:09:43 +0100
Subject: [PATCH] cloudwatch: Own job for Replication Metrics

---
 .../templates/default/cloudwatch.yml.erb      | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/cookbooks/prometheus/templates/default/cloudwatch.yml.erb b/cookbooks/prometheus/templates/default/cloudwatch.yml.erb
index 0dfef8665..14550314d 100644
--- a/cookbooks/prometheus/templates/default/cloudwatch.yml.erb
+++ b/cookbooks/prometheus/templates/default/cloudwatch.yml.erb
@@ -6,7 +6,6 @@ discovery:
       regions:
         - eu-west-1
         - eu-west-2
-        - eu-north-1
       roles:
         - roleArn: "arn:aws:iam::173189593406:role/osm-cloudwatch-export-role" # osm-main
       period: 300
@@ -46,14 +45,22 @@ discovery:
           statistics: [Minimum, Maximum, Average]
         - name: TotalRequestLatency
           statistics: [Minimum, Maximum, Average]
+        - name: OperationsFailedReplication
+          statistics: [Sum]
+    - type: AWS/S3
+      regions:
+        - eu-north-1
+      roles:
+        - roleArn: "arn:aws:iam::173189593406:role/osm-cloudwatch-export-role" # osm-main
+      period: 300
+      length: 300
+      metrics:
         - name: ReplicationLatency
           statistics: [Maximum]
         - name: BytesPendingReplication
           statistics: [Maximum]
         - name: OperationsPendingReplication
           statistics: [Maximum]
-        - name: OperationsFailedReplication
-          statistics: [Sum]
     - type: AWS/S3
       regions:
         - eu-central-1
@@ -147,14 +154,6 @@ discovery:
           statistics: [Minimum, Maximum, Average]
         - name: TotalRequestLatency
           statistics: [Minimum, Maximum, Average]
-        - name: ReplicationLatency
-          statistics: [Maximum]
-        - name: BytesPendingReplication
-          statistics: [Maximum]
-        - name: OperationsPendingReplication
-          statistics: [Maximum]
-        - name: OperationsFailedReplication
-          statistics: [Sum]
     - type: AWS/EC2
       regions:
         - us-east-2
-- 
2.39.5