Repository: ambari Updated Branches: refs/heads/branch-2.4 516ec8663 -> c41565852
AMBARI-17308. Ambari Logfeeder outputs a lot of errors due to parse date (ambari-audit.log) (Masahiro Tanaka via oleewere) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c4156585 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c4156585 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c4156585 Branch: refs/heads/branch-2.4 Commit: c41565852d93f1af6cf0278d752b839689948f15 Parents: 516ec86 Author: oleewere <[email protected]> Authored: Thu Aug 4 00:05:20 2016 +0200 Committer: oleewere <[email protected]> Committed: Thu Aug 4 00:11:24 2016 +0200 ---------------------------------------------------------------------- .../org/apache/ambari/server/audit/AuditLoggerDefaultImpl.java | 2 +- .../LOGSEARCH/0.5.0/package/templates/input.config-ambari.json.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c4156585/ambari-server/src/main/java/org/apache/ambari/server/audit/AuditLoggerDefaultImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/AuditLoggerDefaultImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/AuditLoggerDefaultImpl.java index ea6524f..ab43898 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/audit/AuditLoggerDefaultImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/AuditLoggerDefaultImpl.java @@ -48,7 +48,7 @@ public class AuditLoggerDefaultImpl implements AuditLogger { @Override protected DateFormat initialValue() { //2016-03-11T10:42:36.376Z - return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX"); + return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXX"); } }; http://git-wip-us.apache.org/repos/asf/ambari/blob/c4156585/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 5f751bf..44dc61a 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.SSS'Z'" + "date_pattern":"yyyy-MM-dd'T'HH:mm:ss.SSSXX" } }
