diff --git a/docs/EN_US/ContainerizedHPCC/ContainerizedMods/ContainerLogging.xml b/docs/EN_US/ContainerizedHPCC/ContainerizedMods/ContainerLogging.xml index 5cbef70cf29..51787bcf528 100644 --- a/docs/EN_US/ContainerizedHPCC/ContainerizedMods/ContainerLogging.xml +++ b/docs/EN_US/ContainerizedHPCC/ContainerizedMods/ContainerLogging.xml @@ -619,7 +619,7 @@ ContainerLog Target Audience Filtering The availble target audiences include operator(OPR), user(USR), - programmer(PRO), audit(ADT), or all. The filter is controlled by the + programmer(PRO), monitor(MON), audit(ADT), or all. The filter is controlled by the <section>.logging.audiences value. The string value is comprised of 3 letter codes delimited by the aggregation operator (+) or the removal operator (-). @@ -634,7 +634,7 @@ ContainerLog Target Category Filtering The available target categories include disaster(DIS), error(ERR), - information(INF), warning(WRN), progress(PRO), metrics(MET). The + information(INF), warning(WRN), progress(PRO), event(EVT), metrics(MET). The category (or class) filter is controlled by the <section>.logging.classes value, comprised of 3 letter codes delimited by the aggregation operator (+) or the removal operator diff --git a/esp/scm/ws_logaccess.ecm b/esp/scm/ws_logaccess.ecm index 455561e7f7f..ab9f8fb80f5 100644 --- a/esp/scm/ws_logaccess.ecm +++ b/esp/scm/ws_logaccess.ecm @@ -108,7 +108,8 @@ ESPenum LogEventClass : string Warning("WRN"), Info("INF"), Progress("PRO"), - Metric("MET") + Metric("MET"), + Event("EVT") }; /* diff --git a/esp/services/ws_workunits/ws_workunitsHelpers.hpp b/esp/services/ws_workunits/ws_workunitsHelpers.hpp index 37534458b2b..efaad03fce9 100644 --- a/esp/services/ws_workunits/ws_workunitsHelpers.hpp +++ b/esp/services/ws_workunits/ws_workunitsHelpers.hpp @@ -261,7 +261,7 @@ struct WUComponentLogOptions logFetchFilter = getBinaryLogAccessFilter(logFetchFilter, componentsFilterObj, LOGACCESS_FILTER_and); ILogAccessFilter * logEventTypeFilterObj = nullptr; - StringBuffer logType; //"DIS","ERR","WRN","INF","PRO","MET","ALL" + StringBuffer logType; //"DIS","ERR","WRN","INF","PRO","MET","EVT","ALL" zapHttpRequest->getParameter("LogFilter_LogEventType", logType); if (!logType.isEmpty() && strcmp(logType.str(), "ALL") != 0) logEventTypeFilterObj = getClassLogAccessFilter(LogMsgClassFromAbbrev(logType.str())); diff --git a/helm/examples/azure/log-analytics/loganalytics-hpcc-logaccess.yaml b/helm/examples/azure/log-analytics/loganalytics-hpcc-logaccess.yaml index 56400e03de4..fc01b818c41 100644 --- a/helm/examples/azure/log-analytics/loganalytics-hpcc-logaccess.yaml +++ b/helm/examples/azure/log-analytics/loganalytics-hpcc-logaccess.yaml @@ -40,6 +40,7 @@ global: - code: OPR - code: USR - code: PRO + - code: MON - code: ADT columnMode: "DEFAULT" columnType: "enum" @@ -51,6 +52,7 @@ global: - code: WRN - code: INF - code: PRO + - code: EVT - code: MET columnMode: "DEFAULT" columnType: "enum" diff --git a/helm/managed/logging/elastic/elastic4hpcclogs-hpcc-logaccess.yaml b/helm/managed/logging/elastic/elastic4hpcclogs-hpcc-logaccess.yaml index 3aba0f02d82..d1d32312fc5 100644 --- a/helm/managed/logging/elastic/elastic4hpcclogs-hpcc-logaccess.yaml +++ b/helm/managed/logging/elastic/elastic4hpcclogs-hpcc-logaccess.yaml @@ -29,6 +29,7 @@ global: - code: OPR - code: USR - code: PRO + - code: MON - code: ADT columnMode: "DEFAULT" columnType: "enum" @@ -40,6 +41,7 @@ global: - code: WRN - code: INF - code: PRO + - code: EVT - code: MET columnMode: "DEFAULT" columnType: "enum"