Return-Path: X-Original-To: apmail-argus-commits-archive@minotaur.apache.org Delivered-To: apmail-argus-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 71AAC1194C for ; Mon, 22 Sep 2014 18:29:46 +0000 (UTC) Received: (qmail 83195 invoked by uid 500); 22 Sep 2014 18:29:46 -0000 Delivered-To: apmail-argus-commits-archive@argus.apache.org Received: (qmail 83177 invoked by uid 500); 22 Sep 2014 18:29:46 -0000 Mailing-List: contact commits-help@argus.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@argus.incubator.apache.org Delivered-To: mailing list commits@argus.incubator.apache.org Received: (qmail 83168 invoked by uid 99); 22 Sep 2014 18:29:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Sep 2014 18:29:46 +0000 X-ASF-Spam-Status: No, hits=-2000.8 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 22 Sep 2014 18:29:19 +0000 Received: (qmail 81906 invoked by uid 99); 22 Sep 2014 18:29:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Sep 2014 18:29:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F12339D17A7; Mon, 22 Sep 2014 18:29:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: madhan@apache.org To: commits@argus.incubator.apache.org Date: Mon, 22 Sep 2014 18:29:23 -0000 Message-Id: In-Reply-To: <255e9c0fa9904d5a99960e90aaef2a8d@git.apache.org> References: <255e9c0fa9904d5a99960e90aaef2a8d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/10] git commit: ARGUS-5: log filename generation logic updated to use start-time of the current rollover period (instead of current time). X-Virus-Checked: Checked by ClamAV on apache.org ARGUS-5: log filename generation logic updated to use start-time of the current rollover period (instead of current time). Project: http://git-wip-us.apache.org/repos/asf/incubator-argus/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-argus/commit/46584e44 Tree: http://git-wip-us.apache.org/repos/asf/incubator-argus/tree/46584e44 Diff: http://git-wip-us.apache.org/repos/asf/incubator-argus/diff/46584e44 Branch: refs/heads/master Commit: 46584e44293f2bf379f5206c374ad7644a7b54b7 Parents: efd3501 Author: mneethiraj Authored: Mon Sep 22 11:13:34 2014 -0700 Committer: mneethiraj Committed: Mon Sep 22 11:13:34 2014 -0700 ---------------------------------------------------------------------- .../audit/provider/LocalFileLogBuffer.java | 10 ++-- .../com/xasecure/audit/provider/MiscUtil.java | 49 +++++++++++--------- .../audit/provider/hdfs/HdfsLogDestination.java | 6 ++- hbase-agent/conf/xasecure-audit.xml | 4 +- hbase-agent/scripts/install.properties | 4 +- hdfs-agent/conf/xasecure-audit.xml | 4 +- hdfs-agent/scripts/install.properties | 4 +- hive-agent/conf/xasecure-audit.xml | 4 +- hive-agent/scripts/install.properties | 4 +- knox-agent/conf/xasecure-audit.xml | 4 +- knox-agent/scripts/install.properties | 4 +- storm-agent/conf/xasecure-audit.xml | 4 +- storm-agent/scripts/install.properties | 4 +- 13 files changed, 58 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/46584e44/agents-audit/src/main/java/com/xasecure/audit/provider/LocalFileLogBuffer.java ---------------------------------------------------------------------- diff --git a/agents-audit/src/main/java/com/xasecure/audit/provider/LocalFileLogBuffer.java b/agents-audit/src/main/java/com/xasecure/audit/provider/LocalFileLogBuffer.java index 3e715a9..753c2e4 100644 --- a/agents-audit/src/main/java/com/xasecure/audit/provider/LocalFileLogBuffer.java +++ b/agents-audit/src/main/java/com/xasecure/audit/provider/LocalFileLogBuffer.java @@ -183,9 +183,11 @@ public class LocalFileLogBuffer implements LogBuffer { private synchronized void openFile() { LogLog.debug("==> LocalFileLogBuffer.openFile()"); + long currentRolloverStartTime = MiscUtil.getCurrentRolloverStartTime(mNextRolloverTime, (mRolloverIntervalSeconds * 1000)); + closeFile(); - mBufferFilename = MiscUtil.replaceTokens(mDirectory + File.separator + mFile); + mBufferFilename = MiscUtil.replaceTokens(mDirectory + File.separator + mFile, currentRolloverStartTime); FileOutputStream ostream = null; try { @@ -365,7 +367,7 @@ class DestinationDispatcherThread extends Thread { private void init() { LogLog.debug("==> DestinationDispatcherThread.init()"); - String dirName = MiscUtil.replaceTokens(mFileLogBuffer.getDirectory()); + String dirName = MiscUtil.replaceTokens(mFileLogBuffer.getDirectory(), 0); File directory = new File(dirName); if(directory.exists() && directory.isDirectory()) { @@ -495,8 +497,8 @@ class DestinationDispatcherThread extends Thread { private void archiveCurrentFile() { if(mCurrentLogfile != null) { File logFile = new File(mCurrentLogfile); - String archiveDirName = MiscUtil.replaceTokens(mFileLogBuffer.getArchiveDirectory()); - String archiveFilename = archiveDirName + File.separator + MiscUtil.replaceTokens(logFile.getName()); + String archiveDirName = MiscUtil.replaceTokens(mFileLogBuffer.getArchiveDirectory(), 0); + String archiveFilename = archiveDirName + File.separator +logFile.getName(); try { if(logFile.exists()) { http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/46584e44/agents-audit/src/main/java/com/xasecure/audit/provider/MiscUtil.java ---------------------------------------------------------------------- diff --git a/agents-audit/src/main/java/com/xasecure/audit/provider/MiscUtil.java b/agents-audit/src/main/java/com/xasecure/audit/provider/MiscUtil.java index 76b367a..8aa7368 100644 --- a/agents-audit/src/main/java/com/xasecure/audit/provider/MiscUtil.java +++ b/agents-audit/src/main/java/com/xasecure/audit/provider/MiscUtil.java @@ -5,7 +5,6 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.rmi.dgc.VMID; import java.text.SimpleDateFormat; -import java.util.Date; import org.apache.log4j.helpers.LogLog; @@ -13,11 +12,11 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; public class MiscUtil { - public static final String TOKEN_HOSTNAME = "%hostname%"; - public static final String TOKEN_APP_INSTANCE = "%app-instance%"; - public static final String TOKEN_CREATE_TIME_START = "%create-time:"; - public static final String TOKEN_CREATE_TIME_END = "%"; - public static final String ESCAPE_STR = "\\"; + public static final String TOKEN_HOSTNAME = "%hostname%"; + public static final String TOKEN_JVM_INSTANCE = "%jvm-instance%"; + public static final String TOKEN_TIME_START = "%time:"; + public static final String TOKEN_TIME_END = "%"; + public static final String ESCAPE_STR = "\\"; static VMID sJvmID = new VMID(); @@ -32,14 +31,14 @@ public class MiscUtil { } } - public static String replaceTokens(String str) { + public static String replaceTokens(String str, long time) { if(str == null) { return str; } str = replaceHostname(str); - str = replaceAppInstance(str); - str = replaceCreateTime(str); + str = replaceJvmInstance(str); + str = replaceTime(str, time); return str; } @@ -64,36 +63,38 @@ public class MiscUtil { return str.replace(TOKEN_HOSTNAME, hostName); } - public static String replaceAppInstance(String str) { - if(!str.contains(TOKEN_APP_INSTANCE)) { + public static String replaceJvmInstance(String str) { + if(!str.contains(TOKEN_JVM_INSTANCE)) { return str; } - String appInstance = Integer.toString(Math.abs(sJvmID.hashCode())); + String jvmInstance = Integer.toString(Math.abs(sJvmID.hashCode())); - return str.replace(TOKEN_APP_INSTANCE, appInstance); + return str.replace(TOKEN_JVM_INSTANCE, jvmInstance); } - public static String replaceCreateTime(String str) { - Date now = new Date(); + public static String replaceTime(String str, long time) { + if(time <= 0) { + time = System.currentTimeMillis(); + } - while(str.contains(TOKEN_CREATE_TIME_START)) { - int tagStartPos = str.indexOf(TOKEN_CREATE_TIME_START); - int tagEndPos = str.indexOf(TOKEN_CREATE_TIME_END, tagStartPos + TOKEN_CREATE_TIME_START.length()); + while(str.contains(TOKEN_TIME_START)) { + int tagStartPos = str.indexOf(TOKEN_TIME_START); + int tagEndPos = str.indexOf(TOKEN_TIME_END, tagStartPos + TOKEN_TIME_START.length()); if(tagEndPos <= tagStartPos) { break; } String tag = str.substring(tagStartPos, tagEndPos+1); - String dtFormat = tag.substring(TOKEN_CREATE_TIME_START.length(), tag.lastIndexOf(TOKEN_CREATE_TIME_END)); + String dtFormat = tag.substring(TOKEN_TIME_START.length(), tag.lastIndexOf(TOKEN_TIME_END)); String replaceStr = ""; if(dtFormat != null) { SimpleDateFormat sdf = new SimpleDateFormat(dtFormat); - replaceStr = sdf.format(now); + replaceStr = sdf.format(time); } str = str.replace(tag, replaceStr); @@ -134,6 +135,10 @@ public class MiscUtil { } } + public static long getCurrentRolloverStartTime(long nextRolloverTime, long interval) { + return (nextRolloverTime <= interval) ? System.currentTimeMillis() : nextRolloverTime - interval; + } + public static int parseInteger(String str, int defValue) { int ret = defValue; @@ -152,7 +157,9 @@ public class MiscUtil { String ret = null; if(log != null) { - if(MiscUtil.sGsonBuilder != null) { + if(log instanceof String) { + ret = (String)log; + } else if(MiscUtil.sGsonBuilder != null) { ret = MiscUtil.sGsonBuilder.toJson(log); } else { ret = log.toString(); http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/46584e44/agents-audit/src/main/java/com/xasecure/audit/provider/hdfs/HdfsLogDestination.java ---------------------------------------------------------------------- diff --git a/agents-audit/src/main/java/com/xasecure/audit/provider/hdfs/HdfsLogDestination.java b/agents-audit/src/main/java/com/xasecure/audit/provider/hdfs/HdfsLogDestination.java index fbc0431..defb39f 100644 --- a/agents-audit/src/main/java/com/xasecure/audit/provider/hdfs/HdfsLogDestination.java +++ b/agents-audit/src/main/java/com/xasecure/audit/provider/hdfs/HdfsLogDestination.java @@ -158,9 +158,11 @@ public class HdfsLogDestination implements LogDestination { private void openFile() { LogLog.debug("==> HdfsLogDestination.openFile()"); + long currentRolloverStartTime = MiscUtil.getCurrentRolloverStartTime(mNextRolloverTime, (mRolloverIntervalSeconds * 1000)); + closeFile(); - mHdfsFilename = MiscUtil.replaceTokens(mDirectory + File.separator + mFile); + mHdfsFilename = MiscUtil.replaceTokens(mDirectory + File.separator + mFile, currentRolloverStartTime); FSDataOutputStream ostream = null; FileSystem fileSystem = null; @@ -184,7 +186,7 @@ public class HdfsLogDestination implements LogDestination { ostream = fileSystem.append(pathLogfile); } catch(IOException excp) { // append may not be supported by the filesystem. rename existing file and create a new one - String fileSuffix = MiscUtil.replaceTokens("-" + MiscUtil.TOKEN_CREATE_TIME_START + "yyyyMMdd-HHmm.ss" + MiscUtil.TOKEN_CREATE_TIME_END); + String fileSuffix = MiscUtil.replaceTokens("-" + MiscUtil.TOKEN_TIME_START + "yyyyMMdd-HHmm.ss" + MiscUtil.TOKEN_TIME_END, currentRolloverStartTime); String movedFilename = appendToFilename(mHdfsFilename, fileSuffix); Path movedFilePath = new Path(movedFilename); http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/46584e44/hbase-agent/conf/xasecure-audit.xml ---------------------------------------------------------------------- diff --git a/hbase-agent/conf/xasecure-audit.xml b/hbase-agent/conf/xasecure-audit.xml index 11597b3..93f06d1 100644 --- a/hbase-agent/conf/xasecure-audit.xml +++ b/hbase-agent/conf/xasecure-audit.xml @@ -122,7 +122,7 @@ xasecure.audit.hdfs.config.destination.directroy - hdfs://namenodehost:8020/audit/hbase/%create-time:yyyyMMdd% + hdfs://namenodehost:8020/audit/hbase/%time:yyyyMMdd% @@ -147,7 +147,7 @@ xasecure.audit.hdfs.config.local.buffer.file - %create-time:yyyyMMdd-HHmm.ss%.log + %time:yyyyMMdd-HHmm.ss%.log http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/46584e44/hbase-agent/scripts/install.properties ---------------------------------------------------------------------- diff --git a/hbase-agent/scripts/install.properties b/hbase-agent/scripts/install.properties index bfc5292..337b3f5 100644 --- a/hbase-agent/scripts/install.properties +++ b/hbase-agent/scripts/install.properties @@ -112,12 +112,12 @@ XAAUDIT.DB.JDBC_DRIVER=com.mysql.jdbc.Driver # Audit to HDFS # XAAUDIT.HDFS.IS_ENABLED=false -XAAUDIT.HDFS.DESTINATION_DIRECTORY=hdfs://localhost:8020/audit/hbase/%create-time:yyyyMMdd% +XAAUDIT.HDFS.DESTINATION_DIRECTORY=hdfs://localhost:8020/audit/hbase/%time:yyyyMMdd% XAAUDIT.HDFS.DESTINTATION_FILE=%hostname%-audit.log XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS=86400 XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS=60 XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY=/tmp/logs/hbase -XAAUDIT.HDFS.LOCAL_BUFFER_FILE=%create-time:yyyyMMdd-HHmm.ss%.log +XAAUDIT.HDFS.LOCAL_BUFFER_FILE=%time:yyyyMMdd-HHmm.ss%.log XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS=600 XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY=/tmp/logs/archive/hbase XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT=10 http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/46584e44/hdfs-agent/conf/xasecure-audit.xml ---------------------------------------------------------------------- diff --git a/hdfs-agent/conf/xasecure-audit.xml b/hdfs-agent/conf/xasecure-audit.xml index 6189cf2..e2b8f9d 100644 --- a/hdfs-agent/conf/xasecure-audit.xml +++ b/hdfs-agent/conf/xasecure-audit.xml @@ -103,7 +103,7 @@ xasecure.audit.hdfs.config.destination.directroy - hdfs://namenodehost:8020/audit/hdfs/%create-time:yyyyMMdd% + hdfs://namenodehost:8020/audit/hdfs/%time:yyyyMMdd% @@ -128,7 +128,7 @@ xasecure.audit.hdfs.config.local.buffer.file - %create-time:yyyyMMdd-HHmm.ss%.log + %time:yyyyMMdd-HHmm.ss%.log http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/46584e44/hdfs-agent/scripts/install.properties ---------------------------------------------------------------------- diff --git a/hdfs-agent/scripts/install.properties b/hdfs-agent/scripts/install.properties index 73643b8..5cfa476 100644 --- a/hdfs-agent/scripts/install.properties +++ b/hdfs-agent/scripts/install.properties @@ -105,12 +105,12 @@ XAAUDIT.DB.JDBC_DRIVER=com.mysql.jdbc.Driver # Audit to HDFS # XAAUDIT.HDFS.IS_ENABLED=false -XAAUDIT.HDFS.DESTINATION_DIRECTORY=hdfs://localhost:8020/audit/hdfs/%create-time:yyyyMMdd% +XAAUDIT.HDFS.DESTINATION_DIRECTORY=hdfs://localhost:8020/audit/hdfs/%time:yyyyMMdd% XAAUDIT.HDFS.DESTINTATION_FILE=%hostname%-audit.log XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS=86400 XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS=60 XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY=/tmp/logs/hdfs -XAAUDIT.HDFS.LOCAL_BUFFER_FILE=%create-time:yyyyMMdd-HHmm.ss%.log +XAAUDIT.HDFS.LOCAL_BUFFER_FILE=%time:yyyyMMdd-HHmm.ss%.log XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS=600 XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY=/tmp/logs/archive/hdfs XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT=10 http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/46584e44/hive-agent/conf/xasecure-audit.xml ---------------------------------------------------------------------- diff --git a/hive-agent/conf/xasecure-audit.xml b/hive-agent/conf/xasecure-audit.xml index 73c3d74..319ae09 100644 --- a/hive-agent/conf/xasecure-audit.xml +++ b/hive-agent/conf/xasecure-audit.xml @@ -122,7 +122,7 @@ xasecure.audit.hdfs.config.destination.directroy - hdfs://namenodehost:8020/audit/hive/%create-time:yyyyMMdd% + hdfs://namenodehost:8020/audit/hive/%time:yyyyMMdd% @@ -147,7 +147,7 @@ xasecure.audit.hdfs.config.local.buffer.file - %create-time:yyyyMMdd-HHmm.ss%.log + %time:yyyyMMdd-HHmm.ss%.log http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/46584e44/hive-agent/scripts/install.properties ---------------------------------------------------------------------- diff --git a/hive-agent/scripts/install.properties b/hive-agent/scripts/install.properties index 436c53d..4cbdde0 100644 --- a/hive-agent/scripts/install.properties +++ b/hive-agent/scripts/install.properties @@ -112,12 +112,12 @@ XAAUDIT.DB.JDBC_DRIVER=com.mysql.jdbc.Driver # Audit to HDFS # XAAUDIT.HDFS.IS_ENABLED=false -XAAUDIT.HDFS.DESTINATION_DIRECTORY=hdfs://localhost:8020/audit/hive/%create-time:yyyyMMdd% +XAAUDIT.HDFS.DESTINATION_DIRECTORY=hdfs://localhost:8020/audit/hive/%time:yyyyMMdd% XAAUDIT.HDFS.DESTINTATION_FILE=%hostname%-audit.log XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS=86400 XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS=60 XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY=/tmp/logs/hive -XAAUDIT.HDFS.LOCAL_BUFFER_FILE=%create-time:yyyyMMdd-HHmm.ss%.log +XAAUDIT.HDFS.LOCAL_BUFFER_FILE=%time:yyyyMMdd-HHmm.ss%.log XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS=600 XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY=/tmp/logs/archive/hive XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT=10 http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/46584e44/knox-agent/conf/xasecure-audit.xml ---------------------------------------------------------------------- diff --git a/knox-agent/conf/xasecure-audit.xml b/knox-agent/conf/xasecure-audit.xml index d7d1a8d..4a7303e 100644 --- a/knox-agent/conf/xasecure-audit.xml +++ b/knox-agent/conf/xasecure-audit.xml @@ -117,7 +117,7 @@ xasecure.audit.hdfs.config.destination.directroy - hdfs://namenodehost:8020/audit/knox/%create-time:yyyyMMdd% + hdfs://namenodehost:8020/audit/knox/%time:yyyyMMdd% @@ -142,7 +142,7 @@ xasecure.audit.hdfs.config.local.buffer.file - %create-time:yyyyMMdd-HHmm.ss%.log + %time:yyyyMMdd-HHmm.ss%.log http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/46584e44/knox-agent/scripts/install.properties ---------------------------------------------------------------------- diff --git a/knox-agent/scripts/install.properties b/knox-agent/scripts/install.properties index 3f9aa33..1f0e01e 100644 --- a/knox-agent/scripts/install.properties +++ b/knox-agent/scripts/install.properties @@ -98,12 +98,12 @@ XAAUDIT.DB.JDBC_DRIVER=com.mysql.jdbc.Driver # Audit to HDFS # XAAUDIT.HDFS.IS_ENABLED=false -XAAUDIT.HDFS.DESTINATION_DIRECTORY=hdfs://localhost:8020/audit/knox/%create-time:yyyyMMdd% +XAAUDIT.HDFS.DESTINATION_DIRECTORY=hdfs://localhost:8020/audit/knox/%time:yyyyMMdd% XAAUDIT.HDFS.DESTINTATION_FILE=%hostname%-audit.log XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS=86400 XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS=60 XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY=/tmp/logs/knox -XAAUDIT.HDFS.LOCAL_BUFFER_FILE=%create-time:yyyyMMdd-HHmm.ss%.log +XAAUDIT.HDFS.LOCAL_BUFFER_FILE=%time:yyyyMMdd-HHmm.ss%.log XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS=600 XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY=/tmp/logs/archive/knox XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT=10 http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/46584e44/storm-agent/conf/xasecure-audit.xml ---------------------------------------------------------------------- diff --git a/storm-agent/conf/xasecure-audit.xml b/storm-agent/conf/xasecure-audit.xml index b103aca..f8c07d2 100644 --- a/storm-agent/conf/xasecure-audit.xml +++ b/storm-agent/conf/xasecure-audit.xml @@ -122,7 +122,7 @@ xasecure.audit.hdfs.config.destination.directroy - hdfs://namenodehost:8020/audit/storm/%create-time:yyyyMMdd% + hdfs://namenodehost:8020/audit/storm/%time:yyyyMMdd% @@ -147,7 +147,7 @@ xasecure.audit.hdfs.config.local.buffer.file - %create-time:yyyyMMdd-HHmm.ss%.log + %time:yyyyMMdd-HHmm.ss%.log http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/46584e44/storm-agent/scripts/install.properties ---------------------------------------------------------------------- diff --git a/storm-agent/scripts/install.properties b/storm-agent/scripts/install.properties index 8e0ec8f..c1e3e44 100644 --- a/storm-agent/scripts/install.properties +++ b/storm-agent/scripts/install.properties @@ -102,12 +102,12 @@ XAAUDIT.DB.JDBC_DRIVER=com.mysql.jdbc.Driver # Audit to HDFS # XAAUDIT.HDFS.IS_ENABLED=false -XAAUDIT.HDFS.DESTINATION_DIRECTORY=hdfs://localhost:8020/audit/storm/%create-time:yyyyMMdd% +XAAUDIT.HDFS.DESTINATION_DIRECTORY=hdfs://localhost:8020/audit/storm/%time:yyyyMMdd% XAAUDIT.HDFS.DESTINTATION_FILE=%hostname%-audit.log XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS=86400 XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS=60 XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY=/tmp/logs/storm -XAAUDIT.HDFS.LOCAL_BUFFER_FILE=%create-time:yyyyMMdd-HHmm.ss%.log +XAAUDIT.HDFS.LOCAL_BUFFER_FILE=%time:yyyyMMdd-HHmm.ss%.log XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS=600 XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY=/tmp/logs/archive/storm XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT=10