You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by rm...@apache.org on 2014/09/24 01:21:25 UTC
[1/2] git commit: Argus-59
Repository: incubator-argus
Updated Branches:
refs/heads/master e1a66e582 -> 105e71e94
Argus-59
Project: http://git-wip-us.apache.org/repos/asf/incubator-argus/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-argus/commit/cdb53604
Tree: http://git-wip-us.apache.org/repos/asf/incubator-argus/tree/cdb53604
Diff: http://git-wip-us.apache.org/repos/asf/incubator-argus/diff/cdb53604
Branch: refs/heads/master
Commit: cdb53604dd3fa175ef3c8db71848f97877532a72
Parents: cfec85a
Author: rmani <rm...@hortonworks.com>
Authored: Tue Sep 23 16:02:08 2014 -0700
Committer: rmani <rm...@hortonworks.com>
Committed: Tue Sep 23 16:02:08 2014 -0700
----------------------------------------------------------------------
.../main/java/com/xasecure/audit/provider/Log4jAuditProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/cdb53604/agents-audit/src/main/java/com/xasecure/audit/provider/Log4jAuditProvider.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/com/xasecure/audit/provider/Log4jAuditProvider.java b/agents-audit/src/main/java/com/xasecure/audit/provider/Log4jAuditProvider.java
index 2235ac5..cfc3c51 100644
--- a/agents-audit/src/main/java/com/xasecure/audit/provider/Log4jAuditProvider.java
+++ b/agents-audit/src/main/java/com/xasecure/audit/provider/Log4jAuditProvider.java
@@ -40,7 +40,7 @@ public class Log4jAuditProvider implements AuditProvider {
public void log(AuditEventBase event) {
if(! AUDITLOG.isInfoEnabled())
return;
- Gson gson= new GsonBuilder().setPrettyPrinting().create();
+ Gson gson= new GsonBuilder().create();
String eventAsJson = gson.toJson(event.toString()) ;
AUDITLOG.info(eventAsJson);
}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-argus
Posted by rm...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-argus
Project: http://git-wip-us.apache.org/repos/asf/incubator-argus/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-argus/commit/105e71e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-argus/tree/105e71e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-argus/diff/105e71e9
Branch: refs/heads/master
Commit: 105e71e9444054509ae9cfa2e5495fd3d47d362b
Parents: cdb5360 e1a66e5
Author: rmani <rm...@hortonworks.com>
Authored: Tue Sep 23 16:20:16 2014 -0700
Committer: rmani <rm...@hortonworks.com>
Committed: Tue Sep 23 16:20:16 2014 -0700
----------------------------------------------------------------------
.../audit/provider/BufferedAuditProvider.java | 8 ++
.../audit/provider/LocalFileLogBuffer.java | 133 ++++++++++++++-----
.../com/xasecure/audit/provider/LogBuffer.java | 2 +
.../com/xasecure/audit/provider/MiscUtil.java | 2 +-
.../audit/provider/hdfs/HdfsAuditProvider.java | 8 +-
.../audit/provider/hdfs/HdfsLogDestination.java | 37 ++++--
.../com/xasecure/audit/test/TestEvents.java | 30 ++++-
hbase-agent/conf/xasecure-audit-changes.cfg | 2 +
hbase-agent/conf/xasecure-audit.xml | 10 ++
hbase-agent/scripts/install.properties | 2 +
hdfs-agent/conf/xasecure-audit-changes.cfg | 2 +
hdfs-agent/conf/xasecure-audit.xml | 10 ++
hdfs-agent/scripts/install.properties | 2 +
hive-agent/conf/xasecure-audit-changes.cfg | 2 +
hive-agent/conf/xasecure-audit.xml | 10 ++
hive-agent/scripts/install.properties | 2 +
knox-agent/conf/xasecure-audit-changes.cfg | 2 +
knox-agent/conf/xasecure-audit.xml | 10 ++
knox-agent/scripts/install.properties | 2 +
knox-agent/scripts/install.sh | 2 +-
lookup-client/src/scripts/log4j.xml | 1 +
lookup-client/src/scripts/run-audit-test.sh | 9 +-
.../src/scripts/xasecure-audit.properties | 34 ++++-
security-admin/scripts/install.sh | 4 +-
.../main/java/com/xasecure/biz/AssetMgr.java | 17 ++-
.../main/java/com/xasecure/biz/XABizUtil.java | 29 ++--
.../main/java/com/xasecure/rest/AssetREST.java | 2 +
.../com/xasecure/service/XResourceService.java | 23 +++-
.../src/main/resources/xa_system.properties | 3 +
security-admin/src/main/webapp/login.jsp | 2 +-
storm-agent/conf/xasecure-audit-changes.cfg | 2 +
storm-agent/conf/xasecure-audit.xml | 10 ++
storm-agent/scripts/install.properties | 2 +
33 files changed, 337 insertions(+), 79 deletions(-)
----------------------------------------------------------------------