Repository: ambari Updated Branches: refs/heads/trunk ea1a72bfa -> 0ad6daff6
AMBARI-17774. HST agent log not parsed by logfeeder (oleewere) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0ad6daff Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0ad6daff Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0ad6daff Branch: refs/heads/trunk Commit: 0ad6daff6ed9b707367a5d59f123f6bc3f9c9df0 Parents: ea1a72b Author: oleewere <[email protected]> Authored: Tue Jul 19 12:00:57 2016 +0200 Committer: oleewere <[email protected]> Committed: Tue Jul 19 12:04:15 2016 +0200 ---------------------------------------------------------------------- .../package/templates/input.config-hst.json.j2 | 39 +++++++++----------- 1 file changed, 18 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0ad6daff/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hst.json.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hst.json.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hst.json.j2 index 6c216f4..82b89a9 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hst.json.j2 +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hst.json.j2 @@ -40,33 +40,30 @@ } ], "filter":[ - { - "filter":"grok", - "conditions":{ - "fields":{ - "type":[ - "hst_agent" + { + "filter":"grok", + "conditions":{ + "fields":{ + "type":[ + "hst_agent" ] - } - }, - "log4j_format":"", - "multiline_pattern":"^(%{LOGLEVEL:level}%{SPACE}%{TIMESTAMP_ISO8601:logtime})", - "message_pattern":"(?m)^%{LOGLEVEL:level}%{SPACE}%{TIMESTAMP_ISO8601:logtime}%{SPACE}%{JAVAFILE:file}%{GREEDYDATA:log_message}}", - "post_map_values":{ - "logtime":{ + } + }, + "log4j_format":"", + "multiline_pattern":"^(%{CUSTOM_DATESTAMP:logtime})", + "message_pattern":"(?m)^%{CUSTOM_DATESTAMP:logtime}%{SPACE}%{LOGLEVEL:level}%{SPACE}\\[%{DATA:thread_name}\\]%{SPACE}%{JAVAFILE:file}:%{INT:line_number}%{SPACE}-%{SPACE}%{GREEDYDATA:log_message}", + "post_map_values":{ + "logtime":{ "map_date":{ - "date_pattern":"yyyy-MM-dd HH:mm:ss,SSS" + "date_pattern":"dd MMM yyyy HH:mm:ss" } - }, "level":{ - "map_fieldvalue":{ - "pre_value":"WARNING", - "post_value":"WARN" - } - + "map_fieldvalue":{ + "pre_value":"WARNING", + "post_value":"WARN" + } } - } }, {
