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:48 UTC
[4/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/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
index 5811e4f..aa21e53 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
@@ -47,6 +47,9 @@ limitations under the License.
Read/write locks - when hive.lock.manager is set to
org.apache.hadoop.hive.ql.lockmgr.zookeeper.ZooKeeperHiveLockManager,
2. When HiveServer2 supports service discovery via Zookeeper.</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
@@ -341,13 +344,21 @@ limitations under the License.
<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>
<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>
@@ -403,13 +414,21 @@ limitations under the License.
<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>
- <description>Username to use against metastore database</description>
+ <display-name>Database Username</display-name>
+ <description>username to use against metastore database</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
@@ -1061,7 +1080,13 @@ limitations under the License.
<property>
<name>hive.server2.thrift.port</name>
<value>10000</value>
- <description>Port number of HiveServer2 Thrift interface when hive.server2.transport.mode is 'binary'.</description>
+ <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>
<name>hive.server2.thrift.sasl.qop</name>
@@ -1371,7 +1396,11 @@ limitations under the License.
<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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
index 1b121bc..fc9928f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
@@ -23,6 +23,7 @@
<property>
<name>policy_user</name>
<value>ambari-qa</value>
+ <display-name>policy User for HIVE</display-name>
<description>This user must be system user and also present at Ranger admin portal</description>
</property>
@@ -36,11 +37,15 @@
<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>REPOSITORY_CONFIG_USERNAME</name>
<value>hive</value>
+ <display-name>Ranger repository config user</display-name>
<description>Used for repository creation on ranger admin</description>
</property>
@@ -54,12 +59,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 +165,7 @@
<property>
<name>UPDATE_XAPOLICIES_ON_GRANT_REVOKE</name>
<value>true</value>
+ <display-name>Should Hive 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/HIVE/configuration/webhcat-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/webhcat-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/webhcat-site.xml
index 49563de..2fad897 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/webhcat-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/webhcat-site.xml
@@ -45,6 +45,9 @@ limitations under the License.
<name>templeton.pig.archive</name>
<value>hdfs:///hdp/apps/${hdp.version}/pig/pig.tar.gz</value>
<description>The path to the Pig archive in HDFS.</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
@@ -63,6 +66,9 @@ limitations under the License.
<name>templeton.hive.archive</name>
<value>hdfs:///hdp/apps/${hdp.version}/hive/hive.tar.gz</value>
<description>The path to the Hive archive.</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/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml
index e0c47db..8b77716 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml
@@ -23,6 +23,7 @@
<property>
<name>policy_user</name>
<value>storm</value>
+ <display-name>policy User for STORM</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-storm-plugin-enabled</name>
<value>No</value>
+ <display-name>Enable Ranger for STORM</display-name>
<description>Enable ranger storm plugin ?</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>REPOSITORY_CONFIG_USERNAME</name>
<value>stormtestuser@EXAMPLE.COM</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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml
index aaf027d..884b3f1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml
@@ -51,6 +51,9 @@
<name>nimbus.childopts</name>
<value>-Xmx1024m _JAAS_PLACEHOLDER -javaagent:/usr/hdp/current/storm-nimbus/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8649,wireformat31x=true,mode=multicast,config=/usr/hdp/current/storm-nimbus/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>
@@ -75,6 +78,9 @@
<name>supervisor.childopts</name>
<value>-Xmx256m _JAAS_PLACEHOLDER -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/hdp/current/storm-supervisor/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8650,wireformat31x=true,mode=multicast,config=/usr/hdp/current/storm-supervisor/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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/GLUSTERFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
index 8b382dd..7a7f4c9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
@@ -27,10 +27,12 @@
<property>
<name>fs.AbstractFileSystem.glusterfs.impl</name>
<value>org.apache.hadoop.fs.local.GlusterFs</value>
+ <display-name>GlusterFS Abstract File System Implementation</display-name>
</property>
<property>
<name>fs.glusterfs.impl</name>
+ <display-name>GlusterFS fs impl</display-name>
<value>org.apache.hadoop.fs.glusterfs.GlusterFileSystem</value>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
index e9078e2..1de50bd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3.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>
+ <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.3.GlusterFS/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HBASE/configuration/hbase-site.xml
index 7cfac16..82b6e09 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HBASE/configuration/hbase-site.xml
@@ -50,6 +50,7 @@
<property>
<name>hbase.tmp.dir</name>
<value>/hadoop/hbase</value>
+ <display-name>HBase tmp directory</display-name>
<description>Temporary directory on the local filesystem.
Change this setting to point to a location more permanent
than '/tmp' (The '/tmp' directory is often cleared on
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/OOZIE/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/OOZIE/configuration/oozie-site.xml
index 5208943..0e54ad3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/OOZIE/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/OOZIE/configuration/oozie-site.xml
@@ -231,6 +231,7 @@
<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.
@@ -238,6 +239,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/stacks/HDP/2.3/services/ACCUMULO/configuration/accumulo-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/configuration/accumulo-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/configuration/accumulo-log4j.xml
index 20c858e..ff43b57 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/configuration/accumulo-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/configuration/accumulo-log4j.xml
@@ -107,6 +107,9 @@ log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
</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.3/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml
index 34dff85..32ad416 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml
@@ -23,7 +23,11 @@
<property>
<name>hbase.master.port</name>
<value>16000</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.master.info.port</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml
index 070b637..553d1ea 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml
@@ -29,6 +29,7 @@
<property>
<name>xasecure.audit.destination.db</name>
<value>false</value>
+ <display-name>Audit to DB</display-name>
<description></description>
</property>
@@ -72,6 +73,7 @@
<property>
<name>xasecure.audit.destination.hdfs</name>
<value>true</value>
+ <display-name>Audit to HDFS</display-name>
<description></description>
</property>
@@ -90,6 +92,7 @@
<property>
<name>xasecure.audit.destination.solr</name>
<value>false</value>
+ <display-name>Audit to SOLR</display-name>
<description></description>
</property>
@@ -114,6 +117,7 @@
<property>
<name>xasecure.audit.provider.summary.enabled</name>
<value>true</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/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-security.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-security.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-security.xml
index 8958a9e..8aa741f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-security.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-security.xml
@@ -58,6 +58,7 @@
<property>
<name>xasecure.hbase.update.xapolicies.on.grant.revoke</name>
<value>true</value>
+ <display-name>Should HBase GRANT/REVOKE update XA policies</display-name>
<description>Should HBase plugin update Ranger policies for updates to permissions done using GRANT/REVOKE?</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml
index 3b332ad..9222b1d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml
@@ -155,8 +155,12 @@ export HADOOP_OPTS="-Dhdp.version=$HDP_VERSION $HADOOP_OPTS"
</property>
<property>
<name>nfsgateway_heapsize</name>
+ <display-name>NFSGateway maximum Java heap size</display-name>
<value>1024</value>
<description>Maximum Java heap size for NFSGateway (Java option -Xmx)</description>
+ <value-attributes>
+ <unit>MB</unit>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hdfs-site.xml
index b14d73a..fbce6e8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hdfs-site.xml
@@ -25,6 +25,7 @@
<property>
<name>nfs.file.dump.dir</name>
<value>/tmp/.hdfs-nfs</value>
+ <display-name>NFSGateway dump directory</display-name>
<description>
This directory is used to temporarily save out-of-order writes before
writing to HDFS. For each file, the out-of-order writes are dumped after
@@ -36,6 +37,7 @@
<property>
<name>nfs.exports.allowed.hosts</name>
<value>* rw</value>
+ <display-name>Allowed hosts</display-name>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml
index 57329e3..0451d2d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml
@@ -29,6 +29,7 @@
<property>
<name>xasecure.audit.destination.db</name>
<value>false</value>
+ <display-name>Audit to DB</display-name>
<description></description>
</property>
@@ -72,6 +73,7 @@
<property>
<name>xasecure.audit.destination.hdfs</name>
<value>true</value>
+ <display-name>Audit to HDFS</display-name>
<description></description>
</property>
@@ -90,6 +92,7 @@
<property>
<name>xasecure.audit.destination.solr</name>
<value>false</value>
+ <display-name>Audit to SOLR</display-name>
<description></description>
</property>
@@ -114,6 +117,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/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml
index d5f07a9..7c5c77f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml
@@ -29,6 +29,7 @@
<property>
<name>xasecure.audit.destination.db</name>
<value>false</value>
+ <display-name>Audit to DB</display-name>
<description></description>
</property>
@@ -72,6 +73,7 @@
<property>
<name>xasecure.audit.destination.hdfs</name>
<value>true</value>
+ <display-name>Audit to HDFS</display-name>
<description></description>
</property>
@@ -90,6 +92,7 @@
<property>
<name>xasecure.audit.destination.solr</name>
<value>false</value>
+ <display-name>Audit to SOLR</display-name>
<description></description>
</property>
@@ -114,6 +117,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/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml
index 5407ccf..2a982b6 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml
@@ -59,6 +59,7 @@
<property>
<name>xasecure.hive.update.xapolicies.on.grant.revoke</name>
<value>true</value>
+ <display-name>Should Hive GRANT/REVOKE update XA policies</display-name>
<description>Should Hive plugin update Ranger policies for updates to permissions done using GRANT/REVOKE?</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-audit.xml
index 1433d0a..76b84bb 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-audit.xml
@@ -29,6 +29,7 @@
<property>
<name>xasecure.audit.destination.db</name>
<value>false</value>
+ <display-name>Audit to DB</display-name>
<description></description>
</property>
@@ -72,6 +73,7 @@
<property>
<name>xasecure.audit.destination.hdfs</name>
<value>true</value>
+ <display-name>Audit to HDFS</display-name>
<description></description>
</property>
@@ -90,6 +92,7 @@
<property>
<name>xasecure.audit.destination.solr</name>
<value>true</value>
+ <display-name>Audit to SOLR</display-name>
<description></description>
</property>
@@ -114,6 +117,7 @@
<property>
<name>xasecure.audit.provider.summary.enabled</name>
<value>true</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/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml
index 893652d..8343a3a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml
@@ -30,12 +30,18 @@
<name>hadoop.rpc.protection</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>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>
@@ -47,7 +53,11 @@
<property>
<name>ranger-kafka-plugin-enabled</name>
<value>No</value>
+ <display-name>Enable Ranger for KAFKA</display-name>
<description>Enable ranger kafka 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/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml
index ba8710a..74ab59a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml
@@ -29,6 +29,7 @@
<property>
<name>xasecure.audit.destination.db</name>
<value>false</value>
+ <display-name>Audit to DB</display-name>
<description></description>
</property>
@@ -72,6 +73,7 @@
<property>
<name>xasecure.audit.destination.hdfs</name>
<value>true</value>
+ <display-name>Audit to HDFS</display-name>
<description></description>
</property>
@@ -90,6 +92,7 @@
<property>
<name>xasecure.audit.destination.solr</name>
<value>false</value>
+ <display-name>Audit to SOLR</display-name>
<description></description>
</property>
@@ -114,6 +117,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/stacks/HDP/2.3/services/PIG/configuration/pig-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/configuration/pig-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/configuration/pig-properties.xml
index c18e25a..ac248b3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/configuration/pig-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/configuration/pig-properties.xml
@@ -629,6 +629,11 @@ pig.tez.grace.parallelism=true
# pig.streaming.udf.python.command=python
</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.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 57d21dd..49fce8c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
@@ -27,7 +27,11 @@
<property>
<name>ranger.service.http.enabled</name>
<value>true</value>
+ <display-name>HTTP enabled</display-name>
<description></description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
@@ -76,19 +80,32 @@
<property>
<name>ranger.externalurl</name>
<value>{{ranger_external_url}}</value>
+ <display-name>External URL</display-name>
<description></description>
+ <value-attributes>
+ <visible>false</visible>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>ranger.jpa.jdbc.driver</name>
<value>com.mysql.jdbc.Driver</value>
+ <display-name>Driver class name for a JDBC Ranger database</display-name>
<description></description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>ranger.jpa.jdbc.url</name>
<value>jdbc:mysql://localhost</value>
+ <display-name>JDBC connect string for a Ranger database</display-name>
<description></description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
@@ -131,19 +148,29 @@
<property>
<name>ranger.authentication.method</name>
<value>UNIX</value>
+ <display-name>Authentication method</display-name>
<description></description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>ranger.ldap.url</name>
<value>ldap://71.127.43.33:389</value>
<description></description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>ranger.ldap.user.dnpattern</name>
<value>uid={0},ou=users,dc=xasecure,dc=net</value>
<description></description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
@@ -162,24 +189,36 @@
<name>ranger.ldap.user.searchfilter</name>
<value>(uid={0})</value>
<description>Search filter used for Bind Authentication</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>ranger.ldap.group.roleattribute</name>
<value>cn</value>
<description></description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>ranger.ldap.base.dn</name>
<value>dc=example,dc=com</value>
<description>The Distinguished Name (DN) of the starting point for directory server searches.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>ranger.ldap.bind.dn</name>
<value>cn=adadmin,cn=Users,dc=example,dc=com</value>
<description>Full distinguished name (DN), including common name (CN), of an LDAP user account that has privileges to search for users. </description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
@@ -187,36 +226,54 @@
<value></value>
<property-type>PASSWORD</property-type>
<description>Password for the account that can search for users</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>ranger.ldap.referral</name>
<value>ignore</value>
<description>Set to follow if multiple LDAP servers are configured to return continuation references for results. Set to ignore (default) if no referrals should be followed</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>ranger.ldap.ad.domain</name>
<value>localhost</value>
<description></description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>ranger.ldap.ad.url</name>
<value>ldap://ad.xasecure.net:389</value>
<description></description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>ranger.ldap.ad.base.dn</name>
<value>dc=example,dc=com</value>
<description>The Distinguished Name (DN) of the starting point for directory server searches.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>ranger.ldap.ad.bind.dn</name>
<value>cn=adadmin,cn=Users,dc=example,dc=com</value>
<description>Full distinguished name (DN), including common name (CN), of an LDAP user account that has privileges to search for users.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
@@ -224,18 +281,27 @@
<value></value>
<property-type>PASSWORD</property-type>
<description>Password for the account that can search for users</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>ranger.ldap.ad.user.searchfilter</name>
<value>(sAMAccountName={0})</value>
<description>Search filter used for Bind Authentication</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>ranger.ldap.ad.referral</name>
<value>ignore</value>
<description>"Set to follow if multiple LDAP servers are configured to return continuation references for results. Set to ignore (default) if no referrals should be followed"</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
@@ -272,19 +338,29 @@
<property>
<name>ranger.unixauth.remote.login.enabled</name>
<value>true</value>
+ <display-name>Allow remote Login</display-name>
<description></description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>ranger.unixauth.service.hostname</name>
<value>localhost</value>
<description></description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>ranger.unixauth.service.port</name>
<value>5151</value>
<description></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.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 dd6270c..8308865 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
@@ -29,6 +29,7 @@
<property>
<name>create_db_dbuser</name>
<value>true</value>
+ <display-name>Setup DB and DB user</display-name>
<description>Setup Ranger Database and Database User?</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/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 d7dce19..3cc017e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
@@ -108,6 +108,9 @@
<name>ranger.usersync.source.impl.class</name>
<value>org.apache.ranger.unixusersync.process.UnixUserGroupBuilder</value>
<description>For Ldap: org.apache.ranger.ldapusersync.process.LdapUserGroupBuilder, For Unix: org.apache.ranger.unixusersync.process.UnixUserGroupBuilder, org.apache.ranger.unixusersync.process.FileSourceUserGroupBuilder</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
@@ -139,6 +142,9 @@
<value></value>
<property-type>PASSWORD</property-type>
<description></description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
@@ -151,12 +157,18 @@
<name>ranger.usersync.ldap.bindkeystore</name>
<value></value>
<description></description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>ranger.usersync.ldap.searchBase</name>
<value>dc=hadoop,dc=apache,dc=org</value>
<description></description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
@@ -193,6 +205,9 @@
<name>ranger.usersync.ldap.referral</name>
<value>ignore</value>
<description>Set to follow if multiple LDAP servers are configured to return continuation references for results. Set to ignore (default) if no referrals should be followed</description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
@@ -223,48 +238,72 @@
<name>ranger.usersync.group.searchenabled</name>
<value>false</value>
<description></description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>ranger.usersync.group.usermapsyncenabled</name>
<value>false</value>
<description></description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>ranger.usersync.group.searchbase</name>
<value> </value>
<description></description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>ranger.usersync.group.searchscope</name>
<value> </value>
<description></description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>ranger.usersync.group.objectclass</name>
<value> </value>
<description></description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>ranger.usersync.group.searchfilter</name>
<value> </value>
<description></description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>ranger.usersync.group.nameattribute</name>
<value> </value>
<description></description>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
<property>
<name>ranger.usersync.group.memberattributename</name>
<value> </value>
<description></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/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml
index 3687e88..18726e5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml
@@ -29,6 +29,7 @@
<property>
<name>xasecure.audit.destination.db</name>
<value>false</value>
+ <display-name>Audit to DB</display-name>
<description></description>
</property>
@@ -72,6 +73,7 @@
<property>
<name>xasecure.audit.destination.hdfs</name>
<value>true</value>
+ <display-name>Audit to HDFS</display-name>
<description></description>
</property>
@@ -90,6 +92,7 @@
<property>
<name>xasecure.audit.destination.solr</name>
<value>false</value>
+ <display-name>Audit to SOLR</display-name>
<description></description>
</property>
@@ -114,6 +117,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/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml
index bbe0a3d..2227f53 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml
@@ -23,6 +23,10 @@
<name>nimbus.seeds</name>
<value>localhost</value>
<description>Comma-delimited list of the hosts running nimbus server.</description>
+ <value-attributes>
+ <editable-only-at-install>true</editable-only-at-install>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>topology.min.replication.count.default</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/configuration/tez-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/configuration/tez-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/configuration/tez-site.xml
index be534f1..37db69f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/configuration/tez-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/configuration/tez-site.xml
@@ -24,6 +24,9 @@
<description>AM view ACLs. This allows the specified users/groups to view the status of the AM and all DAGs that run within this AM.
Value format: Comma separated list of users, followed by whitespace, followed by a comma separated list of groups.
</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/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml
index 044f8ec..43d95f9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml
@@ -29,6 +29,7 @@
<property>
<name>xasecure.audit.destination.db</name>
<value>false</value>
+ <display-name>Audit to DB</display-name>
<description></description>
</property>
@@ -72,6 +73,7 @@
<property>
<name>xasecure.audit.destination.hdfs</name>
<value>true</value>
+ <display-name>Audit to HDFS</display-name>
<description></description>
</property>
@@ -90,6 +92,7 @@
<property>
<name>xasecure.audit.destination.solr</name>
<value>false</value>
+ <display-name>Audit to SOLR</display-name>
<description></description>
</property>
@@ -114,6 +117,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/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml
index db456da..1b8ba55 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml
@@ -30,18 +30,28 @@
<name>hadoop.rpc.protection</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>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-yarn-plugin-enabled</name>
<value>No</value>
+ <display-name>Enable Ranger for YARN</display-name>
<description>Enable ranger yarn 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/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
index 28a4836..b52af80 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
@@ -75,6 +75,9 @@ log4j.appender.EWMA.cleanupInterval=${yarn.ewma.cleanupInterval}
log4j.appender.EWMA.messageAgeLimitSeconds=${yarn.ewma.messageAgeLimitSeconds}
log4j.appender.EWMA.maxUniqueMessages=${yarn.ewma.maxUniqueMessages}
</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.3/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
index f2774fc..12a8a21 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
@@ -35,6 +35,9 @@
<name>yarn.admin.acl</name>
<value>yarn</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>
</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
index 24294a4..2c661d9 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
@@ -24,14 +24,24 @@
<property>
<name>hadoop.user.name</name>
<value>hadoop</value>
+ <display-name>Hadoop User Name</display-name>
<property-type>USER</property-type>
<description>User to run Hadoop services under</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property require-input="true">
<name>hadoop.user.password</name>
+ <display-name>Hadoop User Password</display-name>
<value> </value>
<property-type>PASSWORD</property-type>
<description>Password for hadoop user</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>security_enabled</name>
@@ -45,9 +55,13 @@
</property>
<property>
<name>ignore_groupsusers_create</name>
+ <display-name>Skip group modifications during install</display-name>
<property-type>ADDITIONAL_USER_PROPERTY</property-type>
<value>false</value>
<description>Whether to ignore failures on users and group creation</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>smokeuser</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml
index ff779d1..1a8969c 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml
@@ -26,21 +26,25 @@
<property>
<name>metrics_collector_log_dir</name>
<value>C:\var\log\ambari-metrics-collector</value>
+ <display-name>Metrics Collector log dir</display-name>
<description>Collector log directory.</description>
</property>
<property>
<name>metrics_collector_pid_dir</name>
<value>C:\var\run\ambari-metrics-collector</value>
+ <display-name>Metrics Collector pid dir</display-name>
<description>Collector pid directory.</description>
</property>
<property>
<name>metrics_monitor_pid_dir</name>
<value>C:\var\run\ambari-metrics-monitor</value>
+ <display-name>Metrics Monitor pid dir</display-name>
<description>Monitor pid directory.</description>
</property>
<property>
<name>metrics_monitor_log_dir</name>
<value>C:\var\log\ambari-metrics-monitor</value>
+ <display-name>Metrics Monitor log dir</display-name>
<description>Monitor log directory.</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-site.xml
index 097de9d..a68c912 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-site.xml
@@ -24,6 +24,7 @@
<property>
<name>timeline.metrics.aggregator.checkpoint.dir</name>
<value>c:\ambari\ambari-metrics-collector\checkpoint</value>
+ <display-name>Aggregator checkpoint directory</display-name>
<description>
Directory to store aggregator checkpoints. Change to a permanent
location so that checkpoint ar not lost.
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml
index 6ececc6..f0fc01b 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml
@@ -26,16 +26,27 @@
<property>
<name>falcon_log_dir</name>
<value>c:\hadoop\logs\falcon</value>
+ <display-name>Falcon Log Dir</display-name>
<description>Falcon log directory.</description>
+ <value-attributes>
+ <editable-only-at-install>true</editable-only-at-install>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>falcon_pid_dir</name>
<value>c:\hadoop\run\falcon</value>
+ <display-name>Falcon PID Dir</display-name>
<description>Falcon pid-file directory.</description>
+ <value-attributes>
+ <editable-only-at-install>true</editable-only-at-install>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>falcon_local_dir</name>
<value>c:\hadoop\falcon</value>
+ <display-name>Falcon data directory</display-name>
<description>Directory where Falcon data, such as activemq data, is stored.</description>
</property>
<!--embeddedmq properties-->
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-conf.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-conf.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-conf.xml
index 8ff764b..94ae058 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-conf.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-conf.xml
@@ -29,5 +29,9 @@
<value>
# Flume agent config
</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/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml
index 642e746..585c6ca 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml
@@ -24,12 +24,22 @@
<property>
<name>hbase_log_dir</name>
<value>c:\hadoop\logs\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>c:\hadoop\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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-site.xml
index d551d4d..5f834d7 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-site.xml
@@ -27,6 +27,7 @@
<property>
<name>hbase.tmp.dir</name>
<value>c:\hadoop\temp\hbase</value>
+ <display-name>HBase tmp directory</display-name>
<description>Temporary directory on the local filesystem.
Change this setting to point to a location more permanent
than '/tmp' (The '/tmp' directory is often cleared on
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml
index b5451d8..243b4ff 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml
@@ -29,15 +29,26 @@
<name>hdfs_log_dir_prefix</name>
<value>c:\hadoop\logs\hadoop</value>
<description>Hadoop Log Dir Prefix</description>
+ <display-name>Hadoop Log Dir Prefix</display-name>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>hadoop_pid_dir_prefix</name>
<value>c:\hadoop\run\hadoop</value>
+ <display-name>Hadoop PID Dir Prefix</display-name>
<description>Hadoop PID Dir Prefix</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>dfs.datanode.data.dir.mount.file</name>
<value>file:///c:/hadoop/conf/dfs_data_dir_mount.hist</value>
+ <display-name>File that stores mount point for each data dir</display-name>
<description>File path that contains the last known mount point for each data dir. This file is used to avoid creating a DFS data dir on the root drive (and filling it up) if a path was previously mounted on a drive.</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml
index b235da4..f0b0a01 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml
@@ -24,15 +24,20 @@
<property>
<name>dfs.namenode.name.dir</name>
<value>file:///c:/hdpdata/hdfs/nn</value>
+ <display-name>NameNode directories</display-name>
<description>Determines where on the local filesystem the DFS name node
should store the name table. If this is a comma-delimited list
of directories then the name table is replicated in all of the
directories, for redundancy. </description>
<final>true</final>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>dfs.datanode.data.dir</name>
<value>file:///c:/hdpdata/hdfs/dn</value>
+ <display-name>DataNode directories</display-name>
<description>Determines where on the local filesystem an DFS data node
should store its blocks. If this is a comma-delimited
list of directories, then data will be stored in all named
@@ -60,11 +65,15 @@
<property>
<name>dfs.namenode.checkpoint.dir</name>
<value>file:///c:/hadoop/hdfs/snn</value>
+ <display-name>SecondaryNameNode Checkpoint directories</display-name>
<description>Determines where on the local filesystem the DFS secondary
name node should store the temporary images to merge.
If this is a comma-delimited list of directories then the image is
replicated in all of the directories for redundancy.
</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/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml
index 6fa7a08..a81c033 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml
@@ -24,14 +24,22 @@
<property>
<name>hive_database_type</name>
<value>mssql</value>
+ <display-name>Hive Database Type</display-name>
<description>Default HIVE DB type.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>hive_database</name>
<value>Existing MSSQL Server database with SQL authentication</value>
+ <display-name>Hive Database</display-name>
<description>
Property that determines whether the HIVE DB is managed by Ambari.
</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>hive_ambari_database</name>
@@ -41,12 +49,22 @@
<property>
<name>hive_log_dir</name>
<value>c:\hadoop\logs\hive</value>
+ <display-name>Hive Log Dir</display-name>
<description>Directory for Hive Log files.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>hive_pid_dir</name>
<value>c:\hadoop\run\hive</value>
+ <display-name>Hive PID Dir</display-name>
<description>Hive PID Dir.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>hive_user</name>
@@ -57,12 +75,22 @@
<property>
<name>hcat_log_dir</name>
<value>c:\hadoop\logs\webhcat</value>
+ <display-name>WebHCat Log Dir</display-name>
<description>WebHCat Log Dir.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>hcat_pid_dir</name>
<value>c:\hadooop\run\webhcat</value>
+ <display-name>WebHCat Pid Dir</display-name>
<description>WebHCat Pid Dir.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ <editable-only-at-install>true</editable-only-at-install>
+ </value-attributes>
</property>
<property>
<name>hcat_user</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-site.xml
index 18aaf5f..4074368 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-site.xml
@@ -7,13 +7,21 @@
<property>
<name>javax.jdo.option.ConnectionURL</name>
<value>jdbc:sqlserver://localhost;databaseName=hive</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.microsoft.sqlserver.jdbc.SQLServerDriver</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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml
index 138e3e2..57c492a 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml
@@ -28,29 +28,52 @@
<property>
<name>oozie_hostname</name>
<value></value>
+ <display-name>Database Host</display-name>
<description>
Specify the host on which the OOZIE database is hosted.
</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>oozie_database</name>
<value>Existing MSSQL Server database with SQL authentication</value>
+ <display-name>Oozie Database</display-name>
<description>Oozie Server Database.</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>oozie_data_dir</name>
<value>c:\hadoop\oozie\data</value>
+ <display-name>Oozie Data Dir</display-name>
<description>Data directory in which the Oozie DB exists</description>
+ <value-attributes>
+ <editable-only-at-install>true</editable-only-at-install>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>oozie_log_dir</name>
<value>c:\hadoop\logs\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>c:\hadoop\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>
<!-- oozie-env.cmd -->
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-site.xml
index 1693648..ab9cf3f 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-site.xml
@@ -25,16 +25,24 @@
<property>
<name>oozie.service.JPAService.jdbc.driver</name>
<value>com.microsoft.sqlserver.jdbc.SQLServerDriver</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:sqlserver://localhost;databaseName=oozie</value>
+ <display-name>Database URL</display-name>
<description>
JDBC URL.
</description>
+ <value-attributes>
+ <overridable>false</overridable>
+ </value-attributes>
</property>
<property>
<name>oozie.service.HadoopAccessorService.hadoop.configurations</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-env.xml
index a8feead..f1445b2 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-env.xml
@@ -24,12 +24,22 @@
<property>
<name>mapred_log_dir_prefix</name>
<value>c:\hadoop\logs\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>c:\hadoop\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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-env.xml
index 726704d..af4efca 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-env.xml
@@ -24,12 +24,22 @@
<property>
<name>yarn_log_dir_prefix</name>
<value>c:\hadoop\logs\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>c:\hadoop\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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zoo.cfg.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zoo.cfg.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zoo.cfg.xml
index 6505500..6c47094 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zoo.cfg.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zoo.cfg.xml
@@ -24,6 +24,7 @@
<property>
<name>dataDir</name>
<value>c:\\\\hadoop\\\\zookeeper</value>
+ <display-name>ZooKeeper directory</display-name>
<description>Data directory for ZooKeeper.</description>
</property>
</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml
index 64dd971..2ed40ac 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml
@@ -28,12 +28,22 @@
<property>
<name>zk_log_dir</name>
<value>c:\hadoop\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>c:\hadoop\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>
<!-- zookeeper-env.sh -->
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-env.xml
index e46932a..fe58adb 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-env.xml
@@ -25,5 +25,9 @@
<name>hbase_max_direct_memory_size</name>
<value></value>
<description>If not empty, adds '-XX:MaxDirectMemorySize={{hbase_max_direct_memory_size}}m' to HBASE_REGIONSERVER_OPTS.</description>
+ <display-name>HBase off-heap MaxDirectMemorySize</display-name>
+ <value-attributes>
+ <empty-value-valid>true</empty-value-valid>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml
index 3de0397..fd157be 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml
@@ -60,6 +60,7 @@
<property>
<name>hbase.hregion.memstore.block.multiplier</name>
<value>4</value>
+ <display-name>HBase Region Block Multiplier</display-name>
<description>
Block updates if memstore has hbase.hregion.memstore.block.multiplier
times hbase.hregion.memstore.flush.size bytes. Useful preventing
@@ -90,16 +91,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.global.memstore.size</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-log4j.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-log4j.xml
index bc8d959..f627add 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/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>