AMBARI-11338. Solr changes to Ranger Audit properties for all plugins (Gautam Borad via alejandro)

ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py

@@ -276,7 +276,8 @@ if has_ranger_admin:
     'assetType': '2'
   }
 
-  xa_audit_db_is_enabled = config['configurations']['ranger-hbase-audit']['xasecure.audit.db.is.enabled'] if xml_configurations_supported else None
+  ranger_audit_solr_urls = config['configurations']['ranger-admin-site']['ranger.audit.solr.urls']
+  xa_audit_db_is_enabled = config['configurations']['ranger-hbase-audit']['xasecure.audit.destination.db'] if xml_configurations_supported else None
   ssl_keystore_password = unicode(config['configurations']['ranger-hbase-policymgr-ssl']['xasecure.policymgr.clientssl.keystore.password']) if xml_configurations_supported else None
   ssl_truststore_password = unicode(config['configurations']['ranger-hbase-policymgr-ssl']['xasecure.policymgr.clientssl.truststore.password']) if xml_configurations_supported else None
   credential_file = format('/etc/ranger/{repo_name}/cred.jceks') if xml_configurations_supported else None

ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py

@@ -438,7 +438,8 @@ if has_ranger_admin:
     'assetType': '1'
   }
   
-  xa_audit_db_is_enabled = config['configurations']['ranger-hdfs-audit']['xasecure.audit.db.is.enabled'] if xml_configurations_supported else None
+  ranger_audit_solr_urls = config['configurations']['ranger-admin-site']['ranger.audit.solr.urls']
+  xa_audit_db_is_enabled = config['configurations']['ranger-hdfs-audit']['xasecure.audit.destination.db'] if xml_configurations_supported else None
   ssl_keystore_password = unicode(config['configurations']['ranger-hdfs-policymgr-ssl']['xasecure.policymgr.clientssl.keystore.password']) if xml_configurations_supported else None
   ssl_truststore_password = unicode(config['configurations']['ranger-hdfs-policymgr-ssl']['xasecure.policymgr.clientssl.truststore.password']) if xml_configurations_supported else None
   credential_file = format('/etc/ranger/{repo_name}/cred.jceks') if xml_configurations_supported else None

ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py

@@ -467,8 +467,8 @@ if has_ranger_admin:
   }
 
   xa_audit_db_password = unicode(config['configurations']['admin-properties']['audit_db_password'])
-  
-  xa_audit_db_is_enabled = config['configurations']['ranger-hive-audit']['xasecure.audit.db.is.enabled'] if xml_configurations_supported else None
+  ranger_audit_solr_urls = config['configurations']['ranger-admin-site']['ranger.audit.solr.urls']
+  xa_audit_db_is_enabled = config['configurations']['ranger-hive-audit']['xasecure.audit.destination.db'] if xml_configurations_supported else None
   ssl_keystore_password = unicode(config['configurations']['ranger-hive-policymgr-ssl']['xasecure.policymgr.clientssl.keystore.password']) if xml_configurations_supported else None
   ssl_truststore_password = unicode(config['configurations']['ranger-hive-policymgr-ssl']['xasecure.policymgr.clientssl.truststore.password']) if xml_configurations_supported else None
   credential_file = format('/etc/ranger/{repo_name}/cred.jceks') if xml_configurations_supported else None

ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py

@@ -227,7 +227,8 @@ if has_ranger_admin:
     'assetType': '5',
     }
   
-  xa_audit_db_is_enabled = config['configurations']['ranger-knox-audit']['xasecure.audit.db.is.enabled'] if xml_configurations_supported else None
+  ranger_audit_solr_urls = config['configurations']['ranger-admin-site']['ranger.audit.solr.urls']
+  xa_audit_db_is_enabled = config['configurations']['ranger-knox-audit']['xasecure.audit.destination.db'] if xml_configurations_supported else None
   ssl_keystore_password = unicode(config['configurations']['ranger-knox-policymgr-ssl']['xasecure.policymgr.clientssl.keystore.password']) if xml_configurations_supported else None
   ssl_truststore_password = unicode(config['configurations']['ranger-knox-policymgr-ssl']['xasecure.policymgr.clientssl.truststore.password']) if xml_configurations_supported else None
   credential_file = format('/etc/ranger/{repo_name}/cred.jceks') if xml_configurations_supported else None

ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml

@@ -24,59 +24,34 @@
     <name>xasecure.audit.is.enabled</name>
     <value>true</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.db.is.enabled</name>
-    <value>false</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.db.is.async</name>
-    <value>true</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.db.async.max.queue.size</name>
-    <value>10240</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.db.async.max.flush.interval.ms</name>
-    <value>30000</value>
-    <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.db.batch.size</name>
-    <value>100</value>
+    <name>xasecure.audit.destination.db</name>
+    <value>false</value>
     <description></description>
-  </property> 
+  </property>
 
-  
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.url</name>
+    <name>xasecure.audit.destination.db.jdbc.url</name>
     <value>{{audit_jdbc_url}}</value>
     <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.user</name>
+    <name>xasecure.audit.destination.db.user</name>
     <value>{{xa_audit_db_user}}</value>
     <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.password</name>
+    <name>xasecure.audit.destination.db.password</name>
     <value>crypted</value>
     <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.driver</name>
+    <name>xasecure.audit.destination.db.jdbc.driver</name>
     <value>{{jdbc_driver}}</value>
     <description></description>
   </property>
@@ -86,185 +61,53 @@
     <value>jceks://file{{credential_file}}</value>
     <description></description>
   </property>
-  
-  <property>
-    <name>xasecure.audit.hdfs.is.enabled</name>
-    <value>false</value>
-    <description></description>
-  </property> 
 
   <property>
-    <name>xasecure.audit.hdfs.is.async</name>
+    <name>xasecure.audit.destination.hdfs</name>
     <value>true</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.hdfs.async.max.queue.size</name>
-    <value>1048576</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.async.max.flush.interval.ms</name>
-    <value>30000</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.encoding</name>
-    <value></value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.directory</name>
-    <value>hdfs://NAMENODE_HOST:8020/ranger/audit/%app-type%/%time:yyyyMMdd%</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.file</name>
-    <value>%hostname%-audit.log</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.flush.interval.seconds</name>
-    <value>900</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.rollover.interval.seconds</name>
-    <value>86400</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.open.retry.interval.seconds</name>
-    <value>60</value>
-    <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.directory</name>
-    <value>/var/log/kms/audit</value>
+    <name>xasecure.audit.destination.hdfs.dir</name>
+    <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value>
     <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.file</name>
