Repository: ambari Updated Branches: refs/heads/trunk b259c42df -> 075eb17d0
AMBARI-17442. Fix erroneous Logfeeder input configs (Miklos Gergely via oleewere) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/075eb17d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/075eb17d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/075eb17d Branch: refs/heads/trunk Commit: 075eb17d0e1d9c1e1892f566ac7138cb5ba9a4fc Parents: b259c42 Author: Miklos Gergely <[email protected]> Authored: Mon Jun 27 13:45:13 2016 +0200 Committer: oleewere <[email protected]> Committed: Mon Jun 27 13:50:32 2016 +0200 ---------------------------------------------------------------------- .../org/apache/ambari/logfeeder/InputMgr.java | 2 +- .../0.5.0/package/templates/grok-patterns.j2 | 3 +- .../templates/input.config-ambari.json.j2 | 2 +- .../package/templates/input.config-ams.json.j2 | 84 ++++++++++++-------- 4 files changed, 55 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/075eb17d/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/InputMgr.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/InputMgr.java b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/InputMgr.java index c64a007..d83642e 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/InputMgr.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/InputMgr.java @@ -161,7 +161,7 @@ public class InputMgr { } if (isCheckPointFolderValid) { - logger.warn("Using folder " + checkPointFolderFile + logger.info("Using folder " + checkPointFolderFile + " for storing checkpoints"); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/075eb17d/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/grok-patterns.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/grok-patterns.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/grok-patterns.j2 index 874c59d..49aa357 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/grok-patterns.j2 +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/grok-patterns.j2 @@ -104,10 +104,11 @@ TIME (?!<[0-9])%{HOUR}:%{MINUTE}(?::%{SECOND})(?![0-9]) # datestamp is YYYY/MM/DD-HH:MM:SS.UUUU (or something like it) DATE_US %{MONTHNUM}[/-]%{MONTHDAY}[/-]%{YEAR} DATE_EU %{MONTHDAY}[./-]%{MONTHNUM}[./-]%{YEAR} +DATE_EU2 %{YEAR}[./-]%{MONTHNUM}[./-]%{MONTHDAY} ISO8601_TIMEZONE (?:Z|[+-]%{HOUR}(?::?%{MINUTE})) ISO8601_SECOND (?:%{SECOND}|60) TIMESTAMP_ISO8601 %{YEAR}-%{MONTHNUM}-%{MONTHDAY}[T ]%{HOUR}:?%{MINUTE}(?::?%{SECOND})?%{ISO8601_TIMEZONE}? -DATE %{DATE_US}|%{DATE_EU} +DATE %{DATE_US}|%{DATE_EU}|%{DATE_EU2} DATESTAMP %{DATE}[- ]%{TIME} TZ (?:[PMCE][SD]T|UTC) DATESTAMP_RFC822 %{DAY} %{MONTH} %{MONTHDAY} %{YEAR} %{TIME} %{TZ} http://git-wip-us.apache.org/repos/asf/ambari/blob/075eb17d/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-ambari.json.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-ambari.json.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-ambari.json.j2 index b1b413d..5f751bf 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-ambari.json.j2 +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-ambari.json.j2 @@ -242,7 +242,7 @@ "post_map_values":{ "logtime":{ "map_date":{ - "date_pattern":"yyyy-MM-dd'T'HH:mm:ss.SSSZ" + "date_pattern":"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'" } } http://git-wip-us.apache.org/repos/asf/ambari/blob/075eb17d/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-ams.json.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-ams.json.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-ams.json.j2 index 3dbe6b2..355e903 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-ams.json.j2 +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-ams.json.j2 @@ -107,8 +107,8 @@ }, "log4j_format":"%d{ISO8601} %-5p [%t] %c{2}: %m%n", - "multiline_pattern":"^(%{DATESTAMP})", - "message_pattern":"(?m)^%{DATESTAMP}%{SPACE}\\[%{WORD:level}\\]%{SPACE}%{GREEDYDATA:log_message}", + "multiline_pattern":"^(%{DATESTAMP:logtime})", + "message_pattern":"(?m)^%{DATESTAMP:logtime}%{SPACE}\\[%{WORD:level}\\]%{SPACE}%{GREEDYDATA:log_message}", "post_map_values":{ "logtime":{ "map_date":{ @@ -118,26 +118,34 @@ }, "level":[ { - "map_fieldvalue":{ + "map_fieldvalue":{ "pre_value":"I", "post_value":"INFO" - }, - "map_fieldvalue":{ - "pre_value":"W", - "post_value":"WARN" - }, - "map_fieldvalue":{ - "pre_value":"D", - "post_value":"DEBUG" - }, + } + }, + { + "map_fieldvalue":{ + "pre_value":"W", + "post_value":"WARN" + } + }, + { "map_fieldvalue":{ + "pre_value":"D", + "post_value":"DEBUG" + } + }, + { + "map_fieldvalue":{ "pre_value":"E", "post_value":"ERROR" - }, - "map_fieldvalue":{ + } + }, + { + "map_fieldvalue":{ "pre_value":"F", "post_value":"FATAL" - } + } } ] @@ -145,28 +153,38 @@ }, { - "filter":"grok", - "conditions":{ - "fields":{ - "type":[ - "ams_monitor" - ] - } - }, - "log4j_format":"", - "multiline_pattern":"^(%{DATESTAMP:logtime})", - "message_pattern":"(?m)^%{DATESTAMP:logtime}%{SPACE}\\[%{LOGLEVEL:level}\\]%{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" - } + "filter":"grok", + "conditions":{ + "fields":{ + "type":[ + "ams_monitor" + ] + + } + + }, + "log4j_format":"", + "multiline_pattern":"^(%{TIMESTAMP_ISO8601:logtime})", + "message_pattern":"(?m)^%{TIMESTAMP_ISO8601:logtime}%{SPACE}\\[%{LOGLEVEL:level}\\]%{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" + } - } + } + }, + "level":[ + { + "map_fieldvalue":{ + "pre_value":"WARNING", + "post_value":"WARN" } - } + ] + + } ]
