Split daily metrics into separate jobs

diff --git a/cookbooks/prometheus/templates/default/cloudwatch.yml.erb b/cookbooks/prometheus/templates/default/cloudwatch.yml.erb
index fc61acd9b5f7df11480f198be6941e3ff77e39c7..6891342429b2ba0de4848e7cf281d06f562e4443 100644 (file)
--- a/cookbooks/prometheus/templates/default/cloudwatch.yml.erb
+++ b/cookbooks/prometheus/templates/default/cloudwatch.yml.erb
@@ -8,17 +8,22 @@ discovery:
         - eu-west-2
       roles:
         - roleArn: "arn:aws:iam::173189593406:role/osm-cloudwatch-export-role" # osm-main
         - eu-west-2
       roles:
         - roleArn: "arn:aws:iam::173189593406:role/osm-cloudwatch-export-role" # osm-main

-      period: 300
-      length: 300
+      period: 86400
+      length: 86400

       metrics:
         - name: BucketSizeBytes
           statistics: [Average]
       metrics:
         - name: BucketSizeBytes
           statistics: [Average]

-          period: 86400
-          length: 172800

         - name: NumberOfObjects
           statistics: [Average]
         - name: NumberOfObjects
           statistics: [Average]

-          period: 86400
-          length: 172800
+    - type: AWS/S3
+      regions:
+        - eu-west-1
+        - eu-west-2
+      roles:
+        - roleArn: "arn:aws:iam::173189593406:role/osm-cloudwatch-export-role" # osm-main
+      period: 300
+      length: 300
+      metrics:

         - name: AllRequests
           statistics: [Sum]
         - name: GetRequests
         - name: AllRequests
           statistics: [Sum]
         - name: GetRequests


@@ -59,17 +64,22 @@ discovery:
         - us-west-2
       roles:
         - roleArn: "arn:aws:iam::630658470130:role/osm-cloudwatch-export-role" # osm-planet (pds)
         - us-west-2
       roles:
         - roleArn: "arn:aws:iam::630658470130:role/osm-cloudwatch-export-role" # osm-planet (pds)

-      period: 300
-      length: 300
+      period: 86400
+      length: 86400

       metrics:
         - name: BucketSizeBytes
           statistics: [Average]
       metrics:
         - name: BucketSizeBytes
           statistics: [Average]

-          period: 86400
-          length: 172800

         - name: NumberOfObjects
           statistics: [Average]
         - name: NumberOfObjects
           statistics: [Average]

-          period: 86400
-          length: 172800
+    - 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
+      metrics:

         - name: AllRequests
           statistics: [Sum]
         - name: GetRequests
         - name: AllRequests
           statistics: [Sum]
         - name: GetRequests


@@ -109,17 +119,21 @@ discovery:
         - eu-north-1
       roles:
         - roleArn: "arn:aws:iam::674083635870:role/osm-cloudwatch-export-role" # osm-backup
         - eu-north-1
       roles:
         - roleArn: "arn:aws:iam::674083635870:role/osm-cloudwatch-export-role" # osm-backup

-      period: 300
-      length: 300
+      period: 86400
+      length: 86400

       metrics:
         - name: BucketSizeBytes
           statistics: [Average]
       metrics:
         - name: BucketSizeBytes
           statistics: [Average]

-          period: 86400
-          length: 172800

         - name: NumberOfObjects
           statistics: [Average]
         - name: NumberOfObjects
           statistics: [Average]

-          period: 86400
-          length: 172800
+    - type: AWS/S3
+      regions:
+        - eu-north-1
+      roles:
+        - roleArn: "arn:aws:iam::674083635870:role/osm-cloudwatch-export-role" # osm-backup
+      period: 300
+      length: 300
+      metrics:

         - name: AllRequests
           statistics: [Sum]
         - name: GetRequests
         - name: AllRequests
           statistics: [Sum]
         - name: GetRequests