Enable prometheus monitoring

DFE-Digital · Dec 2, 2024 · cbcd3ac · cbcd3ac
1 parent f66de52
commit cbcd3ac
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/terraform/application/application.tf b/terraform/application/application.tf
@@ -37,9 +37,10 @@ module "web_application" {
   service_name = var.service_name
   probe_path   = "/health"
 
-  cluster_configuration_map  = module.cluster_data.configuration_map
-  kubernetes_config_map_name = module.application_configuration.kubernetes_config_map_name
-  kubernetes_secret_name     = module.application_configuration.kubernetes_secret_name
+  cluster_configuration_map    = module.cluster_data.configuration_map
+  kubernetes_config_map_name   = module.application_configuration.kubernetes_config_map_name
+  kubernetes_secret_name       = module.application_configuration.kubernetes_secret_name
+  enable_prometheus_monitoring = var.enable_monitoring
 
   docker_image = var.docker_image
   replicas     = var.app_replicas
@@ -53,18 +54,19 @@ module "main_worker" {
   source     = "./vendor/modules/aks//aks/application"
   depends_on = [module.web_application]
 
-  namespace                  = var.namespace
-  environment                = var.environment
-  service_name               = var.service_name
-  name                       = "worker"
-  is_web                     = false
-  docker_image               = var.docker_image
-  replicas                   = var.worker_replicas
-  max_memory                 = var.worker_memory_max
-  cluster_configuration_map  = module.cluster_data.configuration_map
-  kubernetes_config_map_name = module.application_configuration.kubernetes_config_map_name
-  kubernetes_secret_name     = module.application_configuration.kubernetes_secret_name
-  command                    = ["/bin/sh", "-c", "bundle exec sidekiq -C config/sidekiq.yml"]
-  probe_command              = ["pgrep", "-f", "sidekiq"]
-  enable_logit               = var.enable_logit
+  namespace                    = var.namespace
+  environment                  = var.environment
+  service_name                 = var.service_name
+  name                         = "worker"
+  is_web                       = false
+  docker_image                 = var.docker_image
+  replicas                     = var.worker_replicas
+  max_memory                   = var.worker_memory_max
+  cluster_configuration_map    = module.cluster_data.configuration_map
+  kubernetes_config_map_name   = module.application_configuration.kubernetes_config_map_name
+  kubernetes_secret_name       = module.application_configuration.kubernetes_secret_name
+  command                      = ["/bin/sh", "-c", "bundle exec sidekiq -C config/sidekiq.yml"]
+  probe_command                = ["pgrep", "-f", "sidekiq"]
+  enable_logit                 = var.enable_logit
+  enable_prometheus_monitoring = var.enable_monitoring
 }
diff --git a/terraform/application/variables.tf b/terraform/application/variables.tf
@@ -109,6 +109,6 @@ locals {
   allegations_storage_account_name = "${var.azure_resource_prefix}rsmalleg${local.storage_account_environment}sa"
 
   environment_variables = yamldecode(file("${path.module}/config/${var.config}.yml"))
-  ingress_domain  = "${var.service_name}-${var.environment}.${module.cluster_data.ingress_domain}"
-  external_domain = try(local.environment_variables["EXTERNAL_DOMAIN"], local.ingress_domain)
+  ingress_domain        = "${var.service_name}-${var.environment}.${module.cluster_data.ingress_domain}"
+  external_domain       = try(local.environment_variables["EXTERNAL_DOMAIN"], local.ingress_domain)
 }