diff --git a/dbrepo-dashboard-ui/provisioning/datasources/opensearch.yaml b/dbrepo-dashboard-ui/provisioning/datasources/opensearch.yaml new file mode 100644 index 0000000000000000000000000000000000000000..4fd59bf3825a3777f40a27ca0becb1f308b7f889 --- /dev/null +++ b/dbrepo-dashboard-ui/provisioning/datasources/opensearch.yaml @@ -0,0 +1,14 @@ +apiVersion: 1 + +datasources: + - name: dbrepo-opensearch + uid: dbrepoopensearch0 + type: grafana-opensearch-datasource + basicAuth: false + url: http://search-db:9200 + jsonData: + flavor: "opensearch" + logLevelField: "level" + logMessageField: "message" + timeField: "@time" + version: "2.10.0" diff --git a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar b/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar index 8a56e5818847a742b4ea0247c3793554d47ff0c8..bcbe378ccfc3fc47f00d0955893325afe482a6b8 100644 Binary files a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar and b/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar differ diff --git a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.md5 b/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.md5 index c2273cdb77233e5a4e87427ff48be9a99b9223c5..45f12e6b49fa2287d9d07699b43589fc4f1e319f 100644 --- a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.md5 +++ b/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.md5 @@ -1 +1 @@ -1562ad3e915b2887a6ef54a1f35c2159 \ No newline at end of file +dd9863e47bad7b44d48640513a8a3d4b \ No newline at end of file diff --git a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.sha1 b/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.sha1 index 6ae44f73c203577ff76cb5a1f19cb453773a7887..1d0cc7569ea0aefe7f7aef732cfa1cdd6a8b9dca 100644 --- a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.sha1 +++ b/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.sha1 @@ -1 +1 @@ -9de9b96685d9adeb43855bee866809927943925d \ No newline at end of file +8ade955fe62f8e6cd809f37f3479ddc843882bce \ No newline at end of file diff --git a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml b/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml index 6f6d30510c8457b274a1dbcec21bf6d1abb2ff80..a480540488148f1a4d51d4506f497dcebff17c80 100644 --- a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml +++ b/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml @@ -7,6 +7,6 @@ <versions> <version>1.8.1</version> </versions> - <lastUpdated>20250419102735</lastUpdated> + <lastUpdated>20250420103842</lastUpdated> </versioning> </metadata> diff --git a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.md5 b/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.md5 index 5c70bdc359df0fcf16d3d6bc9cfad514a513b340..4f96650e0d42e970641ce1296f5ee2e604c309d9 100644 --- a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.md5 +++ b/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.md5 @@ -1 +1 @@ -221180cf0049016145639d0dd1a434a1 \ No newline at end of file +779db7a879fe20234417cce3fa298472 \ No newline at end of file diff --git a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.sha1 b/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.sha1 index 33844abe67a7930332e09b57c84083623957ab6c..225b84bd3b769f09eeaec4349223d59b52a0b031 100644 --- a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.sha1 +++ b/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.sha1 @@ -1 +1 @@ -f221232ab20744e98ecef53721cb732826587619 \ No newline at end of file +1caca64fae673f34667cdb4bda7f739ba9144748 \ No newline at end of file diff --git a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar b/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar index 8a56e5818847a742b4ea0247c3793554d47ff0c8..bcbe378ccfc3fc47f00d0955893325afe482a6b8 100644 Binary files a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar and b/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar differ diff --git a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.md5 b/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.md5 index c2273cdb77233e5a4e87427ff48be9a99b9223c5..45f12e6b49fa2287d9d07699b43589fc4f1e319f 100644 --- a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.md5 +++ b/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.md5 @@ -1 +1 @@ -1562ad3e915b2887a6ef54a1f35c2159 \ No newline at end of file +dd9863e47bad7b44d48640513a8a3d4b \ No newline at end of file diff --git a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.sha1 b/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.sha1 index 6ae44f73c203577ff76cb5a1f19cb453773a7887..1d0cc7569ea0aefe7f7aef732cfa1cdd6a8b9dca 100644 --- a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.sha1 +++ b/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.sha1 @@ -1 +1 @@ -9de9b96685d9adeb43855bee866809927943925d \ No newline at end of file +8ade955fe62f8e6cd809f37f3479ddc843882bce \ No newline at end of file diff --git a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml b/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml index 7848a8b2275a24862ccb190c63d8b44645845c73..0c7daa29ab68550b3c9ffd3f1e4ec2b77df373ec 100644 --- a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml +++ b/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml @@ -7,6 +7,6 @@ <versions> <version>1.8.1</version> </versions> - <lastUpdated>20250419102737</lastUpdated> + <lastUpdated>20250420103843</lastUpdated> </versioning> </metadata> diff --git a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.md5 b/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.md5 index 30640bdabd62fab2a3e925e6d5d8cc9269605adc..614bd5caf1f323ff6e6b48764e29813d29ecd965 100644 --- a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.md5 +++ b/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.md5 @@ -1 +1 @@ -388b334e9b3a3684f8d05f5963b397dd \ No newline at end of file +89409a86b1aa8f975e87a5a57220ef58 \ No newline at end of file diff --git a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.sha1 b/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.sha1 index ebfe869b287d92b9eb24849adc8ff14b5203cb4e..23f1f5b9954933b7df8c9b45b3b8008246f152ea 100644 --- a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.sha1 +++ b/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.sha1 @@ -1 +1 @@ -ffc801220f6dafc44c81fa4f7a3a92062c236e64 \ No newline at end of file +f43ca1a24f845bd78c8552fc80003d126ae7e1d8 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 9d4224705fbbc48977e6319206488e30f8598188..75dae591eff93a3c64bb2aadf6d50079e9fbb2df 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -457,7 +457,7 @@ services: volumes: - ./dbrepo-gateway-service/dbrepo.conf:/etc/nginx/conf.d/dbrepo.conf healthcheck: - test: ps -p 1 | grep "nginx" + test: wget -O- http://127.0.0.1:8080 <<: *healthcheck-params deploy: <<: *resources-nano diff --git a/helm/dbrepo/files/create-event-listener.jar b/helm/dbrepo/files/create-event-listener.jar index e97f263749550722030b83f02ffe2538c4b73c46..52b6f4daf4c66a7ddd8c594515069e24e3936fae 100644 Binary files a/helm/dbrepo/files/create-event-listener.jar and b/helm/dbrepo/files/create-event-listener.jar differ