WIP

Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at>

.docs/api/analyse-service.md

@@ -6,7 +6,7 @@ author: Martin Weise
 
 !!! debug "Debug Information"
 
-    Image: [`registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.4.7`](https://hub.docker.com/r/dbrepo/analyse-service)
+    Image: [`registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.8.1`](https://hub.docker.com/r/dbrepo/analyse-service)
 
     * Ports: 5000/tcp
     * Prometheus: `http://<hostname>:5000/metrics`

.docs/api/data-service.md

@@ -6,7 +6,7 @@ author: Martin Weise
 
 !!! debug "Debug Information"
 
-    Image: [`registry.datalab.tuwien.ac.at/dbrepo/data-service:1.4.7`](https://hub.docker.com/r/dbrepo/data-service)
+    Image: [`registry.datalab.tuwien.ac.at/dbrepo/data-service:1.8.1`](https://hub.docker.com/r/dbrepo/data-service)
 
     * Ports: 9093/tcp
     * Info: `http://<hostname>:9093/actuator/info`

.docs/api/metadata-service.md

@@ -6,7 +6,7 @@ author: Martin Weise
 
 !!! debug "Debug Information"
 
-    Image: [`registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.4.7`](https://hub.docker.com/r/dbrepo/metadata-service)
+    Image: [`registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.8.1`](https://hub.docker.com/r/dbrepo/metadata-service)
 
     * Ports: 9099/tcp
     * Info: `http://<hostname>:9099/actuator/info`

.docs/api/search-service.md

@@ -6,7 +6,7 @@ author: Martin Weise
 
 !!! debug "Debug Information"
 
-    Image: [`registry.datalab.tuwien.ac.at/dbrepo/search-service:1.4.7`](https://hub.docker.com/r/dbrepo/search-service)
+    Image: [`registry.datalab.tuwien.ac.at/dbrepo/search-service:1.8.1`](https://hub.docker.com/r/dbrepo/search-service)
 
     * Ports: 4000/tcp
     * Health: `http://<hostname>:4000/api/search/health`

.docs/api/ui.md

@@ -6,7 +6,7 @@ author: Martin Weise
 
 !!! debug "Debug Information"
 
-    Image: [`registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.7`](https://hub.docker.com/r/dbrepo/ui)
+    Image: [`registry.datalab.tuwien.ac.at/dbrepo/ui:1.8.1`](https://hub.docker.com/r/dbrepo/ui)
 
     * Ports: 3000/tcp
 

.docs/concepts/logging.md

+---
+author: Martin Weise
+---
+
+This is a short conceptional overview on the logging mechanisms provided by [fluentbit](https://fluentbit.io/).
+
+## Collection
+
+fluentd, [Structured Logging in Spring Boot](https://spring.io/blog/2024/08/23/structured-logging-in-spring-boot-3-4)
+
+The [Docker Compose](../../installation) test setup uses the `fluentd` logging driver to forward logs from the console
+for every service, except for the [Metadata Service](../../api/metadata-service) and 
+the [Data Service](../../api/data-service). In this case fluentbit scrapes the logs from a logging file in 
+`/app/logs.json` (in [ECS](https://www.elastic.co/docs/reference/ecs) format).
+
+## Storage
+
+opensearch
+
+## Insights
+
+opensearch dashboards, grafana
+

dbrepo-data-service/Dockerfile

@@ -15,7 +15,7 @@ COPY ./services ./services
 RUN mvn -fn clean package -DskipTests
 
 ###### SECOND STAGE ######
-FROM amazoncorretto:17-alpine3.19 AS runtime
+FROM amazoncorretto:17-alpine3.21 AS runtime
 LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 RUN apk --no-cache add \
@@ -25,11 +25,12 @@ RUN apk --no-cache add \
 
 WORKDIR /app
 
-RUN adduser -D dbrepo --uid 1001
+RUN adduser -D dbrepo --uid 1001 && \
+    chown -R 1001:1001 /app
 
 USER 1001
 
-COPY --from=build --chown=1001 ./rest-service/target/rest-service-*.jar ./data-service.jar
+COPY --from=build --chown=1001 ./rest-service/target/*rest-service-*.jar ./data-service.jar
 
 # non-root port
 EXPOSE 8080

dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.md5

-dfe2abb9c96c05cbdc6467bf60537695
+082f84bc96626ba0af33b55e6371e900
\ No newline at end of file

dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/1.8.1/dbrepo-core-1.8.1.jar.sha1

-1d27fdc406b24d5e19e7325cc1c475e54dabdbd8
+73352b727fd328a6f6c87ebb55c5685101ef26a2
\ No newline at end of file

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>20250421083956</lastUpdated>
+    <lastUpdated>20250422121915</lastUpdated>
   </versioning>
 </metadata>

dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.md5

-746a0f0ea34d057de25fcd3c55b6e0ac
+9c8ded18aad1ff29f91e6ea5b11e33d4
\ No newline at end of file

dbrepo-data-service/lib/at/ac/tuwien/ifs/dbrepo/dbrepo-core/maven-metadata.xml.sha1

-f460c93edbab2a5eb6e49a6e124ca6a03d1b60cc
+8784dd005d25156e9599b598deabb8aa15b7a8c1
\ No newline at end of file

dbrepo-data-service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.5</version>
+        <version>3.4.0</version>
     </parent>
 
     <organization>

dbrepo-data-service/rest-service/src/main/resources/application.yml

@@ -29,6 +29,9 @@ spring:
     port: ${BROKER_PORT:5672}
   main:
     banner-mode: off
+  output:
+    ansi:
+      enabled: never
 management:
   endpoints:
     web:
@@ -48,7 +51,8 @@ server:
   tomcat:
     max-swallow-size: -1
 logging:
-  pattern.console: "%d %highlight(%-5level) %msg%n"
+  pattern:
+    console: "%d [%thread] %-5level %logger{36} - %msg%n"
   level:
     root: warn
     at.ac.tuwien.ac.at.ifs.dbrepo.: "${LOG_LEVEL:info}"

dbrepo-logging-service/dbrepo_parser.conf

 [PARSER]
-    # https://rubular.com/r/u029eqdrtxeOT9
+    # https://rubular.com/r/78ieBhDKvlzPnW
     Name        java
     Format      regex
-    Regex       (?<time>[^ ]* {1,2}[^ ]*) (?<level>[^ ]*)  *(?<message>.*)$
+    Regex       (?<time>[^ ]* {1,2}[^ ]*) \[(?<thread>.*)\] *(?<level>[^ ]*) (?<logger>.*) - (?<message>.*)$
     Time_Key    time
     Time_Format %Y-%m-%d %H:%M:%S,%L
     Time_Keep   On

dbrepo-metadata-service/Dockerfile

@@ -16,7 +16,7 @@ COPY ./services ./services
 RUN mvn -fn clean package -DskipTests
 
 ###### SECOND STAGE ######
-FROM amazoncorretto:17-alpine3.19 AS runtime
+FROM amazoncorretto:17-alpine3.21 AS runtime
 LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 RUN apk --no-cache add \
@@ -26,15 +26,16 @@ RUN apk --no-cache add \
 
 WORKDIR /app
 
-RUN adduser -D dbrepo --uid 1001
+RUN adduser -D dbrepo --uid 1001 && \
+    chown -R 1001:1001 /app
 
 USER 1001
 
-COPY --from=build --chown=1001 ./rest-service/target/dbrepo-metadata-service-rest-service-*.jar ./metadata-service.jar
+COPY --from=build --chown=1001 ./rest-service/target/*rest-service-*.jar ./metadata-service.jar
 
 # non-root port
 EXPOSE 8080
 
-ENV JAVA_OPTS="-Dlog4j2.formatMsgNoLookups=true"
+ENV JAVA_OPTS=""
 
 ENTRYPOINT exec java $JAVA_OPTS -jar ./metadata-service.jar
\ No newline at end of file