Revert "cloudwatch: Own job for Replication Metrics"

This reverts commit 6c92319de16d70a02efabb29a4ea2d84e83b8acc.

diff --git a/cookbooks/prometheus/templates/default/cloudwatch.yml.erb b/cookbooks/prometheus/templates/default/cloudwatch.yml.erb
index 14550314d09f6fa3be2f96e0c3aeb350797123c1..0dfef8665a2e3368824472a1697abaa939ab6ca3 100644 (file)
--- a/cookbooks/prometheus/templates/default/cloudwatch.yml.erb
+++ b/cookbooks/prometheus/templates/default/cloudwatch.yml.erb
@@ -6,6 +6,7 @@ discovery:
       regions:
         - eu-west-1
         - eu-west-2
       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
       roles:
         - roleArn: "arn:aws:iam::173189593406:role/osm-cloudwatch-export-role" # osm-main
       period: 300


@@ -45,22 +46,14 @@ discovery:
           statistics: [Minimum, Maximum, Average]
         - name: TotalRequestLatency
           statistics: [Minimum, Maximum, Average]
           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: ReplicationLatency
           statistics: [Maximum]
         - name: BytesPendingReplication
           statistics: [Maximum]
         - name: OperationsPendingReplication
           statistics: [Maximum]

+        - name: OperationsFailedReplication
+          statistics: [Sum]

     - type: AWS/S3
       regions:
         - eu-central-1
     - type: AWS/S3
       regions:
         - eu-central-1


@@ -154,6 +147,14 @@ discovery:
           statistics: [Minimum, Maximum, Average]
         - name: TotalRequestLatency
           statistics: [Minimum, Maximum, Average]
           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
     - type: AWS/EC2
       regions:
         - us-east-2