Merge pull request #4242 from jeclrsg/feat-comms-wslogaccess-loki

feat(comms): add support for the Grafana/Loki log engine
hpcc-systems · Sep 23, 2024 · 4f463ef · 4f463ef
2 parents 8600273 + 43b7403
commit 4f463ef
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/packages/comms/src/services/wsLogaccess.ts b/packages/comms/src/services/wsLogaccess.ts
@@ -82,7 +82,11 @@ export class LogaccessService extends LogaccessServiceBase {
         const convertLogLine = (line: any) => {
             const retVal: LogLine = {};
             for (const key in columnMap) {
-                retVal[key] = line?.fields[0][columnMap[key]] ?? "";
+                if (line?.fields) {
+                    retVal[key] = Object.assign({}, ...line.fields)[columnMap[key]] ?? "";
+                } else {
+                    retVal[key] = "";
+                }
             }
             return retVal;
         };
@@ -236,6 +240,7 @@ export class LogaccessService extends LogaccessServiceBase {
                 switch (logInfo.RemoteLogManagerType) {
                     case "azureloganalyticscurl":
                     case "elasticstack":
+                    case "grafanacurl":
                         lines = logLines.lines?.map(convertLogLine) ?? [];
                         break;
                     default: