From d872d6f2bb704cff918d37366e06e37bcdb75b1d Mon Sep 17 00:00:00 2001 From: Venkata Challa Date: Fri, 31 May 2024 13:55:11 +0100 Subject: [PATCH] Service Onboard to Logit.io --- Gemfile | 3 +++ Gemfile.lock | 12 ++++++++---- terraform/aks/application.tf | 2 ++ terraform/aks/config/qa.tfvars.json | 3 ++- terraform/aks/config/review.tfvars.json | 3 ++- terraform/aks/config/staging.tfvars.json | 3 ++- terraform/aks/variables.tf | 2 +- 7 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index a7c8373c..d4e57962 100644 --- a/Gemfile +++ b/Gemfile @@ -93,3 +93,6 @@ gem "importmap-rails", "~> 1.2" gem "propshaft", "~> 0.8.0" gem "rubyXL", "~> 3.4" + +gem "nokogiri", "~> 1.16.5" +gem "rexml", "~> 3.2.7" diff --git a/Gemfile.lock b/Gemfile.lock index 1faa5d1d..90d90f8c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -259,7 +259,7 @@ GEM matrix (0.4.2) method_source (1.0.0) mini_mime (1.1.5) - mini_portile2 (2.8.5) + mini_portile2 (2.8.6) minitest (5.22.3) msgpack (1.7.2) multi_xml (0.6.0) @@ -274,7 +274,7 @@ GEM net-smtp (0.4.0) net-protocol nio4r (2.6.1) - nokogiri (1.16.3) + nokogiri (1.16.5) mini_portile2 (~> 2.8.2) racc (~> 1.4) notifications-ruby-client (5.4.0) @@ -374,7 +374,8 @@ GEM responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.2.6) + rexml (3.2.8) + strscan (>= 3.0.9) rolify (6.0.1) rspec-core (3.12.2) rspec-support (~> 3.12.0) @@ -470,6 +471,7 @@ GEM hashie version_gem (~> 1.1, >= 1.1.1) stringio (3.1.0) + strscan (3.1.0) thor (1.3.1) timeout (0.4.1) tzinfo (2.0.6) @@ -528,6 +530,7 @@ DEPENDENCIES jbuilder launchy mail-notify (~> 1.2) + nokogiri (~> 1.16.5) notifications-ruby-client okcomputer omniauth-azure-activedirectory-v2 @@ -538,6 +541,7 @@ DEPENDENCIES pry-byebug puma (>= 6.4.2, < 7) rails (~> 7.1) + rexml (~> 3.2.7) rolify rspec-rails rubocop-govuk @@ -556,7 +560,7 @@ DEPENDENCIES web-console RUBY VERSION - ruby 3.2.2p53 + ruby 3.2.3p157 BUNDLED WITH 2.4.21 diff --git a/terraform/aks/application.tf b/terraform/aks/application.tf index b73746cd..ffa92aaf 100644 --- a/terraform/aks/application.tf +++ b/terraform/aks/application.tf @@ -19,6 +19,7 @@ module "web_application" { probe_path = var.probe_path web_external_hostnames = var.gov_uk_host_names + enable_logit = var.enable_logit } module "application_configuration" { @@ -54,4 +55,5 @@ module "worker_application" { replicas = 1 command = ["/bin/sh", "-c", "./bin/worker-startup.sh"] probe_command = ["pgrep", "-f", "sidekiq"] + enable_logit = var.enable_logit } diff --git a/terraform/aks/config/qa.tfvars.json b/terraform/aks/config/qa.tfvars.json index 8f2bd01f..45490ddb 100644 --- a/terraform/aks/config/qa.tfvars.json +++ b/terraform/aks/config/qa.tfvars.json @@ -13,5 +13,6 @@ "gov_uk_host_names": [ "qa.get-a-teacher-relocation-payment.education.gov.uk" ], - "azure_enable_backup_storage": false + "azure_enable_backup_storage": false, + "enable_logit": true } diff --git a/terraform/aks/config/review.tfvars.json b/terraform/aks/config/review.tfvars.json index 35d7d4b8..cff0fadb 100644 --- a/terraform/aks/config/review.tfvars.json +++ b/terraform/aks/config/review.tfvars.json @@ -10,5 +10,6 @@ "enable_monitoring": false, "startup_command": ["/bin/sh", "-c", "./bin/app-startup.sh"], "replicas": 1, - "memory_max": "1Gi" + "memory_max": "1Gi", + "enable_logit": true } diff --git a/terraform/aks/config/staging.tfvars.json b/terraform/aks/config/staging.tfvars.json index fdd9fc56..9c052b4e 100644 --- a/terraform/aks/config/staging.tfvars.json +++ b/terraform/aks/config/staging.tfvars.json @@ -13,5 +13,6 @@ "gov_uk_host_names": [ "staging.get-a-teacher-relocation-payment.education.gov.uk" ], - "azure_enable_backup_storage": false + "azure_enable_backup_storage": false, + "enable_logit": true } diff --git a/terraform/aks/variables.tf b/terraform/aks/variables.tf index a3dca977..ae1d50c8 100644 --- a/terraform/aks/variables.tf +++ b/terraform/aks/variables.tf @@ -39,7 +39,7 @@ variable "statuscake_alerts" { type = map(any) default = {} } - +variable "enable_logit" { default = false } locals { service_name = "teacher-relocation-payment" version = "1.9.7"