Repository: ambari Updated Branches: refs/heads/trunk 4ea207290 -> 21657ce5e
AMBARI-16261. Update infput config json (appendum patch) (Bosco Durai via oleewere) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/21657ce5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/21657ce5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/21657ce5 Branch: refs/heads/trunk Commit: 21657ce5e7965c33da4f829599af53bd7aa6e6d6 Parents: 4ea2072 Author: oleewere <oleew...@gmail.com> Authored: Tue May 10 16:27:20 2016 +0200 Committer: oleewere <oleew...@gmail.com> Committed: Tue May 10 16:29:09 2016 +0200 ---------------------------------------------------------------------- .../package/templates/input.config-logsearch.json.j2 | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/21657ce5/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-logsearch.json.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-logsearch.json.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-logsearch.json.j2 index e942b73..ba151b9 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-logsearch.json.j2 +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-logsearch.json.j2 @@ -36,7 +36,7 @@ ], "filter":[ { - "filter":"grok", + "filter":"json", "conditions":{ "fields":{ "type":[ @@ -47,18 +47,6 @@ } - }, - "log4j_format":"%d [%t] %-5p %C{6} (%F:%L) - %m%n", - "multiline_pattern":"^(%{TIMESTAMP_ISO8601:logtime})", - "message_pattern":"(?m)^%{TIMESTAMP_ISO8601:logtime}%{SPACE}\\[%{DATA:thread_name}\\]%{SPACE}%{LOGLEVEL:level}%{SPACE}%{JAVACLASS:logger_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" - } - - } - } }