From 8dd491259714b56f870e5aa15894bbd22f74e7e0 Mon Sep 17 00:00:00 2001 From: Marcus Aspin Date: Wed, 16 Oct 2024 18:22:22 +0100 Subject: [PATCH] PI-2594 Reduce minimum idle DB connections to 1 (#4323) HikariCP recommends a [fixed-size connection pool](https://github.com/brettwooldridge/HikariCP#:~:text=However%2C%20for%20maximum%20performance%20and%20responsiveness%20to%20spike%20demands%2C%20we%20recommend%20not%20setting%20this%20value%20and%20instead%20allowing%20HikariCP%20to%20act%20as%20a%20fixed%20size%20connection%20pool.%20Default%3A%20same%20as%20maximumPoolSize), so that threads don't have to wait for new connections to be opened during usage spikes. However, with 10 connections per-pod this quickly adds up and is leading to memory exhaustion on the Oracle database. Each service is typically only using a single connection at a time, with some services spiking to 10 during bulk processing of messages - which lines up with the AWS SQS default of receiving up to 10 messages at a time. This change means that a single idle connection will always be available for use. As soon as the idle connection is picked up for use from the pool, a new idle connection will be opened to maintain the minimumIdle setting of 1, up until the maximumPoolSize of 10 is reached. If there is more than 1 idle connection, they will be closed after 10 minutes of inactivity until the minimumIdle setting of 1 is reached. Overall, this means we will be opening and closing connections more often - but the number of open connections at a given time will be much lower than before. --- .../approved-premises-and-delius/deploy/values-dev.yml | 5 +---- projects/arns-and-delius/deploy/values-dev.yml | 6 +----- .../assessment-summary-and-delius/deploy/values-dev.yml | 6 +----- projects/cas2-and-delius/deploy/values-dev.yml | 5 +---- projects/cas3-and-delius/deploy/values-dev.yml | 5 +---- .../common-platform-and-delius/deploy/values-dev.yml | 6 +----- .../core-person-record-and-delius/deploy/values-dev.yml | 6 +----- projects/court-case-and-delius/deploy/values-dev.yml | 6 +----- .../deploy/values-dev.yml | 6 +----- .../custody-key-dates-and-delius/deploy/values-dev.yml | 4 +--- projects/domain-events-and-delius/deploy/values-dev.yml | 7 ++----- projects/dps-and-delius/deploy/values-dev.yml | 6 +----- .../deploy/values-dev.yml | 6 +----- projects/external-api-and-delius/deploy/values-dev.yml | 6 +----- projects/hdc-licences-and-delius/deploy/values-dev.yml | 6 +----- projects/hmpps-auth-and-delius/deploy/values-dev.yml | 6 +----- projects/ims-and-delius/deploy/values-dev.yml | 6 +----- .../deploy/values-dev.yml | 6 +----- .../manage-offences-and-delius/deploy/values-dev.yml | 6 +----- .../manage-pom-cases-and-delius/deploy/values-dev.yml | 4 +--- .../manage-supervision-and-delius/deploy/values-dev.yml | 6 +----- projects/oasys-and-delius/deploy/values-dev.yml | 6 +----- .../offender-events-and-delius/deploy/values-dev.yml | 3 --- projects/opd-and-delius/deploy/values-dev.yml | 6 +----- projects/pathfinder-and-delius/deploy/values-dev.yml | 6 +----- .../pre-sentence-reports-to-delius/deploy/values-dev.yml | 9 ++------- .../prison-case-notes-to-probation/deploy/values-dev.yml | 6 +----- .../deploy/values-dev.yml | 5 +---- .../prison-education-and-delius/deploy/values-dev.yml | 6 +----- .../prison-identifier-and-delius/deploy/values-dev.yml | 7 +------ .../prisoner-profile-and-delius/deploy/values-dev.yml | 7 +------ .../probation-search-and-delius/deploy/values-dev.yml | 6 +----- .../refer-and-monitor-and-delius/deploy/values-dev.yml | 6 +----- .../deploy/values-dev.yml | 6 +----- .../deploy/values-dev.yml | 3 --- projects/sentence-plan-and-delius/deploy/values-dev.yml | 6 +----- projects/soc-and-delius/deploy/values-dev.yml | 6 +----- .../deploy/values-dev.yml | 6 +----- projects/tier-to-delius/deploy/values-dev.yml | 6 +----- projects/unpaid-work-and-delius/deploy/values-dev.yml | 7 +------ .../deploy/values-dev.yml | 6 +----- templates/helm-defaults.yml | 2 ++ .../projects/api-client-and-server/deploy/values-dev.yml | 6 +----- templates/projects/api-server/deploy/values-dev.yml | 6 +----- .../deploy/values-dev.yml | 6 +----- .../deploy/values-dev.yml | 6 +----- .../projects/message-listener/deploy/values-dev.yml | 3 --- 47 files changed, 47 insertions(+), 221 deletions(-) diff --git a/projects/approved-premises-and-delius/deploy/values-dev.yml b/projects/approved-premises-and-delius/deploy/values-dev.yml index 7cbd88a746..698c775c82 100644 --- a/projects/approved-premises-and-delius/deploy/values-dev.yml +++ b/projects/approved-premises-and-delius/deploy/values-dev.yml @@ -7,15 +7,12 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/oauth/token SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer INTEGRATIONS_APPROVED-PREMISES-API_URL: https://approved-premises-api-dev.hmpps.service.justice.gov.uk INTEGRATIONS_ALFRESCO_URL: https://hmpps-delius-alfresco-test.apps.live.cloud-platform.service.justice.gov.uk/alfresco/service/noms-spg/ - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG generic-prometheus-alerts: businessHoursOnly: true \ No newline at end of file diff --git a/projects/arns-and-delius/deploy/values-dev.yml b/projects/arns-and-delius/deploy/values-dev.yml index c9a599b095..4996b1b471 100644 --- a/projects/arns-and-delius/deploy/values-dev.yml +++ b/projects/arns-and-delius/deploy/values-dev.yml @@ -7,13 +7,9 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/assessment-summary-and-delius/deploy/values-dev.yml b/projects/assessment-summary-and-delius/deploy/values-dev.yml index a67572f3e9..7199c3dbb3 100644 --- a/projects/assessment-summary-and-delius/deploy/values-dev.yml +++ b/projects/assessment-summary-and-delius/deploy/values-dev.yml @@ -7,12 +7,8 @@ generic-service: env: SENTRY_ENVIRONMENT: dev - INTEGRATIONS_ORDS_URL: https://t2.oasys.service.justice.gov.uk/eor/oasys - - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG + INTEGRATIONS_ORDS_URL: https://t2.oasys.service.justice.gov.uk/eor/oasys generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/cas2-and-delius/deploy/values-dev.yml b/projects/cas2-and-delius/deploy/values-dev.yml index bcb998267b..756ce2e00d 100644 --- a/projects/cas2-and-delius/deploy/values-dev.yml +++ b/projects/cas2-and-delius/deploy/values-dev.yml @@ -7,12 +7,9 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/oauth/token EVENT_EXCEPTION_THROWNOTFOUND: false - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/cas3-and-delius/deploy/values-dev.yml b/projects/cas3-and-delius/deploy/values-dev.yml index e97f258d85..884822f7db 100644 --- a/projects/cas3-and-delius/deploy/values-dev.yml +++ b/projects/cas3-and-delius/deploy/values-dev.yml @@ -7,13 +7,10 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/oauth/token SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/common-platform-and-delius/deploy/values-dev.yml b/projects/common-platform-and-delius/deploy/values-dev.yml index 0018911381..2da8364e6f 100644 --- a/projects/common-platform-and-delius/deploy/values-dev.yml +++ b/projects/common-platform-and-delius/deploy/values-dev.yml @@ -9,12 +9,8 @@ generic-service: env: SENTRY_ENVIRONMENT: dev - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/oauth/token - - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG + SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/oauth/token generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/core-person-record-and-delius/deploy/values-dev.yml b/projects/core-person-record-and-delius/deploy/values-dev.yml index 8afb1178e4..d9cde568c9 100644 --- a/projects/core-person-record-and-delius/deploy/values-dev.yml +++ b/projects/core-person-record-and-delius/deploy/values-dev.yml @@ -7,13 +7,9 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/court-case-and-delius/deploy/values-dev.yml b/projects/court-case-and-delius/deploy/values-dev.yml index 5ed68eac73..af271f34d7 100644 --- a/projects/court-case-and-delius/deploy/values-dev.yml +++ b/projects/court-case-and-delius/deploy/values-dev.yml @@ -7,14 +7,10 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/oauth/token - - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG COMMUNITY-API_URL: https://community-api.test.probation.service.justice.gov.uk INTEGRATIONS_ALFRESCO_URL: https://hmpps-delius-alfresco-test.apps.live.cloud-platform.service.justice.gov.uk/alfresco/service/noms-spg/ diff --git a/projects/create-and-vary-a-licence-and-delius/deploy/values-dev.yml b/projects/create-and-vary-a-licence-and-delius/deploy/values-dev.yml index efe13ed4cc..a323b1849b 100644 --- a/projects/create-and-vary-a-licence-and-delius/deploy/values-dev.yml +++ b/projects/create-and-vary-a-licence-and-delius/deploy/values-dev.yml @@ -7,14 +7,10 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/oauth/token SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/custody-key-dates-and-delius/deploy/values-dev.yml b/projects/custody-key-dates-and-delius/deploy/values-dev.yml index 150a4d072b..dac0ee9d69 100644 --- a/projects/custody-key-dates-and-delius/deploy/values-dev.yml +++ b/projects/custody-key-dates-and-delius/deploy/values-dev.yml @@ -7,13 +7,11 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/oauth/token INTEGRATIONS_PRISON-API_URL: https://prison-api-dev.prison.service.justice.gov.uk SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG bulk-update: enabled: false diff --git a/projects/domain-events-and-delius/deploy/values-dev.yml b/projects/domain-events-and-delius/deploy/values-dev.yml index 7d7821f413..47b53e3b20 100644 --- a/projects/domain-events-and-delius/deploy/values-dev.yml +++ b/projects/domain-events-and-delius/deploy/values-dev.yml @@ -6,14 +6,11 @@ generic-service: enabled: true env: + SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG DOMAIN_EVENTS_BASE_URL: https://domain-events-and-delius-dev.hmpps.service.justice.gov.uk SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SENTRY_ENVIRONMENT: dev - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG generic-prometheus-alerts: businessHoursOnly: true \ No newline at end of file diff --git a/projects/dps-and-delius/deploy/values-dev.yml b/projects/dps-and-delius/deploy/values-dev.yml index 0743cb9dea..c21831d3af 100644 --- a/projects/dps-and-delius/deploy/values-dev.yml +++ b/projects/dps-and-delius/deploy/values-dev.yml @@ -7,14 +7,10 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer INTEGRATIONS_ALFRESCO_URL: https://hmpps-delius-alfresco-test.apps.live.cloud-platform.service.justice.gov.uk/alfresco/service/noms-spg - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/effective-proposal-framework-and-delius/deploy/values-dev.yml b/projects/effective-proposal-framework-and-delius/deploy/values-dev.yml index 212c1d560c..3d57318cb3 100644 --- a/projects/effective-proposal-framework-and-delius/deploy/values-dev.yml +++ b/projects/effective-proposal-framework-and-delius/deploy/values-dev.yml @@ -7,13 +7,9 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/external-api-and-delius/deploy/values-dev.yml b/projects/external-api-and-delius/deploy/values-dev.yml index a1b09fcb35..31eda9e420 100644 --- a/projects/external-api-and-delius/deploy/values-dev.yml +++ b/projects/external-api-and-delius/deploy/values-dev.yml @@ -7,13 +7,9 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/hdc-licences-and-delius/deploy/values-dev.yml b/projects/hdc-licences-and-delius/deploy/values-dev.yml index a7009351d4..c8923f94dc 100644 --- a/projects/hdc-licences-and-delius/deploy/values-dev.yml +++ b/projects/hdc-licences-and-delius/deploy/values-dev.yml @@ -7,13 +7,9 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/hmpps-auth-and-delius/deploy/values-dev.yml b/projects/hmpps-auth-and-delius/deploy/values-dev.yml index 285b40fbd4..f74d9f8fa3 100644 --- a/projects/hmpps-auth-and-delius/deploy/values-dev.yml +++ b/projects/hmpps-auth-and-delius/deploy/values-dev.yml @@ -7,12 +7,8 @@ generic-service: env: SENTRY_ENVIRONMENT: dev - SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json - - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG + SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/ims-and-delius/deploy/values-dev.yml b/projects/ims-and-delius/deploy/values-dev.yml index 4dea140f33..3568ae952b 100644 --- a/projects/ims-and-delius/deploy/values-dev.yml +++ b/projects/ims-and-delius/deploy/values-dev.yml @@ -7,13 +7,9 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/make-recall-decisions-and-delius/deploy/values-dev.yml b/projects/make-recall-decisions-and-delius/deploy/values-dev.yml index c970da12f4..26a2983a7c 100644 --- a/projects/make-recall-decisions-and-delius/deploy/values-dev.yml +++ b/projects/make-recall-decisions-and-delius/deploy/values-dev.yml @@ -7,15 +7,11 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/oauth/token SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer INTEGRATIONS_ALFRESCO_URL: https://hmpps-delius-alfresco-test.apps.live.cloud-platform.service.justice.gov.uk/alfresco/service/noms-spg/ - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true \ No newline at end of file diff --git a/projects/manage-offences-and-delius/deploy/values-dev.yml b/projects/manage-offences-and-delius/deploy/values-dev.yml index 2bbac8ac80..9d96237861 100644 --- a/projects/manage-offences-and-delius/deploy/values-dev.yml +++ b/projects/manage-offences-and-delius/deploy/values-dev.yml @@ -7,13 +7,9 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/oauth/token INTEGRATIONS_MANAGE-OFFENCES_URL: https://manage-offences-api-dev.hmpps.service.justice.gov.uk - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/manage-pom-cases-and-delius/deploy/values-dev.yml b/projects/manage-pom-cases-and-delius/deploy/values-dev.yml index eabfd431f4..de025deb75 100644 --- a/projects/manage-pom-cases-and-delius/deploy/values-dev.yml +++ b/projects/manage-pom-cases-and-delius/deploy/values-dev.yml @@ -7,12 +7,10 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/oauth/token SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG MPC_HANDOVER_URL: https://dev.moic.service.justice.gov.uk bulk-update: diff --git a/projects/manage-supervision-and-delius/deploy/values-dev.yml b/projects/manage-supervision-and-delius/deploy/values-dev.yml index d3c202b59d..0e067f7017 100644 --- a/projects/manage-supervision-and-delius/deploy/values-dev.yml +++ b/projects/manage-supervision-and-delius/deploy/values-dev.yml @@ -7,14 +7,10 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer INTEGRATIONS_ALFRESCO_URL: https://hmpps-delius-alfresco-test.apps.live.cloud-platform.service.justice.gov.uk/alfresco/service/noms-spg - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/oasys-and-delius/deploy/values-dev.yml b/projects/oasys-and-delius/deploy/values-dev.yml index e44b9bd1ab..8c5a69a4e9 100644 --- a/projects/oasys-and-delius/deploy/values-dev.yml +++ b/projects/oasys-and-delius/deploy/values-dev.yml @@ -7,14 +7,10 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - allowlist: groups: - internal diff --git a/projects/offender-events-and-delius/deploy/values-dev.yml b/projects/offender-events-and-delius/deploy/values-dev.yml index efc1e610c2..556f390620 100644 --- a/projects/offender-events-and-delius/deploy/values-dev.yml +++ b/projects/offender-events-and-delius/deploy/values-dev.yml @@ -7,9 +7,6 @@ generic-service: env: SENTRY_ENVIRONMENT: dev - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG generic-prometheus-alerts: diff --git a/projects/opd-and-delius/deploy/values-dev.yml b/projects/opd-and-delius/deploy/values-dev.yml index e50b302ae8..499eaa591c 100644 --- a/projects/opd-and-delius/deploy/values-dev.yml +++ b/projects/opd-and-delius/deploy/values-dev.yml @@ -7,12 +7,8 @@ generic-service: env: SENTRY_ENVIRONMENT: dev - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/oauth/token - - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG + SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/oauth/token generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/pathfinder-and-delius/deploy/values-dev.yml b/projects/pathfinder-and-delius/deploy/values-dev.yml index 4ee162f582..b47d8624ac 100644 --- a/projects/pathfinder-and-delius/deploy/values-dev.yml +++ b/projects/pathfinder-and-delius/deploy/values-dev.yml @@ -7,13 +7,9 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/pre-sentence-reports-to-delius/deploy/values-dev.yml b/projects/pre-sentence-reports-to-delius/deploy/values-dev.yml index 08b64940c6..7c11d43e3f 100644 --- a/projects/pre-sentence-reports-to-delius/deploy/values-dev.yml +++ b/projects/pre-sentence-reports-to-delius/deploy/values-dev.yml @@ -7,19 +7,14 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_COM_AMAZON_SQS: DEBUG + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/oauth/token SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - INTEGRATIONS_ALFRESCO_URL: https://hmpps-delius-alfresco-test.apps.live.cloud-platform.service.justice.gov.uk/alfresco/service/noms-spg/ INTEGRATIONS_PRE-SENTENCE-REPORTS_BASE-URL: https://pre-sentence-service-dev.hmpps.service.justice.gov.uk INTEGRATIONS_NEW-TECH_BASE-URL: https://ndelius.test.probation.service.justice.gov.uk/newTech - LOGGING_LEVEL_COM_AMAZON_SQS: DEBUG - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true \ No newline at end of file diff --git a/projects/prison-case-notes-to-probation/deploy/values-dev.yml b/projects/prison-case-notes-to-probation/deploy/values-dev.yml index c42f7e3110..1042f9fa36 100644 --- a/projects/prison-case-notes-to-probation/deploy/values-dev.yml +++ b/projects/prison-case-notes-to-probation/deploy/values-dev.yml @@ -7,13 +7,9 @@ generic-service: env: SENTRY_ENVIRONMENT: dev - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/oauth/token - LOGGING_LEVEL_COM_AMAZON_SQS: DEBUG - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG + SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/oauth/token generic-prometheus-alerts: businessHoursOnly: true \ No newline at end of file diff --git a/projects/prison-custody-status-to-delius/deploy/values-dev.yml b/projects/prison-custody-status-to-delius/deploy/values-dev.yml index ce842e677d..d94f208312 100644 --- a/projects/prison-custody-status-to-delius/deploy/values-dev.yml +++ b/projects/prison-custody-status-to-delius/deploy/values-dev.yml @@ -6,12 +6,9 @@ generic-service: enabled: true env: - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/oauth/token SENTRY_ENVIRONMENT: dev - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG + SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/oauth/token INTEGRATIONS_PRISON-API_URL: https://prison-api-dev.prison.service.justice.gov.uk generic-prometheus-alerts: diff --git a/projects/prison-education-and-delius/deploy/values-dev.yml b/projects/prison-education-and-delius/deploy/values-dev.yml index f57367cd1c..ba58111063 100644 --- a/projects/prison-education-and-delius/deploy/values-dev.yml +++ b/projects/prison-education-and-delius/deploy/values-dev.yml @@ -7,13 +7,9 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/prison-identifier-and-delius/deploy/values-dev.yml b/projects/prison-identifier-and-delius/deploy/values-dev.yml index f118593137..fbbd9dbc0f 100644 --- a/projects/prison-identifier-and-delius/deploy/values-dev.yml +++ b/projects/prison-identifier-and-delius/deploy/values-dev.yml @@ -7,18 +7,13 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/oauth/token SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json - INTEGRATIONS_PRISON-API_URL: https://prison-api-dev.prison.service.justice.gov.uk INTEGRATIONS_PRISONER-SEARCH_URL: https://prisoner-search-dev.prison.service.justice.gov.uk INTEGRATIONS_PROBATION-SEARCH_URL: https://probation-offender-search-dev.hmpps.service.justice.gov.uk - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - bulk-update: enabled: false dry-run: true diff --git a/projects/prisoner-profile-and-delius/deploy/values-dev.yml b/projects/prisoner-profile-and-delius/deploy/values-dev.yml index 1fc07bef67..3c5b1c634e 100644 --- a/projects/prisoner-profile-and-delius/deploy/values-dev.yml +++ b/projects/prisoner-profile-and-delius/deploy/values-dev.yml @@ -7,15 +7,10 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - INTEGRATIONS_ALFRESCO_URL: https://hmpps-delius-alfresco-test.apps.live.cloud-platform.service.justice.gov.uk/alfresco/service/noms-spg - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/probation-search-and-delius/deploy/values-dev.yml b/projects/probation-search-and-delius/deploy/values-dev.yml index 996981822c..ceb751f8f3 100644 --- a/projects/probation-search-and-delius/deploy/values-dev.yml +++ b/projects/probation-search-and-delius/deploy/values-dev.yml @@ -7,13 +7,9 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/refer-and-monitor-and-delius/deploy/values-dev.yml b/projects/refer-and-monitor-and-delius/deploy/values-dev.yml index bf578673a0..58ead7f30c 100644 --- a/projects/refer-and-monitor-and-delius/deploy/values-dev.yml +++ b/projects/refer-and-monitor-and-delius/deploy/values-dev.yml @@ -7,14 +7,10 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/oauth/token SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/resettlement-passport-and-delius/deploy/values-dev.yml b/projects/resettlement-passport-and-delius/deploy/values-dev.yml index 83d84ce8a0..de338b8801 100644 --- a/projects/resettlement-passport-and-delius/deploy/values-dev.yml +++ b/projects/resettlement-passport-and-delius/deploy/values-dev.yml @@ -7,13 +7,9 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/risk-assessment-scores-to-delius/deploy/values-dev.yml b/projects/risk-assessment-scores-to-delius/deploy/values-dev.yml index 32d0a8ffcd..b569f3860b 100644 --- a/projects/risk-assessment-scores-to-delius/deploy/values-dev.yml +++ b/projects/risk-assessment-scores-to-delius/deploy/values-dev.yml @@ -7,9 +7,6 @@ generic-service: env: SENTRY_ENVIRONMENT: dev - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG generic-prometheus-alerts: diff --git a/projects/sentence-plan-and-delius/deploy/values-dev.yml b/projects/sentence-plan-and-delius/deploy/values-dev.yml index f57c0bf2d1..2b8ebb4d7b 100644 --- a/projects/sentence-plan-and-delius/deploy/values-dev.yml +++ b/projects/sentence-plan-and-delius/deploy/values-dev.yml @@ -7,13 +7,9 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/soc-and-delius/deploy/values-dev.yml b/projects/soc-and-delius/deploy/values-dev.yml index 9004e88de7..11dfb8a39f 100644 --- a/projects/soc-and-delius/deploy/values-dev.yml +++ b/projects/soc-and-delius/deploy/values-dev.yml @@ -7,13 +7,9 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/subject-access-requests-and-delius/deploy/values-dev.yml b/projects/subject-access-requests-and-delius/deploy/values-dev.yml index 28254f806f..2122f9f0d0 100644 --- a/projects/subject-access-requests-and-delius/deploy/values-dev.yml +++ b/projects/subject-access-requests-and-delius/deploy/values-dev.yml @@ -7,13 +7,9 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/tier-to-delius/deploy/values-dev.yml b/projects/tier-to-delius/deploy/values-dev.yml index e93684e5f8..b0da766bb7 100644 --- a/projects/tier-to-delius/deploy/values-dev.yml +++ b/projects/tier-to-delius/deploy/values-dev.yml @@ -8,15 +8,11 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/oauth/token INTEGRATIONS_TIER_URL: http://hmpps-tier.hmpps-tier-dev.svc.cluster.local SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/unpaid-work-and-delius/deploy/values-dev.yml b/projects/unpaid-work-and-delius/deploy/values-dev.yml index d144239bdc..9026206a8a 100644 --- a/projects/unpaid-work-and-delius/deploy/values-dev.yml +++ b/projects/unpaid-work-and-delius/deploy/values-dev.yml @@ -7,17 +7,12 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/oauth/token SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - INTEGRATIONS_ALFRESCO_URL: https://hmpps-delius-alfresco-test.apps.live.cloud-platform.service.justice.gov.uk/alfresco/service/noms-spg/ - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/projects/workforce-allocations-to-delius/deploy/values-dev.yml b/projects/workforce-allocations-to-delius/deploy/values-dev.yml index 27e4eaf548..30d079e049 100644 --- a/projects/workforce-allocations-to-delius/deploy/values-dev.yml +++ b/projects/workforce-allocations-to-delius/deploy/values-dev.yml @@ -7,14 +7,10 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/oauth/token SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: http://hmpps-auth.hmpps-auth-dev.svc.cluster.local/auth/.well-known/jwks.json INTEGRATIONS_ALFRESCO_URL: https://hmpps-delius-alfresco-test.apps.live.cloud-platform.service.justice.gov.uk/alfresco/service/noms-spg/ - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/templates/helm-defaults.yml b/templates/helm-defaults.yml index 78ad70e461..530e62dccf 100644 --- a/templates/helm-defaults.yml +++ b/templates/helm-defaults.yml @@ -29,6 +29,8 @@ generic-service: JDK_JAVA_OPTIONS: -javaagent:/agent/agent.jar -XX:MaxRAMPercentage=75.0 SENTRY_TRACES_SAMPLE_RATE: '0.05' SENTRY_IGNORED_EXCEPTIONS_FOR_TYPE: "org.apache.catalina.connector.ClientAbortException" + SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 10 + SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 1 namespace_secrets: common: diff --git a/templates/projects/api-client-and-server/deploy/values-dev.yml b/templates/projects/api-client-and-server/deploy/values-dev.yml index 96e98d945e..242d3723bb 100644 --- a/templates/projects/api-client-and-server/deploy/values-dev.yml +++ b/templates/projects/api-client-and-server/deploy/values-dev.yml @@ -9,14 +9,10 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/oauth/token SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/templates/projects/api-server/deploy/values-dev.yml b/templates/projects/api-server/deploy/values-dev.yml index 4cf8f26f0e..a40c68f80b 100644 --- a/templates/projects/api-server/deploy/values-dev.yml +++ b/templates/projects/api-server/deploy/values-dev.yml @@ -9,13 +9,9 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/templates/projects/message-listener-with-api-client-and-server/deploy/values-dev.yml b/templates/projects/message-listener-with-api-client-and-server/deploy/values-dev.yml index 96e98d945e..242d3723bb 100644 --- a/templates/projects/message-listener-with-api-client-and-server/deploy/values-dev.yml +++ b/templates/projects/message-listener-with-api-client-and-server/deploy/values-dev.yml @@ -9,14 +9,10 @@ generic-service: env: SENTRY_ENVIRONMENT: dev + LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/oauth/token SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/.well-known/jwks.json SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG - generic-prometheus-alerts: businessHoursOnly: true diff --git a/templates/projects/message-listener-with-api-client/deploy/values-dev.yml b/templates/projects/message-listener-with-api-client/deploy/values-dev.yml index 6b5e2a51c7..abeda919c4 100644 --- a/templates/projects/message-listener-with-api-client/deploy/values-dev.yml +++ b/templates/projects/message-listener-with-api-client/deploy/values-dev.yml @@ -9,12 +9,8 @@ generic-service: env: SENTRY_ENVIRONMENT: dev - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/oauth/token - - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG + SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_HMPPS-AUTH_TOKEN-URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/oauth/token generic-prometheus-alerts: businessHoursOnly: true diff --git a/templates/projects/message-listener/deploy/values-dev.yml b/templates/projects/message-listener/deploy/values-dev.yml index a5cc07547a..f3f7118af6 100644 --- a/templates/projects/message-listener/deploy/values-dev.yml +++ b/templates/projects/message-listener/deploy/values-dev.yml @@ -9,9 +9,6 @@ generic-service: env: SENTRY_ENVIRONMENT: dev - SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5 - SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0 - LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG generic-prometheus-alerts: