Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC-30393 Add new event class and monitor audience #17859

Merged
merged 1 commit into from
Oct 6, 2023
Merged

HPCC-30393 Add new event class and monitor audience #17859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/EN_US/ContainerizedHPCC/ContainerizedMods/ContainerLogging.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ ContainerLog
<title>Target Audience Filtering</title>

<para>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
&lt;section&gt;.logging.audiences value. The string value is comprised
of 3 letter codes delimited by the aggregation operator (+) or the
removal operator (-).</para>
Expand All @@ -634,7 +634,7 @@ ContainerLog
<title>Target Category Filtering</title>

<para>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
&lt;section&gt;.logging.classes value, comprised of 3 letter codes
delimited by the aggregation operator (+) or the removal operator
Expand Down
3 changes: 2 additions & 1 deletion esp/scm/ws_logaccess.ecm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ ESPenum LogEventClass : string
Warning("WRN"),
Info("INF"),
Progress("PRO"),
Metric("MET")
Metric("MET"),
Event("EVT")
};

/*
Expand Down
2 changes: 1 addition & 1 deletion esp/services/ws_workunits/ws_workunitsHelpers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Expand Down
2 changes: 2 additions & 0 deletions helm/examples/azure/log-analytics/loganalytics-hpcc-logaccess.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ global:
- code: OPR
- code: USR
- code: PRO
- code: MON
- code: ADT
columnMode: "DEFAULT"
columnType: "enum"
Expand All @@ -51,6 +52,7 @@ global:
- code: WRN
- code: INF
- code: PRO
- code: EVT
- code: MET
columnMode: "DEFAULT"
columnType: "enum"
Expand Down
2 changes: 2 additions & 0 deletions helm/managed/logging/elastic/elastic4hpcclogs-hpcc-logaccess.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ global:
- code: OPR
- code: USR
- code: PRO
- code: MON
- code: ADT
columnMode: "DEFAULT"
columnType: "enum"
Expand All @@ -40,6 +41,7 @@ global:
- code: WRN
- code: INF
- code: PRO
- code: EVT
- code: MET
columnMode: "DEFAULT"
columnType: "enum"
Expand Down
Loading