AMBARI-10267. BE: Populate non-UI metadata for Hive, Tez, HBase and HDFS service configs (srimanth)

ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml

@@ -35,6 +35,14 @@
     <name>hbase_regionserver_heapsize</name>
     <value>1024</value>
     <description>HBase RegionServer Heap Size.</description>
+    <display-name>HBase RegionServer Maximum Memory</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>1024</minimum>
+      <maximum>6554</maximum>
+      <unit>MB</unit>
+      <step-increment>250</step-increment>
+    </value-attributes>
   </property>
   <property>
     <name>hbase_regionserver_xmn_max</name>
@@ -50,6 +58,14 @@
     <name>hbase_master_heapsize</name>
     <value>1024</value>
     <description>HBase Master Heap Size</description>
+    <display-name>HBase Master Maximum Memory</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>1024</minimum>
+      <maximum>16384</maximum>
+      <unit>MB</unit>
+      <step-increment>250</step-increment>
+    </value-attributes>
   </property>
    <property>
     <name>hbase_user</name>

ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml

@@ -84,22 +84,42 @@
     <description>Maximum size of all memstores in a region server before new
       updates are blocked and flushes are forced. Defaults to 40% of heap
     </description>
+    <display-name>% of RegionServer Allocated to Write Buffers</display-name>
+    <value-attributes>
+      <type>float</type>
+      <minimum>0</minimum>
+      <maximum>0.8</maximum>
+    </value-attributes>
   </property>
   <property>
     <name>hbase.regionserver.handler.count</name>
-    <value>60</value>
+    <value>30</value>
     <description>Count of RPC Listener instances spun up on RegionServers.
     Same property is used by the Master for count of master handlers.
     Default is 10.
     </description>
+    <display-name>Number of Handlers per RegionServer</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>5</minimum>
+      <maximum>240</maximum>
+      <step-increment>1</step-increment>
+    </value-attributes>
   </property>
   <property>
     <name>hbase.hregion.majorcompaction</name>
-    <value>86400000</value>
+    <value>604800000</value>
     <description>The time (in milliseconds) between 'major' compactions of all
     HStoreFiles in a region.  Default: 1 day.
     Set to 0 to disable automated major compactions.
     </description>
+    <display-name>Major Compaction Interval</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <maximum>2592000000</maximum>
+      <unit>milliseconds</unit>
+    </value-attributes>
   </property>
   
   <property>
@@ -114,7 +134,7 @@
   </property>
   <property>
     <name>hbase.hregion.memstore.block.multiplier</name>
-    <value>2</value>
+    <value>4</value>
     <description>Block updates if memstore has hbase.hregion.memstore.block.multiplier
     time hbase.hregion.flush.size bytes.  Useful preventing
     runaway memstore during spikes in update traffic.  Without an
@@ -122,6 +142,14 @@
     resultant flush files take a long time to compact or split, or
     worse, we OOME
     </description>
+    <display-name>Per-Column Family Memstore Block Multiplier</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>2</entries>
+      <entries>4</entries>
+      <entries>8</entries>
+      <selection_cardinality>1</selection_cardinality>
+    </value-attributes>
   </property>
   <property>
     <name>hbase.hregion.memstore.flush.size</name>
@@ -131,6 +159,14 @@
     exceeds this number of bytes.  Value is checked by a thread that runs
     every hbase.server.thread.wakefrequency.
     </description>
+    <display-name>Per-Column Family Memstore Flush Size</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>32</minimum>
+      <maximum>256</maximum>
+      <step-increment>1</step-increment>
+      <unit>MB</unit>
+    </value-attributes>
   </property>
   <property>
     <name>hbase.hregion.memstore.mslab.enabled</name>
@@ -144,12 +180,20 @@
   </property>
   <property>
     <name>hbase.hregion.max.filesize</name>
-    <value>10737418240</value>
+    <value>1073741824</value>
     <description>
     Maximum HStoreFile size. If any one of a column families' HStoreFiles has
     grown to exceed this value, the hosting HRegion is split in two.
     Default: 1G.
     </description>
+    <display-name>Maximum Region File Size</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>1073741824</minimum>
+      <maximum>10737418240</maximum>
+      <unit>B</unit>
+      <step-increment>268435456</step-increment>
+    </value-attributes>
   </property>
   <property>
     <name>hbase.client.scanner.caching</name>
