Merge pull request #1261 from DFE-Digital/enable_monitoring

Enable monitoring
DFE-Digital · Dec 2, 2024 · b59932f · b59932f
2 parents eb163ea + 3460a51
commit b59932f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -242,6 +242,11 @@ deploy-arm-resources: arm-deployment ## Validate ARM resource deployment. Usage:
 
 validate-arm-resources: set-what-if arm-deployment ## Validate ARM resource deployment. Usage: make domains validate-arm-resources
 
+action-group-resources: set-azure-account # make env action-group-resources [email protected] . Must be run before setting enable_monitoring=true for each subscription
+	$(if $(ACTION_GROUP_EMAIL), , $(error Please specify a notification email for the action group))
+	az group create -l uksouth -g ${AZURE_RESOURCE_PREFIX}-${SERVICE_SHORT}-mn-rg --tags "Product=Refer Serious Misconduct"
+	az monitor action-group create -n ${AZURE_RESOURCE_PREFIX}-${SERVICE_NAME} -g ${AZURE_RESOURCE_PREFIX}-${SERVICE_SHORT}-mn-rg --action email ${AZURE_RESOURCE_PREFIX}-${SERVICE_SHORT}-email ${ACTION_GROUP_EMAIL}
+
 aks-terraform-init: composed-variables bin/terrafile aks-set-azure-account
 	$(if ${DOCKER_IMAGE_TAG}, , $(eval DOCKER_IMAGE_TAG=main))
 

diff --git a/terraform/application/config/production.tfvars.json b/terraform/application/config/production.tfvars.json
@@ -13,7 +13,8 @@
   "account_replication_type": "GRS",
   "cluster": "production",
   "enable_logit": true,
-  "enable_monitoring": false,
+  "enable_monitoring": true,
+  "statuscake_contact_groups": [288912, 282453],
   "namespace": "tra-production",
   "allegations_container_delete_retention_days": 30
 }
diff --git a/terraform/application/config/production.yml b/terraform/application/config/production.yml
@@ -1 +1,2 @@
 ---
+EXTERNAL_DOMAIN: refer-serious-misconduct.education.gov.uk
diff --git a/terraform/application/statuscake.tf b/terraform/application/statuscake.tf
@@ -1,12 +1,10 @@
-/*
 module "statuscake" {
   count = var.enable_monitoring ? 1 : 0
 
   source = "./vendor/modules/aks//monitoring/statuscake"
 
-  uptime_urls = compact([module.web_application.probe_url, var.external_url])
-  ssl_urls    = compact([var.external_url])
+  uptime_urls = compact([module.web_application.probe_url, "https://${local.external_domain}/health"])
+  ssl_urls    = compact(["https://${local.external_domain}/"])
 
   contact_groups = var.statuscake_contact_groups
 }
-*/
diff --git a/terraform/application/terraform.tf b/terraform/application/terraform.tf
@@ -41,6 +41,6 @@ provider "kubernetes" {
   }
 }
 
-/*provider "statuscake" {
+provider "statuscake" {
   api_token = module.infrastructure_secrets.map.STATUSCAKE-API-TOKEN
-}*/
+}
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		---
		EXTERNAL_DOMAIN: refer-serious-misconduct.education.gov.uk