This is an automated email from the ASF dual-hosted git repository. pradeep pushed a commit to branch ranger-2.5 in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/ranger-2.5 by this push: new 922135805 RANGER-4792: Fix issue with creating index and import data in ElasticSearch as Audit database 922135805 is described below commit 922135805df58282e0b2a79527089aba4175c5fa Author: Ognjen Stanisavljevic <ognjen.stanisavlje...@thingsolver.com> AuthorDate: Thu Jun 27 21:07:28 2024 +0200 RANGER-4792: Fix issue with creating index and import data in ElasticSearch as Audit database Change-Id: Ibf9c28ff01605e32a64fee8c5b70c127ab7c121d Signed-off-by: PradeeP AgrawaL <prad...@apache.org> --- agents-audit/pom.xml | 2 +- pom.xml | 2 +- security-admin/scripts/ranger-admin-site-template.xml | 4 ++++ security-admin/scripts/setup.sh | 5 +++++ security-admin/scripts/upgrade_admin.py | 1 + .../ranger/elasticsearch/ElasticSearchAccessAuditsService.java | 2 +- .../main/java/org/apache/ranger/solr/SolrAccessAuditsService.java | 2 +- security-admin/src/main/resources/conf.dist/ranger-admin-site.xml | 5 +++++ .../ranger/elasticsearch/ElasticSearchAccessAuditsServiceTest.java | 1 + 9 files changed, 20 insertions(+), 4 deletions(-) diff --git a/agents-audit/pom.xml b/agents-audit/pom.xml index fd76b208d..249331848 100644 --- a/agents-audit/pom.xml +++ b/agents-audit/pom.xml @@ -308,7 +308,7 @@ <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-spatial</artifactId> - <version>${lucene.version}</version> + <version>8.4.0</version> </dependency> <dependency> <groupId>org.apache.lucene</groupId> diff --git a/pom.xml b/pom.xml index cc9fdaf64..0674b28b7 100644 --- a/pom.xml +++ b/pom.xml @@ -245,7 +245,7 @@ <net.minidev.asm.version>1.0.2</net.minidev.asm.version> <org.bouncycastle.bcprov-jdk15on>1.70</org.bouncycastle.bcprov-jdk15on> <org.bouncycastle.bcpkix-jdk15on>1.70</org.bouncycastle.bcpkix-jdk15on> - <lucene.version>8.4.0</lucene.version> + <lucene.version>8.11.3</lucene.version> <hppc.version>0.8.0</hppc.version> <joda.time.version>2.10.6</joda.time.version> <nimbus-jose-jwt.version>9.31</nimbus-jose-jwt.version> diff --git a/security-admin/scripts/ranger-admin-site-template.xml b/security-admin/scripts/ranger-admin-site-template.xml index dc4bb52de..b02ed174a 100644 --- a/security-admin/scripts/ranger-admin-site-template.xml +++ b/security-admin/scripts/ranger-admin-site-template.xml @@ -160,6 +160,10 @@ <name>ranger.audit.elasticsearch.urls</name> <value></value> </property> + <property> + <name>ranger.audit.elasticsearch.protocol</name> + <value></value> + </property> <property> <name>ranger.audit.elasticsearch.port</name> <value></value> diff --git a/security-admin/scripts/setup.sh b/security-admin/scripts/setup.sh index 299a093a0..16864980d 100755 --- a/security-admin/scripts/setup.sh +++ b/security-admin/scripts/setup.sh @@ -94,6 +94,7 @@ javax_net_ssl_trustStore=$(get_prop 'javax_net_ssl_trustStore' $PROPFILE) javax_net_ssl_trustStorePassword=$(get_prop 'javax_net_ssl_trustStorePassword' $PROPFILE) audit_store=$(get_prop 'audit_store' $PROPFILE) audit_elasticsearch_urls=$(get_prop 'audit_elasticsearch_urls' $PROPFILE) +audit_elasticsearch_protocol=$(get_prop 'audit_elasticsearch_protocol' $PROPFILE) audit_elasticsearch_port=$(get_prop 'audit_elasticsearch_port' $PROPFILE) audit_elasticsearch_user=$(get_prop 'audit_elasticsearch_user' $PROPFILE) audit_elasticsearch_password=$(get_prop 'audit_elasticsearch_password' $PROPFILE) @@ -811,6 +812,10 @@ update_properties() { newPropertyValue=${audit_elasticsearch_urls} updatePropertyToFilePy $propertyName $newPropertyValue $to_file_ranger + propertyName=ranger.audit.elasticsearch.protocol + newPropertyValue=${audit_elasticsearch_protocol} + updatePropertyToFilePy $propertyName $newPropertyValue $to_file_ranger + propertyName=ranger.audit.elasticsearch.port newPropertyValue=${audit_elasticsearch_port} updatePropertyToFilePy $propertyName $newPropertyValue $to_file_ranger diff --git a/security-admin/scripts/upgrade_admin.py b/security-admin/scripts/upgrade_admin.py index d340bc603..345ca6302 100755 --- a/security-admin/scripts/upgrade_admin.py +++ b/security-admin/scripts/upgrade_admin.py @@ -112,6 +112,7 @@ config2xmlMAP = { 'xa.scheduler.enabled':'ranger.scheduler.enabled', 'xa.audit.store':'ranger.audit.source.type', 'audit_elasticsearch_urls':'ranger.audit.elasticsearch.urls', + 'audit_elasticsearch_protocol':'ranger.audit.elasticsearch.protocol', 'audit_elasticsearch_port':'ranger.audit.elasticsearch.port', 'audit_elasticsearch_user':'ranger.audit.elasticsearch.user', 'audit_elasticsearch_password':'ranger.audit.elasticsearch.password', 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 4c9b049a0..826986874 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 @@ -257,7 +257,7 @@ public class ElasticSearchAccessAuditsService extends org.apache.ranger.AccessAu } value = source.get("evtTime"); if (value != null) { - accessAudit.setEventTime(MiscUtil.toDate(value)); + accessAudit.setEventTime(MiscUtil.toLocalDate(value)); } value = source.get("seq_num"); if (value != null) { diff --git a/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java b/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java index c52df9341..061272fa3 100644 --- a/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java +++ b/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java @@ -227,7 +227,7 @@ public class SolrAccessAuditsService extends AccessAuditsService { } value = doc.getFieldValue("evtTime"); if (value != null) { - accessAudit.setEventTime(MiscUtil.toDate(value)); + accessAudit.setEventTime(MiscUtil.toLocalDate(value)); } value = doc.getFieldValue("seq_num"); if (value != null) { diff --git a/security-admin/src/main/resources/conf.dist/ranger-admin-site.xml b/security-admin/src/main/resources/conf.dist/ranger-admin-site.xml index f3dbb777b..717004dce 100644 --- a/security-admin/src/main/resources/conf.dist/ranger-admin-site.xml +++ b/security-admin/src/main/resources/conf.dist/ranger-admin-site.xml @@ -50,6 +50,11 @@ <value>127.0.0.1</value> <description></description> </property> + <property> + <name>ranger.audit.elasticsearch.protocol</name> + <value>http</value> + <description></description> + </property> <property> <name>ranger.audit.elasticsearch.port</name> <value>9200</value> diff --git a/security-admin/src/test/java/org/apache/ranger/elasticsearch/ElasticSearchAccessAuditsServiceTest.java b/security-admin/src/test/java/org/apache/ranger/elasticsearch/ElasticSearchAccessAuditsServiceTest.java index 605f38e78..bbf303715 100644 --- a/security-admin/src/test/java/org/apache/ranger/elasticsearch/ElasticSearchAccessAuditsServiceTest.java +++ b/security-admin/src/test/java/org/apache/ranger/elasticsearch/ElasticSearchAccessAuditsServiceTest.java @@ -53,6 +53,7 @@ public class ElasticSearchAccessAuditsServiceTest { ElasticSearchAccessAuditsService elasticSearchAccessAuditsService = new ElasticSearchAccessAuditsService(); Map<String, String> properties = PropertiesUtil.getPropertiesMap(); properties.put("ranger.audit.elasticsearch.urls", "localhost"); + properties.put("ranger.audit.elasticsearch.protocol", "http"); properties.put("ranger.audit.elasticsearch.user", "elastic"); properties.put("ranger.audit.elasticsearch.password", "password1"); properties.put("ranger.audit.elasticsearch.port", "9200");