fix(comms): GetLogs use WsLogaccess.LogAccessType

If the fields returned by WsLogaccess.GetLogAccessInfo exist in WsLogaccess.LogAccessType, have the filter use those categories, otherwise use the field defined by the log engine in the column map. This is a preliminary attempt at support for the Grafana Loki engine. Also, fixes an issue where searching by container name wouldn't return any log messages for ephemeral containers, eg "hthor-job-W2024..." as well as "hthor" Signed-off-by: Jeremy Clements <[email protected]>
hpcc-systems · Jul 19, 2024 · 498ffa6 · 498ffa6
1 parent 439240f
commit 498ffa6
Showing 1 changed file with 32 additions and 3 deletions.
diff --git a/packages/comms/src/services/wsLogaccess.ts b/packages/comms/src/services/wsLogaccess.ts
@@ -117,28 +117,57 @@ export class LogaccessService extends LogaccessServiceBase {
         for (const key in request) {
             let searchField;
             if (key in columnMap) {
-                searchField = columnMap[key];
+                if (Object.values(WsLogaccess.LogColumnType).includes(key as WsLogaccess.LogColumnType)) {
+                    searchField = key;
+                } else {
+                    searchField = columnMap[key];
+                }
             }
-            let logCategory = WsLogaccess.LogAccessType.ByFieldName;
+            let logCategory;
             if (searchField) {
                 switch (searchField) {
+                    case WsLogaccess.LogColumnType.workunits:
+                    case "hpcc.log.jobid":
+                        logCategory = WsLogaccess.LogAccessType.ByJobID;
+                        break;
+                    case WsLogaccess.LogColumnType.audience:
                     case "hpcc.log.audience":
                         logCategory = WsLogaccess.LogAccessType.ByTargetAudience;
                         break;
+                    case WsLogaccess.LogColumnType.class:
+                    case "hpcc.log.class":
+                        logCategory = WsLogaccess.LogAccessType.ByLogType;
+                        break;
+                    case WsLogaccess.LogColumnType.components:
+                    case "kubernetes.container.name":
+                        logCategory = WsLogaccess.LogAccessType.ByComponent;
+                        break;
+                    default:
+                        logCategory = WsLogaccess.LogAccessType.ByFieldName;
+                        searchField = columnMap[key];
                 }
                 if (Array.isArray(request[key])) {
                     request[key].forEach(value => {
+                        if (logCategory === WsLogaccess.LogAccessType.ByComponent) {
+                            value += "*";
+                        }
                         filters.push({
                             LogCategory: logCategory,
                             SearchField: searchField,
                             SearchByValue: value
                         });
                     });
                 } else {
+                    let value = request[key];
+                    if (logCategory === WsLogaccess.LogAccessType.ByComponent) {
+                        // append wildcard to end of search value to include ephemeral
+                        // containers that aren't listed in ECL Watch's filters
+                        value += "*";
+                    }
                     filters.push({
                         LogCategory: logCategory,
                         SearchField: searchField,
-                        SearchByValue: request[key]
+                        SearchByValue: value
                     });
                 }
             }