-    <value>%time:yyyyMMdd-HHmm.ss%.log</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.file.buffer.size.bytes</name>
-    <value>8192</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.flush.interval.seconds</name>
-    <value>60</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.rollover.interval.seconds</name>
-    <value>600</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.archive.directory</name>
-    <value>/var/log/kms/audit/archive</value>
-    <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.hdfs.config.local.archive.max.file.count</name>
-    <value>10</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.log4j.is.enabled</name>
-    <value>false</value>
+    <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name>
+    <value>/var/log/kms/audit/hdfs/spool</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.log4j.is.async</name>
-    <value>false</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.log4j.async.max.queue.size</name>
-    <value>10240</value>
+    <name>xasecure.audit.destination.solr</name>
+    <value>true</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.log4j.async.max.flush.interval.ms</name>
-    <value>30000</value>
-    <description></description>
-  </property>   
-  
-  <property>
-    <name>xasecure.audit.kafka.is.enabled</name>
-    <value>false</value>
+    <name>xasecure.audit.destination.solr.urls</name>
+    <value>{{ranger_audit_solr_urls}}</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.kafka.async.max.queue.size</name>
-    <value>1</value>
+    <name>xasecure.audit.destination.solr.zookeepers</name>
+    <value>none</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.kafka.async.max.flush.interval.ms</name>
-    <value>1000</value>
+    <name>xasecure.audit.destination.solr.batch.filespool.dir</name>
+    <value>/var/log/kms/audit/solr/spool</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.kafka.broker_list</name>
-    <value>localhost:9092</value>
-    <description></description>
-  </property> 
+  </property>  
 
   <property>
-    <name>xasecure.audit.kafka.topic_name</name>
-    <value>ranger_audits</value>
-    <description></description>
-  </property> 
-    
-  <property>
-    <name>xasecure.audit.solr.is.enabled</name>
+    <name>xasecure.audit.provider.summary.enabled</name>
     <value>false</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.solr.async.max.queue.size</name>
-    <value>1</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.solr.async.max.flush.interval.ms</name>
-    <value>1000</value>
-    <description></description>
-  </property>
-  
-  <property>
-    <name>xasecure.audit.solr.solr_url</name>
-    <value>http://localhost:6083/solr/ranger_audits</value>
-    <description></description>
-  </property>
+  </property>  
 
-</configuration>
+</configuration>

ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/params.py

@@ -80,6 +80,7 @@ if has_ranger_admin:
   ambari_ranger_admin = config['configurations']['ranger-env']['ranger_admin_username']
   ambari_ranger_password = config['configurations']['ranger-env']['ranger_admin_password']
   admin_uname_password = format("{admin_uname}:{admin_password}")
+  ranger_audit_solr_urls = config['configurations']['ranger-admin-site']['ranger.audit.solr.urls']
 
 java_share_dir = '/usr/share/java'
 
@@ -157,6 +158,6 @@ kms_ranger_plugin_repo = {
   'type' : 'kms'
 }
 
-xa_audit_db_is_enabled = config['configurations']['ranger-kms-audit']['xasecure.audit.db.is.enabled']
+xa_audit_db_is_enabled = config['configurations']['ranger-kms-audit']['xasecure.audit.destination.db']
 ssl_keystore_password = unicode(config['configurations']['ranger-kms-policymgr-ssl']['xasecure.policymgr.clientssl.keystore.password'])
 ssl_truststore_password = unicode(config['configurations']['ranger-kms-policymgr-ssl']['xasecure.policymgr.clientssl.truststore.password'])

ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py

@@ -211,8 +211,9 @@ if has_ranger_admin:
     'repositoryType': 'storm',
     'assetType': '6'
   }
-    
-  xa_audit_db_is_enabled = config['configurations']['ranger-storm-audit']['xasecure.audit.db.is.enabled'] if xml_configurations_supported else None
+   
+  ranger_audit_solr_urls = config['configurations']['ranger-admin-site']['ranger.audit.solr.urls']
+  xa_audit_db_is_enabled = config['configurations']['ranger-storm-audit']['xasecure.audit.destination.db'] if xml_configurations_supported else None
   ssl_keystore_password = unicode(config['configurations']['ranger-storm-policymgr-ssl']['xasecure.policymgr.clientssl.keystore.password']) if xml_configurations_supported else None
   ssl_truststore_password = unicode(config['configurations']['ranger-storm-policymgr-ssl']['xasecure.policymgr.clientssl.truststore.password']) if xml_configurations_supported else None
   credential_file = format('/etc/ranger/{repo_name}/cred.jceks') if xml_configurations_supported else None

ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py

@@ -339,8 +339,8 @@ if has_ranger_admin and is_supported_yarn_ranger:
   driver_curl_source = format("{jdk_location}/{jdbc_symlink_name}")
   driver_curl_target = format("{java_share_dir}/{jdbc_jar_name}")
 
-
-  xa_audit_db_is_enabled = config['configurations']['ranger-yarn-audit']['xasecure.audit.db.is.enabled'] if xml_configurations_supported else None
+  ranger_audit_solr_urls = config['configurations']['ranger-admin-site']['ranger.audit.solr.urls']
+  xa_audit_db_is_enabled = config['configurations']['ranger-yarn-audit']['xasecure.audit.destination.db'] if xml_configurations_supported else None
   ssl_keystore_password = unicode(config['configurations']['ranger-yarn-policymgr-ssl']['xasecure.policymgr.clientssl.keystore.password']) if xml_configurations_supported else None
   ssl_truststore_password = unicode(config['configurations']['ranger-yarn-policymgr-ssl']['xasecure.policymgr.clientssl.truststore.password']) if xml_configurations_supported else None
   credential_file = format('/etc/ranger/{repo_name}/cred.jceks') if xml_configurations_supported else None

ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml

@@ -24,59 +24,34 @@
     <name>xasecure.audit.is.enabled</name>
     <value>true</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.db.is.enabled</name>
-    <value>false</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.db.is.async</name>
-    <value>true</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.db.async.max.queue.size</name>
-    <value>10240</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.db.async.max.flush.interval.ms</name>
-    <value>30000</value>
-    <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.db.batch.size</name>
-    <value>100</value>
+    <name>xasecure.audit.destination.db</name>
+    <value>false</value>
     <description></description>
-  </property> 
+  </property>
 
-  
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.url</name>
+    <name>xasecure.audit.destination.db.jdbc.url</name>
     <value>{{audit_jdbc_url}}</value>
     <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.user</name>
+    <name>xasecure.audit.destination.db.user</name>
     <value>{{xa_audit_db_user}}</value>
     <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.password</name>
+    <name>xasecure.audit.destination.db.password</name>
     <value>crypted</value>
     <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.driver</name>
