This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch RANGER-3923
in repository https://gitbox.apache.org/repos/asf/ranger.git
commit 35943801dc74f3452a6c32cf932530f1dcdf6cd8
Merge: 25162b842 b876ae715
Author: Madhan Neethiraj <mad...@apache.org>
AuthorDate: Sat Aug 26 18:34:38 2023 -0700
Merge branch 'master' into RANGER-3923
agents-audit/pom.xml | 22 +
.../ranger/audit/utils/RangerORCAuditWriter.java | 4 +-
.../ranger/plugin/util/RangerPurgeResult.java | 88 ++++
.../service-defs/ranger-servicedef-abfs.json | 3 +-
.../service-defs/ranger-servicedef-kafka.json | 4 +-
.../service-defs/ranger-servicedef-knox.json | 4 +-
.../service-defs/ranger-servicedef-ozone.json | 4 +-
.../ranger-servicedef-schema-registry.json | 4 +-
.../service-defs/ranger-servicedef-solr.json | 4 +-
.../service-defs/ranger-servicedef-tag.json | 3 +-
distro/src/main/assembly/hbase-agent.xml | 4 +
distro/src/main/assembly/hdfs-agent.xml | 4 +
distro/src/main/assembly/kms.xml | 4 +
distro/src/main/assembly/knox-agent.xml | 4 +
distro/src/main/assembly/plugin-atlas.xml | 4 +
distro/src/main/assembly/plugin-elasticsearch.xml | 4 +
distro/src/main/assembly/plugin-kafka.xml | 4 +
distro/src/main/assembly/plugin-kms.xml | 4 +
distro/src/main/assembly/plugin-kylin.xml | 4 +
distro/src/main/assembly/plugin-ozone.xml | 4 +
distro/src/main/assembly/plugin-presto.xml | 4 +
distro/src/main/assembly/plugin-solr.xml | 4 +
distro/src/main/assembly/plugin-sqoop.xml | 4 +
distro/src/main/assembly/plugin-trino.xml | 4 +
distro/src/main/assembly/plugin-yarn.xml | 4 +
distro/src/main/assembly/storm-agent.xml | 4 +
.../ranger/server/tomcat/EmbeddedServer.java | 13 +
.../tomcat/EmbeddedServerMetricsCollector.java | 128 ++++++
.../main/java/org/apache/ranger/RangerClient.java | 14 +
.../python/apache_ranger/client/ranger_client.py | 7 +
.../java/org/apache/ranger/TestRangerClient.java | 14 +
pom.xml | 1 +
ranger-metrics/pom.xml | 19 +
.../ranger/metrics/RangerMetricsSystemWrapper.java | 2 +
.../source/RangerMetricsContainerSource.java | 99 ++++
.../source/TestRangerMetricsContainerSource.java | 108 +++++
.../main/java/org/apache/ranger/biz/AssetMgr.java | 55 ++-
.../java/org/apache/ranger/biz/ServiceDBStore.java | 110 +++--
.../RangerTransactionSynchronizationAdapter.java | 107 +++--
.../apache/ranger/db/XXPolicyExportAuditDao.java | 18 +
.../java/org/apache/ranger/rest/PublicAPIsv2.java | 9 +-
.../java/org/apache/ranger/rest/ServiceREST.java | 43 +-
.../ranger/service/RangerPluginActivityLogger.java | 56 ---
.../main/resources/META-INF/jpa_named_queries.xml | 5 +
.../react-webapp/src/components/Editable.jsx | 502 +++++++++++++--------
.../main/webapp/react-webapp/src/utils/XAUtils.js | 19 +
.../AuditEvent/AdminLogs/PolicyViewDetails.jsx | 29 +-
.../views/PolicyListing/AddUpdatePolicyForm.jsx | 75 ++-
.../views/PolicyListing/PolicyConditionsComp.jsx | 194 ++++----
.../views/PolicyListing/PolicyPermissionItem.jsx | 126 +++---
.../views/ServiceManager/ServiceAuditFilter.jsx | 3 +-
.../src/views/ServiceManager/ServiceForm.jsx | 3 +-
.../org/apache/ranger/rest/TestServiceREST.java | 4 -
.../service/TestRangerPluginActivityLogger.java | 74 ---
54 files changed, 1375 insertions(+), 666 deletions(-)
diff --cc security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
index cce7a2f64,8f1174ac4..6a0a24129
--- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
@@@ -72,7 -74,7 +74,8 @@@ import org.apache.ranger.db.XXTrxLogDao
import org.apache.ranger.entity.XXTagChangeLog;
import org.apache.ranger.plugin.model.RangerSecurityZone;
import org.apache.ranger.plugin.util.RangerCommonConstants;
+import org.apache.ranger.plugin.util.ServiceDefUtil;
+ import org.apache.ranger.plugin.util.RangerPurgeResult;
import org.apache.ranger.plugin.util.ServiceTags;
import org.apache.ranger.plugin.model.validation.RangerServiceDefValidator;
import org.apache.ranger.plugin.model.validation.RangerValidator;
