wip

aks/postgres/resources.tf

@@ -1,14 +1,4 @@
 locals {
-
-  alert_frequency_map = {
-    PT5M  = "PT1M"
-    PT15M = "PT1M"
-    PT30M = "PT1M"
-    PT1H  = "PT1M"
-    PT6H  = "PT5M"
-    PT12H  = "PT5M"
-  }
-
   database_name = "${var.service_short}_${var.environment}"
 
   name_suffix = var.name != null ? "-${var.name}" : ""
@@ -21,8 +11,15 @@ locals {
 
   kubernetes_name = "${var.service_name}-${var.environment}-postgres${local.name_suffix}"
 
+  alert_frequency_map = {
+    PT5M  = "PT1M"
+    PT15M = "PT1M"
+    PT30M = "PT1M"
+    PT1H  = "PT1M"
+    PT6H  = "PT5M"
+    PT12H  = "PT5M"
+  }
   alert_frequency = local.alert_frequency_map[var.alert_window_size]
-
 }
 
 # Username & password

aks/redis/resources.tf

@@ -6,6 +6,16 @@ locals {
   azure_enable_monitoring     = var.use_azure && var.azure_enable_monitoring
 
   kubernetes_name = "${var.service_name}-${var.environment}-redis${local.name_suffix}"
+
+    alert_frequency_map = {
+    PT5M  = "PT1M"
+    PT15M = "PT1M"
+    PT30M = "PT1M"
+    PT1H  = "PT1M"
+    PT6H  = "PT5M"
+    PT12H  = "PT5M"
+  }
+  alert_frequency = local.alert_frequency_map[var.alert_window_size]
 }
 
 # Azure
@@ -86,6 +96,7 @@ resource "azurerm_monitor_metric_alert" "memory" {
   scopes              = [azurerm_redis_cache.main[0].id]
   description         = "Action will be triggered when memory use is greater than ${var.azure_memory_threshold}%"
   window_size         = var.alert_window_size
+  frequency           = local.alert_frequency
 
   criteria {
     metric_namespace = "Microsoft.Cache/redis"

aks/redis/variables.tf

@@ -114,5 +114,9 @@ variable "alert_window_size" {
   type        = string
   default     = "PT5M"
   nullable    = false
-  description = "The period of time that is used to monitor alert activity e.g PT1M, PT5M, PT15M, PT30M, PT1H, PT6H or PT12H"
+  validation {
+    condition     = contains(["PT1M", "PT5M", "PT15M", "PT30M", "PT1H", "PT6H", "PT12H"], var.alert_window_size)
+    error_message = "The alert_window_size must be one of: PT1M, PT5M, PT15M, PT30M, PT1H, PT6H, PT12H"
+  }
+  description = "The period of time that is used to monitor alert activity. The interval between checks is adjusted accordingly."
 }