+    <name>xasecure.audit.destination.db.jdbc.driver</name>
     <value>{{jdbc_driver}}</value>
     <description></description>
   </property>
@@ -86,185 +61,53 @@
     <value>jceks://file{{credential_file}}</value>
     <description></description>
   </property>
-  
-  <property>
-    <name>xasecure.audit.hdfs.is.enabled</name>
-    <value>false</value>
-    <description></description>
-  </property> 
 
   <property>
-    <name>xasecure.audit.hdfs.is.async</name>
+    <name>xasecure.audit.destination.hdfs</name>
     <value>true</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.hdfs.async.max.queue.size</name>
-    <value>1048576</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.async.max.flush.interval.ms</name>
-    <value>30000</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.encoding</name>
-    <value></value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.directory</name>
-    <value>hdfs://NAMENODE_HOST:8020/ranger/audit/%app-type%/%time:yyyyMMdd%</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.file</name>
-    <value>%hostname%-audit.log</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.flush.interval.seconds</name>
-    <value>900</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.rollover.interval.seconds</name>
-    <value>86400</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.open.retry.interval.seconds</name>
-    <value>60</value>
-    <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.directory</name>
-    <value>/var/log/hbase/audit/%app-type%</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.file</name>
-    <value>%time:yyyyMMdd-HHmm.ss%.log</value>
+    <name>xasecure.audit.destination.hdfs.dir</name>
+    <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value>
     <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.file.buffer.size.bytes</name>
-    <value>8192</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.flush.interval.seconds</name>
-    <value>60</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.rollover.interval.seconds</name>
-    <value>600</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.archive.directory</name>
-    <value>/var/log/hbase/audit/archive/%app-type%</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.archive.max.file.count</name>
-    <value>10</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.log4j.is.enabled</name>
-    <value>false</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.log4j.is.async</name>
-    <value>false</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.log4j.async.max.queue.size</name>
-    <value>10240</value>
-    <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.log4j.async.max.flush.interval.ms</name>
-    <value>30000</value>
+    <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name>
+    <value>/var/log/hbase/audit/hdfs/spool</value>
     <description></description>
-  </property>   
-  
-  <property>
-    <name>xasecure.audit.kafka.is.enabled</name>
-    <value>false</value>
-    <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.kafka.async.max.queue.size</name>
-    <value>1</value>
+    <name>xasecure.audit.destination.solr</name>
+    <value>true</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.kafka.async.max.flush.interval.ms</name>
-    <value>1000</value>
+    <name>xasecure.audit.destination.solr.urls</name>
+    <value>{{ranger_audit_solr_urls}}</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.kafka.broker_list</name>
-    <value>localhost:9092</value>
-    <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.kafka.topic_name</name>
-    <value>ranger_audits</value>
-    <description></description>
-  </property> 
-    
-  <property>
-    <name>xasecure.audit.solr.is.enabled</name>
-    <value>false</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.solr.async.max.queue.size</name>
-    <value>1</value>
+    <name>xasecure.audit.destination.solr.zookeepers</name>
+    <value>none</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.solr.async.max.flush.interval.ms</name>
-    <value>1000</value>
+    <name>xasecure.audit.destination.solr.batch.filespool.dir</name>
+    <value>/var/log/hbase/audit/solr/spool</value>
     <description></description>
   </property>
-  
+
   <property>
-    <name>xasecure.audit.solr.solr_url</name>
-    <value>http://localhost:6083/solr/ranger_audits</value>
+    <name>xasecure.audit.provider.summary.enabled</name>
+    <value>true</value>
     <description></description>
   </property>
 
-</configuration>
+</configuration>

ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml

@@ -24,59 +24,34 @@
     <name>xasecure.audit.is.enabled</name>
     <value>true</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.db.is.enabled</name>
-    <value>false</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.db.is.async</name>
-    <value>true</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.db.async.max.queue.size</name>
-    <value>10240</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.db.async.max.flush.interval.ms</name>
-    <value>30000</value>
-    <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.db.batch.size</name>
-    <value>100</value>
+    <name>xasecure.audit.destination.db</name>
+    <value>false</value>
     <description></description>
-  </property> 
+  </property>
 
-  
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.url</name>
+    <name>xasecure.audit.destination.db.jdbc.url</name>
     <value>{{audit_jdbc_url}}</value>
     <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.user</name>
+    <name>xasecure.audit.destination.db.user</name>
     <value>{{xa_audit_db_user}}</value>
     <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.password</name>
+    <name>xasecure.audit.destination.db.password</name>
     <value>crypted</value>
     <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.driver</name>
+    <name>xasecure.audit.destination.db.jdbc.driver</name>
     <value>{{jdbc_driver}}</value>
     <description></description>
   </property>
@@ -86,185 +61,53 @@
     <value>jceks://file{{credential_file}}</value>
     <description></description>
   </property>
-  
-  <property>
-    <name>xasecure.audit.hdfs.is.enabled</name>
-    <value>false</value>
-    <description></description>
-  </property> 
 
   <property>
-    <name>xasecure.audit.hdfs.is.async</name>
+    <name>xasecure.audit.destination.hdfs</name>
     <value>true</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.hdfs.async.max.queue.size</name>
-    <value>1048576</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.async.max.flush.interval.ms</name>
-    <value>30000</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.encoding</name>
-    <value></value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.directory</name>
-    <value>hdfs://NAMENODE_HOST:8020/ranger/audit/%app-type%/%time:yyyyMMdd%</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.file</name>
-    <value>%hostname%-audit.log</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.flush.interval.seconds</name>
-    <value>900</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.rollover.interval.seconds</name>
-    <value>86400</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.open.retry.interval.seconds</name>
-    <value>60</value>
-    <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.directory</name>
-    <value>/var/log/hadoop/audit/%app-type%</value>
+    <name>xasecure.audit.destination.hdfs.dir</name>
+    <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value>
     <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.file</name>
