fix: add ES doc

atlanhq · Feb 22, 2023 · 9483249 · 9483249
1 parent 30f61f4
commit 9483249
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/...udit/src/main/java/org/apache/ranger/audit/destination/ElasticSearchAuditDestination.java b/...udit/src/main/java/org/apache/ranger/audit/destination/ElasticSearchAuditDestination.java
@@ -306,6 +306,7 @@ Map<String, Object> toDoc(AuthzAuditEvent auditEvent) {
         doc.put("sess", auditEvent.getSessionId());
         doc.put("reqUser", auditEvent.getUser());
         doc.put("reqData", auditEvent.getRequestData());
+        doc.put("reqEntityGuid", auditEvent.getEntityGuid());
         doc.put("resource", auditEvent.getResourcePath());
         doc.put("cliIP", auditEvent.getClientIP());
         doc.put("logType", auditEvent.getLogType());

diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/model/AuthzAuditEvent.java b/agents-audit/src/main/java/org/apache/ranger/audit/model/AuthzAuditEvent.java
@@ -148,7 +148,7 @@ public AuthzAuditEvent(int repositoryType, String repositoryName,
 			String resultReason, String aclEnforcer, String sessionId,
 			String clientType, String clientIP, String requestData, String clusterName, String zoneName) {
 		this(repositoryType, repositoryName, user, eventTime, accessType, resourcePath, resourceType, action, accessResult, agentId,
-				policyId, resultReason, aclEnforcer, sessionId, clientType, clientIP, requestData, clusterName, zoneName, null, null);
+				policyId, resultReason, aclEnforcer, sessionId, clientType, clientIP, requestData, clusterName, zoneName, null);
 
 	}
 
@@ -157,18 +157,7 @@ public AuthzAuditEvent(int repositoryType, String repositoryName,
 						   String resourcePath, String resourceType, String action,
 						   short accessResult, String agentId, long policyId,
 						   String resultReason, String aclEnforcer, String sessionId,
-						   String clientType, String clientIP, String requestData, String clusterName, String zoneName, String entityGuid) {
-		this(repositoryType, repositoryName, user, eventTime, accessType, resourcePath, resourceType, action, accessResult, agentId,
-				policyId, resultReason, aclEnforcer, sessionId, clientType, clientIP, requestData, clusterName, zoneName, null, entityGuid);
-
-	}
-
-	public AuthzAuditEvent(int repositoryType, String repositoryName,
-						   String user, Date eventTime, String accessType,
-						   String resourcePath, String resourceType, String action,
-						   short accessResult, String agentId, long policyId,
-						   String resultReason, String aclEnforcer, String sessionId,
-						   String clientType, String clientIP, String requestData, String clusterName, String zoneName, Long policyVersion, String entityGuid) {
+						   String clientType, String clientIP, String requestData, String clusterName, String zoneName, Long policyVersion) {
 		this.repositoryType = repositoryType;
 		this.repositoryName = repositoryName;
 		this.user = user;
@@ -189,7 +178,6 @@ public AuthzAuditEvent(int repositoryType, String repositoryName,
 		this.clusterName = clusterName;
 		this.zoneName = zoneName;
 		this.policyVersion = policyVersion;
-		this.entityGuid = entityGuid;
 	}
 
 	/**