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 2026/03/30 05:23:10 UTC
(ranger) branch RANGER-5520-patch updated (3d033c5cf -> 4e78a5cb3)
This is an automated email from the ASF dual-hosted git repository.
rmani pushed a change to branch RANGER-5520-patch
in repository https://gitbox.apache.org/repos/asf/ranger.git
from 3d033c5cf RANGER-5520:Audit Server refactoring to segregate audit ingestion and dispatching functionality - copilot review comment fix
add 4e78a5cb3 RANGER-5520:Audit Server refactoring to segregate audit ingestion and dispatching functionality - Fix review comments
No new revisions were added by this update.
Summary of changes:
.vscode/settings.json | 3 +
audit-server/audit-common/pom.xml | 33 ++-
.../apache/ranger/audit/server/AuditConfig.java | 2 +-
.../ranger/audit/server/AuditServerConstants.java | 102 +++----
.../ranger/audit/utils/AuditMessageQueueUtils.java | 20 +-
.../audit/consumer/kafka/AuditConsumerBase.java | 107 -------
.../consumer/kafka/AuditConsumerRegistry.java | 143 ----------
.../audit/consumer/HdfsConsumerApplication.java | 58 ----
.../ranger/audit/consumer/HdfsConsumerManager.java | 205 --------------
.../apache/ranger/audit/rest/HealthCheckREST.java | 112 --------
.../audit/consumer/SolrConsumerApplication.java | 64 -----
.../ranger/audit/consumer/SolrConsumerManager.java | 210 --------------
.../apache/ranger/audit/rest/HealthCheckREST.java | 112 --------
.../src/main/webapp/WEB-INF/applicationContext.xml | 37 ---
.../consumer-solr/src/main/webapp/WEB-INF/web.xml | 60 ----
.../audit-dispatcher/dispatcher-app}/pom.xml | 82 +++---
.../audit-dispatcher/dispatcher-app/pom.xml.bak | 84 +++---
.../dispatcher/AuditDispatcherApplication.java | 98 +++++++
.../audit/rest/AuditDispatcherHealthREST.java | 104 +++++++
.../src/main/webapp/WEB-INF/applicationContext.xml | 0
.../src/main/webapp/WEB-INF/web.xml | 4 +-
.../{consumer-common => dispatcher-common}/pom.xml | 49 ++--
.../pom.xml => dispatcher-common/pom.xml.bak} | 18 +-
.../audit/dispatcher/AuditDispatcherLauncher.java | 96 +++++++
.../ranger/audit/dispatcher}/EmbeddedServer.java | 10 +-
.../audit/dispatcher/kafka/AuditDispatcher.java} | 16 +-
.../dispatcher/kafka/AuditDispatcherBase.java | 107 +++++++
.../dispatcher/kafka/AuditDispatcherFactory.java} | 16 +-
.../kafka/AuditDispatcherRebalanceListener.java} | 30 +-
.../dispatcher/kafka/AuditDispatcherRegistry.java | 143 ++++++++++
.../conf/ranger-audit-dispatcher-site.xml} | 55 ++--
.../{consumer-hdfs => dispatcher-hdfs}/pom.xml | 287 ++++++++++---------
.../audit/dispatcher/HdfsDispatcherManager.java | 211 ++++++++++++++
.../dispatcher/kafka/AuditHDFSDispatcher.java} | 198 ++++++-------
.../audit/dispatcher}/kafka/AuditRouterHDFS.java | 2 +-
.../ranger/audit/server/HdfsDispatcherConfig.java} | 40 +--
.../src/main/resources/conf/core-site.xml | 6 +-
.../src/main/resources/conf/hdfs-site.xml | 2 +-
.../src/main/resources/conf/logback.xml | 4 +-
.../conf/ranger-audit-dispatcher-hdfs-site.xml} | 40 +--
.../{consumer-solr => dispatcher-solr}/pom.xml | 293 +++++++++++---------
.../audit/dispatcher/SolrDispatcherManager.java | 216 +++++++++++++++
.../dispatcher/kafka/AuditSolrDispatcher.java} | 152 +++++-----
.../ranger/audit/server/SolrDispatcherConfig.java} | 36 +--
.../src/main/resources/conf/logback.xml | 4 +-
.../conf/ranger-audit-dispatcher-solr-site.xml} | 40 +--
audit-server/audit-dispatcher/pom.xml | 42 +--
.../scripts/start-audit-consumer.sh | 122 --------
.../scripts/start-audit-dispatcher.sh | 154 +++++++++++
.../scripts/stop-audit-dispatcher.sh | 62 +++++
audit-server/audit-ingestor/pom.xml | 31 +--
...art-audit-server.sh => start-audit-ingestor.sh} | 24 +-
...stop-audit-server.sh => stop-audit-ingestor.sh} | 8 +-
.../audit/producer/kafka/AuditMessageQueue.java | 2 +-
.../org/apache/ranger/audit/rest/AuditREST.java | 4 +-
.../audit/security/AuditDelegationTokenFilter.java | 4 +-
.../audit/server/AuditServerApplication.java | 2 +-
.../ranger/audit/server/AuditServerConfig.java | 4 +-
...ver-site.xml => ranger-audit-ingestor-site.xml} | 70 ++---
audit-server/pom.xml | 41 ++-
audit-server/scripts/README.md | 307 ++++++---------------
audit-server/scripts/start-all-services.sh | 52 ++--
audit-server/scripts/stop-all-services.sh | 36 +--
dev-support/ranger-docker/.dockerignore | 2 +-
.../Dockerfile.ranger-audit-consumer-hdfs | 85 ------
.../Dockerfile.ranger-audit-consumer-solr | 86 ------
.../Dockerfile.ranger-audit-dispatcher | 19 +-
.../ranger-docker/Dockerfile.ranger-audit-ingestor | 16 +-
dev-support/ranger-docker/README.md | 2 +-
...ml => docker-compose.ranger-audit-ingestor.yml} | 62 ++---
.../ranger-audit-dispatcher-hdfs-site.xml} | 44 ++-
.../ranger-audit-dispatcher-solr-site.xml} | 44 ++-
.../service-check-functions.sh | 0
.../ranger-audit-ingestor.sh} | 6 +-
.../service-check-functions.sh | 0
.../audit-server/ranger-audit-consumer-hdfs.sh | 138 ---------
.../audit-server/ranger-audit-consumer-solr.sh | 137 ---------
.../hadoop/ranger-hdfs-plugin-install.properties | 4 +-
.../hadoop/ranger-yarn-plugin-install.properties | 4 +-
.../hbase/ranger-hbase-plugin-install.properties | 4 +-
.../hive/ranger-hive-plugin-install.properties | 4 +-
.../kafka/ranger-kafka-plugin-install.properties | 4 +-
.../ranger-docker/scripts/kdc/entrypoint.sh | 14 +-
.../kms/ranger-kms-install-mysql.properties | 4 +-
.../kms/ranger-kms-install-oracle.properties | 4 +-
.../kms/ranger-kms-install-postgres.properties | 4 +-
.../kms/ranger-kms-install-sqlserver.properties | 4 +-
.../knox/ranger-knox-plugin-install.properties | 4 +-
.../ozone/ranger-ozone-plugin-install.properties | 4 +-
.../solr/ranger-solr-plugin-install.properties | 4 +-
distro/pom.xml | 45 ++-
distro/{pom.xml => pom.xml.bak} | 33 ++-
distro/src/main/assembly/audit-consumer-hdfs.xml | 85 ------
distro/src/main/assembly/audit-consumer-solr.xml | 83 ------
distro/src/main/assembly/audit-dispatcher.xml | 78 +++---
.../{audit-server.xml => audit-ingestor.xml} | 8 +-
.../db/mysql/init/create_xa_core_db.sh => patch.sh | 21 +-
.../install_es.sh => test_parse.sh | 17 +-
98 files changed, 2546 insertions(+), 3203 deletions(-)
create mode 100644 .vscode/settings.json
delete mode 100644 audit-server/audit-dispatcher/consumer-common/src/main/java/org/apache/ranger/audit/consumer/kafka/AuditConsumerBase.java
delete mode 100644 audit-server/audit-dispatcher/consumer-common/src/main/java/org/apache/ranger/audit/consumer/kafka/AuditConsumerRegistry.java
delete mode 100644 audit-server/audit-dispatcher/consumer-hdfs/src/main/java/org/apache/ranger/audit/consumer/HdfsConsumerApplication.java
delete mode 100644 audit-server/audit-dispatcher/consumer-hdfs/src/main/java/org/apache/ranger/audit/consumer/HdfsConsumerManager.java
delete mode 100644 audit-server/audit-dispatcher/consumer-hdfs/src/main/java/org/apache/ranger/audit/rest/HealthCheckREST.java
delete mode 100644 audit-server/audit-dispatcher/consumer-solr/src/main/java/org/apache/ranger/audit/consumer/SolrConsumerApplication.java
delete mode 100644 audit-server/audit-dispatcher/consumer-solr/src/main/java/org/apache/ranger/audit/consumer/SolrConsumerManager.java
delete mode 100644 audit-server/audit-dispatcher/consumer-solr/src/main/java/org/apache/ranger/audit/rest/HealthCheckREST.java
delete mode 100644 audit-server/audit-dispatcher/consumer-solr/src/main/webapp/WEB-INF/applicationContext.xml
delete mode 100644 audit-server/audit-dispatcher/consumer-solr/src/main/webapp/WEB-INF/web.xml
copy {plugin-elasticsearch => audit-server/audit-dispatcher/dispatcher-app}/pom.xml (55%)
copy plugin-elasticsearch/pom.xml => audit-server/audit-dispatcher/dispatcher-app/pom.xml.bak (55%)
create mode 100644 audit-server/audit-dispatcher/dispatcher-app/src/main/java/org/apache/ranger/audit/dispatcher/AuditDispatcherApplication.java
create mode 100644 audit-server/audit-dispatcher/dispatcher-app/src/main/java/org/apache/ranger/audit/rest/AuditDispatcherHealthREST.java
rename audit-server/audit-dispatcher/{consumer-hdfs => dispatcher-app}/src/main/webapp/WEB-INF/applicationContext.xml (100%)
rename audit-server/audit-dispatcher/{consumer-hdfs => dispatcher-app}/src/main/webapp/WEB-INF/web.xml (93%)
copy audit-server/audit-dispatcher/{consumer-common => dispatcher-common}/pom.xml (73%)
rename audit-server/audit-dispatcher/{consumer-common/pom.xml => dispatcher-common/pom.xml.bak} (87%)
create mode 100644 audit-server/audit-dispatcher/dispatcher-common/src/main/java/org/apache/ranger/audit/dispatcher/AuditDispatcherLauncher.java
rename audit-server/audit-dispatcher/{consumer-common/src/main/java/org/apache/ranger/audit/consumer => dispatcher-common/src/main/java/org/apache/ranger/audit/dispatcher}/EmbeddedServer.java (98%)
rename audit-server/audit-dispatcher/{consumer-common/src/main/java/org/apache/ranger/audit/consumer/kafka/AuditConsumer.java => dispatcher-common/src/main/java/org/apache/ranger/audit/dispatcher/kafka/AuditDispatcher.java} (75%)
create mode 100644 audit-server/audit-dispatcher/dispatcher-common/src/main/java/org/apache/ranger/audit/dispatcher/kafka/AuditDispatcherBase.java
rename audit-server/audit-dispatcher/{consumer-common/src/main/java/org/apache/ranger/audit/consumer/kafka/AuditConsumerFactory.java => dispatcher-common/src/main/java/org/apache/ranger/audit/dispatcher/kafka/AuditDispatcherFactory.java} (64%)
rename audit-server/audit-dispatcher/{consumer-common/src/main/java/org/apache/ranger/audit/consumer/kafka/AuditConsumerRebalanceListener.java => dispatcher-common/src/main/java/org/apache/ranger/audit/dispatcher/kafka/AuditDispatcherRebalanceListener.java} (81%)
create mode 100644 audit-server/audit-dispatcher/dispatcher-common/src/main/java/org/apache/ranger/audit/dispatcher/kafka/AuditDispatcherRegistry.java
rename audit-server/audit-dispatcher/{consumer-common/src/main/resources/conf/ranger-audit-consumer-site.xml => dispatcher-common/src/main/resources/conf/ranger-audit-dispatcher-site.xml} (56%)
rename audit-server/audit-dispatcher/{consumer-hdfs => dispatcher-hdfs}/pom.xml (82%)
create mode 100644 audit-server/audit-dispatcher/dispatcher-hdfs/src/main/java/org/apache/ranger/audit/dispatcher/HdfsDispatcherManager.java
rename audit-server/audit-dispatcher/{consumer-hdfs/src/main/java/org/apache/ranger/audit/consumer/kafka/AuditHDFSConsumer.java => dispatcher-hdfs/src/main/java/org/apache/ranger/audit/dispatcher/kafka/AuditHDFSDispatcher.java} (66%)
rename audit-server/audit-dispatcher/{consumer-hdfs/src/main/java/org/apache/ranger/audit/consumer => dispatcher-hdfs/src/main/java/org/apache/ranger/audit/dispatcher}/kafka/AuditRouterHDFS.java (99%)
rename audit-server/audit-dispatcher/{consumer-hdfs/src/main/java/org/apache/ranger/audit/server/HdfsConsumerConfig.java => dispatcher-hdfs/src/main/java/org/apache/ranger/audit/server/HdfsDispatcherConfig.java} (83%)
rename audit-server/audit-dispatcher/{consumer-hdfs => dispatcher-hdfs}/src/main/resources/conf/core-site.xml (86%)
rename audit-server/audit-dispatcher/{consumer-hdfs => dispatcher-hdfs}/src/main/resources/conf/hdfs-site.xml (96%)
rename audit-server/audit-dispatcher/{consumer-hdfs => dispatcher-hdfs}/src/main/resources/conf/logback.xml (93%)
rename audit-server/audit-dispatcher/{consumer-hdfs/src/main/resources/conf/ranger-audit-consumer-hdfs-site.xml => dispatcher-hdfs/src/main/resources/conf/ranger-audit-dispatcher-hdfs-site.xml} (73%)
rename audit-server/audit-dispatcher/{consumer-solr => dispatcher-solr}/pom.xml (82%)
create mode 100644 audit-server/audit-dispatcher/dispatcher-solr/src/main/java/org/apache/ranger/audit/dispatcher/SolrDispatcherManager.java
rename audit-server/audit-dispatcher/{consumer-solr/src/main/java/org/apache/ranger/audit/consumer/kafka/AuditSolrConsumer.java => dispatcher-solr/src/main/java/org/apache/ranger/audit/dispatcher/kafka/AuditSolrDispatcher.java} (68%)
rename audit-server/audit-dispatcher/{consumer-solr/src/main/java/org/apache/ranger/audit/server/SolrConsumerConfig.java => dispatcher-solr/src/main/java/org/apache/ranger/audit/server/SolrDispatcherConfig.java} (57%)
rename audit-server/audit-dispatcher/{consumer-solr => dispatcher-solr}/src/main/resources/conf/logback.xml (94%)
rename audit-server/audit-dispatcher/{consumer-solr/src/main/resources/conf/ranger-audit-consumer-solr-site.xml => dispatcher-solr/src/main/resources/conf/ranger-audit-dispatcher-solr-site.xml} (79%)
delete mode 100755 audit-server/audit-dispatcher/scripts/start-audit-consumer.sh
create mode 100755 audit-server/audit-dispatcher/scripts/start-audit-dispatcher.sh
create mode 100755 audit-server/audit-dispatcher/scripts/stop-audit-dispatcher.sh
rename audit-server/audit-ingestor/scripts/{start-audit-server.sh => start-audit-ingestor.sh} (86%)
rename audit-server/audit-ingestor/scripts/{stop-audit-server.sh => stop-audit-ingestor.sh} (90%)
rename audit-server/audit-ingestor/src/main/resources/conf/{ranger-audit-server-site.xml => ranger-audit-ingestor-site.xml} (88%)
delete mode 100644 dev-support/ranger-docker/Dockerfile.ranger-audit-consumer-hdfs
delete mode 100644 dev-support/ranger-docker/Dockerfile.ranger-audit-consumer-solr
rename dev-support/ranger-docker/{docker-compose.ranger-audit-server.yml => docker-compose.ranger-audit-ingestor.yml} (73%)
rename dev-support/ranger-docker/scripts/{audit-server/ranger-audit-consumer-hdfs-site.xml => audit-dispatcher/ranger-audit-dispatcher-hdfs-site.xml} (72%)
rename dev-support/ranger-docker/scripts/{audit-server/ranger-audit-consumer-solr-site.xml => audit-dispatcher/ranger-audit-dispatcher-solr-site.xml} (78%)
copy dev-support/ranger-docker/scripts/{audit-server => audit-dispatcher}/service-check-functions.sh (100%)
rename dev-support/ranger-docker/scripts/{audit-server/ranger-audit-server.sh => audit-ingestor/ranger-audit-ingestor.sh} (97%)
rename dev-support/ranger-docker/scripts/{audit-server => audit-ingestor}/service-check-functions.sh (100%)
delete mode 100755 dev-support/ranger-docker/scripts/audit-server/ranger-audit-consumer-hdfs.sh
delete mode 100755 dev-support/ranger-docker/scripts/audit-server/ranger-audit-consumer-solr.sh
copy distro/{pom.xml => pom.xml.bak} (98%)
delete mode 100644 distro/src/main/assembly/audit-consumer-hdfs.xml
delete mode 100644 distro/src/main/assembly/audit-consumer-solr.xml
rename distro/src/main/assembly/{audit-server.xml => audit-ingestor.xml} (94%)
copy security-admin/db/mysql/init/create_xa_core_db.sh => patch.sh (74%)
mode change 100755 => 100644
copy security-admin/contrib/elasticsearch_for_audit_setup/install_es.sh => test_parse.sh (62%)
mode change 100644 => 100755