-    <value>%time:yyyyMMdd-HHmm.ss%.log</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.file.buffer.size.bytes</name>
-    <value>8192</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.flush.interval.seconds</name>
-    <value>60</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.rollover.interval.seconds</name>
-    <value>600</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.archive.directory</name>
-    <value>/var/log/hadoop/audit/archive/%app-type%</value>
-    <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.hdfs.config.local.archive.max.file.count</name>
-    <value>10</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.log4j.is.enabled</name>
-    <value>false</value>
+    <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name>
+    <value>/var/log/hadoop/audit/hdfs/spool</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.log4j.is.async</name>
-    <value>false</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.log4j.async.max.queue.size</name>
-    <value>10240</value>
+    <name>xasecure.audit.destination.solr</name>
+    <value>true</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.log4j.async.max.flush.interval.ms</name>
-    <value>30000</value>
-    <description></description>
-  </property>   
-  
-  <property>
-    <name>xasecure.audit.kafka.is.enabled</name>
-    <value>false</value>
+    <name>xasecure.audit.destination.solr.urls</name>
+    <value>{{ranger_audit_solr_urls}}</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.kafka.async.max.queue.size</name>
-    <value>1</value>
+    <name>xasecure.audit.destination.solr.zookeepers</name>
+    <value>none</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.kafka.async.max.flush.interval.ms</name>
-    <value>1000</value>
+    <name>xasecure.audit.destination.solr.batch.filespool.dir</name>
+    <value>/var/log/hadoop/audit/solr/spool</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.kafka.broker_list</name>
-    <value>localhost:9092</value>
-    <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.kafka.topic_name</name>
-    <value>ranger_audits</value>
-    <description></description>
-  </property> 
-    
-  <property>
-    <name>xasecure.audit.solr.is.enabled</name>
+    <name>xasecure.audit.provider.summary.enabled</name>
     <value>false</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.solr.async.max.queue.size</name>
-    <value>1</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.solr.async.max.flush.interval.ms</name>
-    <value>1000</value>
-    <description></description>
-  </property>
-  
-  <property>
-    <name>xasecure.audit.solr.solr_url</name>
-    <value>http://localhost:6083/solr/ranger_audits</value>
-    <description></description>
   </property>
 
-</configuration>
+</configuration>

ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml

@@ -24,59 +24,34 @@
     <name>xasecure.audit.is.enabled</name>
     <value>true</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.db.is.enabled</name>
-    <value>false</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.db.is.async</name>
-    <value>true</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.db.async.max.queue.size</name>
-    <value>10240</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.db.async.max.flush.interval.ms</name>
-    <value>30000</value>
-    <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.db.batch.size</name>
-    <value>100</value>
+    <name>xasecure.audit.destination.db</name>
+    <value>false</value>
     <description></description>
-  </property> 
+  </property>
 
-  
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.url</name>
+    <name>xasecure.audit.destination.db.jdbc.url</name>
     <value>{{audit_jdbc_url}}</value>
     <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.user</name>
+    <name>xasecure.audit.destination.db.user</name>
     <value>{{xa_audit_db_user}}</value>
     <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.password</name>
+    <name>xasecure.audit.destination.db.password</name>
     <value>crypted</value>
     <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.driver</name>
+    <name>xasecure.audit.destination.db.jdbc.driver</name>
     <value>{{jdbc_driver}}</value>
     <description></description>
   </property>
@@ -86,185 +61,53 @@
     <value>jceks://file{{credential_file}}</value>
     <description></description>
   </property>
-  
-  <property>
-    <name>xasecure.audit.hdfs.is.enabled</name>
-    <value>false</value>
-    <description></description>
-  </property> 
 
   <property>
-    <name>xasecure.audit.hdfs.is.async</name>
+    <name>xasecure.audit.destination.hdfs</name>
     <value>true</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.hdfs.async.max.queue.size</name>
-    <value>1048576</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.async.max.flush.interval.ms</name>
-    <value>30000</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.encoding</name>
-    <value></value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.directory</name>
-    <value>hdfs://NAMENODE_HOST:8020/ranger/audit/%app-type%/%time:yyyyMMdd%</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.file</name>
-    <value>%hostname%-audit.log</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.flush.interval.seconds</name>
-    <value>900</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.rollover.interval.seconds</name>
-    <value>86400</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.open.retry.interval.seconds</name>
-    <value>60</value>
-    <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.directory</name>
-    <value>/var/log/hive/audit/%app-type%</value>
+    <name>xasecure.audit.destination.hdfs.dir</name>
+    <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value>
     <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.file</name>
-    <value>%time:yyyyMMdd-HHmm.ss%.log</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.file.buffer.size.bytes</name>
-    <value>8192</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.flush.interval.seconds</name>
-    <value>60</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.rollover.interval.seconds</name>
-    <value>600</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.archive.directory</name>
-    <value>/var/log/hive/audit/archive/%app-type%</value>
-    <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.hdfs.config.local.archive.max.file.count</name>
-    <value>10</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.log4j.is.enabled</name>
-    <value>false</value>
+    <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name>
+    <value>/var/log/hive/audit/hdfs/spool</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.log4j.is.async</name>
-    <value>false</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.log4j.async.max.queue.size</name>
-    <value>10240</value>
+    <name>xasecure.audit.destination.solr</name>
+    <value>true</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.log4j.async.max.flush.interval.ms</name>
-    <value>30000</value>
-    <description></description>
-  </property>   
-  
-  <property>
-    <name>xasecure.audit.kafka.is.enabled</name>
-    <value>false</value>
+    <name>xasecure.audit.destination.solr.urls</name>
+    <value>{{ranger_audit_solr_urls}}</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.kafka.async.max.queue.size</name>
-    <value>1</value>
+    <name>xasecure.audit.destination.solr.zookeepers</name>
+    <value>none</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.kafka.async.max.flush.interval.ms</name>
-    <value>1000</value>
+    <name>xasecure.audit.destination.solr.batch.filespool.dir</name>
+    <value>/var/log/hive/audit/solr/spool</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.kafka.broker_list</name>
-    <value>localhost:9092</value>
-    <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.kafka.topic_name</name>
-    <value>ranger_audits</value>
-    <description></description>
-  </property> 
-    
-  <property>
-    <name>xasecure.audit.solr.is.enabled</name>
+    <name>xasecure.audit.provider.summary.enabled</name>
     <value>false</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.solr.async.max.queue.size</name>
-    <value>1</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.solr.async.max.flush.interval.ms</name>
-    <value>1000</value>
-    <description></description>
-  </property>
-  
-  <property>
-    <name>xasecure.audit.solr.solr_url</name>
-    <value>http://localhost:6083/solr/ranger_audits</value>
-    <description></description>
   </property>
 
-</configuration>
+</configuration>

ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml

@@ -24,59 +24,34 @@
     <name>xasecure.audit.is.enabled</name>
     <value>true</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.db.is.enabled</name>
-    <value>false</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.db.is.async</name>
-    <value>true</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.db.async.max.queue.size</name>
-    <value>10240</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.db.async.max.flush.interval.ms</name>
-    <value>30000</value>
-    <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.db.batch.size</name>
-    <value>100</value>
+    <name>xasecure.audit.destination.db</name>
+    <value>false</value>
     <description></description>
-  </property> 
+  </property>
 
