Drop roundingPeriod from cloudwatch exporter configuration

[chef.git] / cookbooks / prometheus / templates / default / cloudwatch.yml.erb

diff --git a/cookbooks/prometheus/templates/default/cloudwatch.yml.erb b/cookbooks/prometheus/templates/default/cloudwatch.yml.erb
index 29d93e36ef42e9d84f1b92379e35c9011009aa77..bab5559b121f3a0477e82900bb3d005b024ccc4b 100644 (file)
--- a/cookbooks/prometheus/templates/default/cloudwatch.yml.erb
+++ b/cookbooks/prometheus/templates/default/cloudwatch.yml.erb
@@ -8,7 +8,6 @@ discovery:
         - eu-west-2
       roles:
         - roleArn: "arn:aws:iam::173189593406:role/osm-cloudwatch-export-role" # osm-main
-      roundingPeriod: 86400
       period: 86400
       length: 86400
       metrics:
@@ -22,7 +21,6 @@ discovery:
         - eu-west-2
       roles:
         - roleArn: "arn:aws:iam::173189593406:role/osm-cloudwatch-export-role" # osm-main
-      roundingPeriod: 300
       period: 300
       length: 300
       metrics:
@@ -66,7 +64,6 @@ discovery:
         - us-west-2
       roles:
         - roleArn: "arn:aws:iam::630658470130:role/osm-cloudwatch-export-role" # osm-planet (pds)
-      roundingPeriod: 86400
       period: 86400
       length: 86400
       metrics:
@@ -80,7 +77,6 @@ discovery:
         - us-west-2
       roles:
         - roleArn: "arn:aws:iam::630658470130:role/osm-cloudwatch-export-role" # osm-planet (pds)
-      roundingPeriod: 300
       period: 300
       length: 300
       metrics:
@@ -123,7 +119,6 @@ discovery:
         - eu-north-1
       roles:
         - roleArn: "arn:aws:iam::674083635870:role/osm-cloudwatch-export-role" # osm-backup
-      roundingPeriod: 86400
       period: 86400
       length: 86400
       metrics:
@@ -136,7 +131,6 @@ discovery:
         - eu-north-1
       roles:
         - roleArn: "arn:aws:iam::674083635870:role/osm-cloudwatch-export-role" # osm-backup
-      roundingPeriod: 300
       period: 300
       length: 300
       metrics:
@@ -179,7 +173,6 @@ discovery:
         - us-east-2
       roles:
         - roleArn: "arn:aws:iam::683740446523:role/osm-cloudwatch-export-role" # osm-render
-      roundingPeriod: 300
       period: 300
       length: 300
       metrics:
@@ -209,9 +202,113 @@ 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