diff --git a/terraform/aks/app.tf b/terraform/aks/app.tf index 964afd3d5e..4c94a98db2 100644 --- a/terraform/aks/app.tf +++ b/terraform/aks/app.tf @@ -192,12 +192,13 @@ module "ui_application" { kubernetes_config_map_name = module.ui_application_configuration.kubernetes_config_map_name kubernetes_secret_name = module.ui_application_configuration.kubernetes_secret_name - docker_image = var.docker_image - command = ["/bin/ash", "-c", "cd /Apps/SupportUi/; dotnet TeachingRecordSystem.SupportUi.dll;"] - web_port = 80 - probe_path = "/health" - replicas = var.ui_replicas - enable_logit = var.enable_logit + docker_image = var.docker_image + command = ["/bin/ash", "-c", "cd /Apps/SupportUi/; dotnet TeachingRecordSystem.SupportUi.dll;"] + web_port = 80 + probe_path = "/health" + replicas = var.ui_replicas + enable_logit = var.enable_logit + enable_prometheus_monitoring = var.enable_prometheus_monitoring } module "worker_application_configuration" { @@ -242,9 +243,10 @@ module "worker_application" { kubernetes_config_map_name = module.worker_application_configuration.kubernetes_config_map_name kubernetes_secret_name = module.worker_application_configuration.kubernetes_secret_name - docker_image = var.docker_image - command = ["/bin/ash", "-c", "cd /Apps/Worker/; dotnet TeachingRecordSystem.Worker.dll;"] - replicas = var.worker_replicas - max_memory = var.worker_max_memory - enable_logit = var.enable_logit + docker_image = var.docker_image + command = ["/bin/ash", "-c", "cd /Apps/Worker/; dotnet TeachingRecordSystem.Worker.dll;"] + replicas = var.worker_replicas + max_memory = var.worker_max_memory + enable_logit = var.enable_logit + enable_prometheus_monitoring = var.enable_prometheus_monitoring } diff --git a/terraform/aks/variables.tf b/terraform/aks/variables.tf index b5f10b7df3..fc5c34a7bb 100644 --- a/terraform/aks/variables.tf +++ b/terraform/aks/variables.tf @@ -47,6 +47,11 @@ variable "enable_monitoring" { variable "enable_logit" { default = false } +variable "enable_prometheus_monitoring" { + type = bool + default = false +} + variable "deploy_azure_backing_services" { type = string default = true diff --git a/terraform/aks/workspace_variables/dev.tfvars.json b/terraform/aks/workspace_variables/dev.tfvars.json index 27ecb78839..60e49128f0 100644 --- a/terraform/aks/workspace_variables/dev.tfvars.json +++ b/terraform/aks/workspace_variables/dev.tfvars.json @@ -4,6 +4,7 @@ "namespace": "tra-development", "resource_group_name": "s189t01-trs-dv-rg", "enable_monitoring": false, + "enable_prometheus_monitoring": true, "deploy_dqt_reporting_server": true, "run_dqt_reporting_service": true, "run_recurring_jobs": false, diff --git a/terraform/aks/workspace_variables/dv_review.tfvars.json b/terraform/aks/workspace_variables/dv_review.tfvars.json index 574e299022..148aed1ccc 100644 --- a/terraform/aks/workspace_variables/dv_review.tfvars.json +++ b/terraform/aks/workspace_variables/dv_review.tfvars.json @@ -3,6 +3,7 @@ "namespace": "development", "resource_group_name": "s189d01-trs-rv-rg", "enable_monitoring": false, + "enable_prometheus_monitoring": true, "deploy_dqt_reporting_server": false, "run_dqt_reporting_service": false, "run_recurring_jobs": false, diff --git a/terraform/aks/workspace_variables/pre-production.tfvars.json b/terraform/aks/workspace_variables/pre-production.tfvars.json index 53c8322514..1ed6fb8e60 100644 --- a/terraform/aks/workspace_variables/pre-production.tfvars.json +++ b/terraform/aks/workspace_variables/pre-production.tfvars.json @@ -4,6 +4,7 @@ "namespace": "tra-test", "resource_group_name": "s189t01-trs-pp-rg", "enable_monitoring": false, + "enable_prometheus_monitoring": true, "deploy_dqt_reporting_server": false, "run_dqt_reporting_service": true, "run_recurring_jobs": true, diff --git a/terraform/aks/workspace_variables/production.tfvars.json b/terraform/aks/workspace_variables/production.tfvars.json index 1bcd75673a..cddbe2503d 100644 --- a/terraform/aks/workspace_variables/production.tfvars.json +++ b/terraform/aks/workspace_variables/production.tfvars.json @@ -4,6 +4,7 @@ "namespace": "tra-production", "resource_group_name": "s189p01-trs-pd-rg", "enable_monitoring": true, + "enable_prometheus_monitoring": true, "deploy_dqt_reporting_server": false, "run_dqt_reporting_service": true, "run_recurring_jobs": true, diff --git a/terraform/aks/workspace_variables/test.tfvars.json b/terraform/aks/workspace_variables/test.tfvars.json index a625e08a6a..6620baf539 100644 --- a/terraform/aks/workspace_variables/test.tfvars.json +++ b/terraform/aks/workspace_variables/test.tfvars.json @@ -4,6 +4,7 @@ "namespace": "tra-test", "resource_group_name": "s189t01-trs-ts-rg", "enable_monitoring": false, + "enable_prometheus_monitoring": true, "deploy_dqt_reporting_server": true, "run_dqt_reporting_service": true, "run_recurring_jobs": false,