-  
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.url</name>
+    <name>xasecure.audit.destination.db.jdbc.url</name>
     <value>{{audit_jdbc_url}}</value>
     <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.user</name>
+    <name>xasecure.audit.destination.db.user</name>
     <value>{{xa_audit_db_user}}</value>
     <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.password</name>
+    <name>xasecure.audit.destination.db.password</name>
     <value>crypted</value>
     <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.driver</name>
+    <name>xasecure.audit.destination.db.jdbc.driver</name>
     <value>{{jdbc_driver}}</value>
     <description></description>
   </property>
@@ -86,185 +61,53 @@
     <value>jceks://file{{credential_file}}</value>
     <description></description>
   </property>
-  
-  <property>
-    <name>xasecure.audit.hdfs.is.enabled</name>
-    <value>false</value>
-    <description></description>
-  </property> 
 
   <property>
-    <name>xasecure.audit.hdfs.is.async</name>
+    <name>xasecure.audit.destination.hdfs</name>
     <value>true</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.hdfs.async.max.queue.size</name>
-    <value>1048576</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.async.max.flush.interval.ms</name>
-    <value>30000</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.encoding</name>
-    <value></value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.directory</name>
-    <value>hdfs://NAMENODE_HOST:8020/ranger/audit/%app-type%/%time:yyyyMMdd%</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.file</name>
-    <value>%hostname%-audit.log</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.flush.interval.seconds</name>
-    <value>900</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.rollover.interval.seconds</name>
-    <value>86400</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.open.retry.interval.seconds</name>
-    <value>60</value>
-    <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.directory</name>
-    <value>/var/log/knox/audit</value>
+    <name>xasecure.audit.destination.hdfs.dir</name>
+    <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value>
     <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.file</name>
-    <value>%time:yyyyMMdd-HHmm.ss%.log</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.file.buffer.size.bytes</name>
-    <value>8192</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.flush.interval.seconds</name>
-    <value>60</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.rollover.interval.seconds</name>
-    <value>600</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.archive.directory</name>
-    <value>/var/log/knox/audit/archive</value>
-    <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.hdfs.config.local.archive.max.file.count</name>
-    <value>10</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.log4j.is.enabled</name>
-    <value>false</value>
+    <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name>
+    <value>/var/log/knox/audit/hdfs/spool</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.log4j.is.async</name>
-    <value>false</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.log4j.async.max.queue.size</name>
-    <value>10240</value>
+    <name>xasecure.audit.destination.solr</name>
+    <value>true</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.log4j.async.max.flush.interval.ms</name>
-    <value>30000</value>
-    <description></description>
-  </property>   
-  
-  <property>
-    <name>xasecure.audit.kafka.is.enabled</name>
-    <value>false</value>
+    <name>xasecure.audit.destination.solr.urls</name>
+    <value>{{ranger_audit_solr_urls}}</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.kafka.async.max.queue.size</name>
-    <value>1</value>
+    <name>xasecure.audit.destination.solr.zookeepers</name>
+    <value>none</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.kafka.async.max.flush.interval.ms</name>
-    <value>1000</value>
+    <name>xasecure.audit.destination.solr.batch.filespool.dir</name>
+    <value>/var/log/knox/audit/solr/spool</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.kafka.broker_list</name>
-    <value>localhost:9092</value>
-    <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.kafka.topic_name</name>
-    <value>ranger_audits</value>
-    <description></description>
-  </property> 
-    
-  <property>
-    <name>xasecure.audit.solr.is.enabled</name>
+    <name>xasecure.audit.provider.summary.enabled</name>
     <value>false</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.solr.async.max.queue.size</name>
-    <value>1</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.solr.async.max.flush.interval.ms</name>
-    <value>1000</value>
-    <description></description>
-  </property>
-  
-  <property>
-    <name>xasecure.audit.solr.solr_url</name>
-    <value>http://localhost:6083/solr/ranger_audits</value>
-    <description></description>
   </property>
 
-</configuration>
+</configuration>

ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml

@@ -122,7 +122,7 @@
   </property>
 
   <property>
-    <name>ranger.solr.url</name>
+    <name>ranger.audit.solr.urls</name>
     <value>http://solr_host:6083/solr/ranger_audits</value>
     <description></description>
   </property>
@@ -234,6 +234,24 @@
     <name>ranger.jpa.audit.jdbc.dialect</name>
     <value>{{jdbc_dialect}}</value>
     <description></description>
+  </property>
+
+  <property>
+    <name>ranger.audit.solr.zookeepers</name>
+    <value>NONE</value>
+    <description></description>
+  </property> 
+
+  <property>
+    <name>ranger.audit.solr.username</name>
+    <value>ranger_solr</value>
+    <description></description>
+  </property> 
+
+  <property>
+    <name>ranger.audit.solr.password</name>
+    <value>NONE</value>
+    <description></description>
   </property> 
 
-</configuration>
+</configuration>

ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml

@@ -24,59 +24,34 @@
     <name>xasecure.audit.is.enabled</name>
     <value>true</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.db.is.enabled</name>
-    <value>false</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.db.is.async</name>
-    <value>true</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.db.async.max.queue.size</name>
-    <value>10240</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.db.async.max.flush.interval.ms</name>
-    <value>30000</value>
-    <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.db.batch.size</name>
-    <value>100</value>
+    <name>xasecure.audit.destination.db</name>
+    <value>false</value>
     <description></description>
-  </property> 
+  </property>
 
-  
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.url</name>
+    <name>xasecure.audit.destination.db.jdbc.url</name>
     <value>{{audit_jdbc_url}}</value>
     <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.user</name>
+    <name>xasecure.audit.destination.db.user</name>
     <value>{{xa_audit_db_user}}</value>
     <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.password</name>
+    <name>xasecure.audit.destination.db.password</name>
     <value>crypted</value>
     <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.driver</name>
+    <name>xasecure.audit.destination.db.jdbc.driver</name>
     <value>{{jdbc_driver}}</value>
     <description></description>
   </property>
@@ -86,185 +61,53 @@
     <value>jceks://file{{credential_file}}</value>
     <description></description>
   </property>
-  
-  <property>
-    <name>xasecure.audit.hdfs.is.enabled</name>
-    <value>false</value>
-    <description></description>
-  </property> 
 
   <property>
-    <name>xasecure.audit.hdfs.is.async</name>
+    <name>xasecure.audit.destination.hdfs</name>
     <value>true</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.hdfs.async.max.queue.size</name>
