Issue #3187: Properly manage missing storage id in system logs

epam · Apr 13, 2023 · 3e37755 · 3e37755
1 parent f13c303
commit 3e37755
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/api/src/main/java/com/epam/pipeline/manager/log/LogManager.java b/api/src/main/java/com/epam/pipeline/manager/log/LogManager.java
@@ -372,6 +372,11 @@ private LogEntry mapHitToLogEntry(SearchHit searchHit) {
                 .user((String) hit.get(USER))
                 .message((String) hit.get(MESSAGE))
                 .severity((String) hit.getOrDefault(SEVERITY, DEFAULT_SEVERITY))
+                .storageId(Optional.ofNullable(hit.get(STORAGE_ID))
+                        .map(Object::toString)
+                        .filter(StringUtils::isNotBlank)
+                        .map(Long::valueOf)
+                        .orElse(null))
                 .build();
     }
 

diff --git a/api/src/main/resources/log4j2-spring.xml b/api/src/main/resources/log4j2-spring.xml
@@ -66,7 +66,7 @@
                 <KeyValuePair key="user" value="$${ctx:user:-NotAuthorized}" />
                 <KeyValuePair key="log_context" value="$${ctx:log_topic:-security}" />
                 <KeyValuePair key="timestamp" value="$${date:yyyy-MM-dd'T'HH:mm:ss.SSSZ}" />
-                <KeyValuePair key="storage_id" value="$${ctx:storage_id}" />
+                <KeyValuePair key="storage_id" value="$${ctx:storage_id:-}" />
             </JsonLayout>
         </RollingFile >
         <RollingFile  name="Spring-Appender" fileName="${log-path}/spring.log"

diff --git a/deploy/docker/cp-search-elk/pipelines/api_server.json b/deploy/docker/cp-search-elk/pipelines/api_server.json
@@ -49,6 +49,21 @@
         ]
       }
     },
+    {
+      "remove": {
+        "field": "storage_id",
+        "if": "ctx.storage_id == ''",
+        "ignore_missing": true,
+        "ignore_failure": true
+      }
+    },
+    {
+      "convert" : {
+        "field" : "storage_id",
+        "type": "long",
+        "ignore_missing": true
+      }
+    },
     {
       "remove": {
         "field": "timestamp",