diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 832b620fde4c58e8372f690598d64836954dced4..6b0482ed883adb26822376ff8279c514681238e6 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -763,6 +763,8 @@ services:
healthcheck:
test: ps -p 1 | grep "fluent-bit"
<<: *healthcheck-params
+ deploy:
+ <<: *resources-micro
depends_on:
dbrepo-search-db:
condition: service_healthy
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
deleted file mode 100644
index 9ad489e8e468bc0b5e7e6c160408d7674a9ec639..0000000000000000000000000000000000000000
Binary files a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar and /dev/null 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
deleted file mode 100644
index f0f519729b152222b8b192a34e09573655d8aec4..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-082f84bc96626ba0af33b55e6371e900
\ 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
deleted file mode 100644
index c459a8e4c3c8b8e92803d290177a2ea24e2be14c..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-73352b727fd328a6f6c87ebb55c5685101ef26a2
\ 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.pom b/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.pom
deleted file mode 100644
index 30db1b770b53b64f2bbbf54247862255c2d01c19..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
- <artifactId>dbrepo-core</artifactId>
- <version>1.8.1</version>
-</project>
diff --git a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.pom.md5 b/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.pom.md5
deleted file mode 100644
index 6bd616e22886309d28f18f97176c609b9e630543..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-439bfdd34cb9013bacf0fef173d229f7
\ 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.pom.sha1 b/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.pom.sha1
deleted file mode 100644
index c95d4a4000464a3ba6828db706d99737dffbb42a..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-df63ba72231cad9fee59b9bf10591941f6a8bbf8
\ 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
deleted file mode 100644
index 69fb88efe4d5f186cd2c397d36cd34722e12e27e..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
- <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
- <artifactId>dbrepo-core</artifactId>
- <versioning>
- <release>1.8.2</release>
- <versions>
- <version>1.8.1</version>
- <version>1.8.2</version>
- </versions>
- <lastUpdated>20250424042157</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
deleted file mode 100644
index 51293a7160951cc1707111f0ea04fa58a3925401..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.md5
+++ /dev/null
@@ -1 +0,0 @@
-535ccfe9a81ec5cacace73e5fda12e7f
\ 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
deleted file mode 100644
index 0287a9867417bb124f83e303c244cd0057353d6d..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4c42fa159ec7959fbfc3de77b8b0307537bff1f1
\ No newline at end of file
diff --git a/dbrepo-logging-service/fluentbit.conf b/dbrepo-logging-service/fluentbit.conf
index 344fa190cea697522acffb74a327f4acf7a55d0c..ec9ca1a6e99be23e562ccec4b6f6b2daf8f2fdfa 100644
--- a/dbrepo-logging-service/fluentbit.conf
+++ b/dbrepo-logging-service/fluentbit.conf
@@ -3,7 +3,7 @@
Daemon Off
Log_Level debug
Parsers_File parsers.conf
- Parsers_File dbrepo_parser.conf
+ Parsers_File fluentbit_parser.conf
[INPUT]
Name forward
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
deleted file mode 100644
index 9ad489e8e468bc0b5e7e6c160408d7674a9ec639..0000000000000000000000000000000000000000
Binary files a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar and /dev/null 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
deleted file mode 100644
index f0f519729b152222b8b192a34e09573655d8aec4..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-082f84bc96626ba0af33b55e6371e900
\ 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
deleted file mode 100644
index c459a8e4c3c8b8e92803d290177a2ea24e2be14c..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-73352b727fd328a6f6c87ebb55c5685101ef26a2
\ 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.pom b/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.pom
deleted file mode 100644
index 30db1b770b53b64f2bbbf54247862255c2d01c19..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
- <artifactId>dbrepo-core</artifactId>
- <version>1.8.1</version>
-</project>
diff --git a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.pom.md5 b/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.pom.md5
deleted file mode 100644
index 6bd616e22886309d28f18f97176c609b9e630543..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-439bfdd34cb9013bacf0fef173d229f7
\ 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.pom.sha1 b/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.pom.sha1
deleted file mode 100644
index c95d4a4000464a3ba6828db706d99737dffbb42a..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-df63ba72231cad9fee59b9bf10591941f6a8bbf8
\ 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
deleted file mode 100644
index b7ee7dbe99db8121c809a6aeed3b3bef0699a420..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
- <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
- <artifactId>dbrepo-core</artifactId>
- <versioning>
- <release>1.8.1</release>
- <versions>
- <version>1.8.1</version>
- </versions>
- <lastUpdated>20250422121933</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
deleted file mode 100644
index 3d856af716fde5bfc16e43b2f1e81433ce85cd79..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.md5
+++ /dev/null
@@ -1 +0,0 @@
-f7d3706978b0e0277aa64ce2b5538405
\ 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
deleted file mode 100644
index 5e5ee45feb96f69239686c74c3db0fbd338f74c9..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7de1d14129a4071daefae0475eea792e1a8f406c
\ No newline at end of file
diff --git a/dbrepo-metadata-service/pom.xml b/dbrepo-metadata-service/pom.xml
index 2baf752edc6987143fde1c80bd6e90d4b794ede4..909ae569302d57bdd38a58116f1f3ec0c97c8420 100644
--- a/dbrepo-metadata-service/pom.xml
+++ b/dbrepo-metadata-service/pom.xml
@@ -67,9 +67,9 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>dbrepo-core</artifactId>
- <version>${project.version}</version>
+ <version>1.8.2</version>
</dependency>
<!-- Data Source -->
<dependency>
diff --git a/dbrepo-metadata-service/report/pom.xml b/dbrepo-metadata-service/report/pom.xml
index 3a26c3fc027e6ca1bd04c1ccedd7c8ab20267c21..ffbe87d0cce2489b32f0de0773a1a6969190020d 100644
--- a/dbrepo-metadata-service/report/pom.xml
+++ b/dbrepo-metadata-service/report/pom.xml
@@ -16,7 +16,7 @@
<dependencies>
<dependency>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
- <artifactId>metadata-service-services</artifactId>
+ <artifactId>services</artifactId>
<version>1.8.2</version>
</dependency>
</dependencies>
diff --git a/helm/dbrepo/charts/seaweedfs-4.2.1.tgz b/helm/dbrepo/charts/seaweedfs-4.2.1.tgz
index 6e3703cd38fdbc2e37da1dd76fb4b1e805e0baa0..2d016e8e90aa3efc68fbec89788b84fccbb7663d 100644
Binary files a/helm/dbrepo/charts/seaweedfs-4.2.1.tgz and b/helm/dbrepo/charts/seaweedfs-4.2.1.tgz differ
diff --git a/helm/dbrepo/files/create-event-listener.jar b/helm/dbrepo/files/create-event-listener.jar
index dd348c636f84e0ec4e345bc53cdcda60c1d2b6c9..cd556f4707e4480ce97a877183eda957bfed268a 100644
Binary files a/helm/dbrepo/files/create-event-listener.jar and b/helm/dbrepo/files/create-event-listener.jar differ
diff --git a/helm/dbrepo/files/my.cnf b/helm/dbrepo/files/my.cnf
deleted file mode 100644
index 2798f37644d8b2b2691335277c50e41dcd295def..0000000000000000000000000000000000000000
--- a/helm/dbrepo/files/my.cnf
+++ /dev/null
@@ -1,125 +0,0 @@
-[client]
-port=3306
-socket=/opt/bitnami/mariadb/tmp/mysql.sock
-plugin_dir=/opt/bitnami/mariadb/plugin
-
-[mysqld]
-explicit_defaults_for_timestamp
-default_storage_engine=InnoDB
-basedir=/opt/bitnami/mariadb
-datadir=/bitnami/mariadb/data
-plugin_dir=/opt/bitnami/mariadb/plugin
-tmpdir=/opt/bitnami/mariadb/tmp
-socket=/opt/bitnami/mariadb/tmp/mysql.sock
-pid_file=/opt/bitnami/mariadb/tmp/mysqld.pid
-bind_address=0.0.0.0
-
-## Character set
-##
-collation_server=utf8_unicode_ci
-init_connect='SET NAMES utf8'
-character_set_server=utf8
-
-## MyISAM
-##
-key_buffer_size=32M
-myisam_recover_options=FORCE,BACKUP
-
-## Safety
-##
-skip_host_cache
-skip_name_resolve
-max_allowed_packet=16M
-max_connect_errors=1000000
-sql_mode=STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_AUTO_VALUE_ON_ZERO,NO_ENGINE_SUBSTITUTION,NO_ZERO_DATE,NO_ZERO_IN_DATE,ONLY_FULL_GROUP_BY
-sysdate_is_now=1
-
-## Binary Logging
-##
-log_bin=mysql-bin
-expire_logs_days=14
-# Disabling for performance per http://severalnines.com/blog/9-tips-going-production-galera-cluster-mysql
-sync_binlog=0
-# Required for Galera
-binlog_format=row
-
-## Caches and Limits
-##
-tmp_table_size=32M
-max_heap_table_size=32M
-# Re-enabling as now works with Maria 10.1.2
-query_cache_type=1
-query_cache_limit=4M
-query_cache_size=256M
-max_connections=500
-thread_cache_size=50
-open_files_limit=65535
-table_definition_cache=4096
-table_open_cache=4096
-
-## InnoDB
-##
-innodb=FORCE
-innodb_strict_mode=1
-# Mandatory per https://github.com/codership/documentation/issues/25
-innodb_autoinc_lock_mode=2
-# Per https://www.percona.com/blog/2006/08/04/innodb-double-write/
-innodb_doublewrite=1
-innodb_flush_method=O_DIRECT
-innodb_log_files_in_group=2
-innodb_log_file_size=128M
-innodb_flush_log_at_trx_commit=1
-innodb_file_per_table=1
-# 80% Memory is default reco.
-# Need to re-evaluate when DB size grows
-innodb_buffer_pool_size=1430M
-innodb_file_format=Barracuda
-
-## Logging
-##
-log_error=/opt/bitnami/mariadb/logs/mysqld.log
-slow_query_log_file=/opt/bitnami/mariadb/logs/mysqld.log
-log_queries_not_using_indexes=1
-slow_query_log=1
-
-## SSL
-## Use extraVolumes and extraVolumeMounts to mount /certs filesystem
-# ssl_ca=/certs/ca.pem
-# ssl_cert=/certs/server-cert.pem
-# ssl_key=/certs/server-key.pem
-
-[galera]
-wsrep_on=ON
-wsrep_provider=/opt/bitnami/mariadb/lib/libgalera_smm.so
-wsrep_sst_method=mariabackup
-wsrep_slave_threads=4
-wsrep_cluster_address=gcomm://
-wsrep_cluster_name=galera
-wsrep_sst_auth="root:"
-# Enabled for performance per https://mariadb.com/kb/en/innodb-system-variables/#innodb_flush_log_at_trx_commit
-innodb_flush_log_at_trx_commit=2
-# MYISAM REPLICATION SUPPORT #
-wsrep_mode=REPLICATE_MYISAM
-
-[mariadb]
-plugin_load_add=auth_pam
-
-## Data-at-Rest Encryption
-## Use extraVolumes and extraVolumeMounts to mount /encryption filesystem
-# plugin_load_add=file_key_management
-# file_key_management_filename=/encryption/keyfile.enc
-# file_key_management_filekey=FILE:/encryption/keyfile.key
-# file_key_management_encryption_algorithm=AES_CTR
-# encrypt_binlog=ON
-# encrypt_tmp_files=ON
-
-## InnoDB/XtraDB Encryption
-# innodb_encrypt_tables=ON
-# innodb_encrypt_temporary_tables=ON
-# innodb_encrypt_log=ON
-# innodb_encryption_threads=4
-# innodb_encryption_rotate_key_age=1
-
-## Aria Encryption
-# aria_encrypt_tables=ON
-# encrypt_tmp_disk_tables=ON
\ No newline at end of file
diff --git a/helm/dbrepo/templates/_resources.tpl b/helm/dbrepo/templates/_resources.tpl
index be31108c93f7f5bbbcf9d5a9c13313190da554db..d4368b7164e634430db9a322e7a5fc9e095ab736 100644
--- a/helm/dbrepo/templates/_resources.tpl
+++ b/helm/dbrepo/templates/_resources.tpl
@@ -38,8 +38,8 @@ These presets are for basic testing and not meant to be used in production
"limits" (dict "cpu" "1.5" "memory" "3072Mi" "ephemeral-storage" "2Gi")
)
"xlarge" (dict
- "requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
- "limits" (dict "cpu" "3.0" "memory" "6144Mi" "ephemeral-storage" "2Gi")
+ "requests" (dict "cpu" "1.5" "memory" "4096Mi" "ephemeral-storage" "50Mi")
+ "limits" (dict "cpu" "2.0" "memory" "6144Mi" "ephemeral-storage" "2Gi")
)
"2xlarge" (dict
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
diff --git a/helm/dbrepo/templates/logging-configmap.yaml b/helm/dbrepo/templates/logging-configmap.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..0d5951d16e91faafb0693226a35d5dfe3f5f014e
--- /dev/null
+++ b/helm/dbrepo/templates/logging-configmap.yaml
@@ -0,0 +1,124 @@
+{{- if .Values.loggingservice.enabled }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: metadata-db-config
+ namespace: {{ include "common.names.namespace" . | quote }}
+data:
+ dbrepo_parser.conf: |-
+ [PARSER]
+ # https://rubular.com/r/78ieBhDKvlzPnW
+ Name java
+ Format regex
+ Regex (?<time>[^ ]* {1,2}[^ ]*) \[(?<thread>.*)\] *(?<level>[^ ]*) (?<logger>.*) - (?<message>.*)$
+ Time_Key time
+ 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
+ Format regex
+ Regex \[(?<time>[^ ]* {1,2}[^ ]*)\] \[(?<level>[a-zA-Z]+)\] *(?<message>.*)$
+ Time_Key time
+ Time_Format %Y-%m-%d %H:%M:%S %z
+ Time_Keep On
+
+ [PARSER]
+ # https://rubular.com/r/bqLY5HuZfP07p3
+ Name seaweedfs
+ Format regex
+ Regex (?<i>I[0-9]*) (?<time>[^ ]*) (?<golocation>[a-z0-9_\.:]*) (?<message>.*)
+ Time_Key time
+ Time_Format %H:%M:%S.%L
+ Time_Keep On
+
+ [PARSER]
+ # https://rubular.com/r/SMa7y7BTOOgf9z
+ Name openldap
+ Format regex
+ Regex (?<rnd>[^ ]*) (?<register>[^ ]*) conn=(?<conn>[0-9]+) op=(?<op>[^ ]*) (?<message>.*)
+ Time_Key time
+ Time_Format %H:%M:%S.%L
+ Time_Keep On
+ fluentbit.conf: |-
+ [SERVICE]
+ Flush 5
+ Daemon Off
+ Log_Level debug
+ Parsers_File parsers.conf
+ Parsers_File dbrepo_parser.conf
+
+ [INPUT]
+ Name forward
+ Listen 0.0.0.0
+ Port 24224
+
+ [FILTER]
+ Name parser
+ Parser nginx
+ Match nginx.*
+ Key_Name log
+ Reserve_Data On
+ Preserve_Key On
+
+ [FILTER]
+ Name parser
+ Parser java
+ Match java.*
+ Key_Name log
+ Reserve_Data On
+ Preserve_Key On
+
+ [FILTER]
+ Name parser
+ Parser gunicorn
+ Match python.*
+ Key_Name log
+ Reserve_Data On
+ Preserve_Key On
+
+ [FILTER]
+ Name parser
+ Parser seaweedfs
+ Match seaweedfs.*
+ Key_Name log
+ Reserve_Data On
+ Preserve_Key On
+
+ [FILTER]
+ Name parser
+ Parser openldap
+ Match openldap.*
+ Key_Name log
+ 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 *
+ Host search-db
+ Port 9200
+ Index logging
+ Replace_Dots On
+ Include_Tag_Key On
+ Suppress_Type_Name On
+{{- end }}
diff --git a/helm/dbrepo/templates/logging-deployment.yaml b/helm/dbrepo/templates/logging-deployment.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..02ff2011940647de5086e4ff3516acd7a64422d4
--- /dev/null
+++ b/helm/dbrepo/templates/logging-deployment.yaml
@@ -0,0 +1,69 @@
+{{- if .Values.loggingservice.enabled }}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: logging-service
+ namespace: {{ include "common.names.namespace" . | quote }}
+ labels:
+ app: logging-service
+ service: logging-service
+spec:
+ replicas: {{ .Values.loggingservice.replicaCount }}
+ strategy:
+ type: {{ .Values.strategyType }}
+ selector:
+ matchLabels:
+ app: logging-service
+ service: logging-service
+ template:
+ metadata:
+ labels:
+ app: logging-service
+ service: logging-service
+ spec:
+ {{- if .Values.loggingservice.podSecurityContext.enabled }}
+ securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.loggingservice.podSecurityContext "context" $) | nindent 8 }}
+ {{- end }}
+ containers:
+ - name: logging-service
+ image: {{ .Values.loggingservice.image.name }}
+ imagePullPolicy: {{ .Values.loggingservice.image.pullPolicy | default "IfNotPresent" }}
+ {{- if .Values.loggingservice.containerSecurityContext.enabled }}
+ securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.loggingservice.containerSecurityContext "context" $) | nindent 12 }}
+ {{- end }}
+ ports:
+ - containerPort: 24224
+ protocol: TCP
+ - containerPort: 24224
+ protocol: UDP
+ volumeMounts:
+ - mountPath: /opt/bitnami/fluent-bit/conf/
+ name: config
+ readOnly: true
+ livenessProbe:
+ exec:
+ command:
+ - /bin/bash
+ - -ec
+ - "ps -p 1 | grep 'fluent-bit'"
+ initialDelaySeconds: 150
+ periodSeconds: 10
+ readinessProbe:
+ exec:
+ command:
+ - /bin/bash
+ - -ec
+ - "ps -p 1 | grep 'fluent-bit'"
+ initialDelaySeconds: 30
+ periodSeconds: 10
+ {{- if .Values.loggingservice.resources }}
+ resources: {{- toYaml .Values.loggingservice.resources | nindent 12 }}
+ {{- else if ne .Values.loggingservice.resourcesPreset "none" }}
+ resources: {{- include "common.resources.preset" (dict "type" .Values.loggingservice.resourcesPreset) | nindent 12 }}
+ {{- end }}
+ volumes:
+ - name: config
+ configMap:
+ name: metadata-db-config
+{{- end }}
diff --git a/helm/dbrepo/templates/metadata-configmap.yaml b/helm/dbrepo/templates/metadata-configmap.yaml
deleted file mode 100644
index e837c8072ada18d0bb9a364456834bfaecc3e697..0000000000000000000000000000000000000000
--- a/helm/dbrepo/templates/metadata-configmap.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-{{- if .Values.metadatadb.enabled }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: metadata-db-config
- namespace: {{ include "common.names.namespace" . | quote }}
-data:
- {{- with .Values.metadatadb.extraInitDbScripts }}
- {{ toYaml . | nindent 2 }}
- {{- end }}
- {{ (.Files.Glob "files/01-setup-schema.sql").AsConfig | nindent 2 }}
- 02-setup-data.sql: |-
- BEGIN;
- INSERT INTO `mdb_containers` (id, name, internal_name, image_id, host, port, ui_host, ui_port, privileged_username,
- privileged_password, readonly_username, readonly_password)
- VALUES ('6cfb3b8e-1792-4e46-871a-f3d103527203', 'mariadb:11.1.3-debian-11-r6', 'mariadb_11_1_3',
- 'd79cb089-363c-488b-9717-649e44d8fcc5', 'data-db', {{ .Values.datadb.containerPorts.mysql }},
- '{{ .Values.hostname }}', {{ .Values.datadb.containerPorts.mysql }}, '{{ .Values.datadb.rootUser.user }}',
- '{{ .Values.datadb.rootUser.password }}', '{{ .Values.datadb.db.user }}',
- '{{ .Values.datadb.db.password }}');
- COMMIT;
- {{ (.Files.Glob "files/my.cnf").AsConfig | nindent 2 }}
-{{- end }}
diff --git a/helm/dbrepo/templates/metadata-setup-configmap.yaml b/helm/dbrepo/templates/metadata-setup-configmap.yaml
index 608f1d13e162665464faeaf3eaa789834f6a8429..a3cd44ca5475cb18a13a98fd910c462d7b1313c9 100644
--- a/helm/dbrepo/templates/metadata-setup-configmap.yaml
+++ b/helm/dbrepo/templates/metadata-setup-configmap.yaml
@@ -13,7 +13,7 @@ data:
02-setup-data.sql: |
BEGIN;
INSERT INTO `mdb_containers` (name, internal_name, image_id, host, port, privileged_username, privileged_password)
- VALUES ('mariadb-galera:11.3.2-debian-12-r9', 'mariadb-galera:11.3.2-debian-12-r9', 1, 'data-db', 3306, '{{ .Values.datadb.rootUser.user }}', '{{ .Values.datadb.rootUser.password }}');
+ VALUES ('mariadb-galera:11.3.2-debian-12-r9', 'mariadb-galera:11.3.2-debian-12-r9', 1, 'data-db', 3306,
+ '{{ .Values.datadb.rootUser.user }}', '{{ .Values.datadb.rootUser.password }}');
COMMIT;
- {{ (.Files.Glob "files/my.cnf").AsConfig | nindent 2 }}
-{{- end }}
+ {{- end }}
diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml
index 9d1251cfe8411109f617c635a650484668827603..0659b73e696cfd7f53a19cce2fb1518a4e584425 100644
--- a/helm/dbrepo/values.yaml
+++ b/helm/dbrepo/values.yaml
@@ -55,9 +55,7 @@ metadatadb:
## @skip metadatadb.metrics.enabled The Prometheus settings.
enabled: true
## @skip metadatadb.initdbScriptsConfigMap The initial database scripts.
- initdbScriptsConfigMap: metadata-db-config
- ## @param metadatadb.configurationConfigMap The database configuration files.
- configurationConfigMap: metadata-db-config
+ initdbScriptsConfigMap: metadata-db-setup
## @param metadatadb.extraInitDbScripts Additional init.db scripts that are executed on the first start.
extraInitDbScripts: { }
# 03-additional-data.sql: |
@@ -66,9 +64,9 @@ metadatadb:
# VALUES ('MariaDB Galera TEST', 'mariadb_11_1_3', 1, 'data-db', 3306, 'data-db', 80, 'root', 'dbrepo');
# COMMIT;
## @param metadatadb.replicaCount The number of cluster nodes, should be uneven i.e. 2n+1
- replicaCount: 3
+ replicaCount: 1
## @param metadatadb.resourcesPreset The container resource preset
- resourcesPreset: "nano-hm"
+ resourcesPreset: "xlarge"
persistence:
## @param metadatadb.persistence.enabled Enable persistent storage.
enabled: true
@@ -187,9 +185,9 @@ datadb:
## @skip datadb.metrics.enabled The Prometheus settings.
enabled: true
## @param datadb.replicaCount The number of cluster nodes, should be uneven i.e. 2n+1
- replicaCount: 3
+ replicaCount: 1
## @param datadb.resourcesPreset The container resource preset
- resourcesPreset: "nano-hm"
+ resourcesPreset: "xlarge"
## @param datadb.initdbScriptsConfigMap The setup data to load into the database on first start.
initdbScriptsConfigMap: "data-db-setup"
persistence:
@@ -1070,6 +1068,59 @@ computeservice:
## @param computeservice.endpoint Configure the number of parallel workers with local[n]
endpoint: local[2]
+## @section Logging Service
+
+loggingservice:
+ enabled: false
+ image:
+ ## @skip loggingservice.image.name
+ name: docker.io/bitnami/fluent-bit:4.0.0
+ podSecurityContext:
+ ## @param loggingservice.podSecurityContext.enabled Enable pods' Security Context
+ enabled: true
+ ## @param loggingservice.podSecurityContext.fsGroupChangePolicy Set filesystem group change policy
+ fsGroupChangePolicy: Always
+ ## @param loggingservice.podSecurityContext.sysctls Set kernel settings using the sysctl interface
+ sysctls: [ ]
+ ## @param loggingservice.podSecurityContext.supplementalGroups Set filesystem extra groups
+ supplementalGroups: [ ]
+ ## @param loggingservice.podSecurityContext.fsGroup Set RabbitMQ pod's Security Context fsGroup
+ fsGroup: 0
+ containerSecurityContext:
+ ## @param loggingservice.containerSecurityContext.enabled Enable containers' Security Context
+ enabled: true
+ ## @param loggingservice.containerSecurityContext.seLinuxOptions Set SELinux options in container
+ seLinuxOptions: { }
+ ## @param loggingservice.containerSecurityContext.runAsUser Set RabbitMQ containers' Security Context runAsUser
+ runAsUser: 1001
+ ## @param loggingservice.containerSecurityContext.runAsGroup Set RabbitMQ containers' Security Context runAsGroup
+ runAsGroup: 1001
+ ## @param loggingservice.containerSecurityContext.runAsNonRoot Set RabbitMQ container's Security Context runAsNonRoot
+ runAsNonRoot: true
+ ## @param loggingservice.containerSecurityContext.allowPrivilegeEscalation Set container's privilege escalation
+ allowPrivilegeEscalation: false
+ ## @param loggingservice.containerSecurityContext.readOnlyRootFilesystem Set container's Security Context readOnlyRootFilesystem
+ readOnlyRootFilesystem: false
+ capabilities:
+ ## @param loggingservice.containerSecurityContext.capabilities.drop Set container's Security Context runAsNonRoot
+ drop: [ "ALL" ]
+ seccompProfile:
+ ## @param loggingservice.containerSecurityContext.seccompProfile.type Set container's Security Context seccomp profile
+ type: "RuntimeDefault"
+ ## @param loggingservice.resourcesPreset The container resource preset
+ resourcesPreset: "micro"
+ ## @param loggingservice.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
+ resources: { }
+ ## requests:
+ ## cpu: 250m
+ ## memory: 64Mi
+ ## limits:
+ ## cpu: 500m
+ ## memory: 1024Mi
+ ## @param loggingservice.replicaCount The number of replicas.
+ replicaCount: 2
+
+
## @section Ingress
ingress:
diff --git a/helm/seaweedfs/Chart.lock b/helm/seaweedfs/Chart.lock
index dfa3620f167709b52e2c54a4c5b55ef8dc6eb09b..17e017ad74ed6bf94e0eb383ddf31c146912e945 100644
--- a/helm/seaweedfs/Chart.lock
+++ b/helm/seaweedfs/Chart.lock
@@ -1,12 +1,12 @@
dependencies:
- name: mariadb
repository: oci://registry-1.docker.io/bitnamicharts
- version: 20.4.2
+ version: 20.4.3
- name: postgresql
repository: oci://registry-1.docker.io/bitnamicharts
- version: 16.6.3
+ version: 16.6.4
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
version: 2.30.0
-digest: sha256:a1969ecd9ac27255060569f5e0e3f4ad93f999b8968e3f9c5e97d1536996ebd2
-generated: "2025-04-10T10:05:59.79430147+02:00"
+digest: sha256:cf895fd3bc8c6715f0fae22d9f9e276a087fd6f39704348b1b8e84954659c548
+generated: "2025-04-24T11:15:12.075870224+02:00"
diff --git a/helm/seaweedfs/charts/common-2.30.0.tgz b/helm/seaweedfs/charts/common-2.30.0.tgz
index ef7b68044a9ee31a9ba735054c13e41814b79a16..df6d799a2c849afea773160f229d79eb1cf1af3b 100644
Binary files a/helm/seaweedfs/charts/common-2.30.0.tgz and b/helm/seaweedfs/charts/common-2.30.0.tgz differ
diff --git a/helm/seaweedfs/charts/mariadb-20.4.2.tgz b/helm/seaweedfs/charts/mariadb-20.4.2.tgz
deleted file mode 100644
index 5d58a0a1104ab1c9d8312d3117d5d2ece8b1d5a9..0000000000000000000000000000000000000000
Binary files a/helm/seaweedfs/charts/mariadb-20.4.2.tgz and /dev/null differ
diff --git a/helm/seaweedfs/charts/mariadb-20.4.3.tgz b/helm/seaweedfs/charts/mariadb-20.4.3.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..be02f47fb0e381105992b699e56fd1fca5f9ba3f
Binary files /dev/null and b/helm/seaweedfs/charts/mariadb-20.4.3.tgz differ
diff --git a/helm/seaweedfs/charts/postgresql-16.6.3.tgz b/helm/seaweedfs/charts/postgresql-16.6.3.tgz
deleted file mode 100644
index 36ca74dcb79a5d83a780bff787c379a488ef1875..0000000000000000000000000000000000000000
Binary files a/helm/seaweedfs/charts/postgresql-16.6.3.tgz and /dev/null differ
diff --git a/helm/seaweedfs/charts/postgresql-16.6.4.tgz b/helm/seaweedfs/charts/postgresql-16.6.4.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..385459186aca75ce1dd99abf0e9cdf97b9d5840b
Binary files /dev/null and b/helm/seaweedfs/charts/postgresql-16.6.4.tgz differ
diff --git a/lib/java/dbrepo-core/pom.xml b/lib/java/dbrepo-core/pom.xml
index 4b9af3d27e91b75396ce10fc5932e32b8f114cd2..da6155893176389e0b7f396ad365c9b307d6943c 100644
--- a/lib/java/dbrepo-core/pom.xml
+++ b/lib/java/dbrepo-core/pom.xml
@@ -17,9 +17,9 @@
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>dbrepo-core</artifactId>
- <name>dbrepo-core</name>
<version>1.8.2</version>
+ <name>dbrepo-core</name>
<description>Core library for DBRepo</description>
<url>https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.8/</url>
diff --git a/make/build.mk b/make/build.mk
index 6eb4f0dbf155f66dda99efa2587d408a3d956518..0ec5055ffe91cfd12584fe1e474e2e13fe9a243c 100644
--- a/make/build.mk
+++ b/make/build.mk
@@ -1,12 +1,12 @@
##@ Build
.PHONY: build-images
-build-images: build-java-lib build-auth-event-listener ## Build Docker images.
+build-images: ## Build Docker images.
docker compose build
.PHONY: build-java-lib
build-java-lib: ## Build the Java Library.
- mvn -f ./lib/java/dbrepo-core/pom.xml clean package -DskipTests
+ mvn -f ./lib/java/dbrepo-core/pom.xml clean package install -DskipTests
mvn deploy:deploy-file -Dfile=./lib/java/dbrepo-core/target/dbrepo-core-$(APP_VERSION).jar -DgroupId=at.ac.tuwien.ifs.dbrepo -DartifactId=dbrepo-core -Dversion=$(APP_VERSION) -Dpackaging=jar -Durl=file:./dbrepo-data-service/lib/ -DrepositoryId=maven-repository -DupdateReleaseInfo=true
mvn -f ./dbrepo-data-service/pom.xml clean package -DskipTests
mvn deploy:deploy-file -Dfile=./lib/java/dbrepo-core/target/dbrepo-core-$(APP_VERSION).jar -DgroupId=at.ac.tuwien.ifs.dbrepo -DartifactId=dbrepo-core -Dversion=$(APP_VERSION) -Dpackaging=jar -Durl=file:./dbrepo-metadata-service/lib/ -DrepositoryId=maven-repository -DupdateReleaseInfo=true
diff --git a/make/dev.mk b/make/dev.mk
index 048081f8002516926915ceb2b0d91a566e275e50..81ce84db6a349e3411a0e3c979e8184a5a4eeeed 100644
--- a/make/dev.mk
+++ b/make/dev.mk
@@ -1,7 +1,7 @@
##@ Development
.PHONY: start-dev
-start-dev: build-images ## Start the development deployment.
+start-dev: build-java-lib build-auth-event-listener build-images ## Start the development deployment.
docker container stop dbrepo-gateway-service || true
docker container rm dbrepo-gateway-service || true
docker compose up -d