-    <value>1048576</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.async.max.flush.interval.ms</name>
-    <value>30000</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.encoding</name>
-    <value></value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.directory</name>
-    <value>hdfs://NAMENODE_HOST:8020/ranger/audit/%app-type%/%time:yyyyMMdd%</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.file</name>
-    <value>%hostname%-audit.log</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.flush.interval.seconds</name>
-    <value>900</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.rollover.interval.seconds</name>
-    <value>86400</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.open.retry.interval.seconds</name>
-    <value>60</value>
-    <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.directory</name>
-    <value>/var/log/storm/audit</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.file</name>
-    <value>%time:yyyyMMdd-HHmm.ss%.log</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.file.buffer.size.bytes</name>
-    <value>8192</value>
+    <name>xasecure.audit.destination.hdfs.dir</name>
+    <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value>
     <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.flush.interval.seconds</name>
-    <value>60</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.rollover.interval.seconds</name>
-    <value>600</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.archive.directory</name>
-    <value>/var/log/storm/audit/archive</value>
-    <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.hdfs.config.local.archive.max.file.count</name>
-    <value>10</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.log4j.is.enabled</name>
-    <value>false</value>
+    <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name>
+    <value>/var/log/storm/audit/hdfs/spool</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.log4j.is.async</name>
-    <value>false</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.log4j.async.max.queue.size</name>
-    <value>10240</value>
+    <name>xasecure.audit.destination.solr</name>
+    <value>true</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.log4j.async.max.flush.interval.ms</name>
-    <value>30000</value>
-    <description></description>
-  </property>   
-  
-  <property>
-    <name>xasecure.audit.kafka.is.enabled</name>
-    <value>false</value>
+    <name>xasecure.audit.destination.solr.urls</name>
+    <value>{{ranger_audit_solr_urls}}</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.kafka.async.max.queue.size</name>
-    <value>1</value>
+    <name>xasecure.audit.destination.solr.zookeepers</name>
+    <value>none</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.kafka.async.max.flush.interval.ms</name>
-    <value>1000</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.kafka.broker_list</name>
-    <value>localhost:9092</value>
+    <name>xasecure.audit.destination.solr.batch.filespool.dir</name>
+    <value>/var/log/storm/audit/solr/spool</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.kafka.topic_name</name>
-    <value>ranger_audits</value>
-    <description></description>
-  </property> 
-    
-  <property>
-    <name>xasecure.audit.solr.is.enabled</name>
+    <name>xasecure.audit.provider.summary.enabled</name>
     <value>false</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.solr.async.max.queue.size</name>
-    <value>1</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.solr.async.max.flush.interval.ms</name>
-    <value>1000</value>
-    <description></description>
-  </property>
-  
-  <property>
-    <name>xasecure.audit.solr.solr_url</name>
-    <value>http://localhost:6083/solr/ranger_audits</value>
-    <description></description>
-  </property>
+  </property>  
 
-</configuration>
+</configuration>

ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml

@@ -24,59 +24,34 @@
     <name>xasecure.audit.is.enabled</name>
     <value>true</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.db.is.enabled</name>
-    <value>false</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.db.is.async</name>
-    <value>true</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.db.async.max.queue.size</name>
-    <value>10240</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.db.async.max.flush.interval.ms</name>
-    <value>30000</value>
-    <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.db.batch.size</name>
-    <value>100</value>
+    <name>xasecure.audit.destination.db</name>
+    <value>false</value>
     <description></description>
-  </property> 
+  </property>
 
-  
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.url</name>
+    <name>xasecure.audit.destination.db.jdbc.url</name>
     <value>{{audit_jdbc_url}}</value>
     <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.user</name>
+    <name>xasecure.audit.destination.db.user</name>
     <value>{{xa_audit_db_user}}</value>
     <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.password</name>
+    <name>xasecure.audit.destination.db.password</name>
     <value>crypted</value>
     <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.jpa.javax.persistence.jdbc.driver</name>
+    <name>xasecure.audit.destination.db.jdbc.driver</name>
     <value>{{jdbc_driver}}</value>
     <description></description>
   </property>
@@ -86,185 +61,53 @@
     <value>jceks://file{{credential_file}}</value>
     <description></description>
   </property>
-  
-  <property>
-    <name>xasecure.audit.hdfs.is.enabled</name>
-    <value>false</value>
-    <description></description>
-  </property> 
 
   <property>
-    <name>xasecure.audit.hdfs.is.async</name>
+    <name>xasecure.audit.destination.hdfs</name>
     <value>true</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.hdfs.async.max.queue.size</name>
-    <value>1048576</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.async.max.flush.interval.ms</name>
-    <value>30000</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.encoding</name>
-    <value></value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.directory</name>
-    <value>hdfs://NAMENODE_HOST:8020/ranger/audit/%app-type%/%time:yyyyMMdd%</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.file</name>
-    <value>%hostname%-audit.log</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.flush.interval.seconds</name>
-    <value>900</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.rollover.interval.seconds</name>
-    <value>86400</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.destination.open.retry.interval.seconds</name>
-    <value>60</value>
-    <description></description>
   </property>
 
   <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.directory</name>
-    <value>/var/log/yarn/audit</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.file</name>
-    <value>%time:yyyyMMdd-HHmm.ss%.log</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.file.buffer.size.bytes</name>
-    <value>8192</value>
+    <name>xasecure.audit.destination.hdfs.dir</name>
+    <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value>
     <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.flush.interval.seconds</name>
-    <value>60</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.buffer.rollover.interval.seconds</name>
-    <value>600</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.hdfs.config.local.archive.directory</name>
-    <value>/var/log/yarn/audit/archive</value>
-    <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.hdfs.config.local.archive.max.file.count</name>
-    <value>10</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.log4j.is.enabled</name>
-    <value>false</value>
+    <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name>
+    <value>/var/log/yarn/audit/hdfs/spool</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.log4j.is.async</name>
-    <value>false</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.log4j.async.max.queue.size</name>
-    <value>10240</value>
+    <name>xasecure.audit.destination.solr</name>
+    <value>true</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.log4j.async.max.flush.interval.ms</name>
-    <value>30000</value>
-    <description></description>
-  </property>   
-  
-  <property>
-    <name>xasecure.audit.kafka.is.enabled</name>
-    <value>false</value>
+    <name>xasecure.audit.destination.solr.urls</name>
+    <value>{{ranger_audit_solr_urls}}</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.kafka.async.max.queue.size</name>
-    <value>1</value>
+    <name>xasecure.audit.destination.solr.zookeepers</name>
+    <value>none</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.kafka.async.max.flush.interval.ms</name>
-    <value>1000</value>
-    <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.kafka.broker_list</name>
-    <value>localhost:9092</value>
+    <name>xasecure.audit.destination.solr.batch.filespool.dir</name>
+    <value>/var/log/yarn/audit/solr/spool</value>
     <description></description>
