Add window_size to postgres module

DFE-Digital · Nov 27, 2023 · e1882be · e1882be
1 parent 8c6c2e0
commit e1882be
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 0 deletions.
diff --git a/aks/postgres/resources.tf b/aks/postgres/resources.tf
@@ -151,6 +151,7 @@ resource "azurerm_monitor_metric_alert" "memory" {
   resource_group_name = data.azurerm_resource_group.main[0].name
   scopes              = [azurerm_postgresql_flexible_server.main[0].id]
   description         = "Action will be triggered when memory use is greater than 75%"
+  window_size         = var.window_size
 
   criteria {
     metric_namespace = "Microsoft.DBforPostgreSQL/flexibleServers"
@@ -178,6 +179,7 @@ resource "azurerm_monitor_metric_alert" "cpu" {
   resource_group_name = data.azurerm_resource_group.main[0].name
   scopes              = [azurerm_postgresql_flexible_server.main[0].id]
   description         = "Action will be triggered when cpu use is greater than 60%"
+  window_size         = var.window_size
 
   criteria {
     metric_namespace = "Microsoft.DBforPostgreSQL/flexibleServers"
@@ -205,6 +207,7 @@ resource "azurerm_monitor_metric_alert" "storage" {
   resource_group_name = data.azurerm_resource_group.main[0].name
   scopes              = [azurerm_postgresql_flexible_server.main[0].id]
   description         = "Action will be triggered when storage use is greater than 75%"
+  window_size         = var.window_size
 
   criteria {
     metric_namespace = "Microsoft.DBforPostgreSQL/flexibleServers"

diff --git a/aks/postgres/tfdocs.md b/aks/postgres/tfdocs.md
@@ -68,6 +68,7 @@ No modules.
 | <a name="input_service_name"></a> [service\_name](#input\_service\_name) | Name of the service | `string` | n/a | yes |
 | <a name="input_service_short"></a> [service\_short](#input\_service\_short) | Short name of the service | `string` | n/a | yes |
 | <a name="input_use_azure"></a> [use\_azure](#input\_use\_azure) | Whether to deploy using Azure Redis Cache service | `bool` | n/a | yes |
+| <a name="input_window_size"></a> [window\_size](#input\_window\_size) | The period of time that is used to monitor alert activity e.g PT1M, PT5M, PT15M, PT30M, PT1H, PT6H or PT12H | `string` | `"PT5M"` | no |
 
 ## Outputs
 

diff --git a/aks/postgres/variables.tf b/aks/postgres/variables.tf
@@ -114,6 +114,12 @@ variable "azure_enable_monitoring" {
   default = true
 }
 
+variable "window_size" {
+  type        = string
+  default     = "PT5M"
+  description = "The period of time that is used to monitor alert activity e.g PT1M, PT5M, PT15M, PT30M, PT1H, PT6H or PT12H"
+}
+
 variable "azure_maintenance_window" {
   type = object({
     day_of_week  = optional(number)

diff --git a/aks/redis/resources.tf b/aks/redis/resources.tf
@@ -85,6 +85,7 @@ resource "azurerm_monitor_metric_alert" "memory" {
   resource_group_name = data.azurerm_resource_group.main[0].name
   scopes              = [azurerm_redis_cache.main[0].id]
   description         = "Action will be triggered when memory use is greater than 60%"
+  window_size         = var.window_size
 
   criteria {
     metric_namespace = "Microsoft.Cache/redis"

diff --git a/aks/redis/tfdocs.md b/aks/redis/tfdocs.md
@@ -51,6 +51,7 @@ No modules.
 | <a name="input_service_name"></a> [service\_name](#input\_service\_name) | Name of the service | `string` | n/a | yes |
 | <a name="input_service_short"></a> [service\_short](#input\_service\_short) | Short name of the service | `string` | n/a | yes |
 | <a name="input_use_azure"></a> [use\_azure](#input\_use\_azure) | Whether to deploy using Azure Redis Cache service | `bool` | n/a | yes |
+| <a name="input_window_size"></a> [window\_size](#input\_window\_size) | The period of time that is used to monitor alert activity e.g PT1M, PT5M, PT15M, PT30M, PT1H, PT6H or PT12H | `string` | `"PT5M"` | no |
 
 ## Outputs
 

diff --git a/aks/redis/variables.tf b/aks/redis/variables.tf
@@ -103,3 +103,10 @@ variable "azure_patch_schedule" {
   }))
   default = []
 }
+
+variable "window_size" {
+  type        = string
+  default     = "PT5M"
+  description = "The period of time that is used to monitor alert activity e.g PT1M, PT5M, PT15M, PT30M, PT1H, PT6H or PT12H"
+}
+