From 262bde19342caf698f45daa0afab0fb901974a19 Mon Sep 17 00:00:00 2001
From: Max Williams <8859277+max-rocket-internet@users.noreply.github.com>
Date: Tue, 29 Aug 2023 12:19:40 +0200
Subject: [PATCH] Multiple updates, fixes (#1)

Co-authored-by: Max Williams <max-rocket-internet@users.noreply.github.com>
---
 README.md                              | 6 +++---
 modules/dashboard/usage.tf             | 4 ++--
 modules/trusted_advisor_alarms/main.tf | 4 ++--
 modules/usage_alarms/main.tf           | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 21d33ca..dfc8e59 100644
--- a/README.md
+++ b/README.md
@@ -12,17 +12,17 @@ See [example](example) for a full example implimentation of both modules, multip
 
 ```hcl
 module "dashboard" {
-  source  = "git::https://github.com/deliveryhero/terraform-aws-service-quota-alarms.git//modules/dashboard?ref=1.4"
+  source  = "git::https://github.com/deliveryhero/terraform-aws-service-quota-alarms.git//modules/dashboard?ref=1.5"
   regions = ["us-east-1"]
 }
 
 module "trusted_advisor_alarms" {
-  source  = "git::https://github.com/deliveryhero/terraform-aws-service-quota-alarms.git//modules/trusted_advisor_alarms?ref=1.4"
+  source  = "git::https://github.com/deliveryhero/terraform-aws-service-quota-alarms.git//modules/trusted_advisor_alarms?ref=1.5"
   regions = ["us-east-1"]
 }
 
 module "usage_alarms" {
-  source = "git::https://github.com/deliveryhero/terraform-aws-service-quota-alarms.git//modules/usage_alarms?ref=1.4"
+  source = "git::https://github.com/deliveryhero/terraform-aws-service-quota-alarms.git//modules/usage_alarms?ref=1.5"
 }
 ```
 
diff --git a/modules/dashboard/usage.tf b/modules/dashboard/usage.tf
index 32a7b1c..81895e3 100644
--- a/modules/dashboard/usage.tf
+++ b/modules/dashboard/usage.tf
@@ -74,7 +74,7 @@ locals {
         {
           type = "metric"
           properties = {
-            stat   = "Sum"
+            stat   = "Maximum"
             region = region
             period = 300
             view   = "timeSeries"
@@ -91,7 +91,7 @@ locals {
               for metric in metrics : flatten([
                 [
                   "AWS/Usage", "ResourceCount", "Class", metric["class"], "Resource", metric["resource"], "Service", metric["service_name"], "Type", "Resource",
-                  { id = metric["id"], region = metric["region"], visible = false }
+                  { id = metric["id"], region = metric["region"], visible = false, "stat" = metric["resource"] == "NumberOfMessagesPublishedPerAccount" ? "Sum" : "Maximum" }
                 ]
               ])
               ],
diff --git a/modules/trusted_advisor_alarms/main.tf b/modules/trusted_advisor_alarms/main.tf
index 1f7f3e8..8e56a75 100644
--- a/modules/trusted_advisor_alarms/main.tf
+++ b/modules/trusted_advisor_alarms/main.tf
@@ -107,8 +107,8 @@ resource "aws_cloudwatch_metric_alarm" "main" {
   metric_name         = "ServiceLimitUsage"
   namespace           = "AWS/TrustedAdvisor"
   ok_actions          = var.cloudwatch_alarm_actions
-  period              = 3600
-  statistic           = "Average"
+  period              = 300
+  statistic           = "Maximum"
   tags                = var.tags
   threshold           = var.cloudwatch_alarm_threshold / 100
   treat_missing_data  = "ignore"
diff --git a/modules/usage_alarms/main.tf b/modules/usage_alarms/main.tf
index ead0308..eb35f51 100644
--- a/modules/usage_alarms/main.tf
+++ b/modules/usage_alarms/main.tf
@@ -112,8 +112,8 @@ resource "aws_cloudwatch_metric_alarm" "main" {
       }
       metric_name = "ResourceCount"
       namespace   = "AWS/Usage"
-      period      = 3600
-      stat        = "Average"
+      period      = 300
+      stat        = each.value["resource"] == "NumberOfMessagesPublishedPerAccount" ? "Sum" : "Maximum"
     }
   }
 }