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 edea6c4ebd6ce0d7728c3da736d1b30c81efa3dd..8a56e5818847a742b4ea0247c3793554d47ff0c8 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 dec793b1e8bc70e118c86d5ee2a540cdd7a2af15..c2273cdb77233e5a4e87427ff48be9a99b9223c5 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 @@ -31b7fb02b0ee64b72460aabbcfd642fe \ No newline at end of file +1562ad3e915b2887a6ef54a1f35c2159 \ 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 1557fd540fb1bcf8707de8636e99b14fd411fa9e..6ae44f73c203577ff76cb5a1f19cb453773a7887 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 @@ -3f93b6217b6dc7694d15ecd752af2df84a458bda \ No newline at end of file +9de9b96685d9adeb43855bee866809927943925d \ 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 0c5fdda34a95cca7b91fdecd5c7ee3172331815d..6f6d30510c8457b274a1dbcec21bf6d1abb2ff80 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>20250417170017</lastUpdated> + <lastUpdated>20250419102735</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 e78fb44f0bfe55a8f7266baa8d16123f0777a539..5c70bdc359df0fcf16d3d6bc9cfad514a513b340 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 @@ -59052bbb00ad9c74d837ede597de9ac4 \ No newline at end of file +221180cf0049016145639d0dd1a434a1 \ 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 636417f7056180f2bb9e68d55a93bb70b3ed7a9c..33844abe67a7930332e09b57c84083623957ab6c 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 @@ -dc0b2a3dd9f784e16ea1a4c359a9656cc11862a8 \ No newline at end of file +f221232ab20744e98ecef53721cb732826587619 \ No newline at end of file diff --git a/dbrepo-logging-service/default.conf b/dbrepo-logging-service/default.conf index 2a7cdc55755578da1792635793998ee3418e581d..eb1156e3c34d96a6f131ab08295f8e5ea16c25c5 100644 --- a/dbrepo-logging-service/default.conf +++ b/dbrepo-logging-service/default.conf @@ -1,12 +1,28 @@ +[SERVICE] + Flush 5 + Daemon Off + Log_Level debug + Parsers_File parsers.conf + [INPUT] - Name cpu - Tag cpu + Name forward + Listen 0.0.0.0 + Port 24224 + +[FILTER] + Name parser + Parser docker + Match * + Key_Name log + Reserve_Data On + Preserve_Key On [OUTPUT] - Name opensearch - Match * - Host search-db - Port 9200 - Index logging - Logstash_Format True - Logstash_Prefix dbrepo \ No newline at end of file + Name opensearch + Match * + Host search-db + Port 9200 + Index logging + Replace_Dots On + Include_Tag_Key On + Suppress_Type_Name On \ 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 edea6c4ebd6ce0d7728c3da736d1b30c81efa3dd..8a56e5818847a742b4ea0247c3793554d47ff0c8 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 dec793b1e8bc70e118c86d5ee2a540cdd7a2af15..c2273cdb77233e5a4e87427ff48be9a99b9223c5 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 @@ -31b7fb02b0ee64b72460aabbcfd642fe \ No newline at end of file +1562ad3e915b2887a6ef54a1f35c2159 \ 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 1557fd540fb1bcf8707de8636e99b14fd411fa9e..6ae44f73c203577ff76cb5a1f19cb453773a7887 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 @@ -3f93b6217b6dc7694d15ecd752af2df84a458bda \ No newline at end of file +9de9b96685d9adeb43855bee866809927943925d \ 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 98007a3c7278bcad7d0c72ce048b0c989d4647c6..7848a8b2275a24862ccb190c63d8b44645845c73 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>20250417170018</lastUpdated> + <lastUpdated>20250419102737</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 1b13d5b0f36d6dee14a6b6ad5982a78348a59e02..30640bdabd62fab2a3e925e6d5d8cc9269605adc 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 @@ -725d5aecb7efb5b77615505e43e9354d \ No newline at end of file +388b334e9b3a3684f8d05f5963b397dd \ 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 8ede992443e3cf6610b96b5768fba54339beac0e..ebfe869b287d92b9eb24849adc8ff14b5203cb4e 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 @@ -32a5d4b6afe96feb91dbedfb60baf264a806724d \ No newline at end of file +ffc801220f6dafc44c81fa4f7a3a92062c236e64 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 832ed9379e444c07dc4a407e08e0935bee252eb3..c8e30a217b7a063f09dfc8bb6ddbf691741ee8d0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -60,8 +60,8 @@ x-healthcheck-params: &healthcheck-params x-logging-params: &logging-params driver: fluentd options: - fluentd-address: localhost:2020 - tag: dbrepo.logs + fluentd-address: 127.0.0.1:24224 + tag: dbrepo volumes: metadata-db-data: @@ -755,13 +755,11 @@ services: hostname: logging-service image: docker.io/bitnami/fluent-bit:4.0.0 ports: - - "2020:2020" - environment: - FLUENTD_CONF: default.conf + - "24224:24224" volumes: - - ./dbrepo-logging-service/default.conf:/fluentd/etc/default.conf + - ./dbrepo-logging-service/default.conf:/opt/bitnami/fluent-bit/conf/fluent-bit.conf deploy: - <<: *resources-nano + <<: *resources-micro healthcheck: test: ps -p 1 | grep "fluent-bit" <<: *healthcheck-params diff --git a/helm/dbrepo/files/create-event-listener.jar b/helm/dbrepo/files/create-event-listener.jar index c0d3347880d8d44ca69805d75e4132225cd022f8..e97f263749550722030b83f02ffe2538c4b73c46 100644 Binary files a/helm/dbrepo/files/create-event-listener.jar and b/helm/dbrepo/files/create-event-listener.jar differ