diff --git a/data-ingestion-service/build.gradle b/data-ingestion-service/build.gradle index aa6d29bb2..18016e1a8 100644 --- a/data-ingestion-service/build.gradle +++ b/data-ingestion-service/build.gradle @@ -26,6 +26,10 @@ apply plugin: 'org.owasp.dependencycheck' group = 'gov.cdc.dataingestion' version = '0.0.1-SNAPSHOT' +springBoot { + buildInfo() +} + java { sourceCompatibility = JavaVersion.VERSION_21 } diff --git a/data-ingestion-service/src/main/java/gov/cdc/dataingestion/security/config/SecurityConfig.java b/data-ingestion-service/src/main/java/gov/cdc/dataingestion/security/config/SecurityConfig.java index 1e5a21633..39281df9b 100644 --- a/data-ingestion-service/src/main/java/gov/cdc/dataingestion/security/config/SecurityConfig.java +++ b/data-ingestion-service/src/main/java/gov/cdc/dataingestion/security/config/SecurityConfig.java @@ -35,7 +35,9 @@ public class SecurityConfig { "/webjars/**", "/v3/api-docs/**", "/swagger-ui/**", - "/api/auth/token" + "/api/auth/token", + "/actuator/health", + "/actuator/info" }; @Autowired private CustomAuthenticationManagerResolver customauthenticationmanagerresolver; diff --git a/data-ingestion-service/src/main/resources/application.yaml b/data-ingestion-service/src/main/resources/application.yaml index fdb3cc4e0..29ef8caec 100644 --- a/data-ingestion-service/src/main/resources/application.yaml +++ b/data-ingestion-service/src/main/resources/application.yaml @@ -6,14 +6,29 @@ server: max-http-form-post-size: ${API_PAYLOAD_MAX_SIZE:100MB} max-swallow-size: ${API_PAYLOAD_MAX_SIZE:100MB} +info: + app: + name: DI + version: 1.0.0 + description: Data Ingestion + management: + info: + build: + enabled: true + java: + enabled: true endpoint: prometheus: enabled: true + health: + show-details: always + roles: ADMIN endpoints: web: + base-path: /actuator exposure: - include: "*" + include: "health,info" prometheus: metrics: export: diff --git a/srte-data-service/build.gradle b/srte-data-service/build.gradle index 076f59235..8cb14668c 100644 --- a/srte-data-service/build.gradle +++ b/srte-data-service/build.gradle @@ -26,6 +26,10 @@ apply plugin: 'org.owasp.dependencycheck' group = 'gov.cdc.rti' version = '0.0.1-SNAPSHOT' +springBoot { + buildInfo() +} + java { toolchain { languageVersion = JavaLanguageVersion.of(21) diff --git a/srte-data-service/src/main/java/gov/cdc/srtedataservice/security/SecurityConfig.java b/srte-data-service/src/main/java/gov/cdc/srtedataservice/security/SecurityConfig.java index f59d2996f..18234a170 100644 --- a/srte-data-service/src/main/java/gov/cdc/srtedataservice/security/SecurityConfig.java +++ b/srte-data-service/src/main/java/gov/cdc/srtedataservice/security/SecurityConfig.java @@ -31,7 +31,9 @@ public class SecurityConfig { "/actuator/prometheus", "/actuator/prometheus/**", "/swagger-ui/**", - "/api/auth/token" + "/api/auth/token", + "/actuator/health", + "/actuator/info" }; @Autowired private CustomAuthenticationManagerResolver customauthenticationmanagerresolver; diff --git a/srte-data-service/src/main/resources/application.yaml b/srte-data-service/src/main/resources/application.yaml index 34e56892d..401e48410 100644 --- a/srte-data-service/src/main/resources/application.yaml +++ b/srte-data-service/src/main/resources/application.yaml @@ -3,6 +3,34 @@ server: servlet: context-path: /data +info: + app: + name: SRTE Data Exchange + version: 1.0.0 + description: SRTE Data Exchange Service + +management: + info: + build: + enabled: true + java: + enabled: true + endpoint: + prometheus: + enabled: true + health: + show-details: always + roles: ADMIN + endpoints: + web: + base-path: /actuator + exposure: + include: "health,info" + prometheus: + metrics: + export: + enabled: true + spring: application: name: srte-data-service