ranger-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mad...@apache.org
Subject [3/3] git commit: ARGUS-5: updates per review comments: - default location of audit logs changed to /var/logs/xasecure/audit and hdfs://%hostname%:8020/xasecure/audit - log message improvement - fixed retry interval on flush() failures.
Date Thu, 25 Sep 2014 08:27:23 GMT
ARGUS-5: updates per review comments:
 - default location of audit logs changed to /var/logs/xasecure/audit
and hdfs://%hostname%:8020/xasecure/audit
 - log message improvement
 - fixed retry interval on flush() failures.

Project: http://git-wip-us.apache.org/repos/asf/incubator-argus/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-argus/commit/7a01fbbe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-argus/tree/7a01fbbe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-argus/diff/7a01fbbe

Branch: refs/heads/master
Commit: 7a01fbbe267816320f0f80f6293a4bd2c83d00f6
Parents: 27b7fd7
Author: mneethiraj <mneethiraj@hortonworks.com>
Authored: Thu Sep 25 01:17:12 2014 -0700
Committer: mneethiraj <mneethiraj@hortonworks.com>
Committed: Thu Sep 25 01:17:12 2014 -0700

----------------------------------------------------------------------
 .../audit/provider/LocalFileLogBuffer.java      |  8 +++---
 .../audit/provider/hdfs/HdfsLogDestination.java |  4 +--
 hbase-agent/conf/xasecure-audit.xml             | 28 +++-----------------
 hbase-agent/scripts/install.properties          |  6 ++---
 hdfs-agent/conf/xasecure-audit.xml              | 28 +++-----------------
 hdfs-agent/scripts/install.properties           |  6 ++---
 hive-agent/conf/xasecure-audit.xml              | 28 +++-----------------
 hive-agent/scripts/install.properties           |  6 ++---
 knox-agent/conf/xasecure-audit.xml              | 28 +++-----------------
 knox-agent/scripts/install.properties           |  6 ++---
 storm-agent/conf/xasecure-audit.xml             | 28 +++-----------------
 storm-agent/scripts/install.properties          |  6 ++---
 12 files changed, 41 insertions(+), 141 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/7a01fbbe/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 fc53ba6..d59d1db 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
@@ -278,11 +278,11 @@ public class LocalFileLogBuffer<T> implements LogBuffer<T>
{
 			openFile();
 		} else if(now > mNextFlushTime) {
 			try {
-				mWriter.flush();
-
 				mNextFlushTime = now + (mFlushIntervalSeconds * 1000L);
+
+				mWriter.flush();
 			} catch (IOException excp) {
-				LogLog.warn("LocalFileLogBuffer: failed to flush", excp);
+				LogLog.warn("LocalFileLogBuffer: failed to flush to file " + mBufferFilename, excp);
 			}
 		}
 	}