-  </property> 
+  </property>
 
   <property>
-    <name>xasecure.audit.kafka.topic_name</name>
-    <value>ranger_audits</value>
-    <description></description>
-  </property> 
-    
-  <property>
-    <name>xasecure.audit.solr.is.enabled</name>
+    <name>xasecure.audit.provider.summary.enabled</name>
     <value>false</value>
     <description></description>
-  </property> 
-  
-  <property>
-    <name>xasecure.audit.solr.async.max.queue.size</name>
-    <value>1</value>
-    <description></description>
-  </property> 
-
-  <property>
-    <name>xasecure.audit.solr.async.max.flush.interval.ms</name>
-    <value>1000</value>
-    <description></description>
-  </property>
-  
-  <property>
-    <name>xasecure.audit.solr.solr_url</name>
-    <value>http://localhost:6083/solr/ranger_audits</value>
-    <description></description>
-  </property>
+  </property>  
 
-</configuration>
+</configuration>

ambari-web/app/data/HDP2.3/site_properties.js

@@ -176,17 +176,7 @@ hdp23properties.push({
   /**************************************** RANGER - HDFS Plugin ***************************************/
   {
     "id": "site property",
-    "name": "xasecure.audit.hdfs.config.encoding",
-    "displayName": "xasecure.audit.hdfs.config.encoding",
-    "recommendedValue": "",
-    "isRequired": false,
-    "filename": "ranger-hdfs-audit.xml",
-    "category": "Advanced ranger-hdfs-audit",
-    "serviceName": "HDFS"
-  },
-  {
-    "id": "site property",
-    "name": "xasecure.audit.db.is.enabled",
+    "name": "xasecure.audit.destination.db",
     "displayName": "Audit to DB",
     "displayType": "checkbox",
     "filename": "ranger-hdfs-audit.xml",
@@ -195,7 +185,7 @@ hdp23properties.push({
   },
   {
     "id": "site property",
-    "name": "xasecure.audit.hdfs.is.enabled",
+    "name": "xasecure.audit.destination.hdfs",
     "displayName": "Audit to HDFS",
     "displayType": "checkbox",
     "filename": "ranger-hdfs-audit.xml",
@@ -204,7 +194,7 @@ hdp23properties.push({
   },
   {
     "id": "site property",
-    "name": "xasecure.audit.solr.is.enabled",
+    "name": "xasecure.audit.destination.solr",
     "displayName": "Audit to SOLR",
     "displayType": "checkbox",
     "filename": "ranger-hdfs-audit.xml",
@@ -213,54 +203,44 @@ hdp23properties.push({
   },
   {
     "id": "site property",
-    "name": "xasecure.audit.hdfs.config.encoding",
-    "displayName": "xasecure.audit.hdfs.config.encoding",
-    "recommendedValue": "",
-    "isRequired": false,
-    "filename": "ranger-hive-audit.xml",
-    "category": "Advanced ranger-hive-audit",
-    "serviceName": "HIVE"
-  },
-  {
-    "id": "site property",
-    "name": "xasecure.audit.hdfs.config.encoding",
-    "displayName": "xasecure.audit.hdfs.config.encoding",
-    "recommendedValue": "",
+    "name": "xasecure.audit.destination.db",
+    "displayName": "Audit to DB",
+    "defaultValue": "",
     "isRequired": false,
-    "filename": "ranger-knox-audit.xml",
-    "category": "Advanced ranger-knox-audit",
-    "serviceName": "KNOX"
+    "filename": "ranger-kms-audit.xml",
+    "category": "Advanced ranger-kms-audit",
+    "serviceName": "RANGER_KMS"
   },
   {
     "id": "site property",
-    "name": "xasecure.audit.hdfs.config.encoding",
-    "displayName": "xasecure.audit.hdfs.config.encoding",
-    "recommendedValue": "",
+    "name": "xasecure.audit.destination.hdfs",
+    "displayName": "Audit to HDFS",
+    "defaultValue": "",
     "isRequired": false,
-    "filename": "ranger-storm-audit.xml",
-    "category": "Advanced ranger-storm-audit",
-    "serviceName": "STORM"
+    "filename": "ranger-kms-audit.xml",
+    "category": "Advanced ranger-kms-audit",
+    "serviceName": "RANGER_KMS"
   },
   {
     "id": "site property",
-    "name": "xasecure.audit.hdfs.config.encoding",
-    "displayName": "xasecure.audit.hdfs.config.encoding",
-    "recommendedValue": "",
+    "name": "xasecure.audit.destination.solr",
+    "displayName": "Audit to SOLR",
+    "defaultValue": "",
     "isRequired": false,
-    "filename": "ranger-yarn-audit.xml",
-    "category": "Advanced ranger-yarn-audit",
-    "serviceName": "YARN"
+    "filename": "ranger-kms-audit.xml",
+    "category": "Advanced ranger-kms-audit",
+    "serviceName": "RANGER_KMS"
   },
   {
     "id": "site property",
-    "name": "xasecure.audit.hdfs.config.encoding",
-    "displayName": "xasecure.audit.hdfs.config.encoding",
+    "name": "xasecure.audit.provider.summary.enabled",
+    "displayName": "Audit provider summary enabled",
     "defaultValue": "",
     "isRequired": false,
     "filename": "ranger-kms-audit.xml",
     "category": "Advanced ranger-kms-audit",
     "serviceName": "RANGER_KMS"
-  },
+  },        
   {
     "id": "site property",
     "name": "ranger-yarn-plugin-enabled",
@@ -283,7 +263,7 @@ hdp23properties.push({
   },
   {
     "id": "site property",
-    "name": "xasecure.audit.hdfs.is.enabled",
+    "name": "xasecure.audit.destination.hdfs",
     "displayName": "Audit to HDFS",
     "displayType": "checkbox",
     "filename": "ranger-hbase-audit.xml",
@@ -292,7 +272,7 @@ hdp23properties.push({
   },
   {
     "id": "site property",
-    "name": "xasecure.audit.solr.is.enabled",
+    "name": "xasecure.audit.destination.solr",
     "displayName": "Audit to SOLR",
     "displayType": "checkbox",
     "filename": "ranger-hbase-audit.xml",
@@ -301,17 +281,7 @@ hdp23properties.push({
   },
   {
     "id": "site property",
-    "name": "xasecure.audit.hdfs.config.encoding",
-    "displayName": "xasecure.audit.hdfs.config.encoding",
-    "recommendedValue": "",
-    "isRequired": false,
-    "filename": "ranger-hbase-audit.xml",
-    "category": "Advanced ranger-hbase-audit",
-    "serviceName": "HBASE"
-  },
-  {
-    "id": "site property",
-    "name": "xasecure.audit.db.is.enabled",
+    "name": "xasecure.audit.destination.db",
     "displayName": "Audit to DB",
     "displayType": "checkbox",
     "filename": "ranger-hive-audit.xml",
@@ -320,7 +290,7 @@ hdp23properties.push({
   },
   {
     "id": "site property",
-    "name": "xasecure.audit.hdfs.is.enabled",
+    "name": "xasecure.audit.destination.hdfs",
     "displayName": "Audit to HDFS",
     "displayType": "checkbox",
     "filename": "ranger-hive-audit.xml",
@@ -329,7 +299,7 @@ hdp23properties.push({
   },
   {
     "id": "site property",
-    "name": "xasecure.audit.solr.is.enabled",
+    "name": "xasecure.audit.destination.solr",
     "displayName": "Audit to SOLR",
     "displayType": "checkbox",
     "filename": "ranger-hive-audit.xml",
@@ -338,7 +308,7 @@ hdp23properties.push({
   },
   {
     "id": "site property",
-    "name": "xasecure.audit.db.is.enabled",
+    "name": "xasecure.audit.destination.db",
     "displayName": "Audit to DB",
     "displayType": "checkbox",
     "filename": "ranger-knox-audit.xml",
@@ -347,7 +317,7 @@ hdp23properties.push({
   },
   {
     "id": "site property",
-    "name": "xasecure.audit.hdfs.is.enabled",
+    "name": "xasecure.audit.destination.hdfs",
     "displayName": "Audit to HDFS",
     "displayType": "checkbox",
     "filename": "ranger-knox-audit.xml",
@@ -356,7 +326,7 @@ hdp23properties.push({
   },
   {
     "id": "site property",
-    "name": "xasecure.audit.solr.is.enabled",
+    "name": "xasecure.audit.destination.solr",
     "displayName": "Audit to SOLR",
     "displayType": "checkbox",
     "filename": "ranger-knox-audit.xml",
@@ -365,7 +335,7 @@ hdp23properties.push({
   },
   {
     "id": "site property",
-    "name": "xasecure.audit.db.is.enabled",
+    "name": "xasecure.audit.destination.db",
     "displayName": "Audit to DB",
     "displayType": "checkbox",
     "filename": "ranger-storm-audit.xml",
@@ -374,7 +344,7 @@ hdp23properties.push({
   },
   {
     "id": "site property",
-    "name": "xasecure.audit.hdfs.is.enabled",
+    "name": "xasecure.audit.destination.hdfs",
     "displayName": "Audit to HDFS",
     "displayType": "checkbox",
     "filename": "ranger-storm-audit.xml",
@@ -383,7 +353,7 @@ hdp23properties.push({
   },
   {
     "id": "site property",
-    "name": "xasecure.audit.solr.is.enabled",
+    "name": "xasecure.audit.destination.solr",
     "displayName": "Audit to SOLR",
     "displayType": "checkbox",
     "filename": "ranger-storm-audit.xml",
@@ -392,7 +362,7 @@ hdp23properties.push({
   },
   {
     "id": "site property",
-    "name": "xasecure.audit.db.is.enabled",
+    "name": "xasecure.audit.destination.db",
     "displayName": "Audit to DB",
     "displayType": "checkbox",
     "filename": "ranger-yarn-audit.xml",
@@ -401,7 +371,7 @@ hdp23properties.push({
   },
   {
     "id": "site property",
-    "name": "xasecure.audit.hdfs.is.enabled",
+    "name": "xasecure.audit.destination.hdfs",
     "displayName": "Audit to HDFS",
     "displayType": "checkbox",
     "filename": "ranger-yarn-audit.xml",
@@ -410,13 +380,76 @@ hdp23properties.push({
   },
   {
     "id": "site property",
-    "name": "xasecure.audit.solr.is.enabled",
+    "name": "xasecure.audit.destination.solr",
     "displayName": "Audit to SOLR",
     "displayType": "checkbox",
     "filename": "ranger-yarn-audit.xml",
     "category": "Advanced ranger-yarn-audit",
     "serviceName": "YARN"
   },
+  {
+    "id": "site property",
+    "name": "xasecure.audit.provider.summary.enabled",
+    "displayName": "Audit provider summary enabled",
+    "displayType": "checkbox",
+    "filename": "ranger-hdfs-audit.xml",
+    "category": "Advanced ranger-hdfs-audit",
+    "serviceName": "HDFS"
+  },
+  {
+    "id": "site property",
+    "name": "xasecure.audit.provider.summary.enabled",
+    "displayName": "Audit provider summary enabled",
+    "displayType": "checkbox",
+    "filename": "ranger-hbase-audit.xml",
+    "category": "Advanced ranger-hbase-audit",
+    "serviceName": "HBASE"
+  },
+  {
+    "id": "site property",
+    "name": "xasecure.audit.provider.summary.enabled",
+    "displayName": "Audit provider summary enabled",
+    "displayType": "checkbox",
+    "filename": "ranger-hive-audit.xml",
+    "category": "Advanced ranger-hive-audit",
+    "serviceName": "HIVE"
+  },
+  {
+    "id": "site property",
+    "name": "xasecure.audit.provider.summary.enabled",
+    "displayName": "Audit provider summary enabled",
+    "displayType": "checkbox",
+    "filename": "ranger-knox-audit.xml",
+    "category": "Advanced ranger-knox-audit",
+    "serviceName": "KNOX"
+  },
+  {
+    "id": "site property",
+    "name": "xasecure.audit.provider.summary.enabled",
+    "displayName": "Audit provider summary enabled",
+    "displayType": "checkbox",
+    "filename": "ranger-yarn-audit.xml",
+    "category": "Advanced ranger-yarn-audit",
+    "serviceName": "YARN"
+  },
+  {
+    "id": "site property",
+    "name": "xasecure.audit.provider.summary.enabled",
+    "displayName": "Audit provider summary enabled",
+    "displayType": "checkbox",
+    "filename": "ranger-storm-audit.xml",
+    "category": "Advanced ranger-storm-audit",
+    "serviceName": "STORM"
+  },
+  {
+    "id": "site property",
+    "name": "xasecure.audit.provider.summary.enabled",
+    "displayName": "Audit provider summary enabled",
+    "displayType": "checkbox",
+    "filename": "ranger-kafka-audit.xml",
+    "category": "Advanced ranger-kafka-audit",
+    "serviceName": "KAFKA"
+  },
   {
     "name": "ranger_mysql_host",
     "id": "puppet var",