diff --git a/.env b/.env
index e50d4f6b5b1c15372029abec7a4fb924a70781ad..efc3a339390f8e04669cee0f14a6ed54e8b612b5 100644
--- a/.env
+++ b/.env
@@ -2,7 +2,7 @@ MARIADB_VERSION=11.3.2
POSTGRES_VERSION=17.0.0
KEYCLOAK_VERSION=26.0.4
RABBITMQ_VERSION=3.13.7
-OPENSEARCH_VERSION=2.10.0
+OPENSEARCH_VERSION=2.19.0
NGINX_VERSION=1.27.3-alpine3.20-slim
OPENLDAP_VERSION=2.6.8
SEAWEEDFS_VERSION=3.71.0
diff --git a/dbrepo-analyse-service/app.py b/dbrepo-analyse-service/app.py
index 41e4c128d9fb39fa6fa619745540996ca3037881..6dd0c082a620bdd4d6e93ba7717587b12d07b15f 100644
--- a/dbrepo-analyse-service/app.py
+++ b/dbrepo-analyse-service/app.py
@@ -28,7 +28,7 @@ dictConfig({
'format': '[%(asctime)s] %(levelname)s in %(module)s: %(message)s',
},
'simple': {
- 'format': '[%(asctime)s] %(levelname)s: %(message)s',
+ 'format': '[%(asctime)s] [%(levelname)s] %(message)s',
},
},
'handlers': {'wsgi': {
diff --git a/dbrepo-dashboard-service/app.py b/dbrepo-dashboard-service/app.py
index fafca139f43f7763a3757a4a33c24c31a3456c0c..76780711ae3502b41e1a49ad119c1364ee817d65 100644
--- a/dbrepo-dashboard-service/app.py
+++ b/dbrepo-dashboard-service/app.py
@@ -29,7 +29,7 @@ dictConfig({
'format': '[%(asctime)s] %(levelname)s in %(module)s: %(message)s',
},
'simple': {
- 'format': '[%(asctime)s] %(levelname)s: %(message)s',
+ 'format': '[%(asctime)s] [%(levelname)s] %(message)s',
},
},
'handlers': {'wsgi': {
diff --git a/dbrepo-dashboard-service/init.py b/dbrepo-dashboard-service/init.py
index 54c01f55ebc063e0b97a4ce799ba4d529e1a5627..12d8c240125032b259043d200b6316e91df0666e 100644
--- a/dbrepo-dashboard-service/init.py
+++ b/dbrepo-dashboard-service/init.py
@@ -18,7 +18,7 @@ dictConfig({
'format': '[%(asctime)s] %(levelname)s in %(module)s: %(message)s',
},
'simple': {
- 'format': '[%(asctime)s] %(levelname)s: %(message)s',
+ 'format': '[%(asctime)s] [%(levelname)s] %(message)s',
},
},
'handlers': {'wsgi': {
diff --git a/dbrepo-dashboard-ui/dashboards/System/dbrepo.json b/dbrepo-dashboard-ui/dashboards/System/dbrepo.json
index 6ce787d4560b063971bff8255b63b96b055ca9b8..e9d03fd40d5c457c7ccdbe0bdefec9957e976623 100644
--- a/dbrepo-dashboard-ui/dashboards/System/dbrepo.json
+++ b/dbrepo-dashboard-ui/dashboards/System/dbrepo.json
@@ -30,7 +30,7 @@
"title": "Docs",
"tooltip": "",
"type": "link",
- "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/"
+ "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.8/"
}
],
"panels": [
@@ -2428,7 +2428,8 @@
"gateway",
"analyse",
"metrics",
- "auth"
+ "auth",
+ "search"
],
"templating": {
"list": []
diff --git a/dbrepo-dashboard-ui/dashboards/System/logging.json b/dbrepo-dashboard-ui/dashboards/System/logging.json
new file mode 100644
index 0000000000000000000000000000000000000000..342894446addff23113db90af153647c91224749
--- /dev/null
+++ b/dbrepo-dashboard-ui/dashboards/System/logging.json
@@ -0,0 +1,694 @@
+{
+ "annotations": {
+ "list": [
+ {
+ "builtIn": 1,
+ "datasource": {
+ "type": "grafana",
+ "uid": "-- Grafana --"
+ },
+ "enable": true,
+ "hide": true,
+ "iconColor": "rgba(0, 211, 255, 1)",
+ "name": "Annotations & Alerts",
+ "type": "dashboard"
+ }
+ ]
+ },
+ "editable": true,
+ "fiscalYearStartMonth": 0,
+ "graphTooltip": 0,
+ "id": 3,
+ "links": [],
+ "panels": [
+ {
+ "collapsed": false,
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 0
+ },
+ "id": 5,
+ "panels": [],
+ "title": "HTTP Gateway",
+ "type": "row"
+ },
+ {
+ "datasource": {
+ "type": "grafana-opensearch-datasource",
+ "uid": "dbrepoopensearch0"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "thresholds"
+ },
+ "custom": {
+ "align": "auto",
+ "cellOptions": {
+ "type": "auto"
+ },
+ "inspect": false
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 80
+ }
+ ]
+ }
+ },
+ "overrides": [
+ {
+ "matcher": {
+ "id": "byName",
+ "options": "request.method"
+ },
+ "properties": [
+ {
+ "id": "custom.width"
+ }
+ ]
+ }
+ ]
+ },
+ "gridPos": {
+ "h": 8,
+ "w": 12,
+ "x": 0,
+ "y": 1
+ },
+ "id": 7,
+ "options": {
+ "cellHeight": "sm",
+ "footer": {
+ "countRows": false,
+ "fields": "",
+ "reducer": [
+ "sum"
+ ],
+ "show": false
+ },
+ "showHeader": true,
+ "sortBy": []
+ },
+ "pluginVersion": "11.5.3",
+ "targets": [
+ {
+ "alias": "",
+ "bucketAggs": [
+ {
+ "field": "@timestamp",
+ "id": "2",
+ "settings": {
+ "interval": "auto"
+ },
+ "type": "date_histogram"
+ }
+ ],
+ "datasource": {
+ "type": "grafana-opensearch-datasource",
+ "uid": "dbrepoopensearch0"
+ },
+ "format": "table",
+ "hide": false,
+ "luceneQueryType": "Logs",
+ "metrics": [
+ {
+ "id": "1",
+ "type": "logs"
+ }
+ ],
+ "query": "container_name: \"/dbrepo-gateway-service\" AND code: >=400",
+ "queryType": "lucene",
+ "refId": "A",
+ "timeField": "@timestamp"
+ }
+ ],
+ "title": "HTTP Gateway Errors",
+ "transformations": [
+ {
+ "id": "filterFieldsByName",
+ "options": {
+ "include": {
+ "names": [
+ "code",
+ "method",
+ "path",
+ "size"
+ ]
+ }
+ }
+ },
+ {
+ "id": "organize",
+ "options": {
+ "excludeByName": {},
+ "includeByName": {},
+ "indexByName": {
+ "code": 2,
+ "method": 0,
+ "path": 1,
+ "size": 3
+ },
+ "renameByName": {
+ "@timestamp": "",
+ "code": "response.status",
+ "method": "request.method",
+ "path": "request.url",
+ "size": "body.size"
+ }
+ }
+ },
+ {
+ "id": "calculateField",
+ "options": {
+ "alias": "Count",
+ "mode": "reduceRow",
+ "reduce": {
+ "include": [
+ "request.url",
+ "response.status"
+ ],
+ "reducer": "distinctCount"
+ },
+ "replaceFields": false
+ }
+ },
+ {
+ "id": "sortBy",
+ "options": {
+ "fields": {},
+ "sort": [
+ {
+ "desc": true,
+ "field": "Count"
+ }
+ ]
+ }
+ }
+ ],
+ "type": "table"
+ },
+ {
+ "datasource": {
+ "type": "grafana-opensearch-datasource",
+ "uid": "dbrepoopensearch0"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "fixed"
+ },
+ "custom": {
+ "axisBorderShow": false,
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
+ "axisLabel": "Count",
+ "axisPlacement": "auto",
+ "fillOpacity": 80,
+ "gradientMode": "none",
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
+ },
+ "lineWidth": 1,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "thresholdsStyle": {
+ "mode": "off"
+ }
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ }
+ ]
+ }
+ },
+ "overrides": [
+ {
+ "matcher": {
+ "id": "byFrameRefID",
+ "options": "200"
+ },
+ "properties": [
+ {
+ "id": "color",
+ "value": {
+ "fixedColor": "green",
+ "mode": "fixed"
+ }
+ },
+ {
+ "id": "displayName",
+ "value": "200s"
+ }
+ ]
+ },
+ {
+ "matcher": {
+ "id": "byFrameRefID",
+ "options": "300"
+ },
+ "properties": [
+ {
+ "id": "color",
+ "value": {
+ "fixedColor": "purple",
+ "mode": "fixed"
+ }
+ },
+ {
+ "id": "displayName",
+ "value": "300s"
+ }
+ ]
+ },
+ {
+ "matcher": {
+ "id": "byFrameRefID",
+ "options": "400"
+ },
+ "properties": [
+ {
+ "id": "color",
+ "value": {
+ "fixedColor": "orange",
+ "mode": "fixed"
+ }
+ },
+ {
+ "id": "displayName",
+ "value": "400s"
+ }
+ ]
+ },
+ {
+ "matcher": {
+ "id": "byFrameRefID",
+ "options": "500"
+ },
+ "properties": [
+ {
+ "id": "color",
+ "value": {
+ "fixedColor": "red",
+ "mode": "fixed"
+ }
+ },
+ {
+ "id": "displayName",
+ "value": "500s"
+ }
+ ]
+ }
+ ]
+ },
+ "gridPos": {
+ "h": 9,
+ "w": 24,
+ "x": 0,
+ "y": 9
+ },
+ "id": 3,
+ "options": {
+ "barRadius": 0,
+ "barWidth": 0.97,
+ "fullHighlight": false,
+ "groupWidth": 0.7,
+ "legend": {
+ "calcs": [],
+ "displayMode": "list",
+ "placement": "right",
+ "showLegend": true
+ },
+ "orientation": "auto",
+ "showValue": "auto",
+ "stacking": "normal",
+ "tooltip": {
+ "hideZeros": false,
+ "mode": "multi",
+ "sort": "none"
+ },
+ "xTickLabelRotation": 0,
+ "xTickLabelSpacing": 100
+ },
+ "pluginVersion": "11.5.3",
+ "targets": [
+ {
+ "alias": "",
+ "bucketAggs": [
+ {
+ "id": "2",
+ "settings": {
+ "interval": "auto",
+ "min_doc_count": "0",
+ "trimEdges": "0"
+ },
+ "type": "date_histogram"
+ }
+ ],
+ "datasource": {
+ "type": "grafana-opensearch-datasource",
+ "uid": "dbrepoopensearch0"
+ },
+ "format": "table",
+ "hide": false,
+ "luceneQueryType": "Metric",
+ "metrics": [
+ {
+ "id": "1",
+ "type": "count"
+ }
+ ],
+ "query": "container_name: \"/dbrepo-gateway-service\" AND code: (>=200 AND <300)",
+ "queryType": "lucene",
+ "refId": "200",
+ "timeField": "@timestamp"
+ },
+ {
+ "alias": "",
+ "bucketAggs": [
+ {
+ "id": "2",
+ "settings": {
+ "interval": "auto",
+ "min_doc_count": "0",
+ "trimEdges": "0"
+ },
+ "type": "date_histogram"
+ }
+ ],
+ "datasource": {
+ "type": "grafana-opensearch-datasource",
+ "uid": "dbrepoopensearch0"
+ },
+ "format": "table",
+ "hide": false,
+ "luceneQueryType": "Metric",
+ "metrics": [
+ {
+ "id": "1",
+ "type": "count"
+ }
+ ],
+ "query": "container_name: \"/dbrepo-gateway-service\" AND code: (>=300 AND <400)",
+ "queryType": "lucene",
+ "refId": "300",
+ "timeField": "@timestamp"
+ },
+ {
+ "alias": "",
+ "bucketAggs": [
+ {
+ "id": "2",
+ "settings": {
+ "interval": "auto",
+ "min_doc_count": "0",
+ "trimEdges": "0"
+ },
+ "type": "date_histogram"
+ }
+ ],
+ "datasource": {
+ "type": "grafana-opensearch-datasource",
+ "uid": "dbrepoopensearch0"
+ },
+ "format": "table",
+ "hide": false,
+ "luceneQueryType": "Metric",
+ "metrics": [
+ {
+ "id": "1",
+ "type": "count"
+ }
+ ],
+ "query": "container_name: \"/dbrepo-gateway-service\" AND code: (>=400 AND <500)",
+ "queryType": "lucene",
+ "refId": "400",
+ "timeField": "@timestamp"
+ },
+ {
+ "alias": "",
+ "bucketAggs": [
+ {
+ "id": "2",
+ "settings": {
+ "interval": "auto",
+ "min_doc_count": "0",
+ "trimEdges": "0"
+ },
+ "type": "date_histogram"
+ }
+ ],
+ "datasource": {
+ "type": "grafana-opensearch-datasource",
+ "uid": "dbrepoopensearch0"
+ },
+ "format": "table",
+ "hide": false,
+ "luceneQueryType": "Metric",
+ "metrics": [
+ {
+ "id": "1",
+ "type": "count"
+ }
+ ],
+ "query": "container_name: \"/dbrepo-gateway-service\" AND code: >=500",
+ "queryType": "lucene",
+ "refId": "500",
+ "timeField": "@timestamp"
+ }
+ ],
+ "title": "HTTP Status Codes over Time",
+ "type": "barchart"
+ },
+ {
+ "collapsed": false,
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 18
+ },
+ "id": 6,
+ "panels": [],
+ "title": "Application",
+ "type": "row"
+ },
+ {
+ "datasource": {
+ "type": "grafana-opensearch-datasource",
+ "uid": "dbrepoopensearch0"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "fixed"
+ },
+ "custom": {
+ "axisBorderShow": false,
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
+ "axisLabel": "",
+ "axisPlacement": "auto",
+ "fillOpacity": 80,
+ "gradientMode": "none",
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
+ },
+ "lineWidth": 1,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "thresholdsStyle": {
+ "mode": "off"
+ }
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ }
+ ]
+ }
+ },
+ "overrides": [
+ {
+ "matcher": {
+ "id": "byFrameRefID",
+ "options": "warn"
+ },
+ "properties": [
+ {
+ "id": "color",
+ "value": {
+ "fixedColor": "orange",
+ "mode": "fixed"
+ }
+ }
+ ]
+ },
+ {
+ "matcher": {
+ "id": "byFrameRefID",
+ "options": "error"
+ },
+ "properties": [
+ {
+ "id": "color",
+ "value": {
+ "fixedColor": "red",
+ "mode": "fixed"
+ }
+ }
+ ]
+ }
+ ]
+ },
+ "gridPos": {
+ "h": 7,
+ "w": 24,
+ "x": 0,
+ "y": 19
+ },
+ "id": 1,
+ "options": {
+ "barRadius": 0,
+ "barWidth": 0.97,
+ "fullHighlight": false,
+ "groupWidth": 0.7,
+ "legend": {
+ "calcs": [],
+ "displayMode": "list",
+ "placement": "right",
+ "showLegend": false
+ },
+ "orientation": "auto",
+ "showValue": "auto",
+ "stacking": "none",
+ "tooltip": {
+ "hideZeros": false,
+ "mode": "single",
+ "sort": "none"
+ },
+ "xTickLabelRotation": 0,
+ "xTickLabelSpacing": 100
+ },
+ "pluginVersion": "11.5.3",
+ "targets": [
+ {
+ "alias": "sdfsdf",
+ "bucketAggs": [
+ {
+ "id": "2",
+ "settings": {
+ "interval": "auto",
+ "min_doc_count": "0",
+ "trimEdges": "0"
+ },
+ "type": "date_histogram"
+ }
+ ],
+ "datasource": {
+ "type": "grafana-opensearch-datasource",
+ "uid": "dbrepoopensearch0"
+ },
+ "format": "table",
+ "hide": false,
+ "luceneQueryType": "Metric",
+ "metrics": [
+ {
+ "hide": false,
+ "id": "1",
+ "type": "count"
+ }
+ ],
+ "query": "level: WARN",
+ "queryType": "lucene",
+ "refId": "warn",
+ "timeField": "@timestamp"
+ },
+ {
+ "alias": "adadas",
+ "bucketAggs": [
+ {
+ "field": "@timestamp",
+ "id": "2",
+ "settings": {
+ "interval": "auto"
+ },
+ "type": "date_histogram"
+ }
+ ],
+ "datasource": {
+ "type": "grafana-opensearch-datasource",
+ "uid": "dbrepoopensearch0"
+ },
+ "format": "table",
+ "hide": false,
+ "luceneQueryType": "Metric",
+ "metrics": [
+ {
+ "id": "1",
+ "type": "count"
+ }
+ ],
+ "query": "level: ERROR",
+ "queryType": "lucene",
+ "refId": "error",
+ "timeField": "@timestamp"
+ }
+ ],
+ "title": "Errors and Warnings over Time",
+ "type": "barchart"
+ }
+ ],
+ "preload": false,
+ "refresh": "",
+ "schemaVersion": 40,
+ "tags": [
+ "ui",
+ "dashboard",
+ "metadata",
+ "data",
+ "gateway",
+ "analyse",
+ "metrics",
+ "auth",
+ "search"
+ ],
+ "templating": {
+ "list": []
+ },
+ "time": {
+ "from": "now-30m",
+ "to": "now"
+ },
+ "timepicker": {},
+ "timezone": "browser",
+ "title": "Logging",
+ "uid": "aejhojr0mrpj4c",
+ "version": 23,
+ "weekStart": ""
+}
\ No newline at end of file
diff --git a/dbrepo-dashboard-ui/provisioning/datasources/opensearch.yaml b/dbrepo-dashboard-ui/provisioning/datasources/opensearch.yaml
index 4fd59bf3825a3777f40a27ca0becb1f308b7f889..7a589eafa68a5c90fa4a74dbe401b1d2fd76d2c7 100644
--- a/dbrepo-dashboard-ui/provisioning/datasources/opensearch.yaml
+++ b/dbrepo-dashboard-ui/provisioning/datasources/opensearch.yaml
@@ -10,5 +10,5 @@ datasources:
flavor: "opensearch"
logLevelField: "level"
logMessageField: "message"
- timeField: "@time"
+ timeField: "@timestamp"
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 bcbe378ccfc3fc47f00d0955893325afe482a6b8..b77e2f543a3afa336eaca712c024ed709e85a306 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 45f12e6b49fa2287d9d07699b43589fc4f1e319f..ef7ffe9dc4fc0ac542245a2852f3b277fdc2f609 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 @@
-dd9863e47bad7b44d48640513a8a3d4b
\ No newline at end of file
+4bb9c10ee8dcc4f05fef0928ec526b5b
\ 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 1d0cc7569ea0aefe7f7aef732cfa1cdd6a8b9dca..d99c5b6b1d2214c0a2ffae0deced8e68f26e3b44 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 @@
-8ade955fe62f8e6cd809f37f3479ddc843882bce
\ No newline at end of file
+f4bc86db3f023f2b9481db399c6d439ba41e5272
\ 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 a480540488148f1a4d51d4506f497dcebff17c80..773bc1fbaaae71f902fdfe69e8c85c51a4fb030a 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>20250420103842</lastUpdated>
+ <lastUpdated>20250420181800</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 4f96650e0d42e970641ce1296f5ee2e604c309d9..5e3334d9995b27f3f3f4d37557df22e244b4c5ab 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 @@
-779db7a879fe20234417cce3fa298472
\ No newline at end of file
+c77e7629604adca32895fd22fcf85f37
\ 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 225b84bd3b769f09eeaec4349223d59b52a0b031..56cd8f8a15754d711414d6848ba4f8d78f6c8e46 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 @@
-1caca64fae673f34667cdb4bda7f739ba9144748
\ No newline at end of file
+33a845a4d64bc82da3fb93f817539603aa7a159d
\ No newline at end of file
diff --git a/dbrepo-logging-service/dbrepo_parser.conf b/dbrepo-logging-service/dbrepo_parser.conf
new file mode 100644
index 0000000000000000000000000000000000000000..7c680629f81b3a6d0192f59268943a63be2f1afc
--- /dev/null
+++ b/dbrepo-logging-service/dbrepo_parser.conf
@@ -0,0 +1,35 @@
+[PARSER]
+ # https://rubular.com/r/u029eqdrtxeOT9
+ Name java
+ Format regex
+ Regex (?<time>[^ ]* {1,2}[^ ]*) (?<level>[^ ]*) *(?<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
diff --git a/dbrepo-logging-service/default.conf b/dbrepo-logging-service/default.conf
index eb1156e3c34d96a6f131ab08295f8e5ea16c25c5..8b5af1493ad488e59631f97c8773ba402299558d 100644
--- a/dbrepo-logging-service/default.conf
+++ b/dbrepo-logging-service/default.conf
@@ -3,6 +3,7 @@
Daemon Off
Log_Level debug
Parsers_File parsers.conf
+ Parsers_File dbrepo_parser.conf
[INPUT]
Name forward
@@ -11,8 +12,40 @@
[FILTER]
Name parser
- Parser docker
- Match *
+ 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
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 bcbe378ccfc3fc47f00d0955893325afe482a6b8..b77e2f543a3afa336eaca712c024ed709e85a306 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 45f12e6b49fa2287d9d07699b43589fc4f1e319f..ef7ffe9dc4fc0ac542245a2852f3b277fdc2f609 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 @@
-dd9863e47bad7b44d48640513a8a3d4b
\ No newline at end of file
+4bb9c10ee8dcc4f05fef0928ec526b5b
\ 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 1d0cc7569ea0aefe7f7aef732cfa1cdd6a8b9dca..d99c5b6b1d2214c0a2ffae0deced8e68f26e3b44 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 @@
-8ade955fe62f8e6cd809f37f3479ddc843882bce
\ No newline at end of file
+f4bc86db3f023f2b9481db399c6d439ba41e5272
\ 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 0c7daa29ab68550b3c9ffd3f1e4ec2b77df373ec..a0a6c1a09606d80c8f69b2707a7d8128010fca55 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>20250420103843</lastUpdated>
+ <lastUpdated>20250420181801</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 614bd5caf1f323ff6e6b48764e29813d29ecd965..da7a315b7d023a65e60ef07315b0006b4ab4c524 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 @@
-89409a86b1aa8f975e87a5a57220ef58
\ No newline at end of file
+9690000f3e5e3480a1e848c01b121660
\ 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 23f1f5b9954933b7df8c9b45b3b8008246f152ea..0b5454ddc4b8423f8df6e0169ba80e06046c9a46 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 @@
-f43ca1a24f845bd78c8552fc80003d126ae7e1d8
\ No newline at end of file
+7931c7834aa370963a4d31537c24f9aa1dc668d6
\ No newline at end of file
diff --git a/dbrepo-search-service/app.py b/dbrepo-search-service/app.py
index 5d4f8b09decf600860293753ee0fbd044a9fdf6b..ad8d023dd82b6f03dac20b05df928b96f4a5ae87 100644
--- a/dbrepo-search-service/app.py
+++ b/dbrepo-search-service/app.py
@@ -29,7 +29,7 @@ dictConfig({
'format': '[%(asctime)s] %(levelname)s in %(module)s: %(message)s',
},
'simple': {
- 'format': '[%(asctime)s] %(levelname)s: %(message)s',
+ 'format': '[%(asctime)s] [%(levelname)s] %(message)s',
},
},
'handlers': {'wsgi': {
diff --git a/dbrepo-search-service/init.py b/dbrepo-search-service/init.py
index 48a59538e01fc232fe49675db5692cb21c2f8942..c4aef34a472332e743a5b4da214edb9ef5471d6c 100644
--- a/dbrepo-search-service/init.py
+++ b/dbrepo-search-service/init.py
@@ -19,7 +19,7 @@ dictConfig({
'format': '[%(asctime)s] %(levelname)s in %(module)s: %(message)s',
},
'simple': {
- 'format': '[%(asctime)s] %(levelname)s: %(message)s',
+ 'format': '[%(asctime)s] [%(levelname)s] %(message)s',
},
},
'handlers': {'wsgi': {
diff --git a/docker-compose.yml b/docker-compose.yml
index 75dae591eff93a3c64bb2aadf6d50079e9fbb2df..e1fc9f26cf093decfd7e61af8bc7a932d79c97e8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -57,12 +57,6 @@ x-healthcheck-params: &healthcheck-params
timeout: 10s
retries: 15
-x-logging-params: &logging-params
- driver: fluentd
- options:
- fluentd-address: 127.0.0.1:24224
- tag: dbrepo
-
volumes:
metadata-db-data:
data-db-data:
@@ -98,7 +92,10 @@ services:
deploy:
<<: *resources-micro-hm
logging:
- <<: *logging-params
+ driver: fluentd
+ options:
+ fluentd-address: 127.0.0.1:24224
+ tag: mariadb.metadata
dbrepo-data-db:
restart: "no"
@@ -124,7 +121,10 @@ services:
deploy:
<<: *resources-micro-hm
logging:
- <<: *logging-params
+ driver: fluentd
+ options:
+ fluentd-address: 127.0.0.1:24224
+ tag: mariadb.data
dbrepo-auth-db:
restart: "no"
@@ -149,7 +149,10 @@ services:
deploy:
<<: *resources-micro
logging:
- <<: *logging-params
+ driver: fluentd
+ options:
+ fluentd-address: 127.0.0.1:24224
+ tag: postgres.auth
dbrepo-auth-service:
restart: "no"
@@ -192,7 +195,10 @@ services:
dbrepo-logging-service:
condition: service_healthy
logging:
- <<: *logging-params
+ driver: fluentd
+ options:
+ fluentd-address: 127.0.0.1:24224
+ tag: keycloak.auth
dbrepo-auth-service-init:
init: true
@@ -222,7 +228,10 @@ services:
dbrepo-logging-service:
condition: service_healthy
logging:
- <<: *logging-params
+ driver: fluentd
+ options:
+ fluentd-address: 127.0.0.1:24224
+ tag: python.auth
dbrepo-metadata-service:
restart: "no"
@@ -293,7 +302,10 @@ services:
dbrepo-logging-service:
condition: service_healthy
logging:
- <<: *logging-params
+ driver: fluentd
+ options:
+ fluentd-address: 127.0.0.1:24224
+ tag: java.metadata
dbrepo-analyse-service:
restart: "no"
@@ -327,7 +339,10 @@ services:
deploy:
<<: *resources-micro
logging:
- <<: *logging-params
+ driver: fluentd
+ options:
+ fluentd-address: 127.0.0.1:24224
+ tag: python.analyse
dbrepo-broker-service:
restart: "no"
@@ -357,7 +372,10 @@ services:
deploy:
<<: *resources-micro
logging:
- <<: *logging-params
+ driver: fluentd
+ options:
+ fluentd-address: 127.0.0.1:24224
+ tag: rabbitmq.broker
dbrepo-search-db:
restart: "no"
@@ -406,7 +424,10 @@ services:
deploy:
<<: *resources-micro
logging:
- <<: *logging-params
+ driver: fluentd
+ options:
+ fluentd-address: 127.0.0.1:24224
+ tag: python.search
dbrepo-ui:
restart: "no"
@@ -445,7 +466,10 @@ services:
extra_hosts:
- "localhost:host-gateway"
logging:
- <<: *logging-params
+ driver: fluentd
+ options:
+ fluentd-address: 127.0.0.1:24224
+ tag: nuxt.ui
dbrepo-gateway-service:
restart: "no"
@@ -479,7 +503,10 @@ services:
dbrepo-logging-service:
condition: service_healthy
logging:
- <<: *logging-params
+ driver: fluentd
+ options:
+ fluentd-address: 127.0.0.1:24224
+ tag: nginx.gateway
dbrepo-identity-service:
restart: "no"
@@ -508,7 +535,10 @@ services:
deploy:
<<: *resources-nano
logging:
- <<: *logging-params
+ driver: fluentd
+ options:
+ fluentd-address: 127.0.0.1:24224
+ tag: openldap.identity
dbrepo-search-service-init:
restart: "no"
@@ -537,7 +567,10 @@ services:
dbrepo-logging-service:
condition: service_healthy
logging:
- <<: *logging-params
+ driver: fluentd
+ options:
+ fluentd-address: 127.0.0.1:24224
+ tag: python.search-init
dbrepo-dashboard-service-init:
restart: "no"
@@ -565,7 +598,10 @@ services:
dbrepo-logging-service:
condition: service_healthy
logging:
- <<: *logging-params
+ driver: fluentd
+ options:
+ fluentd-address: 127.0.0.1:24224
+ tag: python.dashboard-init
dbrepo-storage-service:
restart: "no"
@@ -587,7 +623,10 @@ services:
deploy:
<<: *resources-nano
logging:
- <<: *logging-params
+ driver: fluentd
+ options:
+ fluentd-address: 127.0.0.1:24224
+ tag: seaweedfs.storage
dbrepo-metric-db:
restart: "no"
@@ -606,7 +645,10 @@ services:
deploy:
<<: *resources-nano
logging:
- <<: *logging-params
+ driver: fluentd
+ options:
+ fluentd-address: 127.0.0.1:24224
+ tag: prometheus.metric
dbrepo-storage-service-init:
restart: "no"
@@ -630,7 +672,10 @@ services:
dbrepo-logging-service:
condition: service_healthy
logging:
- <<: *logging-params
+ driver: fluentd
+ options:
+ fluentd-address: 127.0.0.1:24224
+ tag: python.storage-init
dbrepo-data-service:
restart: "no"
@@ -684,7 +729,10 @@ services:
dbrepo-logging-service:
condition: service_healthy
logging:
- <<: *logging-params
+ driver: fluentd
+ options:
+ fluentd-address: 127.0.0.1:24224
+ tag: java.data
dbrepo-dashboard-ui:
restart: "no"
@@ -718,7 +766,10 @@ services:
extra_hosts:
- "localhost:host-gateway"
logging:
- <<: *logging-params
+ driver: fluentd
+ options:
+ fluentd-address: 127.0.0.1:24224
+ tag: opensearch.ui
dbrepo-dashboard-service:
restart: "no"
@@ -747,7 +798,10 @@ services:
dbrepo-logging-service:
condition: service_healthy
logging:
- <<: *logging-params
+ driver: fluentd
+ options:
+ fluentd-address: 127.0.0.1:24224
+ tag: python.dashboard
dbrepo-logging-service:
restart: "no"
@@ -758,6 +812,7 @@ services:
- "24224:24224"
volumes:
- ./dbrepo-logging-service/default.conf:/opt/bitnami/fluent-bit/conf/fluent-bit.conf
+ - ./dbrepo-logging-service/dbrepo_parser.conf:/opt/bitnami/fluent-bit/conf/dbrepo_parser.conf
deploy:
<<: *resources-micro
healthcheck:
@@ -773,7 +828,7 @@ services:
restart: "no"
container_name: dbrepo-logging-ui
hostname: logging-ui
- image: docker.io/bitnami/opensearch-dashboards:2.10.0
+ image: docker.io/bitnami/opensearch-dashboards:2.19.0
ports:
- "5601:5601"
environment:
@@ -785,4 +840,7 @@ services:
dbrepo-logging-service:
condition: service_healthy
logging:
- <<: *logging-params
+ driver: fluentd
+ options:
+ fluentd-address: 127.0.0.1:24224
+ tag: fluentbit.logging
diff --git a/helm/dbrepo/files/create-event-listener.jar b/helm/dbrepo/files/create-event-listener.jar
index 52b6f4daf4c66a7ddd8c594515069e24e3936fae..37865c8fadb7d281ce560b9b1bcf48df35e4a7e8 100644
Binary files a/helm/dbrepo/files/create-event-listener.jar and b/helm/dbrepo/files/create-event-listener.jar differ