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 b77e2f543a3afa336eaca712c024ed709e85a306..09841f9ba9d8565e164047a78f5b39dba59c2025 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 ef7ffe9dc4fc0ac542245a2852f3b277fdc2f609..a2e52d54663a5b9832353c75985ca2b9b1412e1d 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 @@ -4bb9c10ee8dcc4f05fef0928ec526b5b \ No newline at end of file +77859c4ca0aff375f4907c25fb58a3c4 \ 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 d99c5b6b1d2214c0a2ffae0deced8e68f26e3b44..de573188da13d0dbec07ec8a9b5444273e160ef4 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 @@ -f4bc86db3f023f2b9481db399c6d439ba41e5272 \ No newline at end of file +2f9f3715d7d6bcdc0d96689c21ba74cc53b312cb \ 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 773bc1fbaaae71f902fdfe69e8c85c51a4fb030a..f4b759c4f2f71808ab9f1a436515f97c73582d31 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>20250420181800</lastUpdated> + <lastUpdated>20250420195141</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 5e3334d9995b27f3f3f4d37557df22e244b4c5ab..eda0f0bd3f89bef81a212ee391bc158c7d78d519 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 @@ -c77e7629604adca32895fd22fcf85f37 \ No newline at end of file +d17a3fe473e3dc21620d95541dc8be07 \ 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 56cd8f8a15754d711414d6848ba4f8d78f6c8e46..4faa6f87fcb2f30db5755d34cf9b0e1b8ee9bcf4 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 @@ -33a845a4d64bc82da3fb93f817539603aa7a159d \ No newline at end of file +ee2f25c310b95abf32af607e8ce2768ab5311ddc \ No newline at end of file diff --git a/dbrepo-logging-service/dbrepo_parser.conf b/dbrepo-logging-service/dbrepo_parser.conf index 7c680629f81b3a6d0192f59268943a63be2f1afc..f407dbc1ea5ba77f02a09e258defdd556977a3e8 100644 --- a/dbrepo-logging-service/dbrepo_parser.conf +++ b/dbrepo-logging-service/dbrepo_parser.conf @@ -7,6 +7,15 @@ Time_Format %Y-%m-%d %H:%M:%S,%L Time_Keep On +[PARSER] + # https://rubular.com/r/oTnpOflRX0HwaG + Name quarkus + Format regex + Regex ^(?<time>[^ ]* {1,2}[^ ]*) (?<level>[^ ]*).*\[(?<module>.*)\].*\(executor-thread-(?<executor>[0-9]+)\) (?<message>.*)$ + Time_Key time + Time_Format %Y-%m-%d %H:%M:%S,%L + Time_Keep On + [PARSER] # https://rubular.com/r/JqOp74qykhKeBJ Name gunicorn diff --git a/dbrepo-logging-service/default.conf b/dbrepo-logging-service/default.conf index 8b5af1493ad488e59631f97c8773ba402299558d..344fa190cea697522acffb74a327f4acf7a55d0c 100644 --- a/dbrepo-logging-service/default.conf +++ b/dbrepo-logging-service/default.conf @@ -50,6 +50,14 @@ Reserve_Data On Preserve_Key On +[FILTER] + Name parser + Parser quarkus + Match keycloak.* + Key_Name log + Reserve_Data On + Preserve_Key On + [OUTPUT] Name opensearch Match * 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 b77e2f543a3afa336eaca712c024ed709e85a306..09841f9ba9d8565e164047a78f5b39dba59c2025 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 ef7ffe9dc4fc0ac542245a2852f3b277fdc2f609..a2e52d54663a5b9832353c75985ca2b9b1412e1d 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 @@ -4bb9c10ee8dcc4f05fef0928ec526b5b \ No newline at end of file +77859c4ca0aff375f4907c25fb58a3c4 \ 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 d99c5b6b1d2214c0a2ffae0deced8e68f26e3b44..de573188da13d0dbec07ec8a9b5444273e160ef4 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 @@ -f4bc86db3f023f2b9481db399c6d439ba41e5272 \ No newline at end of file +2f9f3715d7d6bcdc0d96689c21ba74cc53b312cb \ 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 a0a6c1a09606d80c8f69b2707a7d8128010fca55..d1681479221d73d53e5d0cde50e864432bb4f6f3 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>20250420181801</lastUpdated> + <lastUpdated>20250420195143</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 da7a315b7d023a65e60ef07315b0006b4ab4c524..55e89ddaadf7e5fed1e05a9f8c4ce4b37d3c1ffa 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 @@ -9690000f3e5e3480a1e848c01b121660 \ No newline at end of file +5a8312a9d3158e8b63c8ee054a90576b \ 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 0b5454ddc4b8423f8df6e0169ba80e06046c9a46..ced627e0dd949ae848afbcb9d22e2467014b35d1 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 @@ -7931c7834aa370963a4d31537c24f9aa1dc668d6 \ No newline at end of file +f41c1065d851d79e91c359712bd079a07b50784a \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index e1fc9f26cf093decfd7e61af8bc7a932d79c97e8..6accc2bc09a7de185b8b4c5d91138c51b5c7bfdc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -484,7 +484,8 @@ services: test: wget -O- http://127.0.0.1:8080 <<: *healthcheck-params deploy: - <<: *resources-nano + # TODO may need less but takes forever to stop + <<: *resources-micro depends_on: dbrepo-analyse-service: condition: service_healthy diff --git a/helm/dbrepo/files/create-event-listener.jar b/helm/dbrepo/files/create-event-listener.jar index 37865c8fadb7d281ce560b9b1bcf48df35e4a7e8..b1173f059e9ada2dff983fed7268e8490ec91822 100644 Binary files a/helm/dbrepo/files/create-event-listener.jar and b/helm/dbrepo/files/create-event-listener.jar differ