You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ga...@apache.org on 2015/10/30 07:39:47 UTC
ambari git commit: AMBARI-13621. Improve Ranger configs labels as
well as descriptions (Advanced Tab)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 6182ec1c2 -> fee0af148
AMBARI-13621. Improve Ranger configs labels as well as descriptions (Advanced Tab)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fee0af14
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fee0af14
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fee0af14
Branch: refs/heads/branch-2.1
Commit: fee0af1483bf8d637798d027d5eb93d7ffe7656e
Parents: 6182ec1
Author: Gautam Borad <ga...@apache.org>
Authored: Fri Oct 30 11:16:55 2015 +0530
Committer: Gautam Borad <ga...@apache.com>
Committed: Fri Oct 30 12:09:31 2015 +0530
----------------------------------------------------------------------
.../0.4.0/configuration/admin-properties.xml | 10 +++----
.../RANGER/0.4.0/configuration/ranger-env.xml | 4 +--
.../RANGER/configuration/ranger-admin-site.xml | 6 ++--
.../RANGER/configuration/ranger-env.xml | 2 +-
.../RANGER/configuration/ranger-ugsync-site.xml | 30 +++++++++++---------
5 files changed, 27 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fee0af14/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/admin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/admin-properties.xml b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/admin-properties.xml
index 0b02eb4..dd9a1b0 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/admin-properties.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/admin-properties.xml
@@ -72,8 +72,8 @@
<property>
<name>db_root_user</name>
<value>root</value>
- <display-name>Ranger DB root user</display-name>
- <description>Database admin user</description>
+ <display-name>Database Admintrator (DBA) username</display-name>
+ <description>Database admin user. This user should have DBA permission to create the Ranger Database and Ranger Database User</description>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -83,8 +83,8 @@
<name>db_root_password</name>
<value></value>
<property-type>PASSWORD</property-type>
- <display-name>Ranger DB root password</display-name>
- <description>Database password for the database admin user-id</description>
+ <display-name>Database Admintrator (DBA) password</display-name>
+ <description>Database password for the database admin username</description>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -114,7 +114,7 @@
<name>db_user</name>
<value>rangeradmin</value>
<display-name>Ranger DB username</display-name>
- <description>Database user-id used for the Ranger schema</description>
+ <description>Database username used for the Ranger schema</description>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fee0af14/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
index 459d5ec..31608a9 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
@@ -24,7 +24,7 @@
<name>ranger_user</name>
<value>ranger</value>
<property-type>USER</property-type>
- <display-name>Used to create user and assign permission</display-name>
+ <display-name>Ranger User</display-name>
<description>Ranger username</description>
<value-attributes>
<overridable>false</overridable>
@@ -35,7 +35,7 @@
<name>ranger_group</name>
<value>ranger</value>
<property-type>GROUP</property-type>
- <display-name>Used to create group and assign permission</display-name>
+ <display-name>Ranger Group</display-name>
<description>Ranger group</description>
<value-attributes>
<overridable>false</overridable>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fee0af14/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 7e7c545..8835503 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
@@ -92,7 +92,7 @@
<property>
<name>ranger.jpa.jdbc.driver</name>
<value>com.mysql.jdbc.Driver</value>
- <description>JDBC driver class name</description>
+ <description>JDBC driver class name. Example: For Mysql: com.mysql.jdbc.Driver, For Oracle: oracle.jdbc.OracleDriver</description>
<display-name>Driver class name for a JDBC Ranger database</display-name>
<value-attributes>
<overridable>false</overridable>
@@ -109,7 +109,7 @@
<name>ranger.jpa.jdbc.url</name>
<value>jdbc:mysql://localhost</value>
<description>JDBC connect string - auto populated based on other values</description>
- <display-name>JDBC connect string for a Ranger database</display-name>
+ <display-name>JDBC connect string</display-name>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -275,7 +275,7 @@
<property>
<name>ranger.ldap.ad.domain</name>
- <display-name>Domain Name (AD specific)</display-name>
+ <display-name>Domain Name (Only for AD)</display-name>
<value></value>
<description>AD domain, only used if Authentication method is AD</description>
<description></description>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fee0af14/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml
index 2506743..8693c46 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml
@@ -30,7 +30,7 @@
<name>create_db_dbuser</name>
<value>true</value>
<display-name>Setup Database and Databse User</display-name>
- <description>If set to Yes, Ranger will Setup Database and Databse User. This will require to specify Database root user and password</description>
+ <description>If set to Yes, Ambari will create and setup Ranger Database and Database User. This will require to specify Database Admin user and password</description>
<value-attributes>
<type>value-list</type>
<overridable>false</overridable>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fee0af14/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 22e53dc..e878d3d 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
@@ -66,7 +66,7 @@
<name>ranger.usersync.enabled</name>
<display-name>Enable User Sync</display-name>
<value>false</value>
- <description>Usersync enabled?</description>
+ <description>Should users and groups be synchronized to Ranger Database? Required to setup Ranger policies</description>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
<type>value-list</type>
@@ -120,12 +120,14 @@
<name>ranger.usersync.unix.group.file</name>
<display-name>Group File</display-name>
<value>/etc/group</value>
+ <description>Location of the groups file on the linux server</description>
</property>
<property>
<name>ranger.usersync.unix.password.file</name>
<display-name>Password File</display-name>
<value>/etc/passwd</value>
+ <description>Location of the password file on the linux server</description>
</property>
<property>
@@ -165,28 +167,28 @@
<name>ranger.usersync.filesource.file</name>
<display-name>File Name</display-name>
<value>/tmp/usergroup.txt</value>
- <description>/tmp/usergroup.json or /tmp/usergroup.csv or /tmp/usergroup.txt</description>
+ <description>Path to the file with the users and groups information. Example: /tmp/usergroup.json or /tmp/usergroup.csv or /tmp/usergroup.txt</description>
</property>
<property>
<name>ranger.usersync.filesource.text.delimiter</name>
- <display-name>Delimeter</display-name>
+ <display-name>Delimiter</display-name>
<value>,</value>
<description>Delimiter used in file, if File based user sync is used</description>
</property>
<property>
<name>ranger.usersync.ldap.url</name>
- <display-name>LDAP (AD) URL</display-name>
+ <display-name>LDAP/AD URL</display-name>
<value></value>
- <description>LDAP server URL. Example value = ldap://localhost:389</description>
+ <description>LDAP server URL. Example: value = ldap://localhost:389 or ldaps//localhost:636</description>
</property>
<property>
<name>ranger.usersync.ldap.binddn</name>
<display-name>Bind User</display-name>
<value></value>
- <description>Full distinguished name (DN), including common name (CN), of an LDAP user account that has privileges to search for users. Example: cn=admin,dc=xasecure,dc=net</description>
+ <description>Full distinguished name (DN), including common name (CN), of an LDAP user account that has privileges to search for users. This user is used for searching the users. This could be read-only LDAP user. Example: cn=admin,dc=example,dc=com</description>
</property>
<property>
@@ -194,7 +196,7 @@
<display-name>Bind User Password</display-name>
<value></value>
<property-type>PASSWORD</property-type>
- <description>Password for the account that can search for users.</description>
+ <description>Password for the LDAP bind user used for searching users.</description>
</property>
<property>
@@ -244,7 +246,7 @@
<name>ranger.usersync.ldap.user.objectclass</name>
<display-name>User Object Class</display-name>
<value>person</value>
- <description>LDAP User Object Class</description>
+ <description>LDAP User Object Class. Example: person or user</description>
</property>
<property>
@@ -264,7 +266,7 @@
<name>ranger.usersync.ldap.user.nameattribute</name>
<display-name>Username Attribute</display-name>
<value></value>
- <description>LDAP user name attribute</description>
+ <description>LDAP user name attribute. Example: sAMAccountName in AD, uid or cn in OpenLDAP</description>
</property>
<property>
@@ -280,7 +282,7 @@
<name>ranger.usersync.ldap.user.groupnameattribute</name>
<display-name>User Group Name Attribute</display-name>
<value>memberof, ismemberof</value>
- <description>LDAP user group name attribute</description>
+ <description>LDAP user group name attribute. Generally it is the same as username attribute. Example: sAMAccountName in AD, uid or cn in OpenLDAP</description>
</property>
<property>
@@ -331,7 +333,7 @@
<name>ranger.usersync.group.usermapsyncenabled</name>
<value>false</value>
<display-name>Group User Map Sync</display-name>
- <description>User map sync enabled?</description>
+ <description>Sync specific groups for users?</description>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
<type>value-list</type>
@@ -376,7 +378,7 @@
<name>ranger.usersync.group.objectclass</name>
<display-name>Group Object Class</display-name>
<value></value>
- <description></description>
+ <description>LDAP Group object class. Example: group</description>
</property>
<property>
@@ -393,14 +395,14 @@
<name>ranger.usersync.group.nameattribute</name>
<display-name>Group Name Attribute</display-name>
<value></value>
- <description>LDAP group name attribute</description>
+ <description>LDAP group name attribute. Example: cn</description>
</property>
<property>
<name>ranger.usersync.group.memberattributename</name>
<display-name>Group Member Attribute</display-name>
<value></value>
- <description>LDAP group member attribute name</description>
+ <description>LDAP group member attribute name. Example: member</description>
</property>
<property>