@@ -161,10 +205,17 @@
     Do not set this value such that the time between invocations is greater
     than the scanner timeout; i.e. hbase.regionserver.lease.period
     </description>
+    <display-name>Number of Fetched Rows when Scanning from Disk</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>100</minimum>
+      <maximum>10000</maximum>
+      <step-increment>100</step-increment>
+    </value-attributes>
   </property>
   <property>
     <name>zookeeper.session.timeout</name>
-    <value>30000</value>
+    <value>90000</value>
     <description>ZooKeeper session timeout.
       HBase passes this to the zk quorum as suggested maximum time for a
       session (This setting becomes zookeeper's 'maxSessionTimeout').  See
@@ -172,10 +223,18 @@
       "The client sends a requested timeout, the server responds with the
       timeout that it can give the client. " In milliseconds.
     </description>
+    <display-name>Zookeeper Session Timeout</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>10000</minimum>
+      <maximum>180000</maximum>
+      <unit>milliseconds</unit>
+      <step-increment>10000</step-increment>
+    </value-attributes>
   </property>
   <property>
     <name>hbase.client.keyvalue.maxsize</name>
-    <value>10485760</value>
+    <value>1048576</value>
     <description>Specifies the combined maximum allowed size of a KeyValue
     instance. This is to set an upper boundary for a single entry saved in a
     storage file. Since they cannot be split it helps avoiding that a region
@@ -183,6 +242,14 @@
     to set this to a fraction of the maximum region size. Setting it to zero
     or less disables the check.
     </description>
+    <display-name>Maximum Record Size</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>1048576</minimum>
+      <maximum>31457280</maximum>
+      <unit>B</unit>
+      <step-increment>262144</step-increment>
+    </value-attributes>
   </property>
   <property>
     <name>hbase.hstore.compactionThreshold</name>
@@ -193,6 +260,13 @@
     is run to rewrite all HStoreFiles files as one.  Larger numbers
     put off compaction but when it runs, it takes longer to complete.
     </description>
+    <display-name>Maximum Files in a Store before Compaction</display-name>
+    <value-attributes>
+      <type>int</type>
+      <entries>2</entries>
+      <entries>3</entries>
+      <entries>4</entries>
+    </value-attributes>
   </property>
   <property>
     <name>hbase.hstore.flush.retries.number</name>
@@ -220,6 +294,12 @@
         used by HFile/StoreFile. Default of 0.25 means allocate 25%.
         Set to 0 to disable but it's not recommended.
     </description>
+    <display-name>% of RegionServer Allocated to Read Buffers</display-name>
+    <value-attributes>
+      <type>float</type>
+      <minimum>0</minimum>
+      <maximum>0.8</maximum>
+    </value-attributes>
   </property>
 
   <!-- Additional configuration specific to HBase security -->
@@ -238,6 +318,13 @@
     <description>  Controls whether or not secure authentication is enabled for HBase. Possible values are 'simple'
       (no authentication), and 'kerberos'.
     </description>
+    <display-name>Enable Authentication</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <selection_cardinality>1</selection_cardinality>
+    </value-attributes>
   </property>
 
   <property>
@@ -245,6 +332,13 @@
     <value>false</value>
     <description>Enables HBase authorization. Set the value of this property to false to disable HBase authorization.
     </description>
+    <display-name>Enable Authorization</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <selection_cardinality>1</selection_cardinality>
+    </value-attributes>
   </property>
 
   <property>
@@ -315,12 +409,56 @@
       relative path, so they will all go under this directory unless changed.
     </description>
   </property>
-
+  <property>
+    <name>hbase.client.retries.number</name>
+    <value>35</value>
+    <description>Maximum retries.  Used as maximum for all retryable
+    operations such as the getting of a cell's value, starting a row update,
+    etc.  Retry interval is a rough function based on hbase.client.pause.  At
+    first we retry at this interval but then with backoff, we pretty quickly reach
+    retrying every ten seconds.  See HConstants#RETRY_BACKOFF for how the backup
+    ramps up.  Change this setting and hbase.client.pause to suit your workload.</description>
+    <display-name>Maximum Client Retries</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>5</minimum>
+      <maximum>50</maximum>
+      <step-increment>1</step-increment>
+    </value-attributes>
+  </property>
+  <property>
+    <name>hbase.rpc.timeout</name>
+    <value>60000</value>
+    <description>This is for the RPC layer to define how long HBase client applications
+        take for a remote call to time out. It uses pings to check connections
+        but will eventually throw a TimeoutException.</description>
+    <display-name>HBase RPC Timeout</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>30000</minimum>
+      <maximum>300000</maximum>
+      <unit>milliseconds</unit>
+      <step-increment>10000</step-increment>
+    </value-attributes>
+  </property>
   <property>
     <name>hbase.defaults.for.version.skip</name>
     <value>true</value>
     <description>Disables version verification.</description>
   </property>
+  <property>
+    <name>phoenix.query.timeoutMs</name>
+    <value>60000</value>
+    <description>Number of milliseconds after which a query will timeout on the client.</description>
+    <display-name>Phoenix Query Timeout</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>30000</minimum>
+      <maximum>300000</maximum>
+      <unit>milliseconds</unit>
+      <step-increment>10000</step-increment>
+    </value-attributes>
+  </property>
 
   <property>
     <name>dfs.domain.socket.path</name>

ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml

@@ -45,31 +45,79 @@
     <name>namenode_heapsize</name>
     <value>1024</value>
     <description>NameNode Java heap size</description>
+    <display-name>NameNode Java heap size</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <maximum>268435456</maximum>
+      <unit>MB</unit>
+      <step-increment>250</step-increment>
+    </value-attributes>
   </property>
   <property>
     <name>namenode_opt_newsize</name>
     <value>200</value>
     <description>NameNode new generation size</description>
+    <display-name>NameNode new generation size</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <maximum>16384</maximum>
+      <unit>MB</unit>
+      <step-increment>250</step-increment>
+    </value-attributes>
   </property>
   <property>
     <name>namenode_opt_maxnewsize</name>
     <value>200</value>
     <description>NameNode maximum new generation size</description>
+    <display-name>NameNode maximum new generation size</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <maximum>16384</maximum>
+      <unit>MB</unit>
+      <step-increment>250</step-increment>
+    </value-attributes>
   </property>
   <property>
     <name>namenode_opt_permsize</name>
     <value>128</value>
     <description>NameNode permanent generation size</description>
+    <display-name>NameNode permanent generation size</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <maximum>2096</maximum>
+      <unit>MB</unit>
+      <step-increment>125</step-increment>
+    </value-attributes>
   </property>
   <property>
     <name>namenode_opt_maxpermsize</name>
     <value>256</value>
     <description>NameNode maximum permanent generation size</description>
+    <display-name>NameNode maximum permanent generation size</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <maximum>2096</maximum>
+      <unit>MB</unit>
+      <step-increment>125</step-increment>
+    </value-attributes>
   </property>
   <property>
     <name>dtnode_heapsize</name>
     <value>1024</value>
     <description>DataNode maximum Java heap size</description>
+    <display-name>DataNode maximum Java heap size</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <maximum>268435456</maximum>
+      <unit>MB</unit>
+      <step-increment>125</step-increment>
+    </value-attributes>
   </property>
   <property>
     <name>proxyuser_group</name>

ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml

@@ -54,6 +54,13 @@
     <value>0</value>
     <description> Number of failed disks a DataNode would tolerate before it stops offering service</description>
     <final>true</final>
+    <display-name>DataNode failed disk tolerance</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <maximum>2</maximum>
+      <step-increment>1</step-increment>
+    </value-attributes>
   </property>
 
   <property>
@@ -161,6 +168,15 @@
       Values less than or equal to 0 mean not to start in safe mode.
       Values greater than 1 will make safe mode permanent.
     </description>
+    <display-name>Minimum replicated blocks %ge</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>0.99</entries>
+      <entries>1.0</entries>
+      <entry_labels>NN HA</entry_labels>
+      <entry_labels>No NN HA</entry_labels>
+      <selection_cardinality>1</selection_cardinality>
+    </value-attributes>
   </property>
 
   <property>
@@ -246,6 +262,12 @@
     <name>dfs.datanode.max.transfer.threads</name>
     <value>1024</value>
     <description>Specifies the maximum number of threads to use for transferring data in and out of the datanode.</description>
+    <display-name>DataNode max data transfer threads</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <maximum>48000</maximum>
+    </value-attributes>
   </property>
 
   <!-- Permissions configuration -->
@@ -280,6 +302,12 @@
     <name>dfs.namenode.handler.count</name>
     <value>100</value>
     <description>Added to grow Queue size so that more client connections are allowed</description>
+    <display-name>NameNode Server threads</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>1</minimum>
+      <maximum>200</maximum>
+    </value-attributes>
   </property>
 
   <property>

ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml

@@ -115,6 +115,15 @@ limitations under the License.
     <name>hive.security.authorization.enabled</name>
     <value>false</value>
     <description>enable or disable the hive client authorization</description>
+    <display-name>Enable Authorization</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <entry_labels>True</entry_labels>
+      <entry_labels>False</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
 
   <property>
@@ -128,6 +137,10 @@ limitations under the License.
     <name>hive.security.metastore.authorization.manager</name>
     <value>org.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider</value>
     <description>The authorization manager class name to be used in the metastore for authorization. The user-defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveMetastoreAuthorizationProvider.  </description>
+    <display-name>Hive Authorization Manager</display-name>
+    <value-attributes>
+      <type>string</type>
+    </value-attributes>
   </property>
 
   <property>
@@ -143,6 +156,15 @@ limitations under the License.
       submitted the query. But if the parameter is set to false, the query will run as the user that the hiveserver2
       process runs as.
     </description>
+    <display-name>Run as end user instead of Hive user</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <entry_labels>True</entry_labels>
+      <entry_labels>False</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
 
   <property>
@@ -155,6 +177,19 @@ limitations under the License.
     <name>hive.server2.authentication</name>
     <description>Authentication mode, default NONE. Options are NONE, NOSASL, KERBEROS, LDAP, PAM and CUSTOM</description>
     <value>NONE</value>
+    <display-name>HiveServer2 Authentication</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>NONE</entries>
+      <entries>LDAP</entries>
+      <entries>KERBEROS</entries>
+      <entries>PAM</entries>
+      <entry_labels>None</entry_labels>
+      <entry_labels>Lightweight Directory Access Protocol</entry_labels>
+      <entry_labels>Kerberos</entry_labels>
+      <entry_labels>Pluggable Authentication Modules</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
 
   <property>
@@ -173,6 +208,15 @@ limitations under the License.
     <name>hive.enforce.bucketing</name>
     <value>true</value>
     <description>Whether bucketing is enforced. If true, while inserting into the table, bucketing is enforced.</description>
+    <display-name>Enforce bucketing</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <entry_labels>True</entry_labels>
+      <entry_labels>False</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
 
   <property>
@@ -242,11 +286,19 @@ limitations under the License.
 
   <property>
     <name>hive.auto.convert.join.noconditionaltask.size</name>
-    <value>1000000000</value>
+    <value>2147483648</value>
     <description>If hive.auto.convert.join.noconditionaltask is off, this parameter does not take affect. However, if it
       is on, and the sum of size for n-1 of the tables/partitions for a n-way join is smaller than this size, the join is directly
       converted to a mapjoin(there is no conditional task). The default is 10MB.
     </description>
+    <display-name>For Map Join, per Map memory threshold</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>1073741824</minimum>
+      <maximum>17179869184</maximum>
+      <unit>B</unit>
+      <step-increment></step-increment>
+    </value-attributes>
   </property>
 
   <property>
@@ -279,9 +331,18 @@ limitations under the License.
 
   <property>
     <name>hive.vectorized.execution.enabled</name>
-    <value>false</value>
+    <value>true</value>
     <description>This flag controls the vectorized mode of query execution as documented in HIVE-4160 (as of Hive 0.13.0)
     </description>
+    <display-name>Enable Vectorization and Map Vectorization</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <entry_labels>True</entry_labels>
+      <entry_labels>False</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
 
   <property>
@@ -297,6 +358,15 @@ limitations under the License.
     <description>
     Whether to enable automatic use of indexes
     </description>
+    <display-name>Push Filters to Storage</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <entry_labels>True</entry_labels>
+      <entry_labels>False</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
 
   <property>
@@ -335,4 +405,17 @@ limitations under the License.
     </description>
   </property>
 
+  <property>
+    <name>hive.default.fileformat</name>
+    <value>Text</value>
+    <description>Default file format for CREATE TABLE statement.</description>
+    <display-name>Default File Format</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>ORCFile</entries>
+      <entries>Text</entries>
+      <entry_descriptions>The Optimized Row Columnar (ORC) file format provides a highly efficient way to store Hive data. It was designed to overcome limitations of the other Hive file formats. Using ORC files improves performance when Hive is reading, writing, and processing data.</entry_descriptions>
+      <entry_descriptions>Text file format saves Hive data as normal text.</entry_descriptions>
+    </value-attributes>
+  </property>
 </configuration>

ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml

@@ -168,6 +168,14 @@
     <description>Time (in seconds) for which the Tez AM should wait for a DAG to be submitted
       before shutting down
     </description>
+    <display-name>Max idle tez session length</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>600</minimum>
+      <maximum>86400</maximum>
+      <step-increment>600</step-increment>
+      <unit>seconds</unit>
+    </value-attributes>
   </property>
 
 

ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml

@@ -37,6 +37,7 @@
       <minimum>0</minimum>
       <maximum>2047</maximum>
       <unit>MB</unit>
+      <step-increment>1</step-increment>
     </value-attributes>
     <depends-on>
       <property>
@@ -181,6 +182,7 @@
       <minimum>512</minimum>
       <maximum>5120</maximum>
       <unit>MB</unit>
+      <increment-step>250</increment-step>
     </value-attributes>
     <depends-on>
       <property>
@@ -200,6 +202,7 @@
       <minimum>512</minimum>
       <maximum>5120</maximum>
       <unit>MB</unit>
+      <increment-step>250</increment-step>
     </value-attributes>
     <depends-on>
       <property>
@@ -274,6 +277,7 @@
       <minimum>512</minimum>
       <maximum>5120</maximum>
       <unit>MB</unit>
+      <step-increment>250</step-increment>
     </value-attributes>
     <depends-on>
       <property>

ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml

@@ -76,6 +76,7 @@
       <minimum>0</minimum>
       <maximum>5120</maximum>
       <unit>MB</unit>
+      <step-increment>250</step-increment>
     </value-attributes>
     <depends-on>
       <property>
@@ -99,6 +100,7 @@
       <minimum>0</minimum>
       <maximum>5120</maximum>
       <unit>MB</unit>
+      <step-increment>250</step-increment>
     </value-attributes>
     <depends-on>
       <property>
@@ -139,6 +141,7 @@
       <minimum>0</minimum>
       <maximum>268435456</maximum>
       <unit>MB</unit>
+      <step-increment>250</step-increment>
     </value-attributes>
   </property>
 
@@ -161,6 +164,7 @@
       <type>float</type>
       <minimum>0.1</minimum>
       <maximum>5.0</maximum>
+      <step-increment>0.1</step-increment>
     </value-attributes>
   </property>
 

ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml

@@ -361,6 +361,14 @@ limitations under the License.
     <name>hive.tez.container.size</name>
     <value>682</value>
     <description>By default, Tez uses the java options from map tasks. Use this property to override that value.</description>
+    <display-name>Tez Container Size</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>682</minimum>
+      <minimum>6820</minimum>
+      <unit>MB</unit>
+      <step-increment>682</step-increment>
+    </value-attributes>
   </property>
 
   <property>
@@ -383,6 +391,15 @@ limitations under the License.
       stored in metastore. For basic stats collection turn on the config hive.stats.autogather to true.
       For more advanced stats collection need to run analyze table queries.
     </description>
+    <display-name>Compute simple queries using stats only</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <entry_labels>True</entry_labels>
+      <entry_labels>False</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
 
   <property>
@@ -446,12 +463,28 @@ limitations under the License.
     <name>hive.compactor.initiator.on</name>
     <value>false</value>
     <description>Whether to run the compactor's initiator thread in this metastore instance or not. If there is more than one instance of the thrift metastore this should only be set to true for one of them.</description>
+    <display-name>Run Compactor</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <entry_labels>True</entry_labels>
+      <entry_labels>False</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
 
   <property>
     <name>hive.compactor.worker.threads</name>
     <value>0</value>
     <description>Number of compactor worker threads to run on this metastore instance. Can be different values on different metastore instances.</description>
+    <display-name>Number of threads used by Compactor</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <maximum>20</maximum>
+      <step-increment>1</step-increment>
+    </value-attributes>
   </property>
 
   <property>

ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml

@@ -23,6 +23,15 @@ limitations under the License.
     <name>hive.cbo.enable</name>
     <value>true</value>
     <description>Flag to control enabling Cost Based Optimizations using Calcite framework.</description>
+    <display-name>Enable Cost Based Optimizer</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <entry_labels>On</entry_labels>
+      <entry_labels>Off</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
 
   <property>
@@ -233,6 +242,15 @@ limitations under the License.
       in case the user accidentally overwrites all partitions.
       NonStrict allows all partitions of a table to be dynamic.
     </description>
+    <display-name>Allow all partitions to be Dynamic</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <entry_labels>True</entry_labels>
+      <entry_labels>False</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
 
   <property>
@@ -446,12 +464,29 @@ limitations under the License.
     <name>hive.exec.orc.default.stripe.size</name>
     <value>67108864</value>
     <description>Define the default ORC stripe size</description>
+    <display-name>Default ORC Stripe Size</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>8388608</minimum>
+      <maximum>268435456</maximum>
+      <unit>B</unit>
+      <step-increment>8388608</step-increment>
+    </value-attributes>
   </property>
 
   <property>
     <name>hive.exec.orc.default.compress</name>
     <value>ZLIB</value>
     <description>Define the default compression codec for ORC file</description>
+    <display-name>ORC Compression Algorithm</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>ZLIB</entries>
+      <entries>SNAPPY</entries>
+      <entry_labels>zlib Compression Library</entry_labels>
+      <entry_labels>Snappy Compression Library</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
 
   <property>
@@ -601,6 +636,15 @@ limitations under the License.
       This way we can keep only one record writer open for each partition value
       in the reducer thereby reducing the memory pressure on reducers.
     </description>
+    <display-name>Sort Partitions Dynamically</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <entry_labels>True</entry_labels>
+      <entry_labels>False</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
   <property>
     <name>hive.stats.autogather</name>
@@ -627,6 +671,15 @@ limitations under the License.
       from metastore. When this flag is disabled, Hive will make calls to filesystem to get file sizes
       and will estimate the number of rows from row schema.
     </description>
+    <display-name>Fetch partition stats at compiler</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <entry_labels>On</entry_labels>
+      <entry_labels>Off</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
   <property>
     <name>hive.stats.fetch.column.stats</name>
@@ -637,6 +690,15 @@ limitations under the License.
       can be expensive when the number of columns is high. This flag can be used to disable fetching
       of column statistics from metastore.
     </description>
+    <display-name>Fetch column stats at compiler</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <entry_labels>On</entry_labels>
+      <entry_labels>Off</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
 
   <property>
@@ -655,6 +717,15 @@ limitations under the License.
     <name>hive.txn.manager</name>
     <value>org.apache.hadoop.hive.ql.lockmgr.DummyTxnManager</value>
     <description/>
+    <display-name>Transaction Manager</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>org.apache.hadoop.hive.ql.lockmgr.DummyTxnManager</entries>
+      <entries>org.apache.hadoop.hive.ql.lockmgr.DbTxnManager</entries>
+      <entry_labels>org.apache.hadoop.hive.ql.lockmgr.DummyTxnManager (off)</entry_labels>
+      <entry_labels>org.apache.hadoop.hive.ql.lockmgr.DbTxnManager (on)</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
 
   <property>
@@ -674,6 +745,15 @@ limitations under the License.
     <description>
       Support concurrency and use locks, needed for Transactions. Requires Zookeeper.
     </description>
+    <display-name>Use Locking</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <entry_labels>True</entry_labels>
+      <entry_labels>False</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
 
   <property>
@@ -895,6 +975,15 @@ limitations under the License.
     <name>hive.server2.use.SSL</name>
     <value>false</value>
     <description/>
+    <display-name>Use SSL</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <entry_labels>True</entry_labels>
+      <entry_labels>False</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
 
   <property>
@@ -926,11 +1015,27 @@ limitations under the License.
     <name>hive.prewarm.enabled</name>
     <value>false</value>
     <description>Enables container prewarm for Tez (Hadoop 2 only)</description>
+    <display-name>Hold Containers to Reduce Latency</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <entry_labels>True</entry_labels>
+      <entry_labels>False</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
   <property>
     <name>hive.prewarm.numcontainers</name>
-    <value>10</value>
+    <value>3</value>
     <description>Controls the number of containers to prewarm for Tez (Hadoop 2 only)</description>
+    <display-name>Number of Containers Held</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>1</minimum>
+      <maximum>20</maximum>
+      <step-increment>1</step-increment>
+    </value-attributes>
   </property>
 
   <property>
@@ -960,6 +1065,15 @@ limitations under the License.
       and set parallelism estimates. Tez will sample source vertices' output sizes and adjust the estimates at runtime as
       necessary.
     </description>
+    <display-name>Allow dynamic numbers of reducers</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <entry_labels>True</entry_labels>
+      <entry_labels>False</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
   <property>
     <name>hive.tez.max.partition.factor</name>
@@ -978,6 +1092,15 @@ limitations under the License.
     <name>hive.tez.dynamic.partition.pruning</name>
     <value>true</value>
     <description>When dynamic pruning is enabled, joins on partition keys will be processed by sending events from the processing vertices to the tez application master. These events will be used to prune unnecessary partitions.</description>
+    <display-name>Allow dynamic partition pruning</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <entry_labels>True</entry_labels>
+      <entry_labels>False</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
   <property>
     <name>hive.tez.dynamic.partition.pruning.max.event.size</name>
@@ -1067,6 +1190,15 @@ limitations under the License.
       Expects one of [mr, tez].
       Chooses execution engine. Options are: mr (Map reduce, default) or tez (hadoop 2 only)
     </description>
+    <display-name>Exection Engine</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>mr</entries>
+      <entries>tez</entries>
+      <entry_labels>MapReduce</entry_labels>
+      <entry_labels>TEZ</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
 
   <property>
@@ -1089,6 +1221,15 @@ limitations under the License.
       stored in metastore. For basic stats collection turn on the config hive.stats.autogather to true.
       For more advanced stats collection need to run analyze table queries.
     </description>
+    <display-name>Compute simple queries using stats only</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <entry_labels>On</entry_labels>
+      <entry_labels>Off</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
 
   <property>
@@ -1105,6 +1246,13 @@ limitations under the License.
       launched on each of the queues specified by "hive.server2.tez.default.queues".
       Determines the parallelism on each queue.
     </description>
+    <display-name>Session per queue</display-name>
+    <value-attributes>
+      <type>int</type>
+      <minimum>1</minimum>
+      <maximum>10</maximum>
+      <step-increment>1</step-increment>
+    </value-attributes>
   </property>
 
   <property>
@@ -1115,7 +1263,70 @@ limitations under the License.
       turning on Tez for HiveServer2. The user could potentially want to run queries
       over Tez without the pool of sessions.
     </description>
+    <display-name>Start Tez session at Initialization</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <entry_labels>True</entry_labels>
+      <entry_labels>False</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
 
+  <property>
+    <name>hive.exec.orc.encoding.strategy</name>
+    <value>SPEED</value>
+    <description>
+      Define the encoding strategy to use while writing data. Changing this 
+      will only affect the light weight encoding for integers. This flag will not change 
+      the compression level of higher level compression codec (like ZLIB). Possible 
+      options are SPEED and COMPRESSION.
+    </description>
+    <display-name>ORC Encoding Strategy</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>SPEED</entries>
+      <entries>COMPRESSION</entries>
+      <entry_labels>Speed</entry_labels>
+      <entry_labels>Compression</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
+  </property>
 
+  <property>
+    <name>hive.exec.orc.compression.strategy</name>
+    <value>SPEED</value>
+    <description>
+      Define the compression strategy to use while writing data. This changes the 
+      compression level of higher level compression codec (like ZLIB).
+    </description>
+    <display-name>ORC Compression Strategy</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>SPEED</entries>
+      <entries>COMPRESSION</entries>
+      <entry_labels>Speed</entry_labels>
+      <entry_labels>Compression</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>hive.vectorized.execution.reduce.enabled</name>
+    <value>false</value>
+    <description>
+      This flag should be set to true to enable vectorized mode of the reduce-side of 
+      query execution.
+    </description>
+    <display-name>Enable Reduce Vectorization</display-name>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>true</entries>
+      <entries>false</entries>
+      <entry_labels>True</entry_labels>
+      <entry_labels>False</entry_labels>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
+  </property>
 </configuration>

ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml

@@ -199,6 +199,7 @@
       <type>int</type>
       <minimum>0</minimum>
       <maximum>100</maximum>
+      <step-increment>1</step-increment>
     </value-attributes>
   </property>
   <property>
@@ -344,6 +345,7 @@
       <type>int</type>
       <minimum>0</minimum>
       <maximum>8</maximum>
+      <step-increment>1</step-increment>
     </value-attributes>
     <depends-on>
       <property>
@@ -361,6 +363,7 @@
       <type>int</type>
       <minimum>0</minimum>
       <maximum>8</maximum>
+      <step-increment>1</step-increment>
     </value-attributes>
     <depends-on>
       <property>