Skip to content

Commit

Permalink
Merge pull request #3234 from DFE-Digital/1889-scrape-custom-metrics
Browse files Browse the repository at this point in the history
Scrape custom metrics
  • Loading branch information
RMcVelia authored Jul 10, 2024
2 parents 57acca9 + fb470d6 commit 3452929
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 3 deletions.
2 changes: 2 additions & 0 deletions terraform/aks/application.tf
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ module "web_application" {
probe_path = "/check"
web_external_hostnames = var.create_dsi_ingress ? [var.dsi_hostname] : []
enable_logit = var.enable_logit

enable_prometheus_monitoring = var.enable_prometheus_monitoring
}

module "worker_application" {
Expand Down
3 changes: 2 additions & 1 deletion terraform/aks/config/development.tfvars.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
"sidekiq_replicas" : 1,
"sidekiq_memory_max" : "1Gi",
"dsi_hostname": "development.schoolexperience.education.gov.uk",
"enable_logit": true
"enable_logit": true,
"enable_prometheus_monitoring": true
}
3 changes: 2 additions & 1 deletion terraform/aks/config/production.tfvars.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
}
},
"dsi_hostname": "schoolexperience.education.gov.uk",
"enable_logit": true
"enable_logit": true,
"enable_prometheus_monitoring": true
}
3 changes: 2 additions & 1 deletion terraform/aks/config/staging.tfvars.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
}
},
"dsi_hostname": "staging.schoolexperience.education.gov.uk",
"enable_logit": true
"enable_logit": true,
"enable_prometheus_monitoring": true
}
5 changes: 5 additions & 0 deletions terraform/aks/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,11 @@ variable "create_dsi_ingress" {
default = false
}
variable "enable_logit" { default = false }
variable "enable_prometheus_monitoring" {
type = bool
default = false
}

locals {
azure_credentials = try(jsondecode(var.azure_credentials_json), null)
postgres_ssl_mode = var.enable_postgres_ssl ? "require" : "disable"
Expand Down

0 comments on commit 3452929

Please sign in to comment.