@@ -295,7 +295,7 @@ public class LocalFileLogBuffer<T> implements LogBuffer<T>
{
 				try {
 					writer = new OutputStreamWriter(os, mEncoding);
 				} catch(UnsupportedEncodingException excp) {
-					LogLog.warn("LocalFileLogBuffer: failed to create output writer.", excp);
+					LogLog.warn("LocalFileLogBuffer: failed to create output writer for file " + mBufferFilename,
excp);
 				}
 			}
 	

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/7a01fbbe/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 8872541..60fda6c 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
@@ -289,9 +289,9 @@ public class HdfsLogDestination<T> implements LogDestination<T>
{
 			rollover();
 		} else if(now > mNextFlushTime) {
 			try {
-				mWriter.flush();
-
 				mNextFlushTime = now + (mFlushIntervalSeconds * 1000L);
+
+				mWriter.flush();
 			} catch (IOException excp) {
 				LogLog.warn("HdfsLogDestination: failed to flush", excp);
 			}

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/7a01fbbe/hbase-agent/conf/xasecure-audit.xml
----------------------------------------------------------------------
diff --git a/hbase-agent/conf/xasecure-audit.xml b/hbase-agent/conf/xasecure-audit.xml
index c57d580..2bdcc8d 100644
--- a/hbase-agent/conf/xasecure-audit.xml
+++ b/hbase-agent/conf/xasecure-audit.xml
@@ -92,27 +92,7 @@
 	<!-- HDFS audit provider configuration -->
 	<property>
 		<name>xasecure.audit.hdfs.is.enabled</name>
-		<value>false</value>
-	</property>	
-
-	<property>
-		<name>xasecure.audit.hdfs.is.async</name>
-		<value>false</value>
-	</property>	
-
-	<property>
-		<name>xasecure.audit.hdfs.async.max.queue.size</name>
-		<value>10240</value>
-	</property>	
-
-	<property>
-		<name>xasecure.audit.hdfs.async.resume.queue.size</name>
-		<value>8192</value>
-	</property>	
-
-	<property>
-		<name>xasecure.audit.hdfs.async.max.flush.interval.ms</name>
-		<value>30000</value>
+		<value>true</value>
 	</property>	
 
 	<property>
@@ -122,7 +102,7 @@
 
 	<property>
 		<name>xasecure.audit.hdfs.config.destination.directroy</name>
-		<value>hdfs://namenodehost:8020/audit/hbase/%time:yyyyMMdd%</value>
+		<value>hdfs://%hostname%:8020/xasecure/audit/%app-type%/%time:yyyyMMdd%</value>
 	</property>	
 
 	<property>
@@ -147,7 +127,7 @@
 
 	<property>
 		<name>xasecure.audit.hdfs.config.local.buffer.directroy</name>
-		<value>/tmp/logs/hbase</value>
+		<value>/var/log/xasecure/audit/%app-type%</value>
 	</property>	
 
 	<property>
@@ -167,7 +147,7 @@
 
 	<property>
 		<name>xasecure.audit.hdfs.config.local.archive.directroy</name>
-		<value>/tmp/logs/archive/hbase</value>
+		<value>/var/log/xasecure/audit/archive/%app-type%</value>
 	</property>	
 
 	<property>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/7a01fbbe/hbase-agent/scripts/install.properties
----------------------------------------------------------------------
diff --git a/hbase-agent/scripts/install.properties b/hbase-agent/scripts/install.properties
index 2e227dc..576cda6 100644
--- a/hbase-agent/scripts/install.properties
+++ b/hbase-agent/scripts/install.properties
@@ -112,14 +112,14 @@ 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/%time:yyyyMMdd%
+XAAUDIT.HDFS.DESTINATION_DIRECTORY=hdfs://%hostname%:8020/xasecure/audit/%app-type%/%time:yyyyMMdd%
 XAAUDIT.HDFS.DESTINTATION_FILE=%hostname%-audit.log
 XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS=900
 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_DIRECTORY=/var/log/xasecure/audit/%app-type%
 XAAUDIT.HDFS.LOCAL_BUFFER_FILE=%time:yyyyMMdd-HHmm.ss%.log
 XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS=60
 XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS=600
-XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY=/tmp/logs/archive/hbase
+XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY=/var/log/xasecure/audit/archive/%app-type%
 XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT=10

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/7a01fbbe/hdfs-agent/conf/xasecure-audit.xml
----------------------------------------------------------------------
diff --git a/hdfs-agent/conf/xasecure-audit.xml b/hdfs-agent/conf/xasecure-audit.xml
index e7c23d4..9e181e0 100644
--- a/hdfs-agent/conf/xasecure-audit.xml
+++ b/hdfs-agent/conf/xasecure-audit.xml
@@ -73,27 +73,7 @@
 	<!-- HDFS audit provider configuration -->
 	<property>
 		<name>xasecure.audit.hdfs.is.enabled</name>
-		<value>false</value>
-	</property>	
-
-	<property>
-		<name>xasecure.audit.hdfs.is.async</name>
-		<value>false</value>
-	</property>	
-
-	<property>
-		<name>xasecure.audit.hdfs.async.max.queue.size</name>
-		<value>10240</value>
-	</property>	
-
-	<property>
-		<name>xasecure.audit.hdfs.async.resume.queue.size</name>
-		<value>8192</value>
-	</property>	
-
-	<property>
-		<name>xasecure.audit.hdfs.async.max.flush.interval.ms</name>
-		<value>30000</value>
+		<value>true</value>
 	</property>	
 
 	<property>
@@ -103,7 +83,7 @@
 
 	<property>
 		<name>xasecure.audit.hdfs.config.destination.directroy</name>
-		<value>hdfs://namenodehost:8020/audit/hdfs/%time:yyyyMMdd%</value>
+		<value>hdfs://%hostname%:8020/xasecure/audit/%app-type%/%time:yyyyMMdd%</value>
 	</property>	
 
 	<property>
@@ -128,7 +108,7 @@
 
 	<property>
 		<name>xasecure.audit.hdfs.config.local.buffer.directroy</name>
-		<value>/tmp/logs/hdfs</value>
+		<value>/var/log/xasecure/audit/%app-type%</value>
 	</property>	
 
 	<property>
@@ -148,7 +128,7 @@
 
 	<property>
 		<name>xasecure.audit.hdfs.config.local.archive.directroy</name>
-		<value>/tmp/logs/archive/hdfs</value>
+		<value>/var/log/xasecure/audit/archive/%app-type%</value>
 	</property>	
 
 	<property>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/7a01fbbe/hdfs-agent/scripts/install.properties
----------------------------------------------------------------------
diff --git a/hdfs-agent/scripts/install.properties b/hdfs-agent/scripts/install.properties
index d8b6680..4866883 100644
--- a/hdfs-agent/scripts/install.properties
+++ b/hdfs-agent/scripts/install.properties
@@ -105,14 +105,14 @@ 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/%time:yyyyMMdd%
+XAAUDIT.HDFS.DESTINATION_DIRECTORY=hdfs://%hostname%:8020/xasecure/audit/%app-type%/%time:yyyyMMdd%
 XAAUDIT.HDFS.DESTINTATION_FILE=%hostname%-audit.log
 XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS=900
 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_DIRECTORY=/var/log/xasecure/audit/%app-type%
 XAAUDIT.HDFS.LOCAL_BUFFER_FILE=%time:yyyyMMdd-HHmm.ss%.log
 XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS=60
 XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS=600
-XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY=/tmp/logs/archive/hdfs
+XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY=/var/log/xasecure/audit/archive/%app-type%
 XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT=10

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/7a01fbbe/hive-agent/conf/xasecure-audit.xml
----------------------------------------------------------------------
diff --git a/hive-agent/conf/xasecure-audit.xml b/hive-agent/conf/xasecure-audit.xml
index 35c4c8c..37591fc 100644
--- a/hive-agent/conf/xasecure-audit.xml
+++ b/hive-agent/conf/xasecure-audit.xml
@@ -92,27 +92,7 @@
 	<!-- HDFS audit provider configuration -->
 	<property>
 		<name>xasecure.audit.hdfs.is.enabled</name>
-		<value>false</value>
-	</property>	
-
-	<property>
-		<name>xasecure.audit.hdfs.is.async</name>
-		<value>false</value>
-	</property>	
-
-	<property>
-		<name>xasecure.audit.hdfs.async.max.queue.size</name>
-		<value>10240</value>
-	</property>	
-
-	<property>
-		<name>xasecure.audit.hdfs.async.resume.queue.size</name>
-		<value>8192</value>
-	</property>	
-
-	<property>
-		<name>xasecure.audit.hdfs.async.max.flush.interval.ms</name>
-		<value>30000</value>
+		<value>true</value>
 	</property>	
 
 	<property>
@@ -122,7 +102,7 @@
 
 	<property>
 		<name>xasecure.audit.hdfs.config.destination.directroy</name>
-		<value>hdfs://namenodehost:8020/audit/hive/%time:yyyyMMdd%</value>
+		<value>hdfs://%hostname%:8020/xasecure/audit/%app-type%/%time:yyyyMMdd%</value>
 	</property>	
 
 	<property>
@@ -147,7 +127,7 @@
 
 	<property>
 		<name>xasecure.audit.hdfs.config.local.buffer.directroy</name>
-		<value>/tmp/logs/hive</value>
+		<value>/var/log/xasecure/audit/%app-type%</value>
 	</property>	
 
 	<property>
@@ -167,7 +147,7 @@
 
 	<property>
 		<name>xasecure.audit.hdfs.config.local.archive.directroy</name>
-		<value>/tmp/logs/archive/hive</value>
+		<value>/var/log/xasecure/audit/archive/%app-type%</value>
 	</property>	
 
 	<property>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/7a01fbbe/hive-agent/scripts/install.properties
----------------------------------------------------------------------
diff --git a/hive-agent/scripts/install.properties b/hive-agent/scripts/install.properties
index 1c4a232..11a2c5b 100644
--- a/hive-agent/scripts/install.properties
+++ b/hive-agent/scripts/install.properties
@@ -112,14 +112,14 @@ 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/%time:yyyyMMdd%
+XAAUDIT.HDFS.DESTINATION_DIRECTORY=hdfs://%hostname%:8020/xasecure/audit/%app-type%/%time:yyyyMMdd%
 XAAUDIT.HDFS.DESTINTATION_FILE=%hostname%-audit.log
 XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS=900
 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_DIRECTORY=/var/log/xasecure/audit/%app-type%
 XAAUDIT.HDFS.LOCAL_BUFFER_FILE=%time:yyyyMMdd-HHmm.ss%.log
 XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS=60
 XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS=600
-XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY=/tmp/logs/archive/hive
+XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY=/var/log/xasecure/audit/archive/%app-type%
 XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT=10

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/7a01fbbe/knox-agent/conf/xasecure-audit.xml
----------------------------------------------------------------------
diff --git a/knox-agent/conf/xasecure-audit.xml b/knox-agent/conf/xasecure-audit.xml
index c861abb..501b2b7 100644
--- a/knox-agent/conf/xasecure-audit.xml
+++ b/knox-agent/conf/xasecure-audit.xml
@@ -87,27 +87,7 @@
 	<!-- HDFS audit provider configuration -->
 	<property>
 		<name>xasecure.audit.hdfs.is.enabled</name>
-		<value>false</value>
-	</property>	
-
-	<property>
-		<name>xasecure.audit.hdfs.is.async</name>
-		<value>false</value>
-	</property>	
-
-	<property>
-		<name>xasecure.audit.hdfs.async.max.queue.size</name>
-		<value>10240</value>
-	</property>	
-
-	<property>
-		<name>xasecure.audit.hdfs.async.resume.queue.size</name>
-		<value>8192</value>
-	</property>	
-
-	<property>
-		<name>xasecure.audit.hdfs.async.max.flush.interval.ms</name>
-		<value>30000</value>
+		<value>true</value>
 	</property>	
 
 	<property>
@@ -117,7 +97,7 @@
 
 	<property>
 		<name>xasecure.audit.hdfs.config.destination.directroy</name>
-		<value>hdfs://namenodehost:8020/audit/knox/%time:yyyyMMdd%</value>
+		<value>hdfs://%hostname%:8020/xasecure/audit/%app-type%/%time:yyyyMMdd%</value>
 	</property>	
 
 	<property>
@@ -142,7 +122,7 @@
 
 	<property>
 		<name>xasecure.audit.hdfs.config.local.buffer.directroy</name>
-		<value>/tmp/logs/knox</value>
+		<value>/var/log/xasecure/audit/%app-type%</value>
 	</property>	
 
 	<property>
@@ -162,7 +142,7 @@
 
 	<property>
 		<name>xasecure.audit.hdfs.config.local.archive.directroy</name>
-		<value>/tmp/logs/archive/knox</value>
+		<value>/var/log/xasecure/audit/archive/%app-type%</value>
 	</property>	
 
 	<property>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/7a01fbbe/knox-agent/scripts/install.properties
----------------------------------------------------------------------
diff --git a/knox-agent/scripts/install.properties b/knox-agent/scripts/install.properties
index c93e844..9fa72b0 100644
--- a/knox-agent/scripts/install.properties
+++ b/knox-agent/scripts/install.properties
@@ -98,14 +98,14 @@ 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/%time:yyyyMMdd%
+XAAUDIT.HDFS.DESTINATION_DIRECTORY=hdfs://%hostname%:8020/xasecure/audit/%app-type%/%time:yyyyMMdd%
 XAAUDIT.HDFS.DESTINTATION_FILE=%hostname%-audit.log
 XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS=900
 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_DIRECTORY=/var/log/xasecure/audit/%app-type%
 XAAUDIT.HDFS.LOCAL_BUFFER_FILE=%time:yyyyMMdd-HHmm.ss%.log
 XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS=60
 XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS=600
-XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY=/tmp/logs/archive/knox
+XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY=/var/log/xasecure/audit/archive/%app-type%
 XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT=10

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/7a01fbbe/storm-agent/conf/xasecure-audit.xml
----------------------------------------------------------------------
diff --git a/storm-agent/conf/xasecure-audit.xml b/storm-agent/conf/xasecure-audit.xml
index acac19b..37591fc 100644
--- a/storm-agent/conf/xasecure-audit.xml
+++ b/storm-agent/conf/xasecure-audit.xml
@@ -92,27 +92,7 @@
 	<!-- HDFS audit provider configuration -->
 	<property>
 		<name>xasecure.audit.hdfs.is.enabled</name>
-		<value>false</value>
-	</property>	
-
-	<property>
-		<name>xasecure.audit.hdfs.is.async</name>
-		<value>false</value>
-	</property>	
-
-	<property>
-		<name>xasecure.audit.hdfs.async.max.queue.size</name>
-		<value>10240</value>
-	</property>	
-
-	<property>
-		<name>xasecure.audit.hdfs.async.resume.queue.size</name>
-		<value>8192</value>
-	</property>	
-
-	<property>
-		<name>xasecure.audit.hdfs.async.max.flush.interval.ms</name>
-		<value>30000</value>
+		<value>true</value>
 	</property>	
 
 	<property>
@@ -122,7 +102,7 @@
 
 	<property>
 		<name>xasecure.audit.hdfs.config.destination.directroy</name>
-		<value>hdfs://namenodehost:8020/audit/storm/%time:yyyyMMdd%</value>
+		<value>hdfs://%hostname%:8020/xasecure/audit/%app-type%/%time:yyyyMMdd%</value>
 	</property>	
 
 	<property>
@@ -147,7 +127,7 @@
 
 	<property>
 		<name>xasecure.audit.hdfs.config.local.buffer.directroy</name>
-		<value>/tmp/logs/storm</value>
+		<value>/var/log/xasecure/audit/%app-type%</value>
 	</property>	
 
 	<property>
@@ -167,7 +147,7 @@
 
 	<property>
 		<name>xasecure.audit.hdfs.config.local.archive.directroy</name>
-		<value>/tmp/logs/archive/storm</value>
+		<value>/var/log/xasecure/audit/archive/%app-type%</value>
 	</property>	
 
 	<property>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/7a01fbbe/storm-agent/scripts/install.properties
----------------------------------------------------------------------
diff --git a/storm-agent/scripts/install.properties b/storm-agent/scripts/install.properties
index 2d28d5d..4403c3c 100644
--- a/storm-agent/scripts/install.properties
+++ b/storm-agent/scripts/install.properties
@@ -102,14 +102,14 @@ 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/%time:yyyyMMdd%
+XAAUDIT.HDFS.DESTINATION_DIRECTORY=hdfs://%hostname%:8020/xasecure/audit/%app-type%/%time:yyyyMMdd%
 XAAUDIT.HDFS.DESTINTATION_FILE=%hostname%-audit.log
 XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS=900
 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_DIRECTORY=/var/log/xasecure/audit/%app-type%
 XAAUDIT.HDFS.LOCAL_BUFFER_FILE=%time:yyyyMMdd-HHmm.ss%.log
 XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS=60
 XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS=600
-XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY=/tmp/logs/archive/storm
+XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY=/var/log/xasecure/audit/archive/%app-type%
 XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT=10


Mime
View raw message