X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6c92319de16d70a02efabb29a4ea2d84e83b8acc..3c4f3eaeb6715b18911b951f8b704818efb0ce3a:/cookbooks/prometheus/templates/default/cloudwatch.yml.erb?ds=inline

diff --git a/cookbooks/prometheus/templates/default/cloudwatch.yml.erb b/cookbooks/prometheus/templates/default/cloudwatch.yml.erb
index 14550314d..6a8757e40 100644
--- a/cookbooks/prometheus/templates/default/cloudwatch.yml.erb
+++ b/cookbooks/prometheus/templates/default/cloudwatch.yml.erb
@@ -8,17 +8,24 @@ discovery:
         - eu-west-2
       roles:
         - roleArn: "arn:aws:iam::173189593406:role/osm-cloudwatch-export-role" # osm-main
-      period: 300
-      length: 300
+      roundingPeriod: 86400
+      period: 86400
+      length: 86400
       metrics:
         - name: BucketSizeBytes
           statistics: [Average]
-          period: 86400
-          length: 86400
         - name: NumberOfObjects
           statistics: [Average]
-          period: 86400
-          length: 86400
+    - type: AWS/S3
+      regions:
+        - eu-west-1
+        - eu-west-2
+      roles:
+        - roleArn: "arn:aws:iam::173189593406:role/osm-cloudwatch-export-role" # osm-main
+      roundingPeriod: 300
+      period: 300
+      length: 300
+      metrics:
         - name: AllRequests
           statistics: [Sum]
         - name: GetRequests
@@ -45,39 +52,38 @@ 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
         - us-west-2
       roles:
         - roleArn: "arn:aws:iam::630658470130:role/osm-cloudwatch-export-role" # osm-planet (pds)
-      period: 300
-      length: 300
+      roundingPeriod: 86400
+      period: 86400
+      length: 86400
       metrics:
         - name: BucketSizeBytes
           statistics: [Average]
-          period: 86400
-          length: 86400
         - name: NumberOfObjects
           statistics: [Average]
-          period: 86400
-          length: 86400
+    - type: AWS/S3
+      regions:
+        - eu-central-1
+        - us-west-2
+      roles:
+        - roleArn: "arn:aws:iam::630658470130:role/osm-cloudwatch-export-role" # osm-planet (pds)
+      roundingPeriod: 300
+      period: 300
+      length: 300
+      metrics:
         - name: AllRequests
           statistics: [Sum]
         - name: GetRequests
@@ -117,17 +123,23 @@ discovery:
         - eu-north-1
       roles:
         - roleArn: "arn:aws:iam::674083635870:role/osm-cloudwatch-export-role" # osm-backup
-      period: 300
-      length: 300
+      roundingPeriod: 86400
+      period: 86400
+      length: 86400
       metrics:
         - name: BucketSizeBytes
           statistics: [Average]
-          period: 86400
-          length: 86400
         - name: NumberOfObjects
           statistics: [Average]
-          period: 86400
-          length: 86400
+    - type: AWS/S3
+      regions:
+        - eu-north-1
+      roles:
+        - roleArn: "arn:aws:iam::674083635870:role/osm-cloudwatch-export-role" # osm-backup
+      roundingPeriod: 300
+      period: 300
+      length: 300
+      metrics:
         - name: AllRequests
           statistics: [Sum]
         - name: GetRequests
@@ -154,11 +166,20 @@ 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
       roles:
         - roleArn: "arn:aws:iam::683740446523:role/osm-cloudwatch-export-role" # osm-render
+      roundingPeriod: 300
       period: 300
       length: 300
       metrics:
@@ -188,8 +209,114 @@ discovery:
         - roleArn: "arn:aws:iam::674083635870:role/osm-cloudwatch-export-role" # osm-backup
         - roleArn: "arn:aws:iam::683740446523:role/osm-cloudwatch-export-role" # osm-render
         # Note osm-planet is billed direct to AWS Open Data Program
+      roundingPeriod: 21600
       period: 21600
       length: 21600
       metrics:
         - name: EstimatedCharges
           statistics: [Sum]
+static:
+  - namespace: AWS/S3
+    name: gps-images-replication
+    regions:
+      - eu-north-1
+    roles:
+      - roleArn: "arn:aws:iam::173189593406:role/osm-cloudwatch-export-role" # osm-main
+    dimensions:
+      - name: RuleId
+        value: full-bucket-replication
+      - name: SourceBucket
+        value: openstreetmap-gps-images
+      - name: DestinationBucket
+        value: openstreetmap-gps-images-replicate
+    metrics:
+      - name: ReplicationLatency
+        statistics: [Maximum]
+        period: 300
+        length: 300
+      - name: BytesPendingReplication
+        statistics: [Maximum]
+        period: 300
+        length: 300
+      - name: OperationsPendingReplication
+        statistics: [Maximum]
+        period: 300
+        length: 300
+  - namespace: AWS/S3
+    name: gps-traces-replication
+    regions:
+      - eu-north-1
+    roles:
+      - roleArn: "arn:aws:iam::173189593406:role/osm-cloudwatch-export-role" # osm-main
+    dimensions:
+      - name: RuleId
+        value: full-bucket-replication
+      - name: SourceBucket
+        value: openstreetmap-gps-traces
+      - name: DestinationBucket
+        value: openstreetmap-gps-traces-replicate
+    metrics:
+      - name: ReplicationLatency
+        statistics: [Maximum]
+        period: 300
+        length: 300
+      - name: BytesPendingReplication
+        statistics: [Maximum]
+        period: 300
+        length: 300
+      - name: OperationsPendingReplication
+        statistics: [Maximum]
+        period: 300
+        length: 300
+  - namespace: AWS/S3
+    name: user-avatars-replication
+    regions:
+      - eu-north-1
+    roles:
+      - roleArn: "arn:aws:iam::173189593406:role/osm-cloudwatch-export-role" # osm-main
+    dimensions:
+      - name: RuleId
+        value: full-bucket-replication
+      - name: SourceBucket
+        value: openstreetmap-user-avatars
+      - name: DestinationBucket
+        value: openstreetmap-user-avatars-replicate
+    metrics:
+      - name: ReplicationLatency
+        statistics: [Maximum]
+        period: 300
+        length: 300
+      - name: BytesPendingReplication
+        statistics: [Maximum]
+        period: 300
+        length: 300
+      - name: OperationsPendingReplication
+        statistics: [Maximum]
+        period: 300
+        length: 300
+  - namespace: AWS/S3
+    name: aws-cloudtrail-replication
+    regions:
+      - eu-north-1
+    roles:
+      - roleArn: "arn:aws:iam::173189593406:role/osm-cloudwatch-export-role" # osm-main
+    dimensions:
+      - name: RuleId
+        value: full-bucket-replication
+      - name: SourceBucket
+        value: openstreetmap-aws-cloudtrail
+      - name: DestinationBucket
+        value: openstreetmap-aws-cloudtrail-replicate
+    metrics:
+      - name: ReplicationLatency
+        statistics: [Maximum]
+        period: 300
+        length: 300
+      - name: BytesPendingReplication
+        statistics: [Maximum]
+        period: 300
+        length: 300
+      - name: OperationsPendingReplication
+        statistics: [Maximum]
+        period: 300
+        length: 300