You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2015/09/12 03:04:49 UTC
[5/6] ambari git commit: AMBARI-13069. Attributes of configuration
property should be stack API driven. (jaimin)
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml
index bbd3d12..1d32afd 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml
@@ -21,33 +21,43 @@
-->
<configuration supports_final="false">
- <!-- knox-env.sh -->
+ <!-- knox-env.sh -->
- <property require-input="true">
- <name>knox_master_secret</name>
- <value></value>
- <property-type>PASSWORD</property-type>
- <description>password to use as the master secret</description>
- </property>
+ <property require-input="true">
+ <name>knox_master_secret</name>
+ <value></value>
+ <display-name>Knox Master Secret</display-name>
+ <property-type>PASSWORD</property-type>
+ <description>password to use as the master secret</description>
+ <value-attributes>
+ <editable-only-at-install>true</editable-only-at-install>
+ <overridable>false</overridable>
+ </value-attributes>
+ </property>
- <property>
- <name>knox_user</name>
- <value>knox</value>
- <property-type>USER</property-type>
- <description>Knox Username.</description>
- </property>
+ <property>
+ <name>knox_user</name>
+ <value>knox</value>
+ <property-type>USER</property-type>
+ <description>Knox Username.</description>
+ </property>
- <property>
- <name>knox_group</name>
- <value>knox</value>
- <property-type>GROUP</property-type>
- <description>Knox Group.</description>
- </property>
+ <property>
+ <name>knox_group</name>
+ <value>knox</value>
+ <property-type>GROUP</property-type>
+ <description>Knox Group.</description>
+ </property>
- <property>
- <name>knox_pid_dir</name>
- <value>/var/run/knox</value>
- <description>Knox PID dir.</description>
- </property>
+ <property>
+ <name>knox_pid_dir</name>
+ <value>/var/run/knox</value>
+ <display-name>Knox PID dir</display-name>
+ <description>Knox PID dir.</description>
+ <value-attributes>
+ <editable-only-at-install>true</editable-only-at-install>
+ <overridable>false</overridable>
+ </value-attributes>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ldap-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ldap-log4j.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ldap-log4j.xml
index a0cf658..ce66fbf 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ldap-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ldap-log4j.xml
@@ -62,5 +62,8 @@
<description>
content for log4j.properties file for the demo LDAP that comes with Knox.
</description>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/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 8bf1dd3..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
@@ -23,6 +23,7 @@
<property>
<name>policy_user</name>
<value>ambari-qa</value>
+ <display-name>policy User for KNOX</display-name>
<description>This user must be system user and also present at Ranger admin portal</description>
</property>
@@ -30,17 +31,25 @@
<name>common.name.for.certificate</name>
<value></value>
<description>Used for repository creation on ranger admin</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>ranger-knox-plugin-enabled</name>
<value>No</value>
+ <display-name>Enable Ranger for KNOX</display-name>
<description>Enable ranger knox plugin ?</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>REPOSITORY_CONFIG_USERNAME</name>
<value>admin</value>
+ <display-name>Ranger repository config user</display-name>
<description>Used for repository creation on ranger admin</description>
</property>
@@ -60,12 +69,14 @@
<property>
<name>XAAUDIT.DB.IS_ENABLED</name>
<value>true</value>
+ <display-name>Audit to DB</display-name>
<description></description>
</property>
<property>
<name>XAAUDIT.HDFS.IS_ENABLED</name>
<value>false</value>
+ <display-name>Audit to HDFS</display-name>
<description></description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
index 89527b3..eae1f34 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
@@ -118,5 +118,9 @@
<description>
The configuration specifies the Hadoop cluster services Knox will provide access to.
</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/users-ldif.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/users-ldif.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/users-ldif.xml
index ace4858..0fcc639 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/users-ldif.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/users-ldif.xml
@@ -131,5 +131,9 @@ member: uid=sam,ou=people,dc=hadoop,dc=apache,dc=org
<description>
content for users-ldif file for the demo LDAP that comes with Knox.
</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-log4j.xml b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-log4j.xml
index c5ee937..594c3c6 100644
--- a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-log4j.xml
@@ -60,6 +60,9 @@ log4j.logger.org.eclipse.jetty=WARN
log4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=WARN
log4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=WARN
</value>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
index bc42bc6..ac7ea04 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
@@ -35,7 +35,11 @@
<property>
<name>oozie_database</name>
<value>New Derby Database</value>
+ <display-name>Oozie Database</display-name>
<description>Oozie Server Database.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>oozie_derby_database</name>
@@ -45,22 +49,41 @@
<property>
<name>oozie_data_dir</name>
<value>/hadoop/oozie/data</value>
+ <display-name>Oozie Data Dir</display-name>
<description>Data directory in which the Oozie DB exists</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>oozie_log_dir</name>
<value>/var/log/oozie</value>
+ <display-name>Oozie Log Dir</display-name>
<description>Directory for oozie logs</description>
+ <value-attributes>
+ <editable-only-at-install>true</editable-only-at-install>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>oozie_pid_dir</name>
<value>/var/run/oozie</value>
+ <display-name>Oozie PID Dir</display-name>
<description>Directory in which the pid files for oozie reside.</description>
+ <value-attributes>
+ <editable-only-at-install>true</editable-only-at-install>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>oozie_admin_port</name>
<value>11001</value>
+ <display-name>Oozie Server Admin Port</display-name>
<description>The admin port Oozie server runs.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>oozie_heapsize</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-log4j.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-log4j.xml
index 7f7158f..2c48cae 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-log4j.xml
@@ -92,6 +92,9 @@ log4j.logger.org.mortbay=WARN, oozie
log4j.logger.org.hsqldb=WARN, oozie
log4j.logger.org.apache.hadoop.security.authentication.server=INFO, oozie
</value>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
index 329ac64..10b9324 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
@@ -104,10 +104,14 @@
<property>
<name>oozie.db.schema.name</name>
+ <display-name>Database Name</display-name>
<value>oozie</value>
<description>
Oozie DataBase Name
</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
@@ -195,30 +199,43 @@
<property>
<name>oozie.service.JPAService.jdbc.driver</name>
<value>org.apache.derby.jdbc.EmbeddedDriver</value>
+ <display-name>JDBC Driver Class</display-name>
<description>
JDBC driver class.
</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>oozie.service.JPAService.jdbc.url</name>
<value>jdbc:derby:${oozie.data.dir}/${oozie.db.schema.name}-db;create=true</value>
+ <display-name>Database URL</display-name>
<description>
JDBC URL.
</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>oozie.service.JPAService.jdbc.username</name>
<value>oozie</value>
+ <display-name>Database Username</display-name>
<description>
Database user name to use to connect to the database
</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property require-input = "true">
<name>oozie.service.JPAService.jdbc.password</name>
<value> </value>
+ <display-name>Database Password</display-name>
<property-type>PASSWORD</property-type>
<description>
DB user password.
@@ -226,6 +243,9 @@
IMPORTANT: if password is emtpy leave a 1 space string, the service trims the value,
if empty Configuration assumes it is NULL.
</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
index f449421..e03d08f 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
@@ -92,22 +92,31 @@
<property>
<name>oozie.db.schema.name</name>
<value>oozie</value>
+ <display-name>Database Name</display-name>
<description>
Oozie DataBase Name
</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>oozie.service.JPAService.jdbc.username</name>
<value>oozie</value>
+ <display-name>Database Username</display-name>
<description>
Database user name to use to connect to the database
</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property require-input="true">
<name>oozie.service.JPAService.jdbc.password</name>
<value></value>
+ <display-name>Database Password</display-name>
<property-type>PASSWORD</property-type>
<description>
DB user password.
@@ -115,22 +124,33 @@
IMPORTANT: if password is emtpy leave a 1 space string, the service trims the value,
if empty Configuration assumes it is NULL.
</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>oozie.service.JPAService.jdbc.driver</name>
<value>org.apache.derby.jdbc.EmbeddedDriver</value>
+ <display-name>JDBC Driver Class</display-name>
<description>
JDBC driver class.
</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>oozie.service.JPAService.jdbc.url</name>
<value>jdbc:derby:${oozie.data.dir}/${oozie.db.schema.name}-db;create=true</value>
+ <display-name>Database URL</display-name>
<description>
JDBC URL.
</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-log4j.xml b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-log4j.xml
index 4fe323c..4f656f4 100644
--- a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-log4j.xml
@@ -57,6 +57,9 @@ log4j.appender.A=org.apache.log4j.ConsoleAppender
log4j.appender.A.layout=org.apache.log4j.PatternLayout
log4j.appender.A.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
</value>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-properties.xml b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-properties.xml
index 7916680..b4217ca 100644
--- a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-properties.xml
+++ b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-properties.xml
@@ -84,6 +84,10 @@ pig.disable.counter=false
hcat.bin=/usr/bin/hcat
</value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/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 0558d21..5fdb1b9 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
@@ -24,124 +24,200 @@
<property>
<name>DB_FLAVOR</name>
<value>MYSQL</value>
+ <display-name>DB FLAVOR</display-name>
<description>The database type to be used (mysql/oracle)</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>SQL_COMMAND_INVOKER</name>
<value>mysql</value>
+ <display-name>SQL Command Invoker</display-name>
<description>The executable path to be used to invoke command-line MYSQL</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>SQL_CONNECTOR_JAR</name>
<value>/usr/share/java/mysql-connector-java.jar</value>
+ <display-name>Location of Sql Connector Jar</display-name>
<description>Location of DB client library (please check the location of the jar file)</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>db_root_user</name>
<value>root</value>
+ <display-name>Ranger DB root user</display-name>
<description>Database admin user</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property require-input="true">
<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>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>db_host</name>
<value></value>
+ <display-name>Ranger DB host</display-name>
<description>Database host</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>db_name</name>
<value>ranger</value>
+ <display-name>Ranger DB name</display-name>
<description>Database name</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>db_user</name>
<value>rangeradmin</value>
+ <display-name>Ranger DB username</display-name>
<description>Database user-id used for the Ranger schema</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property require-input="true">
<name>db_password</name>
<value></value>
<property-type>PASSWORD</property-type>
+ <display-name>Ranger DB password</display-name>
<description>Database password for the Ranger schema</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>audit_db_name</name>
<value>ranger_audit</value>
<description>Audit database name</description>
+ <display-name>Ranger Audit DB name</display-name>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>audit_db_user</name>
<value>rangerlogger</value>
+ <display-name>Ranger Audit DB username</display-name>
<description>Database user-id for storing auditlog information</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property require-input="true">
<name>audit_db_password</name>
<value></value>
<property-type>PASSWORD</property-type>
+ <display-name>Ranger Audit DB password</display-name>
<description>Database password for storing auditlog information</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>policymgr_external_url</name>
<value></value>
+ <display-name>External URL</display-name>
<description>Policy Manager external url eg: http://RANGER_HOST:6080</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>policymgr_http_enabled</name>
<value>true</value>
+ <display-name>HTTP enabled</display-name>
<description>HTTP Enabled</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>authentication_method</name>
<value>UNIX</value>
+ <display-name>Authentication method</display-name>
<description></description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>remoteLoginEnabled</name>
<value>true</value>
+ <display-name>Allow remote Login</display-name>
<description></description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>authServiceHostName</name>
<value>localhost</value>
<description></description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>authServicePort</name>
<value>5151</value>
<description></description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>xa_ldap_url</name>
<value>"ldap://71.127.43.33:389"</value>
<description></description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>xa_ldap_userDNpattern</name>
<value>"uid={0},ou=users,dc=xasecure,dc=net"</value>
<description></description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
@@ -160,18 +236,27 @@
<name>xa_ldap_groupRoleAttribute</name>
<value>"cn"</value>
<description></description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>xa_ldap_ad_domain</name>
<value>"xasecure.net"</value>
<description></description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>xa_ldap_ad_url</name>
<value>"ldap://ad.xasecure.net:389"</value>
<description></description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/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 3eb86fb..95c3b50 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,14 +24,22 @@
<name>ranger_user</name>
<value>ranger</value>
<property-type>USER</property-type>
+ <display-name>Used to create user and assign permission</display-name>
<description>Ranger username</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>ranger_group</name>
<value>ranger</value>
<property-type>GROUP</property-type>
+ <display-name>Used to create group and assign permission</display-name>
<description>Ranger group</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
@@ -57,7 +65,11 @@
<name>ranger_admin_password</name>
<value></value>
<property-type>PASSWORD</property-type>
+ <display-name>Ranger Admin user's password for Ambari</display-name>
<description>This is the ambari user password created for creating repositories and policies in Ranger Admin for each plugin</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml
index cb7bd2b..742e971 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml
@@ -80,6 +80,9 @@
<name>SYNC_LDAP_USER_SEARCH_FILTER</name>
<value></value>
<description>default value is empty</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>SYNC_LDAP_USER_NAME_ATTRIBUTE</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml
index 42db997..8ed83a3 100644
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml
@@ -62,7 +62,10 @@ log4j.rootLogger=ALL, kms
log4j.logger.org.apache.hadoop.conf=ERROR
log4j.logger.org.apache.hadoop=INFO
log4j.logger.com.sun.jersey.server.wadl.generators.WadlGeneratorJAXBGrammarGenerator=OFF
- </value>
+ </value>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/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 e5bd75e..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
@@ -29,6 +29,7 @@
<property>
<name>xasecure.audit.destination.db</name>
<value>false</value>
+ <display-name>Audit to DB</display-name>
<description></description>
</property>
@@ -71,6 +72,7 @@
<property>
<name>xasecure.audit.destination.hdfs</name>
<value>true</value>
+ <display-name>Audit to HDFS</display-name>
<description></description>
</property>
@@ -89,6 +91,7 @@
<property>
<name>xasecure.audit.destination.solr</name>
<value>true</value>
+ <display-name>Audit to SOLR</display-name>
<description></description>
</property>
@@ -113,6 +116,7 @@
<property>
<name>xasecure.audit.provider.summary.enabled</name>
<value>false</value>
+ <display-name>Audit provider summary enabled</display-name>
<description></description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-log4j.xml b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-log4j.xml
index 709867c..c473844 100644
--- a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-log4j.xml
@@ -84,6 +84,9 @@ log4j.logger.org.apache.hadoop.yarn.server.nodemanager.containermanager.monitor=
log4j.logger.org.apache.hadoop.yarn.server.nodemanager.NodeStatusUpdaterImpl=WARN
log4j.logger.org.apache.zookeeper=WARN
</value>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-defaults.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-defaults.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-defaults.xml
index 4491469..8b13779 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-defaults.xml
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-defaults.xml
@@ -130,6 +130,9 @@
<description>
Specifies parameters that are passed to the JVM of the Spark driver.
</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
@@ -138,6 +141,9 @@
<description>
Specifies the parameters that are passed to the JVM of the Spark Application Master.
</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-javaopts-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-javaopts-properties.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-javaopts-properties.xml
index c2db325..f48d79b 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-javaopts-properties.xml
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-javaopts-properties.xml
@@ -23,5 +23,8 @@
<name>content</name>
<description>Spark-javaopts-properties</description>
<value> </value>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-log4j-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-log4j-properties.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-log4j-properties.xml
index 2ba64fb..6b1d9bf 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-log4j-properties.xml
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-log4j-properties.xml
@@ -38,5 +38,8 @@ log4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=INFO
log4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=INFO
</value>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-metrics-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-metrics-properties.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-metrics-properties.xml
index 9af5f2e..3e544e2 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-metrics-properties.xml
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-metrics-properties.xml
@@ -156,5 +156,8 @@
#executor.source.jvm.class=org.apache.spark.metrics.source.JvmSource
</value>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-site.xml b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-site.xml
index 49d3f04..5055a67 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-site.xml
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-site.xml
@@ -40,6 +40,10 @@
<name>storm.zookeeper.servers</name>
<value>['localhost']</value>
<description>A list of hosts of ZooKeeper servers used to manage the cluster.</description>
+ <value-attributes>
+ <editable-only-at-install>true</editable-only-at-install>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>storm.zookeeper.port</name>
@@ -70,11 +74,17 @@
<name>storm.zookeeper.retry.interval</name>
<value>1000</value>
<description>The interval between retries of a Zookeeper operation.</description>
+ <value-attributes>
+ <unit>ms</unit>
+ </value-attributes>
</property>
<property>
<name>storm.zookeeper.retry.intervalceiling.millis</name>
<value>30000</value>
<description>The ceiling of the interval between retries of a Zookeeper operation.</description>
+ <value-attributes>
+ <unit>ms</unit>
+ </value-attributes>
</property>
<property>
<name>storm.cluster.mode</name>
@@ -104,6 +114,10 @@
<name>nimbus.host</name>
<value>localhost</value>
<description>The host that the master server is running on.</description>
+ <value-attributes>
+ <editable-only-at-install>true</editable-only-at-install>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>nimbus.thrift.port</name>
@@ -115,16 +129,25 @@
<name>nimbus.thrift.max_buffer_size</name>
<value>1048576</value>
<description>The maximum buffer size thrift should use when reading messages.</description>
+ <value-attributes>
+ <unit>bytes</unit>
+ </value-attributes>
</property>
<property>
<name>nimbus.childopts</name>
<value>-Xmx1024m -javaagent:/usr/lib/storm/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8649,wireformat31x=true,mode=multicast,config=/usr/lib/storm/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Nimbus_JVM</value>
<description>This parameter is used by the storm-deploy project to configure the jvm options for the nimbus daemon.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>nimbus.task.timeout.secs</name>
<value>30</value>
<description>How long without heartbeating a task can go before nimbus will consider the task dead and reassign it to another location.</description>
+ <value-attributes>
+ <unit>seconds</unit>
+ </value-attributes>
</property>
<property>
<name>nimbus.supervisor.timeout.secs</name>
@@ -139,11 +162,17 @@
that if a machine ever goes down Nimbus will immediately wake up and take action.
This parameter is for checking for failures when there's no explicit event like that occuring.
</description>
+ <value-attributes>
+ <unit>seconds</unit>
+ </value-attributes>
</property>
<property>
<name>nimbus.cleanup.inbox.freq.secs</name>
<value>600</value>
<description>How often nimbus should wake the cleanup thread to clean the inbox.</description>
+ <value-attributes>
+ <unit>seconds</unit>
+ </value-attributes>
</property>
<property>
<name>nimbus.inbox.jar.expiration.secs</name>
@@ -155,12 +184,18 @@
Note that the time it takes to delete an inbox jar file is going to be somewhat more than
NIMBUS_CLEANUP_INBOX_JAR_EXPIRATION_SECS (depending on how often NIMBUS_CLEANUP_FREQ_SECS is set to).
</description>
+ <value-attributes>
+ <unit>seconds</unit>
+ </value-attributes>
</property>
<property>
<name>nimbus.task.launch.secs</name>
<value>120</value>
<description>A special timeout used when a task is initially launched. During launch, this is the timeout
used until the first heartbeat, overriding nimbus.task.timeout.secs.</description>
+ <value-attributes>
+ <unit>seconds</unit>
+ </value-attributes>
</property>
<property>
<name>nimbus.reassign</name>
@@ -173,6 +208,9 @@
<value>600</value>
<description>During upload/download with the master, how long an upload or download connection is idle
before nimbus considers it dead and drops the connection.</description>
+ <value-attributes>
+ <unit>seconds</unit>
+ </value-attributes>
</property>
<property>
<name>nimbus.topology.validator</name>
@@ -232,6 +270,9 @@
<description>The timeout on DRPC requests within the DRPC server. Defaults to 10 minutes. Note that requests can also
timeout based on the socket timeout on the DRPC client, and separately based on the topology message
timeout for the topology implementing the DRPC function.</description>
+ <value-attributes>
+ <unit>seconds</unit>
+ </value-attributes>
</property>
<property>
<name>drpc.childopts</name>
@@ -266,6 +307,9 @@
<name>supervisor.childopts</name>
<value>-Xmx256m -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port={{jmxremote_port}} -javaagent:/usr/lib/storm/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8650,wireformat31x=true,mode=multicast,config=/usr/lib/storm/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM</value>
<description>This parameter is used by the storm-deploy project to configure the jvm options for the supervisor daemon.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>supervisor.worker.start.timeout.secs</name>
@@ -274,21 +318,33 @@
the supervisor tries to restart the worker process. This value override
supervisor.worker.timeout.secs during launch because there is additional
overhead to starting and configuring the JVM on launch.</description>
+ <value-attributes>
+ <unit>seconds</unit>
+ </value-attributes>
</property>
<property>
<name>supervisor.worker.timeout.secs</name>
<value>30</value>
<description>How long a worker can go without heartbeating before the supervisor tries to restart the worker process.</description>
+ <value-attributes>
+ <unit>seconds</unit>
+ </value-attributes>
</property>
<property>
<name>supervisor.monitor.frequency.secs</name>
<value>3</value>
<description>How often the supervisor checks the worker heartbeats to see if any of them need to be restarted.</description>
+ <value-attributes>
+ <unit>seconds</unit>
+ </value-attributes>
</property>
<property>
<name>supervisor.heartbeat.frequency.secs</name>
<value>5</value>
<description>How often the supervisor sends a heartbeat to the master.</description>
+ <value-attributes>
+ <unit>seconds</unit>
+ </value-attributes>
</property>
<property>
<name>worker.childopts</name>
@@ -346,6 +402,9 @@
<name>storm.messaging.netty.buffer_size</name>
<value>5242880</value>
<description>Netty based messaging: The buffer size for send/recv buffer.</description>
+ <value-attributes>
+ <unit>bytes</unit>
+ </value-attributes>
</property>
<property>
<name>storm.messaging.netty.max_retries</name>
@@ -356,11 +415,17 @@
<name>storm.messaging.netty.max_wait_ms</name>
<value>1000</value>
<description>Netty based messaging: The max # of milliseconds that a peer will wait.</description>
+ <value-attributes>
+ <unit>ms</unit>
+ </value-attributes>
</property>
<property>
<name>storm.messaging.netty.min_wait_ms</name>
<value>100</value>
<description>Netty based messaging: The min # of milliseconds that a peer will wait.</description>
+ <value-attributes>
+ <unit>ms</unit>
+ </value-attributes>
</property>
<property>
<name>topology.enable.message.timeouts</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml
index b387102..8bb96fa 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml
@@ -24,12 +24,22 @@
<property>
<name>mapred_log_dir_prefix</name>
<value>/var/log/hadoop-mapreduce</value>
+ <display-name>Mapreduce Log Dir Prefix</display-name>
<description>Mapreduce Log Dir Prefix</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>mapred_pid_dir_prefix</name>
<value>/var/run/hadoop-mapreduce</value>
+ <display-name>Mapreduce PID Dir Prefix</display-name>
<description>Mapreduce PID Dir Prefix</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>mapred_user</name>
@@ -39,8 +49,12 @@
</property>
<property>
<name>jobhistory_heapsize</name>
+ <display-name>History Server heap size</display-name>
<value>900</value>
<description>Value for JobHistoryServer heap_size variable in hadoop-env.sh</description>
+ <value-attributes>
+ <unit>MB</unit>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml
index 6eb1a1d..de0f31e 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml
@@ -24,12 +24,22 @@
<property>
<name>yarn_log_dir_prefix</name>
<value>/var/log/hadoop-yarn</value>
+ <display-name>YARN Log Dir Prefix</display-name>
<description>YARN Log Dir Prefix</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>yarn_pid_dir_prefix</name>
<value>/var/run/hadoop-yarn</value>
+ <display-name>YARN PID Dir Prefix</display-name>
<description>YARN PID Dir Prefix</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>yarn_user</name>
@@ -40,21 +50,35 @@
<property>
<name>yarn_heapsize</name>
<value>1024</value>
+ <display-name>YARN Java heap size</display-name>
<description>Max heapsize for all YARN components using a numerical value in the scale of MB</description>
+ <value-attributes>
+ <unit>MB</unit>
+ </value-attributes>
</property>
<property>
<name>resourcemanager_heapsize</name>
<value>1024</value>
+ <display-name>ResourceManager Java heap size</display-name>
<description>Max heapsize for ResourceManager using a numerical value in the scale of MB</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <unit>MB</unit>
+ </value-attributes>
</property>
<property>
<name>nodemanager_heapsize</name>
<value>1024</value>
+ <display-name>NodeManager Java heap size</display-name>
<description>Max heapsize for NodeManager using a numerical value in the scale of MB</description>
+ <value-attributes>
+ <unit>MB</unit>
+ </value-attributes>
</property>
<property>
<name>min_user_id</name>
<value>1000</value>
+ <display-name>Minimum user ID for submitting job</display-name>
<description>Set to 0 to disallow root from submitting jobs. Set to 1000 to disallow all superusers from submitting jobs</description>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml
index 8c44b9e..bbd2a3f 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml
@@ -66,6 +66,9 @@ log4j.appender.JSA.layout=org.apache.log4j.PatternLayout
log4j.logger.org.apache.hadoop.yarn.server.resourcemanager.RMAppManager$ApplicationSummary=${yarn.server.resourcemanager.appsummary.logger}
log4j.additivity.org.apache.hadoop.yarn.server.resourcemanager.RMAppManager$ApplicationSummary=false
</value>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml
index 26a74df..3592ec0 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml
@@ -120,6 +120,9 @@
<name>yarn.admin.acl</name>
<value></value>
<description> ACL of who can be admin of the YARN cluster. </description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<!-- NodeManager -->
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zoo.cfg.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zoo.cfg.xml b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zoo.cfg.xml
index 12e2a00..37e9c0d 100644
--- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zoo.cfg.xml
+++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zoo.cfg.xml
@@ -24,26 +24,44 @@
<property>
<name>tickTime</name>
<value>2000</value>
+ <display-name>Length of single Tick</display-name>
<description>The length of a single tick in milliseconds, which is the basic time unit used by ZooKeeper</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <unit>ms</unit>
+ </value-attributes>
</property>
<property>
<name>initLimit</name>
<value>10</value>
+ <display-name>Ticks to allow for sync at Init</display-name>
<description>Ticks to allow for sync at Init.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>syncLimit</name>
<value>5</value>
+ <display-name>Ticks to allow for sync at Runtime</display-name>
<description>Ticks to allow for sync at Runtime.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>clientPort</name>
<value>2181</value>
+ <display-name>Port for running ZK Server</display-name>
<description>Port for running ZK Server.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>dataDir</name>
<value>/hadoop/zookeeper</value>
+ <display-name>ZooKeeper directory</display-name>
<description>Data directory for ZooKeeper.</description>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
index 608f504..e214bf8 100644
--- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
+++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
@@ -30,12 +30,22 @@
<property>
<name>zk_log_dir</name>
<value>/var/log/zookeeper</value>
+ <display-name>ZooKeeper Log Dir</display-name>
<description>ZooKeeper Log Dir</description>
+ <value-attributes>
+ <editable-only-at-install>true</editable-only-at-install>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>zk_pid_dir</name>
<value>/var/run/zookeeper</value>
+ <display-name>ZooKeeper PID Dir</display-name>
<description>ZooKeeper Pid Dir</description>
+ <value-attributes>
+ <editable-only-at-install>true</editable-only-at-install>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-log4j.xml b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-log4j.xml
index 6fcf5bc..5a68745 100644
--- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-log4j.xml
@@ -96,6 +96,9 @@ log4j.appender.TRACEFILE.layout=org.apache.log4j.PatternLayout
### Notice we are including log4j's NDC here (%x)
log4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L][%x] - %m%n
</value>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/properties.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/properties.json b/ambari-server/src/main/resources/properties.json
index 2dc1af5..0837af2 100644
--- a/ambari-server/src/main/resources/properties.json
+++ b/ambari-server/src/main/resources/properties.json
@@ -437,6 +437,7 @@
"StackLevelConfigurations/stack_version",
"StackLevelConfigurations/property_name",
"StackLevelConfigurations/property_value",
+ "StackLevelConfigurations/property_display_name",
"StackLevelConfigurations/property_value_attributes",
"StackLevelConfigurations/property_depends_on",
"StackLevelConfigurations/property_description",
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
index 47dffec..3d2c3f2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
@@ -33,9 +33,13 @@
</property>
<property>
<name>ignore_groupsusers_create</name>
+ <display-name>Skip group modifications during install</display-name>
<value>false</value>
<property-type>ADDITIONAL_USER_PROPERTY</property-type>
<description>Whether to ignore failures on users and group creation</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>smokeuser</name>
@@ -75,7 +79,11 @@ gpgcheck=0</value>
<name>override_uid</name>
<value>true</value>
<property-type>ADDITIONAL_USER_PROPERTY</property-type>
+ <display-name>Have Ambari manage UIDs</display-name>
<description>Have Ambari manage UIDs</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
index 7794ac8..12dfafc 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
@@ -26,12 +26,14 @@
<property>
<name>fs.AbstractFileSystem.glusterfs.impl</name>
+ <display-name>GlusterFS fs impl</display-name>
<value>org.apache.hadoop.fs.local.GlusterFs</value>
</property>
<property>
<name>fs.glusterfs.impl</name>
<value>org.apache.hadoop.fs.glusterfs.GlusterFileSystem</value>
+ <display-name>GlusterFS Abstract File System Implementation</display-name>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
index bce6b53..9644642 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
@@ -25,26 +25,52 @@
<name>hadoop_pid_dir_prefix</name>
<value>/var/run/hadoop</value>
<description>Hadoop PID Dir Prefix</description>
+ <display-name>Hadoop PID Dir Prefix</display-name>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ <visible>false</visible>
+ </value-attributes>
</property>
<property>
<name>hadoop_heapsize</name>
<value>1024</value>
- <description>Hadoop maximum Java heap size</description>
+ <display-name>Hadoop maximum Java heap size</display-name>
+ <description>Hadoop maximum Java heap size</description>
+ <value-attributes>
+ <unit>MB</unit>
+ </value-attributes>
</property>
<property>
<name>glusterfs_user</name>
<value>root</value>
- <description></description>
+ <display-name>glusterfs user</display-name>
+ <description>glusterfs user</description>
+ <value-attributes>
+ <visible>false</visible>
+ </value-attributes>
</property>
<property>
<name>hdfs_log_dir_prefix</name>
<value>/var/log/hadoop</value>
+ <display-name>Hadoop Log Dir Prefix</display-name>
<description>Hadoop Log Dir Prefix</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ <visible>false</visible>
+ </value-attributes>
</property>
<property>
<name>namenode_heapsize</name>
<value>1024</value>
+ <display-name>Name Node Heap Size</display-name>
<description>NameNode Java heap size</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ <visible>false</visible>
+ </value-attributes>
</property>
<property>
<name>namenode_host</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/HBASE/configuration/hbase-site.xml
index cf8ddd3..8bdd8d5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/HBASE/configuration/hbase-site.xml
@@ -45,7 +45,11 @@
<property>
<name>hbase.master.port</name>
<value>60000</value>
+ <display-name>HBase Master Port</display-name>
<description>The port the HBase Master should bind to.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>hbase.tmp.dir</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml
index 182acfe..4f78228 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml
@@ -22,38 +22,63 @@ limitations under the License.
<property>
<name>hive.heapsize</name>
<value>1024</value>
+ <display-name>HiveServer2 heap size</display-name>
<description>Hive Java heap size</description>
+ <value-attributes>
+ <unit>MB</unit>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>ambari.hive.db.schema.name</name>
<value>hive</value>
+ <display-name>Database Name</display-name>
<description>Database name used as the Hive Metastore</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>javax.jdo.option.ConnectionURL</name>
<value>jdbc:mysql://localhost/hive?createDatabaseIfNotExist=true</value>
+ <display-name>Database URL</display-name>
<description>JDBC connect string for a JDBC metastore</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>javax.jdo.option.ConnectionDriverName</name>
<value>com.mysql.jdbc.Driver</value>
+ <display-name>JDBC Driver Class</display-name>
<description>Driver class name for a JDBC metastore</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>javax.jdo.option.ConnectionUserName</name>
<value>hive</value>
+ <display-name>Database Username</display-name>
<description>username to use against metastore database</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property require-input="true">
<name>javax.jdo.option.ConnectionPassword</name>
<value></value>
<property-type>PASSWORD</property-type>
+ <display-name>Database Password</display-name>
<description>password to use against metastore database</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
@@ -428,6 +453,9 @@ limitations under the License.
<name>hive.server2.tez.default.queues</name>
<value>default</value>
<description>A comma-separated list of queues configured for the cluster.</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
@@ -545,9 +573,13 @@ limitations under the License.
<property>
<name>hive.server2.thrift.port</name>
<value>10000</value>
+ <display-name>HiveServer2 Port</display-name>
<description>
TCP port number to listen on, default 10000.
</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml
index a429a13..f46bf8f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml
@@ -105,9 +105,13 @@
<property>
<name>oozie.db.schema.name</name>
<value>oozie</value>
+ <display-name>Database Name</display-name>
<description>
Oozie DataBase Name
</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
@@ -200,25 +204,37 @@
<property>
<name>oozie.service.JPAService.jdbc.driver</name>
<value>org.apache.derby.jdbc.EmbeddedDriver</value>
+ <display-name>JDBC Driver Class</display-name>
<description>
JDBC driver class.
</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>oozie.service.JPAService.jdbc.url</name>
<value>jdbc:derby:${oozie.data.dir}/${oozie.db.schema.name}-db;create=true</value>
+ <display-name>Database URL</display-name>
<description>
JDBC URL.
</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>oozie.service.JPAService.jdbc.username</name>
<value>oozie</value>
+ <display-name>Database Username</display-name>
<description>
Database user name to use to connect to the database
</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.1/services/PIG/configuration/pig-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/PIG/configuration/pig-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/PIG/configuration/pig-properties.xml
index 480be75..5746109 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/PIG/configuration/pig-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/PIG/configuration/pig-properties.xml
@@ -86,6 +86,11 @@ pig.location.check.strict=false
hcat.bin=/usr/bin/hcat
</value>
+ <description>Describe all the Pig agent configurations</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml
index 9ad95ac..a069962 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml
@@ -24,7 +24,12 @@
<property>
<name>apptimelineserver_heapsize</name>
<value>1024</value>
+ <display-name>AppTimelineServer Java heap size</display-name>
<description>Max heapsize for AppTimelineServer using a numerical value in the scale of MB</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <unit>MB</unit>
+ </value-attributes>
</property>
<!-- yarn-env.sh -->
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml
index 0e21eb0..5f6b1bd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml
@@ -24,12 +24,22 @@
<property>
<name>hbase_log_dir</name>
<value>/var/log/hbase</value>
+ <display-name>HBase Log Dir Prefix</display-name>
<description>Log Directories for HBase.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>hbase_pid_dir</name>
<value>/var/run/hbase</value>
+ <display-name>HBase PID Dir</display-name>
<description>Pid Directory for HBase.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>hbase_regionserver_xmn_max</name>
@@ -39,10 +49,15 @@ Sets the upper bound on HBase RegionServers' young generation size.
This value is used in case the young generation size (-Xmn) calculated based on the max heapsize (hbase_regionserver_heapsize)
and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
</description>
+ <display-name>RegionServers maximum value for -Xmn</display-name>
+ <value-attributes>
+ <unit>MB</unit>
+ </value-attributes>
</property>
<property>
<name>hbase_regionserver_xmn_ratio</name>
<value>0.2</value>
+ <display-name>RegionServers -Xmn in -Xmx ratio</display-name>
<description>Percentage of max heap size (-Xmx) which used for young generation heap (-Xmn).</description>
</property>
<property>
@@ -54,7 +69,11 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
<property>
<name>hbase_max_direct_memory_size</name>
<value></value>
+ <display-name>HBase off-heap MaxDirectMemorySize</display-name>
<description>If not empty, adds '-XX:MaxDirectMemorySize={{hbase_max_direct_memory_size}}m' to HBASE_REGIONSERVER_OPTS.</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>phoenix_sql_enabled</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
index 3451585..cdb0391 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
@@ -94,16 +94,25 @@
<value></value>
<description>Where to store the contents of the bucketcache. One of: onheap,
offheap, or file. If a file, set it to file:PATH_TO_FILE.</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>hbase.bucketcache.size</name>
<value></value>
<description>The size of the buckets for the bucketcache if you only use a single size.</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>hbase.bucketcache.percentage.in.combinedcache</name>
<value></value>
<description>Value to be set between 0.0 and 1.0</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>hbase.regionserver.wal.codec</name>
@@ -119,6 +128,9 @@
<property>
<name>hbase.region.server.rpc.scheduler.factory.class</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
<depends-on>
<property>
<type>hbase-env</type>
@@ -129,6 +141,9 @@
<property>
<name>hbase.rpc.controllerfactory.class</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
<depends-on>
<property>
<type>hbase-env</type>
@@ -149,6 +164,9 @@
<property>
<name>hbase.coprocessor.regionserver.classes</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
<depends-on>
<property>
<type>hbase-site</type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/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 30af22c..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,24 +23,33 @@
<property>
<name>common.name.for.certificate</name>
<value></value>
- <description>Used for repository creation on ranger admin</description>
+ <description>Used for repository creation on ranger admin</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>policy_user</name>
<value>ambari-qa</value>
+ <display-name>policy User for HBASE</display-name>
<description>This user must be system user and also present at Ranger admin portal</description>
</property>
<property>
<name>ranger-hbase-plugin-enabled</name>
<value>No</value>
+ <display-name>Enable Ranger for HBASE</display-name>
<description>Enable ranger hbase plugin ?</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>REPOSITORY_CONFIG_USERNAME</name>
<value>hbase</value>
+ <display-name>Ranger repository config user</display-name>
<description>Used for repository creation on ranger admin</description>
</property>
@@ -54,12 +63,14 @@
<property>
<name>XAAUDIT.DB.IS_ENABLED</name>
<value>true</value>
+ <display-name>Audit to DB</display-name>
<description></description>
</property>
<property>
<name>XAAUDIT.HDFS.IS_ENABLED</name>
<value>false</value>
+ <display-name>Audit to HDFS</display-name>
<description></description>
</property>
@@ -158,6 +169,7 @@
<property>
<name>UPDATE_XAPOLICIES_ON_GRANT_REVOKE</name>
<value>true</value>
+ <display-name>Should HBase GRANT/REVOKE update XA policies</display-name>
<description></description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml
index 1e68146..37096c4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml
@@ -31,6 +31,9 @@
<property>
<name>hadoop.security.key.provider.path</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
<depends-on>
<property>
<type>hadoop-env</type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
index 4cee438..d91ca71 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
@@ -33,11 +33,12 @@
</property>
<property>
<name>keyserver_port</name>
- <value> </value>
+ <value></value>
<display-name>Key Server Port</display-name>
<description>Port number where Key Management Server is available</description>
<value-attributes>
<type>int</type>
+ <empty-value-valid>true</empty-value-valid>
</value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml
index bc8d959..f627add 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml
@@ -217,6 +217,9 @@ log4j.logger.org.apache.hadoop.conf.Configuration.deprecation=WARN
# messages from BlockManager in NameNode.
#log4j.logger.BlockStateChange=WARN
</value>
+ <value-attributes>
+ <show-property-name>false</show-property-name>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml
index c1ff588..178f436 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml
@@ -49,6 +49,9 @@
<property>
<name>dfs.encryption.key.provider.uri</name>
<value></value>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
<depends-on>
<property>
<type>hadoop-env</type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/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 32f7c54..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
@@ -15,6 +15,7 @@
<property>
<name>policy_user</name>
<value>ambari-qa</value>
+ <display-name>policy User for HDFS</display-name>
<description>This user must be system user and also present at Ranger
admin portal</description>
</property>
@@ -24,6 +25,9 @@
<value></value>
<description>Used for repository creation on ranger admin
</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
@@ -31,17 +35,25 @@
<value></value>
<description>Used for repository creation on ranger admin
</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>ranger-hdfs-plugin-enabled</name>
<value>No</value>
- <description>Enable ranger hdfs plugin ?</description>
+ <display-name>Enable Ranger for HDFS</display-name>
+ <description>Enable ranger hdfs plugin</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>REPOSITORY_CONFIG_USERNAME</name>
<value>hadoop</value>
+ <display-name>Ranger repository config user</display-name>
<description>Used for repository creation on ranger admin
</description>
</property>
@@ -57,12 +69,14 @@
<property>
<name>XAAUDIT.DB.IS_ENABLED</name>
<value>true</value>
+ <display-name>Audit to DB</display-name>
<description></description>
</property>
<property>
<name>XAAUDIT.HDFS.IS_ENABLED</name>
<value>false</value>
+ <display-name>Audit to HDFS</display-name>
<description></description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
index 443648f..5c6b355 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
@@ -32,6 +32,7 @@
<maximum>2048</maximum>
<unit>MB</unit>
<increment-step>512</increment-step>
+ <overridable>false</overridable>
</value-attributes>
</property>