HPCC-30571 LogAccessreport log procid by default

- Reports procid by default Signed-off-by: Rodrigo Pastrana <[email protected]>
hpcc-systems · Oct 25, 2023 · b830481 · b830481
1 parent 33e0b82
commit b830481
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 25 deletions.
diff --git a/esp/scm/ws_logaccess.ecm b/esp/scm/ws_logaccess.ecm
@@ -83,7 +83,6 @@ ESPStruct [nil_remove] LogColumn
     ESParray<string> EnumeratedValues;
     LogSelectColumnMode ColumnMode;
     ESPenum LogColumnValueType ColumnType;
-    [min_ver("1.06")] string Alias;
 };
 
 ESPResponse GetLogAccessInfoResponse
@@ -220,7 +219,7 @@ ESPResponse GetLogsResponse
     [min_ver("1.02")] unsigned int TotalLogLinesAvailable;
 };
 
-ESPservice [auth_feature("WsLogAccess:READ"), version("1.06"), default_client_version("1.06"), exceptions_inline("xslt/exceptions.xslt")] ws_logaccess
+ESPservice [auth_feature("WsLogAccess:READ"), version("1.05"), default_client_version("1.05"), exceptions_inline("xslt/exceptions.xslt")] ws_logaccess
 {
     ESPmethod GetLogAccessInfo(GetLogAccessInfoRequest, GetLogAccessInfoResponse);
     ESPmethod GetLogs(GetLogsRequest, GetLogsResponse);

diff --git a/esp/services/ws_logaccess/WsLogAccessService.cpp b/esp/services/ws_logaccess/WsLogAccessService.cpp
@@ -71,26 +71,6 @@ bool Cws_logaccessEx::onGetLogAccessInfo(IEspContext &context, IEspGetLogAccessI
                                 WARNLOG("Invalid col type found in logaccess logmap config");
                             }
                         }
-                        if (clientVer >= 1.06)
-                        {
-                            if (column.hasProp("@alias"))
-                            {
-                                try
-                                {
-                                    espLogColumn->setAlias(column.queryProp("@alias"));
-                                }
-                                catch (IException *e)
-                                {
-                                    VStringBuffer msg("Invalid alias found in logaccess logmap config for '%s'", csearchColumn);
-                                    EXCLOG(e, msg.str());
-                                    e->Release();
-                                }
-                                catch(...)
-                                {
-                                    WARNLOG("Invalid alias found in logaccess logmap config");
-                                }
-                            }
-                        }
                         logColumns.append(*espLogColumn.getClear());
                     }
                     else

diff --git a/helm/examples/azure/log-analytics/loganalytics-hpcc-logaccess.yaml b/helm/examples/azure/log-analytics/loganalytics-hpcc-logaccess.yaml
@@ -59,7 +59,7 @@ global:
     - type: "instance"
       storeName: "ContainerInventory"
       searchColumn: "Name"
-      alias: "hpcc_log_component"
+      projectName: "hpcc_log_component"
       columnMode: "ALL"
       columnType: "string"
     - type: "node"

diff --git a/system/logaccess/Azure/LogAnalytics/CurlClient/AzureLogAnalyticsCurlClient.cpp b/system/logaccess/Azure/LogAnalytics/CurlClient/AzureLogAnalyticsCurlClient.cpp
@@ -434,9 +434,9 @@ void AzureLogAnalyticsCurlClient::getDefaultReturnColumns(StringBuffer & columns
     if (includeComponentName)
         columns.appendf("%s, ", defaultHPCCLogComponentCol);
 
-    columns.appendf("%s, %s, %s, %s, %s, %s, %s",
+    columns.appendf("%s, %s, %s, %s, %s, %s, %s, %s",
     m_globalIndexTimestampField.str(), defaultHPCCLogMessageCol, m_classSearchColName.str(),
-    m_audienceSearchColName.str(), m_workunitSearchColName.str(), defaultHPCCLogSeqCol, defaultHPCCLogThreadIDCol);
+    m_audienceSearchColName.str(), m_workunitSearchColName.str(), defaultHPCCLogSeqCol, defaultHPCCLogThreadIDCol, defaultHPCCLogProcIDCol);
 }
 
 bool generateHPCCLogColumnstAllColumns(StringBuffer & kql, const char * colName)