Repository: ambari Updated Branches: refs/heads/trunk 9b6d33d0c -> bf1a65ee2
Revert "AMBARI-13040. Improve help text description for Ranger properties in Ambari. (Gautam Board via jaimin)" This reverts commit c6e61d8bb5ce97926a2d68bc08a134f80c9769ba. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bf1a65ee Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bf1a65ee Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bf1a65ee Branch: refs/heads/trunk Commit: bf1a65ee2811da73fa234a84a155406023081078 Parents: 9b6d33d Author: Sumit Mohanty <[email protected]> Authored: Mon Sep 14 16:16:23 2015 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Mon Sep 14 16:16:23 2015 -0700 ---------------------------------------------------------------------- .../ranger-knox-plugin-properties.xml | 4 +- .../configuration/ranger-kms-audit.xml | 32 +++--- .../configuration/ranger-kms-policymgr-ssl.xml | 2 +- .../ranger-hbase-plugin-properties.xml | 2 +- .../ranger-hdfs-plugin-properties.xml | 3 +- .../ranger-hive-plugin-properties.xml | 2 +- .../ranger-storm-plugin-properties.xml | 2 +- .../HBASE/configuration/ranger-hbase-audit.xml | 32 +++--- .../ranger-hbase-policymgr-ssl.xml | 6 +- .../HDFS/configuration/ranger-hdfs-audit.xml | 32 +++--- .../configuration/ranger-hdfs-policymgr-ssl.xml | 6 +- .../HIVE/configuration/ranger-hive-audit.xml | 32 +++--- .../configuration/ranger-hive-policymgr-ssl.xml | 6 +- .../HIVE/configuration/ranger-hive-security.xml | 2 +- .../KAFKA/configuration/ranger-kafka-audit.xml | 32 +++--- .../ranger-kafka-plugin-properties.xml | 2 +- .../ranger-kafka-policymgr-ssl.xml | 6 +- .../KNOX/configuration/ranger-knox-audit.xml | 32 +++--- .../configuration/ranger-knox-policymgr-ssl.xml | 6 +- .../RANGER/configuration/ranger-admin-site.xml | 78 +++++++-------- .../RANGER/configuration/ranger-ugsync-site.xml | 100 ++++++++----------- .../STORM/configuration/ranger-storm-audit.xml | 32 +++--- .../ranger-storm-policymgr-ssl.xml | 6 +- .../YARN/configuration/ranger-yarn-audit.xml | 32 +++--- .../ranger-yarn-plugin-properties.xml | 2 +- .../configuration/ranger-yarn-policymgr-ssl.xml | 6 +- 26 files changed, 239 insertions(+), 258 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml index d71b3c2..6291b64 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml @@ -30,7 +30,7 @@ <property> <name>common.name.for.certificate</name> <value></value> - <description>Common name for certificate, this value should match what is specified in repo within ranger admin</description> + <description>Used for repository creation on ranger admin</description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -63,7 +63,7 @@ <property> <name>KNOX_HOME</name> <value>/usr/hdp/current/knox-server</value> - <description>Knox home folder</description> + <description></description> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml index 4d42576..af47bb1 100644 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml @@ -23,101 +23,101 @@ <property> <name>xasecure.audit.is.enabled</name> <value>true</value> - <description>Is Audit enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db</name> <value>false</value> <display-name>Audit to DB</display-name> - <description>Is Audit to DB enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.jdbc.url</name> <value>{{audit_jdbc_url}}</value> - <description>Audit DB JDBC URL</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.user</name> <value>{{xa_audit_db_user}}</value> - <description>Audit DB JDBC User</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.password</name> <value>crypted</value> - <description>Audit DB JDBC Password</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.jdbc.driver</name> <value>{{jdbc_driver}}</value> - <description>Audit DB JDBC Driver</description> + <description></description> </property> <property> <name>xasecure.audit.credential.provider.file</name> <value>jceks://file{{credential_file}}</value> - <description>Credential file store</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.batch.filespool.dir</name> <value>/var/log/ranger/kms/audit/db/spool</value> - <description>/var/log/ranger/kms/audit/db/spool</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs</name> <value>true</value> <display-name>Audit to HDFS</display-name> - <description>Is Audit to HDFS enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs.dir</name> <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value> - <description>HDFS folder to write audit to, make sure the service user has requried permissions</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name> <value>/var/log/ranger/kms/audit/hdfs/spool</value> - <description>/var/log/ranger/kms/audit/hdfs/spool</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr</name> <value>true</value> <display-name>Audit to SOLR</display-name> - <description>Is Solr audit enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.urls</name> <value>{{ranger_audit_solr_urls}}</value> - <description>Solr URL</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.zookeepers</name> <value>none</value> - <description>Solr Zookeeper string</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.batch.filespool.dir</name> <value>/var/log/ranger/kms/audit/solr/spool</value> - <description>/var/log/ranger/kms/audit/solr/spool</description> + <description></description> </property> <property> <name>xasecure.audit.provider.summary.enabled</name> <value>false</value> <display-name>Audit provider summary enabled</display-name> - <description>Enable Summary audit?</description> + <description></description> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-policymgr-ssl.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-policymgr-ssl.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-policymgr-ssl.xml index bcec1a5..fb4a4e6 100644 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-policymgr-ssl.xml +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-policymgr-ssl.xml @@ -47,7 +47,7 @@ <property> <name>xasecure.policymgr.clientssl.keystore.credential.file</name> <value>jceks://file{{credential_file}}</value> - <description>java keystore credential file</description> + <description> java keystore credential file</description> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml index 9eea80e..a39ce5d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml @@ -23,7 +23,7 @@ <property> <name>common.name.for.certificate</name> <value></value> - <description>Common name for certificate, this value should match what is specified in repo within ranger admin</description> + <description>Used for repository creation on ranger admin</description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml index 48a99e2..bfbccbb 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml @@ -33,7 +33,8 @@ <property> <name>common.name.for.certificate</name> <value></value> - <description>Common name for certificate, this value should match what is specified in repo within ranger admin</description> + <description>Used for repository creation on ranger admin + </description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml index 9e98b57..fc9928f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml @@ -36,7 +36,7 @@ <property> <name>common.name.for.certificate</name> <value></value> - <description>Common name for certificate, this value should match what is specified in repo within ranger admin</description> + <description>Used for repository creation on ranger admin</description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml index 74cac2c..8b77716 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml @@ -30,7 +30,7 @@ <property> <name>common.name.for.certificate</name> <value></value> - <description>Common name for certificate, this value should match what is specified in repo within ranger admin</description> + <description>Used for repository creation on ranger admin</description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml index d466c4f..553d1ea 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml @@ -23,102 +23,102 @@ <property> <name>xasecure.audit.is.enabled</name> <value>true</value> - <description>Is Audit enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db</name> <value>false</value> <display-name>Audit to DB</display-name> - <description>Is Audit to DB enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.jdbc.url</name> <value>{{audit_jdbc_url}}</value> - <description>Audit DB JDBC URL</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.user</name> <value>{{xa_audit_db_user}}</value> - <description>Audit DB JDBC User</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.password</name> <value>crypted</value> <property-type>PASSWORD</property-type> - <description>Audit DB JDBC Password</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.jdbc.driver</name> <value>{{jdbc_driver}}</value> - <description>Audit DB JDBC Driver</description> + <description></description> </property> <property> <name>xasecure.audit.credential.provider.file</name> <value>jceks://file{{credential_file}}</value> - <description>Credential file store</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.batch.filespool.dir</name> <value>/var/log/hbase/audit/db/spool</value> - <description>/var/log/hbase/audit/db/spool</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs</name> <value>true</value> <display-name>Audit to HDFS</display-name> - <description>Is Audit to HDFS enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs.dir</name> <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value> - <description>HDFS folder to write audit to, make sure the service user has requried permissions</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name> <value>/var/log/hbase/audit/hdfs/spool</value> - <description>/var/log/hbase/audit/hdfs/spool</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr</name> <value>false</value> <display-name>Audit to SOLR</display-name> - <description>Is Solr audit enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.urls</name> <value>{{ranger_audit_solr_urls}}</value> - <description>Solr URL</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.zookeepers</name> <value>none</value> - <description>Solr Zookeeper string</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.batch.filespool.dir</name> <value>/var/log/hbase/audit/solr/spool</value> - <description>/var/log/hbase/audit/solr/spool</description> + <description></description> </property> <property> <name>xasecure.audit.provider.summary.enabled</name> <value>true</value> <display-name>Audit provider summary enabled</display-name> - <description>Enable Summary audit?</description> + <description></description> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml index 654b7c7..20b5e7d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml @@ -43,19 +43,19 @@ <name>xasecure.policymgr.clientssl.truststore.password</name> <value>changeit</value> <property-type>PASSWORD</property-type> - <description>java truststore password</description> + <description>java truststore password</description> </property> <property> <name>xasecure.policymgr.clientssl.keystore.credential.file</name> <value>jceks://file{{credential_file}}</value> - <description>java keystore credential file</description> + <description>java keystore credential file</description> </property> <property> <name>xasecure.policymgr.clientssl.truststore.credential.file</name> <value>jceks://file{{credential_file}}</value> - <description>java truststore credential file</description> + <description>java truststore credential file</description> </property> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml index cb29b7f..0451d2d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml @@ -23,102 +23,102 @@ <property> <name>xasecure.audit.is.enabled</name> <value>true</value> - <description>Is Audit enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db</name> <value>false</value> <display-name>Audit to DB</display-name> - <description>Is Audit to DB enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.jdbc.url</name> <value>{{audit_jdbc_url}}</value> - <description>Audit DB JDBC URL</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.user</name> <value>{{xa_audit_db_user}}</value> - <description>Audit DB JDBC User</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.password</name> <value>crypted</value> <property-type>PASSWORD</property-type> - <description>Audit DB JDBC Password</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.jdbc.driver</name> <value>{{jdbc_driver}}</value> - <description>Audit DB JDBC Driver</description> + <description></description> </property> <property> <name>xasecure.audit.credential.provider.file</name> <value>jceks://file{{credential_file}}</value> - <description>Credential file store</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.batch.filespool.dir</name> <value>/var/log/hadoop/hdfs/audit/db/spool</value> - <description>/var/log/hadoop/hdfs/audit/db/spool</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs</name> <value>true</value> <display-name>Audit to HDFS</display-name> - <description>Is Audit to HDFS enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs.dir</name> <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value> - <description>HDFS folder to write audit to, make sure the service user has requried permissions</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name> <value>/var/log/hadoop/hdfs/audit/hdfs/spool</value> - <description>/var/log/hadoop/hdfs/audit/hdfs/spool</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr</name> <value>false</value> <display-name>Audit to SOLR</display-name> - <description>Is Solr audit enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.urls</name> <value>{{ranger_audit_solr_urls}}</value> - <description>Solr URL</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.zookeepers</name> <value>none</value> - <description>Solr Zookeeper string</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.batch.filespool.dir</name> <value>/var/log/hadoop/hdfs/audit/solr/spool</value> - <description>/var/log/hadoop/hdfs/audit/solr/spool</description> + <description></description> </property> <property> <name>xasecure.audit.provider.summary.enabled</name> <value>false</value> <display-name>Audit provider summary enabled</display-name> - <description>Enable Summary audit?</description> + <description></description> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml index b51fefb..8f48fcf 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml @@ -43,19 +43,19 @@ <name>xasecure.policymgr.clientssl.truststore.password</name> <value>changeit</value> <property-type>PASSWORD</property-type> - <description>java truststore password</description> + <description>java truststore password</description> </property> <property> <name>xasecure.policymgr.clientssl.keystore.credential.file</name> <value>jceks://file{{credential_file}}</value> - <description>java keystore credential file</description> + <description>java keystore credential file</description> </property> <property> <name>xasecure.policymgr.clientssl.truststore.credential.file</name> <value>jceks://file{{credential_file}}</value> - <description>java truststore credential file</description> + <description>java truststore credential file</description> </property> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml index 4b41e49..7c5c77f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml @@ -23,102 +23,102 @@ <property> <name>xasecure.audit.is.enabled</name> <value>true</value> - <description>Is Audit enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db</name> <value>false</value> <display-name>Audit to DB</display-name> - <description>Is Audit to DB enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.jdbc.url</name> <value>{{audit_jdbc_url}}</value> - <description>Audit DB JDBC URL</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.user</name> <value>{{xa_audit_db_user}}</value> - <description>Audit DB JDBC User</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.password</name> <value>crypted</value> <property-type>PASSWORD</property-type> - <description>Audit DB JDBC Password</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.jdbc.driver</name> <value>{{jdbc_driver}}</value> - <description>Audit DB JDBC Driver</description> + <description></description> </property> <property> <name>xasecure.audit.credential.provider.file</name> <value>jceks://file{{credential_file}}</value> - <description>Credential file store</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.batch.filespool.dir</name> <value>/var/log/hive/audit/db/spool</value> - <description>/var/log/hive/audit/db/spool</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs</name> <value>true</value> <display-name>Audit to HDFS</display-name> - <description>Is Audit to HDFS enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs.dir</name> <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value> - <description>HDFS folder to write audit to, make sure the service user has requried permissions</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name> <value>/var/log/hive/audit/hdfs/spool</value> - <description>/var/log/hive/audit/hdfs/spool</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr</name> <value>false</value> <display-name>Audit to SOLR</display-name> - <description>Is Solr audit enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.urls</name> <value>{{ranger_audit_solr_urls}}</value> - <description>Solr URL</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.zookeepers</name> <value>none</value> - <description>Solr Zookeeper string</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.batch.filespool.dir</name> <value>/var/log/hive/audit/solr/spool</value> - <description>/var/log/hive/audit/solr/spool</description> + <description></description> </property> <property> <name>xasecure.audit.provider.summary.enabled</name> <value>false</value> <display-name>Audit provider summary enabled</display-name> - <description>Enable Summary audit?</description> + <description></description> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml index b8ae6ca..d4a6d45 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml @@ -43,19 +43,19 @@ <name>xasecure.policymgr.clientssl.truststore.password</name> <value>changeit</value> <property-type>PASSWORD</property-type> - <description>java truststore password</description> + <description>java truststore password</description> </property> <property> <name>xasecure.policymgr.clientssl.keystore.credential.file</name> <value>jceks://file{{credential_file}}</value> - <description>java keystore credential file</description> + <description>java keystore credential file</description> </property> <property> <name>xasecure.policymgr.clientssl.truststore.credential.file</name> <value>jceks://file{{credential_file}}</value> - <description>java truststore credential file</description> + <description>java truststore credential file</description> </property> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml index def3828..2a982b6 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml @@ -23,7 +23,7 @@ <property> <name>ranger.plugin.hive.service.name</name> <value>{{repo_name}}</value> - <description>Name of the Ranger service containing policies for this HIVE instance</description> + <description>Name of the Ranger service containing policies for this YARN instance</description> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-audit.xml index 75e5efe..76b84bb 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-audit.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-audit.xml @@ -23,102 +23,102 @@ <property> <name>xasecure.audit.is.enabled</name> <value>true</value> - <description>Is Audit enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db</name> <value>false</value> <display-name>Audit to DB</display-name> - <description>Is Audit to DB enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.jdbc.url</name> <value>{{audit_jdbc_url}}</value> - <description>Audit DB JDBC URL</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.user</name> <value>{{xa_audit_db_user}}</value> - <description>Audit DB JDBC User</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.password</name> <value>crypted</value> <property-type>PASSWORD</property-type> - <description>Audit DB JDBC Password</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.jdbc.driver</name> <value>{{jdbc_driver}}</value> - <description>Audit DB JDBC Driver</description> + <description></description> </property> <property> <name>xasecure.audit.credential.provider.file</name> <value>jceks://file{{credential_file}}</value> - <description>Credential file store</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.batch.filespool.dir</name> <value>/var/log/kafka/audit/db/spool</value> - <description>/var/log/kafka/audit/db/spool</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs</name> <value>true</value> <display-name>Audit to HDFS</display-name> - <description>Is Audit to HDFS enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs.dir</name> <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value> - <description>HDFS folder to write audit to, make sure the service user has requried permissions</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name> <value>/var/log/kafka/audit/hdfs/spool</value> - <description>/var/log/kafka/audit/hdfs/spool</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr</name> <value>true</value> <display-name>Audit to SOLR</display-name> - <description>Is Solr audit enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.urls</name> <value>{{ranger_audit_solr_urls}}</value> - <description>Solr URL</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.zookeepers</name> <value>none</value> - <description>Solr Zookeeper string</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.batch.filespool.dir</name> <value>/var/log/kafka/audit/solr/spool</value> - <description>/var/log/kafka/audit/solr/spool</description> + <description></description> </property> <property> <name>xasecure.audit.provider.summary.enabled</name> <value>true</value> <display-name>Audit provider summary enabled</display-name> - <description>Enable Summary audit?</description> + <description></description> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml index a3985af..8343a3a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml @@ -38,7 +38,7 @@ <property> <name>common.name.for.certificate</name> <value></value> - <description>Common name for certificate, this value should match what is specified in repo within ranger admin</description> + <description>Used for repository creation on ranger admin</description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-policymgr-ssl.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-policymgr-ssl.xml index 993de48..447320f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-policymgr-ssl.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-policymgr-ssl.xml @@ -43,19 +43,19 @@ <name>xasecure.policymgr.clientssl.truststore.password</name> <value>changeit</value> <property-type>PASSWORD</property-type> - <description>java truststore password</description> + <description>java truststore password</description> </property> <property> <name>xasecure.policymgr.clientssl.keystore.credential.file</name> <value>jceks://file/{{credential_file}}</value> - <description>java keystore credential file</description> + <description>java keystore credential file</description> </property> <property> <name>xasecure.policymgr.clientssl.truststore.credential.file</name> <value>jceks://file/{{credential_file}}</value> - <description>java truststore credential file</description> + <description>java truststore credential file</description> </property> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml index 7b04544..74ab59a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml @@ -23,102 +23,102 @@ <property> <name>xasecure.audit.is.enabled</name> <value>true</value> - <description>Is Audit enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db</name> <value>false</value> <display-name>Audit to DB</display-name> - <description>Is Audit to DB enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.jdbc.url</name> <value>{{audit_jdbc_url}}</value> - <description>Audit DB JDBC URL</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.user</name> <value>{{xa_audit_db_user}}</value> - <description>Audit DB JDBC User</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.password</name> <value>crypted</value> <property-type>PASSWORD</property-type> - <description>Audit DB JDBC Password</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.jdbc.driver</name> <value>{{jdbc_driver}}</value> - <description>Audit DB JDBC Driver</description> + <description></description> </property> <property> <name>xasecure.audit.credential.provider.file</name> <value>jceks://file{{credential_file}}</value> - <description>Credential file store</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.batch.filespool.dir</name> <value>/var/log/knox/audit/db/spool</value> - <description>/var/log/knox/audit/db/spool</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs</name> <value>true</value> <display-name>Audit to HDFS</display-name> - <description>Is Audit to HDFS enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs.dir</name> <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value> - <description>HDFS folder to write audit to, make sure the service user has requried permissions</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name> <value>/var/log/knox/audit/hdfs/spool</value> - <description>/var/log/knox/audit/hdfs/spool</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr</name> <value>false</value> <display-name>Audit to SOLR</display-name> - <description>Is Solr audit enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.urls</name> <value>{{ranger_audit_solr_urls}}</value> - <description>Solr URL</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.zookeepers</name> <value>none</value> - <description>Solr Zookeeper string</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.batch.filespool.dir</name> <value>/var/log/knox/audit/solr/spool</value> - <description>/var/log/knox/audit/solr/spool</description> + <description></description> </property> <property> <name>xasecure.audit.provider.summary.enabled</name> <value>false</value> <display-name>Audit provider summary enabled</display-name> - <description>Enable Summary audit?</description> + <description></description> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml index b9c5da6..a39ff0b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml @@ -43,19 +43,19 @@ <name>xasecure.policymgr.clientssl.truststore.password</name> <value>changeit</value> <property-type>PASSWORD</property-type> - <description>java truststore password</description> + <description>java truststore password</description> </property> <property> <name>xasecure.policymgr.clientssl.keystore.credential.file</name> <value>jceks://file{{credential_file}}</value> - <description>java keystore credential file</description> + <description>java keystore credential file</description> </property> <property> <name>xasecure.policymgr.clientssl.truststore.credential.file</name> <value>jceks://file{{credential_file}}</value> - <description>java truststore credential file</description> + <description>java truststore credential file</description> </property> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml index 62f098b..49fce8c 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml @@ -21,14 +21,14 @@ <property> <name>ranger.service.host</name> <value>{{ranger_host}}</value> - <description>Host where ranger service to be installed</description> + <description></description> </property> <property> <name>ranger.service.http.enabled</name> <value>true</value> <display-name>HTTP enabled</display-name> - <description>Enable HTTP</description> + <description></description> <value-attributes> <overridable>false</overridable> </value-attributes> @@ -37,51 +37,51 @@ <property> <name>ranger.service.http.port</name> <value>6080</value> - <description>HTTP port</description> + <description></description> </property> <property> <name>ranger.service.https.port</name> <value>6182</value> - <description>HTTPS port (if SSL is enabled)</description> + <description></description> </property> <property> <name>ranger.service.https.attrib.ssl.enabled</name> <value>false</value> - <description>true/false, set to true if using SSL</description> + <description></description> </property> <property> <name>ranger.service.https.attrib.clientAuth</name> <value>want</value> - <description>Needs to be set to want for two way SSL</description> + <description></description> </property> <property> <name>ranger.service.https.attrib.keystore.keyalias</name> <value>rangeradmin</value> - <description>Alias for Ranger Admin key in keystore</description> + <description></description> </property> <property> <name>ranger.service.https.attrib.keystore.pass</name> <value>xasecure</value> <property-type>PASSWORD</property-type> - <description>Password for keystore</description> + <description></description> </property> <property> <name>ranger.https.attrib.keystore.file</name> <value>/etc/ranger/admin/conf/ranger-admin-keystore.jks</value> - <description>Ranger admin keystore (specify full path)</description> + <description></description> </property> <property> <name>ranger.externalurl</name> <value>{{ranger_external_url}}</value> <display-name>External URL</display-name> - <description>URL to be used by clients to access ranger admin</description> + <description></description> <value-attributes> <visible>false</visible> <overridable>false</overridable> @@ -92,7 +92,7 @@ <name>ranger.jpa.jdbc.driver</name> <value>com.mysql.jdbc.Driver</value> <display-name>Driver class name for a JDBC Ranger database</display-name> - <description>JDBC driver class name</description> + <description></description> <value-attributes> <overridable>false</overridable> </value-attributes> @@ -102,7 +102,7 @@ <name>ranger.jpa.jdbc.url</name> <value>jdbc:mysql://localhost</value> <display-name>JDBC connect string for a Ranger database</display-name> - <description>JDBC connect string - auto populated based on other values</description> + <description></description> <value-attributes> <overridable>false</overridable> </value-attributes> @@ -111,45 +111,45 @@ <property> <name>ranger.jpa.jdbc.user</name> <value>{{ranger_db_user}}</value> - <description>JDBC user</description> + <description></description> </property> <property> <name>ranger.jpa.jdbc.password</name> <value>_</value> <property-type>PASSWORD</property-type> - <description>JDBC password</description> + <description></description> </property> <property> <name>ranger.jpa.jdbc.credential.alias</name> <value>rangeradmin</value> - <description>Alias name for storing JDBC password</description> + <description></description> </property> <property> <name>ranger.credential.provider.path</name> <value>/etc/ranger/admin/rangeradmin.jceks</value> - <description>File for credential store, provide full file path</description> + <description></description> </property> <property> <name>ranger.audit.source.type</name> <value>solr</value> - <description>db or solr, based on the audit destination used</description> + <description></description> </property> <property> <name>ranger.audit.solr.urls</name> <value>http://solr_host:6083/solr/ranger_audits</value> - <description>Solr url for audit</description> + <description></description> </property> <property> <name>ranger.authentication.method</name> <value>UNIX</value> <display-name>Authentication method</display-name> - <description>Ranger admin Authentication - UNIX/LDAP/AD/NONE</description> + <description></description> <value-attributes> <overridable>false</overridable> </value-attributes> @@ -158,7 +158,7 @@ <property> <name>ranger.ldap.url</name> <value>ldap://71.127.43.33:389</value> - <description>LDAP Server URL, only used if Authentication method is LDAP</description> + <description></description> <value-attributes> <overridable>false</overridable> </value-attributes> @@ -167,7 +167,7 @@ <property> <name>ranger.ldap.user.dnpattern</name> <value>uid={0},ou=users,dc=xasecure,dc=net</value> - <description>LDAP user DN, only used if Authentication method is LDAP</description> + <description></description> <value-attributes> <overridable>false</overridable> </value-attributes> @@ -176,13 +176,13 @@ <property> <name>ranger.ldap.group.searchbase</name> <value>ou=groups,dc=xasecure,dc=net</value> - <description>LDAP group searchbase, only used if Authentication method is LDAP</description> + <description></description> </property> <property> <name>ranger.ldap.group.searchfilter</name> <value>(member=uid={0},ou=users,dc=xasecure,dc=net)</value> - <description>LDAP group search filter, only used if Authentication method is LDAP</description> + <description></description> </property> <property> @@ -197,7 +197,7 @@ <property> <name>ranger.ldap.group.roleattribute</name> <value>cn</value> - <description>LDAP group role attribute, only used if Authentication method is LDAP</description> + <description></description> <value-attributes> <overridable>false</overridable> </value-attributes> @@ -243,7 +243,7 @@ <property> <name>ranger.ldap.ad.domain</name> <value>localhost</value> - <description>AD domain, only used if Authentication method is AD</description> + <description></description> <value-attributes> <overridable>false</overridable> </value-attributes> @@ -252,7 +252,7 @@ <property> <name>ranger.ldap.ad.url</name> <value>ldap://ad.xasecure.net:389</value> - <description>AD URL, only used if Authentication method is AD</description> + <description></description> <value-attributes> <overridable>false</overridable> </value-attributes> @@ -307,39 +307,39 @@ <property> <name>ranger.jpa.audit.jdbc.driver</name> <value>{{ranger_jdbc_driver}}</value> - <description>JDBC driver class name - for audit DB</description> + <description></description> </property> <property> <name>ranger.jpa.audit.jdbc.url</name> <value>{{audit_jdbc_url}}</value> - <description>JDBC connect string - auto populated based on other values</description> + <description></description> </property> <property> <name>ranger.jpa.audit.jdbc.user</name> <value>{{ranger_audit_db_user}}</value> - <description>JDBC user - audit</description> + <description></description> </property> <property> <name>ranger.jpa.audit.jdbc.password</name> <value>_</value> <property-type>PASSWORD</property-type> - <description>JDBC password - audit</description> + <description></description> </property> <property> <name>ranger.jpa.audit.jdbc.credential.alias</name> <value>rangeraudit</value> - <description>Alias name for storing JDBC password - for audit user</description> + <description></description> </property> <property> <name>ranger.unixauth.remote.login.enabled</name> <value>true</value> <display-name>Allow remote Login</display-name> - <description>Remote login enabled? - only used if Authentication method is UNIX</description> + <description></description> <value-attributes> <overridable>false</overridable> </value-attributes> @@ -348,7 +348,7 @@ <property> <name>ranger.unixauth.service.hostname</name> <value>localhost</value> - <description>Host where unix authentication service is running - only used if Authentication method is UNIX</description> + <description></description> <value-attributes> <overridable>false</overridable> </value-attributes> @@ -357,7 +357,7 @@ <property> <name>ranger.unixauth.service.port</name> <value>5151</value> - <description>Port for unix authentication service - only used if Authentication method is UNIX</description> + <description></description> <value-attributes> <overridable>false</overridable> </value-attributes> @@ -366,32 +366,32 @@ <property> <name>ranger.jpa.jdbc.dialect</name> <value>{{jdbc_dialect}}</value> - <description>JDBC dialect used for policy DB</description> + <description></description> </property> <property> <name>ranger.jpa.audit.jdbc.dialect</name> <value>{{jdbc_dialect}}</value> - <description>JDBC dialect used for audit DB</description> + <description></description> </property> <property> <name>ranger.audit.solr.zookeepers</name> <value>NONE</value> - <description>Solr Zookeeper string</description> + <description></description> </property> <property> <name>ranger.audit.solr.username</name> <value>ranger_solr</value> - <description>Solr username</description> + <description></description> </property> <property> <name>ranger.audit.solr.password</name> <value>NONE</value> <property-type>PASSWORD</property-type> - <description>Solr password</description> + <description></description> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml index 73c7d73..3cc017e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml @@ -21,87 +21,87 @@ <property> <name>ranger.usersync.port</name> <value>5151</value> - <description>Port for unix authentication service, run within usersync</description> + <description></description> </property> <property> <name>ranger.usersync.ssl</name> <value>true</value> - <description>SSL enabled? (ranger admin -> usersync communication)</description> + <description></description> </property> <property> <name>ranger.usersync.keystore.file</name> <value>/usr/hdp/current/ranger-usersync/conf/unixauthservice.jks</value> - <description>Keystore file used for usersync</description> + <description></description> </property> <property> <name>ranger.usersync.keystore.password</name> <value>UnIx529p</value> <property-type>PASSWORD</property-type> - <description>Keystore password</description> + <description></description> </property> <property> <name>ranger.usersync.truststore.file</name> <value>/usr/hdp/current/ranger-usersync/conf/mytruststore.jks</value> - <description>Truststore used for usersync, required if usersync -> ranger admin communication is SSL enabled</description> + <description></description> </property> <property> <name>ranger.usersync.truststore.password</name> <value>changeit</value> <property-type>PASSWORD</property-type> - <description>Truststore password</description> + <description></description> </property> <property> <name>ranger.usersync.passwordvalidator.path</name> <value>./native/credValidator.uexe</value> - <description>Native program for password validation</description> + <description></description> </property> <property> <name>ranger.usersync.enabled</name> <value>true</value> - <description>Usersync enabled?</description> + <description></description> </property> <property> <name>ranger.usersync.sink.impl.class</name> <value>org.apache.ranger.unixusersync.process.PolicyMgrUserGroupBuilder</value> - <description>Class to be used as sink (to sync users into ranger admin)</description> + <description></description> </property> <property> <name>ranger.usersync.policymanager.baseURL</name> <value>{{ranger_external_url}}</value> - <description>URL to be used by clients to access ranger admin, use FQDN</description> + <description></description> </property> <property> <name>ranger.usersync.policymanager.maxrecordsperapicall</name> <value>1000</value> - <description>How many records to be returned per API call</description> + <description></description> </property> <property> <name>ranger.usersync.policymanager.mockrun</name> <value>false</value> - <description>Is user sync doing mock run?</description> + <description></description> </property> <property> <name>ranger.usersync.unix.minUserId</name> <value>500</value> - <description>Only sync users above this user id (applicable for UNIX)</description> + <description></description> </property> <property> <name>ranger.usersync.sleeptimeinmillisbetweensynccycle</name> <value>5</value> - <description>Sleeptime interval in milliseconds, if < 1000 then default to 30 sec</description> + <description></description> </property> <property> @@ -122,26 +122,26 @@ <property> <name>ranger.usersync.filesource.text.delimiter</name> <value>,</value> - <description>Delimiter used in file, if File based user sync is used</description> + <description></description> </property> <property> <name>ranger.usersync.ldap.url</name> <value>ldap://localhost:389</value> - <description>LDAP server URL</description> + <description></description> </property> <property> <name>ranger.usersync.ldap.binddn</name> <value>cn=admin,dc=xasecure,dc=net</value> - <description>Full distinguished name (DN), including common name (CN), of an LDAP user account that has privileges to search for users. </description> + <description></description> </property> <property> <name>ranger.usersync.ldap.ldapbindpassword</name> <value></value> <property-type>PASSWORD</property-type> - <description>Password for the account that can search for users.</description> + <description></description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -150,13 +150,13 @@ <property> <name>ranger.usersync.ldap.bindalias</name> <value>testldapalias</value> - <description>Set as ranger.usersync.ldap.bindalias (string as is)</description> + <description></description> </property> <property> <name>ranger.usersync.ldap.bindkeystore</name> <value></value> - <description>Set same value as ranger.usersync.keystore.file property i.e default value /usr/hdp/current/ranger-usersync/conf/ugsync.jceks</description> + <description></description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -165,8 +165,7 @@ <property> <name>ranger.usersync.ldap.searchBase</name> <value>dc=hadoop,dc=apache,dc=org</value> - <description>"# search base for users and groups -# sample value would be dc=hadoop,dc=apache,dc=org"</description> + <description></description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -175,38 +174,31 @@ <property> <name>ranger.usersync.ldap.user.searchbase</name> <value>ou=users,dc=xasecure,dc=net</value> - <description>"# search base for users -# sample value would be ou=users,dc=hadoop,dc=apache,dc=org -# overrides value specified in ranger.usersync.ldap.searchBase"</description> + <description></description> </property> <property> <name>ranger.usersync.ldap.user.searchscope</name> <value>sub</value> - <description>"# search scope for the users, only base, one and sub are supported values -# please customize the value to suit your deployment -# default value: sub"</description> + <description></description> </property> <property> <name>ranger.usersync.ldap.user.objectclass</name> <value>person</value> - <description>LDAP User Object Class</description> + <description></description> </property> <property> <name>ranger.usersync.ldap.user.searchfilter</name> <value>empty</value> - <description>"optional additional filter constraining the users selected for syncing -# a sample value would be (dept=eng) -# please customize the value to suit your deployment -# default value is empty"</description> + <description></description> </property> <property> <name>ranger.usersync.ldap.user.nameattribute</name> <value>cn</value> - <description>LDAP user name attribute</description> + <description></description> </property> <property> @@ -221,34 +213,31 @@ <property> <name>ranger.usersync.ldap.user.groupnameattribute</name> <value>memberof, ismemberof</value> - <description>LDAP user group name attribute</description> + <description></description> </property> <property> <name>ranger.usersync.ldap.username.caseconversion</name> <value>lower</value> - <description>User name case conversion</description> + <description></description> </property> <property> <name>ranger.usersync.ldap.groupname.caseconversion</name> <value>lower</value> - <description>Group name case conversion</description> + <description></description> </property> <property> <name>ranger.usersync.logdir</name> <value>/var/log/ranger/usersync</value> - <description>User sync log directory</description> + <description></description> </property> <property> <name>ranger.usersync.group.searchenabled</name> <value>false</value> - <description>"# do we want to do ldapsearch to find groups instead of relying on user entry attributes -# valid values: true, false -# any value other than true would be treated as false -# default value: false"</description> + <description></description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -257,7 +246,7 @@ <property> <name>ranger.usersync.group.usermapsyncenabled</name> <value>false</value> - <description>User map sync enabled?</description> + <description></description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -266,11 +255,7 @@ <property> <name>ranger.usersync.group.searchbase</name> <value> </value> - <description>"# search base for groups -# sample value would be ou=groups,dc=hadoop,dc=apache,dc=org -# overrides value specified in ranger.usersync.ldap.searchBase, ranger.usersync.ldap.user.searchbase -# if a value is not specified, takes the value of ranger.usersync.ldap.searchBase -# if ranger.usersync.ldap.searchBase is also not specified, takes the value of ranger.usersync.ldap.user.searchbase"</description> + <description></description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -279,9 +264,7 @@ <property> <name>ranger.usersync.group.searchscope</name> <value> </value> - <description>"# search scope for the groups, only base, one and sub are supported values -# please customize the value to suit your deployment -# default value: sub"</description> + <description></description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -299,10 +282,7 @@ <property> <name>ranger.usersync.group.searchfilter</name> <value> </value> - <description>"# optional additional filter constraining the groups selected for syncing -# a sample value would be (dept=eng) -# please customize the value to suit your deployment -# default value is empty"</description> + <description></description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -311,7 +291,7 @@ <property> <name>ranger.usersync.group.nameattribute</name> <value> </value> - <description>LDAP group name attribute</description> + <description></description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -320,7 +300,7 @@ <property> <name>ranger.usersync.group.memberattributename</name> <value> </value> - <description>LDAP group member attribute name</description> + <description></description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -329,19 +309,19 @@ <property> <name>ranger.usersync.pagedresultsenabled</name> <value>true</value> - <description>Results can be paged?</description> + <description></description> </property> <property> <name>ranger.usersync.pagedresultssize</name> <value>500</value> - <description>Page size</description> + <description></description> </property> <property> <name>ranger.usersync.credstore.filename</name> <value>/usr/hdp/current/ranger-usersync/conf/ugsync.jceks</value> - <description>Credential store file name for user sync, specify full path</description> + <description></description> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml index 0c9299d..18726e5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml @@ -23,102 +23,102 @@ <property> <name>xasecure.audit.is.enabled</name> <value>true</value> - <description>Is Audit enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db</name> <value>false</value> <display-name>Audit to DB</display-name> - <description>Is Audit to DB enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.jdbc.url</name> <value>{{audit_jdbc_url}}</value> - <description>Audit DB JDBC URL</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.user</name> <value>{{xa_audit_db_user}}</value> - <description>Audit DB JDBC User</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.password</name> <value>crypted</value> <property-type>PASSWORD</property-type> - <description>Audit DB JDBC Password</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.jdbc.driver</name> <value>{{jdbc_driver}}</value> - <description>Audit DB JDBC Driver</description> + <description></description> </property> <property> <name>xasecure.audit.credential.provider.file</name> <value>jceks://file{{credential_file}}</value> - <description>Credential file store</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.batch.filespool.dir</name> <value>/var/log/storm/audit/db/spool</value> - <description>/var/log/storm/audit/db/spool</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs</name> <value>true</value> <display-name>Audit to HDFS</display-name> - <description>Is Audit to HDFS enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs.dir</name> <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value> - <description>HDFS folder to write audit to, make sure the service user has requried permissions</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name> <value>/var/log/storm/audit/hdfs/spool</value> - <description>/var/log/storm/audit/hdfs/spool</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr</name> <value>false</value> <display-name>Audit to SOLR</display-name> - <description>Is Solr audit enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.urls</name> <value>{{ranger_audit_solr_urls}}</value> - <description>Solr URL</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.zookeepers</name> <value>none</value> - <description>Solr Zookeeper string</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.batch.filespool.dir</name> <value>/var/log/storm/audit/solr/spool</value> - <description>/var/log/storm/audit/solr/spool</description> + <description></description> </property> <property> <name>xasecure.audit.provider.summary.enabled</name> <value>false</value> <display-name>Audit provider summary enabled</display-name> - <description>Enable Summary audit?</description> + <description></description> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-policymgr-ssl.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-policymgr-ssl.xml index 6aac72d..4fc6452 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-policymgr-ssl.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-policymgr-ssl.xml @@ -43,19 +43,19 @@ <name>xasecure.policymgr.clientssl.truststore.password</name> <value>changeit</value> <property-type>PASSWORD</property-type> - <description>java truststore password</description> + <description>java truststore password</description> </property> <property> <name>xasecure.policymgr.clientssl.keystore.credential.file</name> <value>jceks://file{{credential_file}}</value> - <description>java keystore credential file</description> + <description>java keystore credential file</description> </property> <property> <name>xasecure.policymgr.clientssl.truststore.credential.file</name> <value>jceks://file{{credential_file}}</value> - <description>java truststore credential file</description> + <description>java truststore credential file</description> </property> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml index 9837c0e..43d95f9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml @@ -23,102 +23,102 @@ <property> <name>xasecure.audit.is.enabled</name> <value>true</value> - <description>Is Audit enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db</name> <value>false</value> <display-name>Audit to DB</display-name> - <description>Is Audit to DB enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.jdbc.url</name> <value>{{audit_jdbc_url}}</value> - <description>Audit DB JDBC URL</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.user</name> <value>{{xa_audit_db_user}}</value> - <description>Audit DB JDBC User</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.password</name> <value>crypted</value> <property-type>PASSWORD</property-type> - <description>Audit DB JDBC Password</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.jdbc.driver</name> <value>{{jdbc_driver}}</value> - <description>Audit DB JDBC Driver</description> + <description></description> </property> <property> <name>xasecure.audit.credential.provider.file</name> <value>jceks://file{{credential_file}}</value> - <description>Credential file store</description> + <description></description> </property> <property> <name>xasecure.audit.destination.db.batch.filespool.dir</name> <value>/var/log/hadoop/yarn/audit/db/spool</value> - <description>/var/log/hadoop/yarn/audit/db/spool</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs</name> <value>true</value> <display-name>Audit to HDFS</display-name> - <description>Is Audit to HDFS enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs.dir</name> <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value> - <description>HDFS folder to write audit to, make sure the service user has requried permissions</description> + <description></description> </property> <property> <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name> <value>/var/log/hadoop/yarn/audit/hdfs/spool</value> - <description>/var/log/hadoop/yarn/audit/hdfs/spool</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr</name> <value>false</value> <display-name>Audit to SOLR</display-name> - <description>Is Solr audit enabled?</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.urls</name> <value>{{ranger_audit_solr_urls}}</value> - <description>Solr URL</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.zookeepers</name> <value>none</value> - <description>Solr Zookeeper string</description> + <description></description> </property> <property> <name>xasecure.audit.destination.solr.batch.filespool.dir</name> <value>/var/log/hadoop/yarn/audit/solr/spool</value> - <description>/var/log/hadoop/yarn/audit/solr/spool</description> + <description></description> </property> <property> <name>xasecure.audit.provider.summary.enabled</name> <value>false</value> <display-name>Audit provider summary enabled</display-name> - <description>Enable Summary audit?</description> + <description></description> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml index 2817bdd..1b8ba55 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml @@ -38,7 +38,7 @@ <property> <name>common.name.for.certificate</name> <value></value> - <description>Common name for certificate, this value should match what is specified in repo within ranger admin</description> + <description>Used for repository creation on ranger admin</description> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/bf1a65ee/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml index 0489679..ffb06d9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml @@ -43,19 +43,19 @@ <name>xasecure.policymgr.clientssl.truststore.password</name> <value>changeit</value> <property-type>PASSWORD</property-type> - <description>java truststore password</description> + <description>java truststore password</description> </property> <property> <name>xasecure.policymgr.clientssl.keystore.credential.file</name> <value>jceks://file{{credential_file}}</value> - <description>java keystore credential file</description> + <description>java keystore credential file</description> </property> <property> <name>xasecure.policymgr.clientssl.truststore.credential.file</name> <value>jceks://file{{credential_file}}</value> - <description>java truststore credential file</description> + <description>java truststore credential file</description> </property> </configuration>
