From d65649f2def04a6ff208465714f7c48181727242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Grzegorz=20Kokosi=C5=84ski?= Date: Thu, 25 Jul 2024 14:39:50 +0200 Subject: [PATCH] Remove unused properties --- .../ranger/audit/provider/solr/SolrAuditProvider.java | 2 -- hbase-agent/conf/ranger-hbase-audit-changes.cfg | 2 -- hbase-agent/conf/ranger-hbase-audit.xml | 10 ---------- hdfs-agent/conf/ranger-hdfs-audit-changes.cfg | 2 -- hdfs-agent/conf/ranger-hdfs-audit.xml | 10 ---------- hive-agent/conf/ranger-hive-audit-changes.cfg | 2 -- hive-agent/conf/ranger-hive-audit.xml | 10 ---------- knox-agent/conf/ranger-knox-audit-changes.cfg | 2 -- knox-agent/conf/ranger-knox-audit.xml | 10 ---------- .../conf/ranger-elasticsearch-audit-changes.cfg | 2 -- .../conf/ranger-elasticsearch-audit.xml | 10 ---------- plugin-kafka/conf/ranger-kafka-audit.xml | 10 ---------- plugin-kms/conf/ranger-kms-audit-changes.cfg | 2 -- plugin-kms/conf/ranger-kms-audit.xml | 10 ---------- plugin-kylin/conf/ranger-kylin-audit-changes.cfg | 2 -- plugin-kylin/conf/ranger-kylin-audit.xml | 10 ---------- plugin-ozone/conf/ranger-ozone-audit.xml | 8 -------- plugin-presto/conf/ranger-presto-audit.xml | 10 ---------- plugin-solr/conf/ranger-solr-audit.xml | 10 ---------- plugin-sqoop/conf/ranger-sqoop-audit-changes.cfg | 2 -- plugin-sqoop/conf/ranger-sqoop-audit.xml | 10 ---------- plugin-trino/conf/ranger-trino-audit.xml | 10 ---------- plugin-yarn/conf/ranger-yarn-audit-changes.cfg | 2 -- plugin-yarn/conf/ranger-yarn-audit.xml | 10 ---------- storm-agent/conf/ranger-storm-audit-changes.cfg | 2 -- storm-agent/conf/ranger-storm-audit.xml | 5 ----- 26 files changed, 165 deletions(-) diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java index 691cef0021..defe1e5670 100644 --- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java +++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java @@ -41,8 +41,6 @@ public class SolrAuditProvider extends AuditDestination { private static final Logger LOG = LoggerFactory.getLogger(SolrAuditProvider.class); - public static final String AUDIT_MAX_QUEUE_SIZE_PROP = "xasecure.audit.solr.async.max.queue.size"; - public static final String AUDIT_MAX_FLUSH_INTERVAL_PROP = "xasecure.audit.solr.async.max.flush.interval.ms"; public static final String AUDIT_RETRY_WAIT_PROP = "xasecure.audit.solr.retry.ms"; static final Object lock = new Object(); diff --git a/hbase-agent/conf/ranger-hbase-audit-changes.cfg b/hbase-agent/conf/ranger-hbase-audit-changes.cfg index a743db457d..78498b25a0 100644 --- a/hbase-agent/conf/ranger-hbase-audit-changes.cfg +++ b/hbase-agent/conf/ranger-hbase-audit-changes.cfg @@ -34,8 +34,6 @@ xasecure.audit.hdfs.config.local.archive.max.file.count %XAAUDIT.HDFS #xasecure.audit.kafka.topic_name %XAAUDIT.KAFKA.TOPIC_NAME% mod create-if-not-exists xasecure.audit.solr.is.enabled %XAAUDIT.SOLR.IS_ENABLED% mod create-if-not-exists -xasecure.audit.solr.async.max.queue.size %XAAUDIT.SOLR.MAX_QUEUE_SIZE% mod create-if-not-exists -xasecure.audit.solr.async.max.flush.interval.ms %XAAUDIT.SOLR.MAX_FLUSH_INTERVAL_MS% mod create-if-not-exists xasecure.audit.solr.solr_url %XAAUDIT.SOLR.SOLR_URL% mod create-if-not-exists #V3 configuration diff --git a/hbase-agent/conf/ranger-hbase-audit.xml b/hbase-agent/conf/ranger-hbase-audit.xml index 9e27b5a2bc..4126cb58fb 100644 --- a/hbase-agent/conf/ranger-hbase-audit.xml +++ b/hbase-agent/conf/ranger-hbase-audit.xml @@ -198,16 +198,6 @@ false - - xasecure.audit.solr.async.max.queue.size - 1 - - - - xasecure.audit.solr.async.max.flush.interval.ms - 1000 - - xasecure.audit.solr.solr_url http://localhost:6083/solr/ranger_audits diff --git a/hdfs-agent/conf/ranger-hdfs-audit-changes.cfg b/hdfs-agent/conf/ranger-hdfs-audit-changes.cfg index 8e0e158d72..de00b1915a 100644 --- a/hdfs-agent/conf/ranger-hdfs-audit-changes.cfg +++ b/hdfs-agent/conf/ranger-hdfs-audit-changes.cfg @@ -33,8 +33,6 @@ xasecure.audit.hdfs.config.local.archive.max.file.count %XAAUDIT.HDFS #xasecure.audit.kafka.topic_name %XAAUDIT.KAFKA.TOPIC_NAME% mod create-if-not-exists xasecure.audit.solr.is.enabled %XAAUDIT.SOLR.IS_ENABLED% mod create-if-not-exists -xasecure.audit.solr.async.max.queue.size %XAAUDIT.SOLR.MAX_QUEUE_SIZE% mod create-if-not-exists -xasecure.audit.solr.async.max.flush.interval.ms %XAAUDIT.SOLR.MAX_FLUSH_INTERVAL_MS% mod create-if-not-exists xasecure.audit.solr.solr_url %XAAUDIT.SOLR.SOLR_URL% mod create-if-not-exists #V3 configuration diff --git a/hdfs-agent/conf/ranger-hdfs-audit.xml b/hdfs-agent/conf/ranger-hdfs-audit.xml index e16ea590dc..143f01be07 100644 --- a/hdfs-agent/conf/ranger-hdfs-audit.xml +++ b/hdfs-agent/conf/ranger-hdfs-audit.xml @@ -198,16 +198,6 @@ false - - xasecure.audit.solr.async.max.queue.size - 1 - - - - xasecure.audit.solr.async.max.flush.interval.ms - 1000 - - xasecure.audit.solr.solr_url http://localhost:6083/solr/ranger_audits diff --git a/hive-agent/conf/ranger-hive-audit-changes.cfg b/hive-agent/conf/ranger-hive-audit-changes.cfg index ec98baf3aa..5c1242f356 100644 --- a/hive-agent/conf/ranger-hive-audit-changes.cfg +++ b/hive-agent/conf/ranger-hive-audit-changes.cfg @@ -34,8 +34,6 @@ xasecure.audit.hdfs.config.local.archive.max.file.count %XAAUDIT.HDFS #xasecure.audit.kafka.topic_name %XAAUDIT.KAFKA.TOPIC_NAME% mod create-if-not-exists xasecure.audit.solr.is.enabled %XAAUDIT.SOLR.IS_ENABLED% mod create-if-not-exists -xasecure.audit.solr.async.max.queue.size %XAAUDIT.SOLR.MAX_QUEUE_SIZE% mod create-if-not-exists -xasecure.audit.solr.async.max.flush.interval.ms %XAAUDIT.SOLR.MAX_FLUSH_INTERVAL_MS% mod create-if-not-exists xasecure.audit.solr.solr_url %XAAUDIT.SOLR.SOLR_URL% mod create-if-not-exists #V3 configuration diff --git a/hive-agent/conf/ranger-hive-audit.xml b/hive-agent/conf/ranger-hive-audit.xml index d42e58935d..0cb9093049 100644 --- a/hive-agent/conf/ranger-hive-audit.xml +++ b/hive-agent/conf/ranger-hive-audit.xml @@ -198,16 +198,6 @@ false - - xasecure.audit.solr.async.max.queue.size - 1 - - - - xasecure.audit.solr.async.max.flush.interval.ms - 1000 - - xasecure.audit.solr.solr_url http://localhost:6083/solr/ranger_audits diff --git a/knox-agent/conf/ranger-knox-audit-changes.cfg b/knox-agent/conf/ranger-knox-audit-changes.cfg index ec98baf3aa..5c1242f356 100644 --- a/knox-agent/conf/ranger-knox-audit-changes.cfg +++ b/knox-agent/conf/ranger-knox-audit-changes.cfg @@ -34,8 +34,6 @@ xasecure.audit.hdfs.config.local.archive.max.file.count %XAAUDIT.HDFS #xasecure.audit.kafka.topic_name %XAAUDIT.KAFKA.TOPIC_NAME% mod create-if-not-exists xasecure.audit.solr.is.enabled %XAAUDIT.SOLR.IS_ENABLED% mod create-if-not-exists -xasecure.audit.solr.async.max.queue.size %XAAUDIT.SOLR.MAX_QUEUE_SIZE% mod create-if-not-exists -xasecure.audit.solr.async.max.flush.interval.ms %XAAUDIT.SOLR.MAX_FLUSH_INTERVAL_MS% mod create-if-not-exists xasecure.audit.solr.solr_url %XAAUDIT.SOLR.SOLR_URL% mod create-if-not-exists #V3 configuration diff --git a/knox-agent/conf/ranger-knox-audit.xml b/knox-agent/conf/ranger-knox-audit.xml index ee7982db00..0d03c596ad 100644 --- a/knox-agent/conf/ranger-knox-audit.xml +++ b/knox-agent/conf/ranger-knox-audit.xml @@ -198,16 +198,6 @@ false - - xasecure.audit.solr.async.max.queue.size - 1 - - - - xasecure.audit.solr.async.max.flush.interval.ms - 1000 - - xasecure.audit.solr.solr_url http://localhost:6083/solr/ranger_audits diff --git a/plugin-elasticsearch/conf/ranger-elasticsearch-audit-changes.cfg b/plugin-elasticsearch/conf/ranger-elasticsearch-audit-changes.cfg index ec98baf3aa..5c1242f356 100644 --- a/plugin-elasticsearch/conf/ranger-elasticsearch-audit-changes.cfg +++ b/plugin-elasticsearch/conf/ranger-elasticsearch-audit-changes.cfg @@ -34,8 +34,6 @@ xasecure.audit.hdfs.config.local.archive.max.file.count %XAAUDIT.HDFS #xasecure.audit.kafka.topic_name %XAAUDIT.KAFKA.TOPIC_NAME% mod create-if-not-exists xasecure.audit.solr.is.enabled %XAAUDIT.SOLR.IS_ENABLED% mod create-if-not-exists -xasecure.audit.solr.async.max.queue.size %XAAUDIT.SOLR.MAX_QUEUE_SIZE% mod create-if-not-exists -xasecure.audit.solr.async.max.flush.interval.ms %XAAUDIT.SOLR.MAX_FLUSH_INTERVAL_MS% mod create-if-not-exists xasecure.audit.solr.solr_url %XAAUDIT.SOLR.SOLR_URL% mod create-if-not-exists #V3 configuration diff --git a/plugin-elasticsearch/conf/ranger-elasticsearch-audit.xml b/plugin-elasticsearch/conf/ranger-elasticsearch-audit.xml index f06b3840c2..b516e8708f 100644 --- a/plugin-elasticsearch/conf/ranger-elasticsearch-audit.xml +++ b/plugin-elasticsearch/conf/ranger-elasticsearch-audit.xml @@ -198,16 +198,6 @@ false - - xasecure.audit.solr.async.max.queue.size - 1 - - - - xasecure.audit.solr.async.max.flush.interval.ms - 1000 - - xasecure.audit.solr.solr_url http://localhost:6083/solr/ranger_audits diff --git a/plugin-kafka/conf/ranger-kafka-audit.xml b/plugin-kafka/conf/ranger-kafka-audit.xml index b7b4806e63..952bdf2c92 100644 --- a/plugin-kafka/conf/ranger-kafka-audit.xml +++ b/plugin-kafka/conf/ranger-kafka-audit.xml @@ -200,16 +200,6 @@ false - - xasecure.audit.solr.async.max.queue.size - 1 - - - - xasecure.audit.solr.async.max.flush.interval.ms - 1000 - - xasecure.audit.solr.solr_url http://localhost:6083/solr/ranger_audits diff --git a/plugin-kms/conf/ranger-kms-audit-changes.cfg b/plugin-kms/conf/ranger-kms-audit-changes.cfg index 50e52a1470..7d9b71d3a8 100644 --- a/plugin-kms/conf/ranger-kms-audit-changes.cfg +++ b/plugin-kms/conf/ranger-kms-audit-changes.cfg @@ -34,8 +34,6 @@ xasecure.audit.hdfs.config.local.archive.max.file.count %XAAUDIT.HDFS #xasecure.audit.kafka.topic_name %XAAUDIT.KAFKA.TOPIC_NAME% mod create-if-not-exists xasecure.audit.solr.is.enabled %XAAUDIT.SOLR.IS_ENABLED% mod create-if-not-exists -xasecure.audit.solr.async.max.queue.size %XAAUDIT.SOLR.MAX_QUEUE_SIZE% mod create-if-not-exists -xasecure.audit.solr.async.max.flush.interval.ms %XAAUDIT.SOLR.MAX_FLUSH_INTERVAL_MS% mod create-if-not-exists xasecure.audit.solr.solr_url %XAAUDIT.SOLR.SOLR_URL% mod create-if-not-exists #V3 configuration diff --git a/plugin-kms/conf/ranger-kms-audit.xml b/plugin-kms/conf/ranger-kms-audit.xml index 2ae726d124..6a73a1f7ff 100755 --- a/plugin-kms/conf/ranger-kms-audit.xml +++ b/plugin-kms/conf/ranger-kms-audit.xml @@ -198,16 +198,6 @@ false - - xasecure.audit.solr.async.max.queue.size - 1 - - - - xasecure.audit.solr.async.max.flush.interval.ms - 1000 - - xasecure.audit.solr.solr_url http://localhost:6083/solr/ranger_audits diff --git a/plugin-kylin/conf/ranger-kylin-audit-changes.cfg b/plugin-kylin/conf/ranger-kylin-audit-changes.cfg index ec98baf3aa..5c1242f356 100644 --- a/plugin-kylin/conf/ranger-kylin-audit-changes.cfg +++ b/plugin-kylin/conf/ranger-kylin-audit-changes.cfg @@ -34,8 +34,6 @@ xasecure.audit.hdfs.config.local.archive.max.file.count %XAAUDIT.HDFS #xasecure.audit.kafka.topic_name %XAAUDIT.KAFKA.TOPIC_NAME% mod create-if-not-exists xasecure.audit.solr.is.enabled %XAAUDIT.SOLR.IS_ENABLED% mod create-if-not-exists -xasecure.audit.solr.async.max.queue.size %XAAUDIT.SOLR.MAX_QUEUE_SIZE% mod create-if-not-exists -xasecure.audit.solr.async.max.flush.interval.ms %XAAUDIT.SOLR.MAX_FLUSH_INTERVAL_MS% mod create-if-not-exists xasecure.audit.solr.solr_url %XAAUDIT.SOLR.SOLR_URL% mod create-if-not-exists #V3 configuration diff --git a/plugin-kylin/conf/ranger-kylin-audit.xml b/plugin-kylin/conf/ranger-kylin-audit.xml index f6878147ed..ad9c3c01e3 100644 --- a/plugin-kylin/conf/ranger-kylin-audit.xml +++ b/plugin-kylin/conf/ranger-kylin-audit.xml @@ -198,16 +198,6 @@ false - - xasecure.audit.solr.async.max.queue.size - 1 - - - - xasecure.audit.solr.async.max.flush.interval.ms - 1000 - - xasecure.audit.solr.solr_url http://localhost:6083/solr/ranger_audits diff --git a/plugin-ozone/conf/ranger-ozone-audit.xml b/plugin-ozone/conf/ranger-ozone-audit.xml index d9dede5be5..396c3a9a0f 100644 --- a/plugin-ozone/conf/ranger-ozone-audit.xml +++ b/plugin-ozone/conf/ranger-ozone-audit.xml @@ -191,15 +191,7 @@ xasecure.audit.solr.is.enabled false - - xasecure.audit.solr.async.max.queue.size - 1 - - - xasecure.audit.solr.async.max.flush.interval.ms - 1000 - xasecure.audit.solr.solr_url http://localhost:6083/solr/ranger_audits diff --git a/plugin-presto/conf/ranger-presto-audit.xml b/plugin-presto/conf/ranger-presto-audit.xml index d335974f26..acead4d885 100644 --- a/plugin-presto/conf/ranger-presto-audit.xml +++ b/plugin-presto/conf/ranger-presto-audit.xml @@ -199,16 +199,6 @@ false - - xasecure.audit.solr.async.max.queue.size - 1 - - - - xasecure.audit.solr.async.max.flush.interval.ms - 1000 - - xasecure.audit.solr.solr_url http://localhost:6083/solr/ranger_audits diff --git a/plugin-solr/conf/ranger-solr-audit.xml b/plugin-solr/conf/ranger-solr-audit.xml index 9120a10dc1..4629d55c16 100644 --- a/plugin-solr/conf/ranger-solr-audit.xml +++ b/plugin-solr/conf/ranger-solr-audit.xml @@ -199,16 +199,6 @@ false - - xasecure.audit.solr.async.max.queue.size - 1 - - - - xasecure.audit.solr.async.max.flush.interval.ms - 1000 - - xasecure.audit.solr.solr_url http://localhost:6083/solr/ranger_audits diff --git a/plugin-sqoop/conf/ranger-sqoop-audit-changes.cfg b/plugin-sqoop/conf/ranger-sqoop-audit-changes.cfg index ec98baf3aa..5c1242f356 100644 --- a/plugin-sqoop/conf/ranger-sqoop-audit-changes.cfg +++ b/plugin-sqoop/conf/ranger-sqoop-audit-changes.cfg @@ -34,8 +34,6 @@ xasecure.audit.hdfs.config.local.archive.max.file.count %XAAUDIT.HDFS #xasecure.audit.kafka.topic_name %XAAUDIT.KAFKA.TOPIC_NAME% mod create-if-not-exists xasecure.audit.solr.is.enabled %XAAUDIT.SOLR.IS_ENABLED% mod create-if-not-exists -xasecure.audit.solr.async.max.queue.size %XAAUDIT.SOLR.MAX_QUEUE_SIZE% mod create-if-not-exists -xasecure.audit.solr.async.max.flush.interval.ms %XAAUDIT.SOLR.MAX_FLUSH_INTERVAL_MS% mod create-if-not-exists xasecure.audit.solr.solr_url %XAAUDIT.SOLR.SOLR_URL% mod create-if-not-exists #V3 configuration diff --git a/plugin-sqoop/conf/ranger-sqoop-audit.xml b/plugin-sqoop/conf/ranger-sqoop-audit.xml index 89faa2315a..ddba648017 100644 --- a/plugin-sqoop/conf/ranger-sqoop-audit.xml +++ b/plugin-sqoop/conf/ranger-sqoop-audit.xml @@ -198,16 +198,6 @@ false - - xasecure.audit.solr.async.max.queue.size - 1 - - - - xasecure.audit.solr.async.max.flush.interval.ms - 1000 - - xasecure.audit.solr.solr_url http://localhost:6083/solr/ranger_audits diff --git a/plugin-trino/conf/ranger-trino-audit.xml b/plugin-trino/conf/ranger-trino-audit.xml index cd57118512..c10b85653c 100644 --- a/plugin-trino/conf/ranger-trino-audit.xml +++ b/plugin-trino/conf/ranger-trino-audit.xml @@ -199,16 +199,6 @@ false - - xasecure.audit.solr.async.max.queue.size - 1 - - - - xasecure.audit.solr.async.max.flush.interval.ms - 1000 - - xasecure.audit.solr.solr_url http://localhost:6083/solr/ranger_audits diff --git a/plugin-yarn/conf/ranger-yarn-audit-changes.cfg b/plugin-yarn/conf/ranger-yarn-audit-changes.cfg index ec98baf3aa..5c1242f356 100644 --- a/plugin-yarn/conf/ranger-yarn-audit-changes.cfg +++ b/plugin-yarn/conf/ranger-yarn-audit-changes.cfg @@ -34,8 +34,6 @@ xasecure.audit.hdfs.config.local.archive.max.file.count %XAAUDIT.HDFS #xasecure.audit.kafka.topic_name %XAAUDIT.KAFKA.TOPIC_NAME% mod create-if-not-exists xasecure.audit.solr.is.enabled %XAAUDIT.SOLR.IS_ENABLED% mod create-if-not-exists -xasecure.audit.solr.async.max.queue.size %XAAUDIT.SOLR.MAX_QUEUE_SIZE% mod create-if-not-exists -xasecure.audit.solr.async.max.flush.interval.ms %XAAUDIT.SOLR.MAX_FLUSH_INTERVAL_MS% mod create-if-not-exists xasecure.audit.solr.solr_url %XAAUDIT.SOLR.SOLR_URL% mod create-if-not-exists #V3 configuration diff --git a/plugin-yarn/conf/ranger-yarn-audit.xml b/plugin-yarn/conf/ranger-yarn-audit.xml index 1927572a91..878a89dd44 100644 --- a/plugin-yarn/conf/ranger-yarn-audit.xml +++ b/plugin-yarn/conf/ranger-yarn-audit.xml @@ -198,16 +198,6 @@ false - - xasecure.audit.solr.async.max.queue.size - 1 - - - - xasecure.audit.solr.async.max.flush.interval.ms - 1000 - - xasecure.audit.solr.solr_url http://localhost:6083/solr/ranger_audits diff --git a/storm-agent/conf/ranger-storm-audit-changes.cfg b/storm-agent/conf/ranger-storm-audit-changes.cfg index ec98baf3aa..5c1242f356 100644 --- a/storm-agent/conf/ranger-storm-audit-changes.cfg +++ b/storm-agent/conf/ranger-storm-audit-changes.cfg @@ -34,8 +34,6 @@ xasecure.audit.hdfs.config.local.archive.max.file.count %XAAUDIT.HDFS #xasecure.audit.kafka.topic_name %XAAUDIT.KAFKA.TOPIC_NAME% mod create-if-not-exists xasecure.audit.solr.is.enabled %XAAUDIT.SOLR.IS_ENABLED% mod create-if-not-exists -xasecure.audit.solr.async.max.queue.size %XAAUDIT.SOLR.MAX_QUEUE_SIZE% mod create-if-not-exists -xasecure.audit.solr.async.max.flush.interval.ms %XAAUDIT.SOLR.MAX_FLUSH_INTERVAL_MS% mod create-if-not-exists xasecure.audit.solr.solr_url %XAAUDIT.SOLR.SOLR_URL% mod create-if-not-exists #V3 configuration diff --git a/storm-agent/conf/ranger-storm-audit.xml b/storm-agent/conf/ranger-storm-audit.xml index 80232dbd60..2d64f10522 100644 --- a/storm-agent/conf/ranger-storm-audit.xml +++ b/storm-agent/conf/ranger-storm-audit.xml @@ -198,11 +198,6 @@ false - - xasecure.audit.solr.async.max.queue.size - 1 - - xasecure.audit.solr.async.max.flush.interval.ms 1000