diff --git a/CHANGELOG.md b/CHANGELOG.md index 5420b6380..ebe20ec07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,18 +9,25 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md). ### Detailed Changes -#### Minor +#### Major Changes +#### Minor Changes - API Wrapper: - Added wrapper API endpoint to query a single contract agreement -#### Patch +#### Patch Changes +- Logginghouse-Client: Update logging-house-client extension to v1.1.0 -#### Major Changes +### Deployment Migration Notes +#### logging-house-client extension +As the updated logging-house-client extension now also saves data locally in a database, the following additional proerties must be added and set accordingly to a second additional database since the extension has its own flyway migration: +- ```EDC_DATASOURCE_LOGGINGHOUSE_URL```: "postgres://some-url" +- ```EDC_DATASOURCE_LOGGINGHOUSE_USER```: "username" +- ```EDC_DATASOURCE_LOGGINGHOUSE_PASSWORD```: "password" -#### Minor Changes +If the extension is to be switched off, the following must now be set, as the extension is now activated by default when integrated: +- ```EDC_LOGGINGHOUSE_EXTENSION_ENABLED: 'false'``` -### Deployment Migration Notes #### Compatible Versions diff --git a/docs/deployment-guide/goals/development/README.md b/docs/deployment-guide/goals/development/README.md index 09239430c..f67884732 100644 --- a/docs/deployment-guide/goals/development/README.md +++ b/docs/deployment-guide/goals/development/README.md @@ -48,8 +48,8 @@ docker login ghcr.io # Pull the latest images docker compose --env-file .env.dev -f docker-compose-dev.yaml pull -# Start MDS EDC Connectors -EDC_UI_ACTIVE_PROFILE=mds-open-source docker compose --env-file .env.dev -f docker-compose-dev.yaml up +# Start MDS EDC Connectors without activating the logging-house-extension +EDC_UI_ACTIVE_PROFILE=mds-open-source EDC_LOGGINGHOUSE_EXTENSION_ENABLED=false docker compose --env-file .env.dev -f docker-compose-dev.yaml up ``` diff --git a/docs/deployment-guide/goals/local-demo/README.md b/docs/deployment-guide/goals/local-demo/README.md index 7d15efd51..6675355f6 100644 --- a/docs/deployment-guide/goals/local-demo/README.md +++ b/docs/deployment-guide/goals/local-demo/README.md @@ -39,8 +39,8 @@ docker compose up # Log-In to the Github Container Registry docker login ghcr.io -# Start MDS EDC Connectors -EDC_UI_ACTIVE_PROFILE=mds-open-source docker compose up +# Start MDS EDC Connectors without activating the logging-house-extension +EDC_UI_ACTIVE_PROFILE=mds-open-source EDC_LOGGINGHOUSE_EXTENSION_ENABLED=false docker compose up ``` diff --git a/docs/deployment-guide/goals/production/README.md b/docs/deployment-guide/goals/production/README.md index b679811e6..849c7971c 100644 --- a/docs/deployment-guide/goals/production/README.md +++ b/docs/deployment-guide/goals/production/README.md @@ -29,7 +29,7 @@ To deploy an EDC multiple deployment units must be deployed and configured. |-------------------------------------------------------------------|---------------------------------------------------------------------------------------------| | An Auth Proxy / Auth solution of your choice. | (deployment specific, required to secure UI and management API) | | Reverse Proxy that merges multiple services and removes the ports | (deployment specific) | -| Postgresql | 13 or compatible version | +| Postgresql | 13 or compatible version, one for the EDC-data one for the LH-data | | EDC Backend | edc-ce or edc-ce-mds, see [CHANGELOG.md](../../../../CHANGELOG.md) for compatible versions. | | EDC UI | edc-ui, see [CHANGELOG.md](../../../../CHANGELOG.md) for compatible versions. | @@ -151,9 +151,14 @@ EDC_OAUTH_PRIVATE_KEY_ALIAS: 1 A LoggingHouse extension is included in the MDS variant, which means that additional properties must be set for it: ```yaml -# LoggingHouse Extension +# LoggingHouse Extension general settings EDC_LOGGINGHOUSE_EXTENSION_ENABLED: "true" EDC_LOGGINGHOUSE_EXTENSION_URL: https://clearing.test.mobility-dataspace.eu + +# LoggingHouse Extension database connection for its own database +EDC_DATASOURCE_LOGGINGHOUSE_URL: jdbc:postgresql://postgresql2:5432/edc +EDC_DATASOURCE_LOGGINGHOUSE_USER: edc +EDC_DATASOURCE_LOGGINGHOUSE_PASSWORD: edc ``` You can also optionally set the following config properties: diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 748f8b6ec..fe13c11b3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -43,7 +43,7 @@ json = "20220924" jsonAssert = "1.5.1" jsonUnit = "3.2.7" junit = "5.10.0" -loggingHouse = "0.2.10" +loggingHouse = "v1.1.0" lombok = "1.18.30" mockito = "5.12.0" mockserver = "5.15.0"