fix: introduced auto‑mitigation option for function app 4xx/5xx alerts (#1830)

nc-shahidazim · web-flow · commit 2950b89d689c · 2026-02-04T16:37:59.000Z
fix: introduced auto‑mitigation option with a default of false for function app 4xx/5xx alerts
diff --git a/.azuredevops/pipelines/acr-image-retag.yaml b/.azuredevops/pipelines/acr-image-retag.yaml
@@ -9,7 +9,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 6144dfb45fb8eca01794bbbe686a4e9857738ec1
+      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/adhoc-post-deployment-tests-dev.yaml b/.azuredevops/pipelines/adhoc-post-deployment-tests-dev.yaml
@@ -8,7 +8,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 6144dfb45fb8eca01794bbbe686a4e9857738ec1
+      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/cd-infrastructure-dev-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-dev-audit.yaml
@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 6144dfb45fb8eca01794bbbe686a4e9857738ec1
+      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/cd-infrastructure-dev-core.yaml b/.azuredevops/pipelines/cd-infrastructure-dev-core.yaml
@@ -9,7 +9,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 6144dfb45fb8eca01794bbbe686a4e9857738ec1
+      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/cd-infrastructure-int-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-int-audit.yaml
@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 6144dfb45fb8eca01794bbbe686a4e9857738ec1
+      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/cd-infrastructure-int-core.yaml b/.azuredevops/pipelines/cd-infrastructure-int-core.yaml
@@ -9,7 +9,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 6144dfb45fb8eca01794bbbe686a4e9857738ec1
+      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/cd-infrastructure-nft-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-nft-audit.yaml
@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 6144dfb45fb8eca01794bbbe686a4e9857738ec1
+      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/cd-infrastructure-nft-core.yaml b/.azuredevops/pipelines/cd-infrastructure-nft-core.yaml
@@ -9,7 +9,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 6144dfb45fb8eca01794bbbe686a4e9857738ec1
+      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/cd-infrastructure-preprod-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-preprod-audit.yaml
@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 6144dfb45fb8eca01794bbbe686a4e9857738ec1
+      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/cd-infrastructure-preprod-core.yaml b/.azuredevops/pipelines/cd-infrastructure-preprod-core.yaml
@@ -9,7 +9,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 6144dfb45fb8eca01794bbbe686a4e9857738ec1
+      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/cd-infrastructure-prod-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-prod-audit.yaml
@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 6144dfb45fb8eca01794bbbe686a4e9857738ec1
+      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/cd-infrastructure-prod-core.yaml b/.azuredevops/pipelines/cd-infrastructure-prod-core.yaml
@@ -9,7 +9,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 6144dfb45fb8eca01794bbbe686a4e9857738ec1
+      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/cd-infrastructure-sandbox-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-sandbox-audit.yaml
@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 6144dfb45fb8eca01794bbbe686a4e9857738ec1
+      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/cd-infrastructure-sandbox-core.yaml b/.azuredevops/pipelines/cd-infrastructure-sandbox-core.yaml
@@ -9,7 +9,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 6144dfb45fb8eca01794bbbe686a4e9857738ec1
+      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/post-deployment-tests-dev.yaml b/.azuredevops/pipelines/post-deployment-tests-dev.yaml
@@ -16,7 +16,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 6144dfb45fb8eca01794bbbe686a4e9857738ec1
+      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/task_azure_sql_backup_prod.yaml b/.azuredevops/pipelines/task_azure_sql_backup_prod.yaml
@@ -17,7 +17,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 6144dfb45fb8eca01794bbbe686a4e9857738ec1
+      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/task_azure_sql_scaling_dev.yaml b/.azuredevops/pipelines/task_azure_sql_scaling_dev.yaml
@@ -27,7 +27,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 6144dfb45fb8eca01794bbbe686a4e9857738ec1
+      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/task_azure_sql_scaling_int.yaml b/.azuredevops/pipelines/task_azure_sql_scaling_int.yaml
@@ -27,7 +27,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 6144dfb45fb8eca01794bbbe686a4e9857738ec1
+      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/task_azure_sql_scaling_nft.yaml b/.azuredevops/pipelines/task_azure_sql_scaling_nft.yaml
@@ -27,7 +27,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 6144dfb45fb8eca01794bbbe686a4e9857738ec1
+      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/task_azure_sql_scaling_preprod.yaml b/.azuredevops/pipelines/task_azure_sql_scaling_preprod.yaml
@@ -27,7 +27,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 6144dfb45fb8eca01794bbbe686a4e9857738ec1
+      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/task_azure_sql_scaling_prod.yaml b/.azuredevops/pipelines/task_azure_sql_scaling_prod.yaml
@@ -27,7 +27,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 6144dfb45fb8eca01794bbbe686a4e9857738ec1
+      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
       endpoint: NHSDigital
 
 parameters:
diff --git a/infrastructure/tf-core/function_app.tf b/infrastructure/tf-core/function_app.tf
@@ -13,6 +13,7 @@ module "functionapp" {
   action_group_id                                      = var.features.alerts_function_errors_enabled ? module.monitor_action_group_performance[0].monitor_action_group.id : null
   alert_4xx_threshold                                  = var.function_apps.alert_4xx_threshold
   alert_5xx_threshold                                  = var.function_apps.alert_5xx_threshold
+  alert_auto_mitigate                                  = var.function_apps.alert_auto_mitigate
   alert_window_size                                    = var.function_apps.alert_window_size
   log_analytics_workspace_id                           = data.terraform_remote_state.audit.outputs.log_analytics_workspace_id[local.primary_region]
   monitor_diagnostic_setting_function_app_enabled_logs = local.monitor_diagnostic_setting_function_app_enabled_logs
diff --git a/infrastructure/tf-core/variables.tf b/infrastructure/tf-core/variables.tf
@@ -260,6 +260,7 @@ variable "function_apps" {
     worker_32bit                           = bool
     alert_4xx_threshold                    = optional(number, 1)
     alert_5xx_threshold                    = optional(number, 1)
+    alert_auto_mitigate                    = optional(bool, false)
     alert_window_size                      = optional(string, "PT5M") # Check every 5 minutes
     slots = optional(map(object({
       name         = string
