Merge pull request #1452 from DFE-Digital/1889-scrape-custom-metrics

Scrape custom metrics
DFE-Digital · Jul 8, 2024 · 283b8fc · 283b8fc
2 parents 56a8298 + 97697b2
commit 283b8fc
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/terraform/aks/application.tf b/terraform/aks/application.tf
@@ -18,6 +18,8 @@ module "api_application" {
   web_external_hostnames = var.gov_uk_host_names
   web_port               = 8080
   enable_logit           = var.enable_logit
+
+  enable_prometheus_monitoring  = var.enable_prometheus_monitoring
 }
 
 module "application_configuration" {

diff --git a/terraform/aks/config/development_aks.tfvars.json b/terraform/aks/config/development_aks.tfvars.json
@@ -6,5 +6,6 @@
   "cluster": "test",
   "namespace": "git-development",
   "enable_monitoring": false,
-  "enable_logit": true
+  "enable_logit": true,
+  "enable_prometheus_monitoring": true
 }
diff --git a/terraform/aks/config/production_aks.tfvars.json b/terraform/aks/config/production_aks.tfvars.json
@@ -13,5 +13,6 @@
   "redis_sku_name": "Premium",
   "postgres_flexible_server_sku": "GP_Standard_D2ds_v4",
   "postgres_enable_high_availability": true,
-  "enable_logit": true
+  "enable_logit": true,
+  "enable_prometheus_monitoring": true
 }
diff --git a/terraform/aks/config/test_aks.tfvars.json b/terraform/aks/config/test_aks.tfvars.json
@@ -6,5 +6,6 @@
   "cluster": "test",
   "namespace": "git-test",
   "enable_monitoring": false,
-  "enable_logit": true
+  "enable_logit": true,
+  "enable_prometheus_monitoring": true
 }
diff --git a/terraform/aks/variables.tf b/terraform/aks/variables.tf
@@ -59,6 +59,11 @@ variable "enable_logit" {
   default = false
 }
 
+variable "enable_prometheus_monitoring" {
+  type    = bool
+  default = false
+}
+
 locals {
   azure_credentials       = try(jsondecode(var.azure_credentials), null)
   app_resource_group_name = "${var.azure_resource_prefix}-${var.service_short}-${var.config_short}-rg"