[ranger] branch master updated: RANGER-3005: repoType and repo values does not set when Audit to Elasticsearch is enabled

[bpatel]

This is an automated email from the ASF dual-hosted git repository.

bpatel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/master by this push:
     new 168f128  RANGER-3005: repoType and repo values does not set when Audit 
to Elasticsearch is enabled
168f128 is described below

commit 168f128c29868b93cd8a5c3a3374e48eb40e2cc8
Author: Bhavik Patel <bhavikpatel...@gmail.com>
AuthorDate: Mon Sep 21 11:30:24 2020 +0530

    RANGER-3005: repoType and repo values does not set when Audit to 
Elasticsearch is enabled
---
 .../ranger/elasticsearch/ElasticSearchAccessAuditsService.java     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git 
a/security-admin/src/main/java/org/apache/ranger/elasticsearch/ElasticSearchAccessAuditsService.java
 
b/security-admin/src/main/java/org/apache/ranger/elasticsearch/ElasticSearchAccessAuditsService.java
index f28eb24..0b2e7df 100644
--- 
a/security-admin/src/main/java/org/apache/ranger/elasticsearch/ElasticSearchAccessAuditsService.java
+++ 
b/security-admin/src/main/java/org/apache/ranger/elasticsearch/ElasticSearchAccessAuditsService.java
@@ -25,6 +25,7 @@ import org.apache.ranger.common.PropertiesUtil;
 import org.apache.ranger.common.RESTErrorUtil;
 import org.apache.ranger.common.SearchCriteria;
 import org.apache.ranger.db.XXServiceDefDao;
+import org.apache.ranger.entity.XXService;
 import org.apache.ranger.entity.XXServiceDef;
 import org.apache.ranger.view.VXAccessAudit;
 import org.apache.ranger.view.VXAccessAuditList;
@@ -187,6 +188,11 @@ public class ElasticSearchAccessAuditsService extends 
org.apache.ranger.AccessAu
                value = source.get("repo");
                if (value != null) {
                        accessAudit.setRepoName(value.toString());
+                       XXService xxService = 
daoManager.getXXService().findByName(accessAudit.getRepoName());
+
+                       if(xxService != null) {
+                               
accessAudit.setRepoDisplayName(xxService.getDisplayName());
+                       }
                }
                value = source.get("sess");
                if (value != null) {
@@ -230,6 +236,7 @@ public class ElasticSearchAccessAuditsService extends 
org.apache.ranger.AccessAu
                                        XXServiceDef xServiceDef = 
xxServiceDef.getById((long) accessAudit.getRepoType());
                                        if (xServiceDef != null) {
                                                
accessAudit.setServiceType(xServiceDef.getName());
+                                               
accessAudit.setServiceTypeDisplayName(xServiceDef.getDisplayName());
                                        }
                                }
                        }