ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject [2/6] ambari git commit: AMBARI-13069. Attributes of configuration property should be stack API driven. (jaimin)
Date Sat, 12 Sep 2015 01:04:46 GMT
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ca8500/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index 0cda85c..3950874 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -20,57 +20,43 @@ var App = require('app');
 
 var hdp2properties = [
   //***************************************** HDP stack **************************************
-/**********************************************HDFS***************************************/
+  /**********************************************HDFS***************************************/
   {
-    "id": "site property",
     "name": "dfs.namenode.checkpoint.dir",
-    "displayName": "SecondaryNameNode Checkpoint directories",
     "defaultDirectory": "/hadoop/hdfs/namesecondary",
     "displayType": "directories",
-    "isOverridable": false,
     "serviceName": "HDFS",
     "filename": "hdfs-site.xml",
     "category": "SECONDARY_NAMENODE",
     "index": 1
   },
   {
-    "id": "site property",
     "name": "dfs.namenode.checkpoint.period",
-    "displayName": "HDFS Maximum Checkpoint Delay",
     "displayType": "int",
-    "unit": "seconds",
     "category": "General",
     "serviceName": "HDFS",
     "filename": "hdfs-site.xml",
     "index": 3
   },
   {
-    "id": "site property",
     "name": "dfs.namenode.name.dir",
-    "displayName": "NameNode directories",
     "defaultDirectory": "/hadoop/hdfs/namenode",
     "displayType": "directories",
-    "isOverridable": false,
     "serviceName": "HDFS",
     "filename": "hdfs-site.xml",
     "category": "NAMENODE",
     "index": 1
   },
   {
-    "id": "site property",
     "name": "dfs.webhdfs.enabled",
-    "displayName": "WebHDFS enabled",
     "displayType": "checkbox",
-    "isOverridable": false,
     "category": "General",
     "serviceName": "HDFS",
     "filename": "hdfs-site.xml",
     "index": 0
   },
   {
-    "id": "site property",
     "name": "dfs.datanode.failed.volumes.tolerated",
-    "displayName": "DataNode volumes failure toleration",
     "displayType": "int",
     "category": "DATANODE",
     "serviceName": "HDFS",
@@ -78,22 +64,15 @@ var hdp2properties = [
     "index": 3
   },
   {
-    "id": "site property",
     "name": "dfs.datanode.data.dir.mount.file",
-    "displayName": "File that stores mount point for each data dir",
-    "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.",
-    "recommendedValue": "/etc/hadoop/conf/dfs_data_dir_mount.hist",
     "displayType": "directory",
-    "isVisible": true,
     "category": "DATANODE",
     "serviceName": "HDFS",
     "filename": "hadoop-env.xml",
     "index": 4
   },
   {
-    "id": "site property",
     "name": "dfs.datanode.data.dir",
-    "displayName": "DataNode directories",
     "defaultDirectory": "/hadoop/hdfs/data",
     "displayType": "directories",
     "category": "DATANODE",
@@ -102,18 +81,14 @@ var hdp2properties = [
     "index": 1
   },
   {
-    "id": "site property",
     "name": "dfs.datanode.data.dir.perm",
-    "displayName": "DataNode directories permission",
     "displayType": "int",
     "category": "DATANODE",
     "serviceName": "HDFS",
     "filename": "hdfs-site.xml"
   },
   {
-    "id": "site property",
     "name": "nfs.file.dump.dir",
-    "displayName": "NFSGateway dump directory",
     "defaultDirectory": "/tmp/.hdfs-nfs",
     "displayType": "directory",
     "category": "NFS_GATEWAY",
@@ -122,10 +97,7 @@ var hdp2properties = [
     "index": 1
   },
   {
-    "id": "site property",
     "name": "dfs.namenode.accesstime.precision",
-    "displayName": "Access time precision",
-    "recommendedValue": "0",
     "displayType": "long",
     "category": "General",
     "serviceName": "HDFS",
@@ -133,10 +105,7 @@ var hdp2properties = [
     "index": 2
   },
   {
-    "id": "site property",
     "name": "nfs.exports.allowed.hosts",
-    "displayName": "Allowed hosts",
-    "recommendedValue": "* rw",
     "displayType": "string",
     "category": "NFS_GATEWAY",
     "serviceName": "HDFS",
@@ -144,140 +113,234 @@ var hdp2properties = [
     "index": 3
   },
   {
-    "id": "site property",
     "name": "dfs.replication",
-    "displayName": "Block replication",
     "displayType": "int",
     "category": "General",
     "serviceName": "HDFS",
     "filename": "hdfs-site.xml"
   },
   {
-    "id": "site property",
     "name": "dfs.datanode.du.reserved",
-    "displayName": "Reserved space for HDFS",
     "displayType": "int",
-    "unit": "bytes",
     "category": "General",
     "serviceName": "HDFS",
     "filename": "hdfs-site.xml",
     "index": 2
   },
   {
-    "id": "site property",
     "name": "dfs.client.read.shortcircuit",
-    "displayName": "HDFS Short-circuit read",
     "displayType": "checkbox",
     "category": "Advanced hdfs-site",
     "serviceName": "HDFS",
     "filename": "hdfs-site.xml"
   },
   {
-    "id": "site property",
-    "name": "apache_artifacts_download_url",
-    "displayName": "apache_artifacts_download_url",
-    "description": "",
+    "name": "namenode_host",
+    "displayName": "NameNode hosts",
+    "value": "",
+    "recommendedValue": "",
+    "description": "The hosts that has been assigned to run NameNode",
+    "displayType": "masterHosts",
+    "isOverridable": false,
+    "isRequiredByAgent": false,
+    "serviceName": "HDFS",
+    "filename": "hadoop-env.xml",
+    "category": "NAMENODE",
+    "index": 0
+  },
+  {
+    "name": "namenode_heapsize",
+    "displayType": "int",
+    "serviceName": "HDFS",
+    "filename": "hadoop-env.xml",
+    "category": "NAMENODE",
+    "index": 2
+  },
+  {
+    "name": "namenode_opt_newsize",
+    "displayType": "int",
+    "serviceName": "HDFS",
+    "filename": "hadoop-env.xml",
+    "category": "NAMENODE",
+    "index": 3
+  },
+  {
+    "name": "namenode_opt_permsize",
+    "displayType": "int",
+    "serviceName": "HDFS",
+    "filename": "hadoop-env.xml",
+    "category": "NAMENODE",
+    "index": 5
+  },
+  {
+    "name": "namenode_opt_maxpermsize",
+    "displayType": "int",
+    "serviceName": "HDFS",
+    "filename": "hadoop-env.xml",
+    "category": "NAMENODE",
+    "index": 6
+  },
+  {
+    "name": "namenode_opt_maxnewsize",
+    "displayType": "int",
+    "serviceName": "HDFS",
+    "filename": "hadoop-env.xml",
+    "category": "NAMENODE",
+    "index": 4
+  },
+  {
+    "name": "snamenode_host",
+    "displayName": "SNameNode host",
+    "value": "",
+    "recommendedValue": "",
+    "description": "The host that has been assigned to run SecondaryNameNode",
+    "displayType": "masterHost",
+    "isOverridable": false,
+    "isRequiredByAgent": false,
+    "serviceName": "HDFS",
+    "filename": "hadoop-env.xml",
+    "category": "SECONDARY_NAMENODE",
+    "index": 0
+  },
+  {
+    "name": "datanode_hosts", //not in the schema. For UI purpose
+    "displayName": "DataNode hosts",
+    "value": "",
+    "recommendedValue": "",
+    "description": "The hosts that have been assigned to run DataNode",
+    "displayType": "slaveHosts",
     "isRequired": false,
+    "isOverridable": false,
     "isRequiredByAgent": false,
-    "isVisible": false,
-    "category": "Advanced hdfs-site",
-    "filename": "hdfs-site.xml",
-    "serviceName": "HDFS"
+    "serviceName": "HDFS",
+    "filename": "hadoop-env.xml",
+    "category": "DATANODE",
+    "index": 0
+  },
+  {
+    "name": "dtnode_heapsize",
+    "displayType": "int",
+    "serviceName": "HDFS",
+    "filename": "hadoop-env.xml",
+    "category": "DATANODE",
+    "index": 2
   },
   {
-    "id": "site property",
-    "name": "dfs.cluster.administrators",
-    "displayName": "dfs.cluster.administrators",
-    "description": "ACL for who all can view the default servlets in the HDFS",
+    "name": "nfsgateway_hosts", //not in the schema. For UI purpose
+    "displayName": "NFSGateway hosts",
+    "value": "",
+    "recommendedValue": "",
+    "description": "The hosts that have been assigned to run NFSGateway",
+    "displayType": "slaveHosts",
+    "isRequired": false,
+    "isOverridable": false,
     "isVisible": true,
-    "category": "Advanced hdfs-site",
+    "isRequiredByAgent": false,
     "serviceName": "HDFS",
-    "filename": "hdfs-site.xml"
+    "filename": "hadoop-env.xml",
+    "category": "NFS_GATEWAY",
+    "index": 0
+  },
+  {
+    "name": "nfsgateway_heapsize",
+    "displayType": "int",
+    "serviceName": "HDFS",
+    "filename": "hadoop-env.xml",
+    "category": "NFS_GATEWAY",
+    "index": 1
+  },
+  {
+    "name": "hadoop_heapsize",
+    "displayType": "int",
+    "serviceName": "HDFS",
+    "filename": "hadoop-env.xml",
+    "category": "General",
+    "index": 1
+  },
+  {
+    "name": "hdfs_log_dir_prefix",
+    "displayType": "directory",
+    "serviceName": "HDFS",
+    "filename": "hadoop-env.xml",
+    "category": "Advanced hadoop-env"
+  },
+  {
+    "name": "hadoop_pid_dir_prefix",
+    "displayType": "directory",
+    "serviceName": "HDFS",
+    "filename": "hadoop-env.xml",
+    "category": "Advanced hadoop-env"
+  },
+  {
+    "name": "hadoop_root_logger",
+    "displayType": "string",
+    "serviceName": "HDFS",
+    "filename": "hadoop-env.xml",
+    "category": "Advanced hadoop-env"
   },
 
 /**********************************************YARN***************************************/
   {
-    "id": "site property",
     "name": "yarn.acl.enable",
-    "displayName": "yarn.acl.enable",
     "displayType": "checkbox",
     "serviceName": "YARN",
     "filename": "yarn-site.xml",
     "category": "RESOURCEMANAGER"
   },
   {
-    "id": "site property",
     "name": "yarn.admin.acl",
-    "displayName": "yarn.admin.acl",
-    "isRequired": false,
     "serviceName": "YARN",
     "filename": "yarn-site.xml",
     "category": "RESOURCEMANAGER"
   },
   {
-    "id": "site property",
     "name": "yarn.log-aggregation-enable",
-    "displayName": "yarn.log-aggregation-enable",
     "displayType": "checkbox",
     "serviceName": "YARN",
     "filename": "yarn-site.xml",
     "category": "RESOURCEMANAGER"
   },
   {
-    "id": "site property",
     "name": "yarn.resourcemanager.scheduler.class",
-    "displayName": "yarn.resourcemanager.scheduler.class",
     "serviceName": "YARN",
     "filename": "yarn-site.xml",
     "category": "CapacityScheduler"
   },
   {
-    "id": "site property",
     "name": "yarn.scheduler.minimum-allocation-mb",
-    "displayName": "yarn.scheduler.minimum-allocation-mb",
     "displayType": "int",
     "serviceName": "YARN",
     "filename": "yarn-site.xml",
     "category": "CapacityScheduler"
   },
   {
-    "id": "site property",
     "name": "yarn.scheduler.maximum-allocation-mb",
-    "displayName": "yarn.scheduler.maximum-allocation-mb",
     "displayType": "int",
     "serviceName": "YARN",
     "filename": "yarn-site.xml",
     "category": "CapacityScheduler"
   },
   {
-    "id": "site property",
     "name": "yarn.nodemanager.resource.memory-mb",
-    "displayName": "yarn.nodemanager.resource.memory-mb",
     "displayType": "int",
     "serviceName": "YARN",
     "filename": "yarn-site.xml",
     "category": "NODEMANAGER"
   },
   {
-    "id": "site property",
     "name": "yarn.nodemanager.vmem-pmem-ratio",
-    "displayName": "yarn.nodemanager.vmem-pmem-ratio",
     "serviceName": "YARN",
     "filename": "yarn-site.xml",
     "category": "NODEMANAGER"
   },
   {
-    "id": "site property",
     "name": "yarn.nodemanager.linux-container-executor.group",
-    "displayName": "yarn.nodemanager.linux-container-executor.group",
     "serviceName": "YARN",
     "category": "NODEMANAGER",
     "filename": "yarn-site.xml"
   },
   {
-    "id": "site property",
     "name": "yarn.nodemanager.log-dirs",
-    "displayName": "yarn.nodemanager.log-dirs",
     "defaultDirectory": "/hadoop/yarn/log",
     "displayType": "directories",
     "serviceName": "YARN",
@@ -285,9 +348,7 @@ var hdp2properties = [
     "category": "NODEMANAGER"
   },
   {
-    "id": "site property",
     "name": "yarn.nodemanager.local-dirs",
-    "displayName": "yarn.nodemanager.local-dirs",
     "defaultDirectory": "/hadoop/yarn/local",
     "displayType": "directories",
     "serviceName": "YARN",
@@ -295,112 +356,204 @@ var hdp2properties = [
     "category": "NODEMANAGER"
   },
   {
-    "id": "site property",
     "name": "yarn.nodemanager.remote-app-log-dir",
-    "displayName": "yarn.nodemanager.remote-app-log-dir",
     "serviceName": "YARN",
     "filename": "yarn-site.xml",
     "category": "NODEMANAGER"
   },
   {
-    "id": "site property",
     "name": "yarn.nodemanager.remote-app-log-dir-suffix",
-    "displayName": "yarn.nodemanager.remote-app-log-dir-suffix",
     "serviceName": "YARN",
     "filename": "yarn-site.xml",
     "category": "NODEMANAGER"
   },
   {
-    "id": "site property",
     "name": "yarn.nodemanager.aux-services",
-    "displayName": "yarn.nodemanager.aux-services",
     "serviceName": "YARN",
     "filename": "yarn-site.xml",
     "category": "NODEMANAGER"
   },
   {
-    "id": "site property",
     "name": "yarn.nodemanager.log.retain-second",
-    "displayName": "yarn.nodemanager.log.retain-second",
     "serviceName": "YARN",
     "filename": "yarn-site.xml",
     "category": "NODEMANAGER"
   },
   {
-    "id": "site property",
-    "name": "yarn.log.server.url",
-    "displayName": "yarn.log.server.url",
-    "category": "Advanced yarn-site",
+    "name": "yarn_heapsize",
+    "displayType": "int",
     "serviceName": "YARN",
-    "filename": "yarn-site.xml"
+    "filename": "yarn-env.xml",
+    "category": "General",
+    "index": 0
+  },
+  {
+    "name": "rm_host",
+    "displayName": "ResourceManager",
+    "description": "ResourceManager",
+    "recommendedValue": "",
+    "isOverridable": false,
+    "displayType": "masterHost",
+    "isRequiredByAgent": false,
+    "serviceName": "YARN",
+    "filename": "yarn-env.xml",
+    "category": "RESOURCEMANAGER",
+    "index": 0
+  },
+  {
+    "name": "resourcemanager_heapsize",
+    "displayType": "int",
+    "serviceName": "YARN",
+    "filename": "yarn-env.xml",
+    "category": "RESOURCEMANAGER",
+    "index": 1
+  },
+  {
+    "name": "nm_hosts",
+    "displayName": "NodeManager",
+    "description": "List of NodeManager Hosts.",
+    "recommendedValue": "",
+    "isOverridable": false,
+    "displayType": "slaveHosts",
+    "isRequiredByAgent": false,
+    "serviceName": "YARN",
+    "filename": "yarn-env.xml",
+    "category": "NODEMANAGER",
+    "index": 0
+  },
+  {
+    "name": "nodemanager_heapsize",
+    "displayType": "int",
+    "serviceName": "YARN",
+    "filename": "yarn-env.xml",
+    "category": "NODEMANAGER",
+    "index": 0
+  },
+  {
+    "name": "yarn_log_dir_prefix",
+    "displayType": "directory",
+    "serviceName": "YARN",
+    "filename": "yarn-env.xml",
+    "category": "Advanced yarn-env"
+  },
+  {
+    "name": "yarn_pid_dir_prefix",
+    "displayType": "directory",
+    "serviceName": "YARN",
+    "filename": "yarn-env.xml",
+    "category": "Advanced yarn-env"
+  },
+  {
+    "name": "min_user_id",
+    "displayType": "int",
+    "serviceName": "YARN",
+    "filename": "yarn-env.xml",
+    "category": "Advanced yarn-env"
+  },
+  {
+    "name": "ats_host",
+    "displayName": "App Timeline Server",
+    "description": "Application Timeline Server Host",
+    "recommendedValue": "",
+    "isOverridable": false,
+    "displayType": "masterHost",
+    "isRequiredByAgent": false,
+    "serviceName": "YARN",
+    "filename": "yarn-env.xml",
+    "category": "APP_TIMELINE_SERVER",
+    "index": 0
+  },
+  {
+    "name": "apptimelineserver_heapsize",
+    "displayType": "int",
+    "serviceName": "YARN",
+    "filename": "yarn-env.xml",
+    "category": "APP_TIMELINE_SERVER",
+    "index": 1
   },
 /**********************************************MAPREDUCE2***************************************/
   {
-    "id": "site property",
     "name": "mapreduce.map.memory.mb",
-    "displayName": "Default virtual memory for a job's map-task",
     "displayType": "int",
-    "unit": "MB",
     "category": "General",
     "serviceName": "MAPREDUCE2",
     "filename": "mapred-site.xml"
   },
   {
-    "id": "site property",
     "name": "mapreduce.reduce.memory.mb",
-    "displayName": "Default virtual memory for a job's reduce-task",
     "displayType": "int",
-    "unit": "MB",
     "category": "General",
     "serviceName": "MAPREDUCE2",
     "filename": "mapred-site.xml"
   },
   {
-    "id": "site property",
     "name": "mapreduce.task.io.sort.mb",
-    "displayName": "Map-side sort buffer memory",
     "displayType": "int",
-    "unit": "MB",
     "category": "General",
     "serviceName": "MAPREDUCE2",
     "filename": "mapred-site.xml"
   },
   {
-    "id": "site property",
     "name": "hadoop.security.auth_to_local",
-    "displayName": "hadoop.security.auth_to_local",
     "displayType": "multiLine",
     "serviceName": "HDFS",
     "filename": "core-site.xml",
     "category": "Advanced core-site"
   },
   {
-    "id": "site property",
     "name": "yarn.app.mapreduce.am.resource.mb",
-    "displayName": "yarn.app.mapreduce.am.resource.mb",
     "displayType": "int",
     "category": "Advanced mapred-site",
     "serviceName": "MAPREDUCE2",
     "filename": "mapred-site.xml"
   },
-
-/**********************************************oozie-site***************************************/
   {
-    "id": "site property",
-    "name": "oozie.db.schema.name",
-    "displayName": "Database Name",
+    "name": "hs_host",
+    "displayName": "History Server",
+    "description": "History Server",
+    "recommendedValue": "",
     "isOverridable": false,
-    "displayType": "host",
-    "category": "OOZIE_SERVER",
-    "serviceName": "OOZIE",
-    "filename": "oozie-site.xml",
-    "index": 4
+    "displayType": "masterHost",
+    "isRequiredByAgent": false,
+    "isVisible": true,
+    "serviceName": "MAPREDUCE2",
+    "filename": "mapred-env.xml",
+    "category": "HISTORYSERVER",
+    "index": 0
   },
   {
-    "id": "site property",
-    "name": "oozie.service.JPAService.jdbc.username",
-    "displayName": "Database Username",
-    "isOverridable": false,
+    "name": "jobhistory_heapsize",
+    "displayType": "int",
+    "serviceName": "MAPREDUCE2",
+    "filename": "mapred-env.xml",
+    "category": "HISTORYSERVER",
+    "index": 1
+  },
+  {
+    "name": "mapred_log_dir_prefix",
+    "displayType": "directory",
+    "serviceName": "MAPREDUCE2",
+    "filename": "mapred-env.xml",
+    "category": "Advanced mapred-env"
+  },
+  {
+    "name": "mapred_pid_dir_prefix",
+    "displayType": "directory",
+    "serviceName": "MAPREDUCE2",
+    "filename": "mapred-env.xml",
+    "category": "Advanced mapred-env"
+  },
+/**********************************************oozie-site***************************************/
+  {
+    "name": "oozie.db.schema.name",
+    "displayType": "host",
+    "category": "OOZIE_SERVER",
+    "serviceName": "OOZIE",
+    "filename": "oozie-site.xml",
+    "index": 4
+  },
+  {
+    "name": "oozie.service.JPAService.jdbc.username",
     "displayType": "user",
     "category": "OOZIE_SERVER",
     "serviceName": "OOZIE",
@@ -408,268 +561,431 @@ var hdp2properties = [
     "index": 5
   },
   {
-    "id": "site property",
     "name": "oozie.service.JPAService.jdbc.password",
-    "displayName": "Database Password",
-    "isOverridable": false,
-    "displayType": "password",
     "category": "OOZIE_SERVER",
     "serviceName": "OOZIE",
     "filename": "oozie-site.xml",
     "index": 6
   },
   {
-    "id": "site property",
     "name": "oozie.service.JPAService.jdbc.driver", // the default value of this property is overriden in code
-    "displayName": "JDBC Driver Class",
-    "isOverridable": false,
     "category": "OOZIE_SERVER",
     "serviceName": "OOZIE",
     "filename": "oozie-site.xml",
     "index": 7
   },
   {
-    "id": "site property",
     "name": "oozie.service.JPAService.jdbc.url",
-    "displayName": "Database URL",
-    "isOverridable": false,
     "displayType": "advanced",
     "category": "OOZIE_SERVER",
     "serviceName": "OOZIE",
     "filename": "oozie-site.xml",
     "index": 8
   },
+  {
+    "name": "oozieserver_host",
+    "displayName": "Oozie Server host",
+    "value": "",
+    "recommendedValue": "",
+    "description": "The hosts that have been assigned to run Oozie Server",
+    "displayType": "masterHosts",
+    "isOverridable": false,
+    "isRequiredByAgent": false,
+    "serviceName": "OOZIE",
+    "filename": "oozie-env.xml",
+    "category": "OOZIE_SERVER",
+    "index": 0
+  },
+  {
+    "name": "oozie_database",
+    "options": [
+      {
+        displayName: 'New Derby Database',
+        hidden: false
+      },
+      {
+        displayName: 'Existing MySQL Database',
+        hidden: false
+      },
+      {
+        displayName: 'Existing PostgreSQL Database',
+        hidden: false
+      },
+      {
+        displayName: 'Existing Oracle Database',
+        hidden: false
+      },
+      {
+        displayName: 'Existing SQLA Database',
+        hidden: !App.get('isHadoop23Stack')
+      }
+    ],
+    "displayType": "radio button",
+    "radioName": "oozie-database",
+    "serviceName": "OOZIE",
+    "filename": "oozie-env.xml",
+    "category": "OOZIE_SERVER",
+    "index": 2
+  },
+  {
+    "name": "oozie_data_dir",
+    "defaultDirectory": "/hadoop/oozie/data",
+    "displayType": "directory",
+    "serviceName": "OOZIE",
+    "filename": "oozie-env.xml",
+    "category": "OOZIE_SERVER",
+    "index": 9
+  },
+  {
+    "name": "oozie_hostname",
+    "displayType": "host",
+    "serviceName": "OOZIE",
+    "filename": "oozie-env.xml",
+    "category": "OOZIE_SERVER",
+    "index": 3
+  },
+  {
+    "name": "oozie_log_dir",
+    "displayType": "directory",
+    "serviceName": "OOZIE",
+    "filename": "oozie-env.xml",
+    "category": "Advanced oozie-env"
+  },
+  {
+    "name": "oozie_pid_dir",
+    "displayType": "directory",
+    "serviceName": "OOZIE",
+    "filename": "oozie-env.xml",
+    "category": "Advanced oozie-env"
+  },
+  {
+    "name": "oozie_admin_port",
+    "displayType": "int",
+    "serviceName": "OOZIE",
+    "filename": "oozie-env.xml",
+    "category": "Advanced oozie-env"
+  },
 
-/**********************************************hive-site***************************************/
+/**********************************************HIVE***************************************/
   {
-    "id": "site property",
     "name": "javax.jdo.option.ConnectionDriverName",  // the default value is overwritten in code
-    "displayName": "JDBC Driver Class",
-    "isOverridable": false,
     "category": "HIVE_METASTORE",
     "serviceName": "HIVE",
     "filename": "hive-site.xml",
     "index": 7
   },
   {
-    "id": "site property",
     "name": "hive.metastore.heapsize",  // the default value is overwritten in code
-    "displayName": "Hive Metastore heapsize",
-    "isOverridable": false,
     "category": "HIVE_METASTORE",
     "serviceName": "HIVE",
     "filename": "hive-env.xml",
     "displayType": "int",
-    "unit": "MB",
     "index": 11
   },
   {
-    "id": "site property",
     "name": "hive.heapsize",
-    "displayName": "HiveServer2 heap size",
     "displayType": "int",
-    "unit": "MB",
-    "isOverridable": false,
     "serviceName": "HIVE",
     "filename": "hive-site.xml",
     "category": "HIVE_SERVER2",
     "index": 9
   },
   {
-    "id": "site property",
     "name": "hive.client.heapsize",
-    "displayName": "Hive Client heapsize",
-    "isOverridable": false,
     "category": "HIVE_CLIENT",
     "serviceName": "HIVE",
     "filename": "hive-env.xml",
     "displayType": "int",
-    "unit": "MB",
     "index": 10
   },
   {
-    "id": "site property",
     "name": "javax.jdo.option.ConnectionUserName",
-    "displayName": "Database Username",
     "displayType": "user",
-    "isOverridable": false,
     "category": "HIVE_METASTORE",
     "serviceName": "HIVE",
     "filename": "hive-site.xml",
     "index": 5
   },
   {
-    "id": "site property",
     "name": "javax.jdo.option.ConnectionPassword",
-    "displayName": "Database Password",
     "displayType": "password",
-    "isOverridable": false,
     "category": "HIVE_METASTORE",
     "serviceName": "HIVE",
     "filename": "hive-site.xml",
     "index": 6
   },
   {
-    "id": "site property",
     "name": "javax.jdo.option.ConnectionURL",
-    "displayName": "Database URL",
     "displayType": "advanced",
-    "isOverridable": false,
     "category": "HIVE_METASTORE",
     "serviceName": "HIVE",
     "filename": "hive-site.xml",
     "index": 8
   },
   {
-    "id": "site property",
     "name": "ambari.hive.db.schema.name",
-    "displayName": "Database Name",
     "displayType": "host",
-    "isOverridable": false,
     "serviceName": "HIVE",
     "filename": "hive-site.xml",
     "category": "HIVE_METASTORE",
     "index": 4
   },
   {
-    "id": "site property",
     "name": "hive.server2.tez.default.queues",
-    "displayName": "hive.server2.tez.default.queues",
-    "isRequired": false,
     "serviceName": "HIVE",
     "filename": "hive-site.xml",
     "category": "Advanced hive-site"
   },
   {
-    "id": "site property",
     "name": "hive.server2.thrift.port",
-    "displayName": "HiveServer2 Port",
-    "description": "TCP port number to listen on, default 10000.",
-    "recommendedValue": "10000",
     "displayType": "int",
-    "isReconfigurable": true,
-    "isOverridable": false,
-    "isVisible": true,
     "category": "Advanced hive-site",
     "serviceName": "HIVE",
     "filename": "hive-site.xml"
   },
   {
-    "id": "site property",
     "name": "hive.server2.support.dynamic.service.discovery",
-    "displayName": "hive.server2.support.dynamic.service.discovery",
-    "recommendedValue": true,
     "displayType": "checkbox",
     "category": "Advanced hive-site",
     "serviceName": "HIVE",
     "filename": "hive-site.xml"
   },
   {
-    "id": "site property",
     "name": "hive.security.authorization.enabled",
-    "displayName": "hive.security.authorization.enabled",
-    "recommendedValue": false,
     "displayType": "checkbox",
     "category": "Advanced hive-site",
     "serviceName": "HIVE",
     "filename": "hive-site.xml"
   },
-/**********************************************tez-site*****************************************/
   {
-    "id": "site property",
-    "name": "tez.am.resource.memory.mb",
-    "displayName": "tez.am.resource.memory.mb",
-    "displayType": "int",
-    "category": "General",
-    "serviceName": "TEZ",
-    "filename": "tez-site.xml"
+    "name": "hivemetastore_host",
+    "displayName": "Hive Metastore hosts",
+    "value": "",
+    "recommendedValue": "",
+    "description": "The hosts that have been assigned to run Hive Metastore",
+    "displayType": "masterHosts",
+    "isOverridable": false,
+    "isRequiredByAgent": false,
+    "serviceName": "HIVE",
+    "filename": "hive-env.xml",
+    "category": "HIVE_METASTORE",
+    "index": 0
   },
   {
-    "id": "site property",
-    "name": "tez.am.java.opts",
-    "displayName": "tez.am.java.opts",
-    "category": "General",
-    "serviceName": "TEZ",
-    "filename": "tez-site.xml"
+    "name": "hive_master_hosts",
+    "value": "",
+    "recommendedValue": "",
+    "isOverridable": false,
+    "isRequiredByAgent": false,
+    "isVisible": false,
+    "serviceName": "HIVE",
+    "filename": "hive-env.xml"
   },
   {
-    "id": "site property",
-    "name": "tez.am.grouping.split-waves",
-    "displayName": "tez.am.grouping.split-waves",
-    "displayType": "float",
-    "category": "General",
-    "serviceName": "TEZ",
-    "filename": "tez-site.xml"
+    "name": "hive_ambari_database",
+    "displayName": "Database Type",
+    "value": "",
+    "recommendedValue": "MySQL",
+    "description": "MySQL will be installed by Ambari",
+    "displayType": "masterHost",
+    "isOverridable": false,
+    "isReconfigurable": false,
+    "isRequiredByAgent": false,
+    "isVisible": false,
+    "serviceName": "HIVE",
+    "filename": "hive-env.xml",
+    "category": "HIVE_METASTORE",
+    "index": 1
   },
   {
-    "id": "site property",
-    "name": "tez.am.grouping.min-size",
-    "displayName": "tez.am.grouping.min-size",
-    "displayType": "int",
-    "category": "General",
-    "serviceName": "TEZ",
-    "filename": "tez-site.xml"
+    "name": "hive_database",
+    "options": [
+      {
+        displayName: 'New MySQL Database',
+        hidden: false
+      },
+      {
+        displayName: 'Existing MySQL Database',
+        hidden: false
+      },
+      {
+        displayName: 'Existing PostgreSQL Database',
+        hidden: false
+      },
+      {
+        displayName: 'Existing Oracle Database',
+        hidden: false
+      },
+      {
+        displayName: 'Existing SQLA Database',
+        hidden: !App.get('isHadoop23Stack')
+      }
+    ],
+    "displayType": "radio button",
+    "radioName": "hive-database",
+    "serviceName": "HIVE",
+    "filename": "hive-env.xml",
+    "category": "HIVE_METASTORE",
+    "index": 2
   },
   {
-    "id": "site property",
-    "name": "tez.am.grouping.max-size",
-    "displayName": "tez.am.grouping.max-size",
-    "displayType": "int",
-    "category": "General",
-    "serviceName": "TEZ",
-    "filename": "tez-site.xml"
+    "name": "hive_hostname",
+    "displayName": "Database Host",
+    "description": "Specify the host on which the database is hosted",
+    "recommendedValue": "",
+    "isReconfigurable": true,
+    "displayType": "host",
+    "isOverridable": false,
+    "isRequiredByAgent": false,
+    "isVisible": true,
+    "serviceName": "HIVE",
+    "filename": "hive-env.xml",
+    "category": "HIVE_METASTORE",
+    "index": 3
   },
   {
-    "id": "site property",
-    "name": "tez.am.log.level",
-    "displayName": "tez.am.log.level",
-    "displayType": "string",
-    "category": "General",
-    "serviceName": "TEZ",
-    "filename": "tez-site.xml"
+    "name": "hive_ambari_host",
+    "value": "",
+    "recommendedValue": "",
+    "displayName": "Database Host",
+    "description": "Host on which the database will be created by Ambari",
+    "isReconfigurable": false,
+    "displayType": "masterHost",
+    "isOverridable": false,
+    "isVisible": false,
+    "isRequiredByAgent": false,
+    "serviceName": "HIVE",
+    "filename": "hive-env.xml",
+    "category": "HIVE_METASTORE",
+    "index": 3
   },
   {
-    "id": "site property",
-    "name": "tez.runtime.intermediate-input.compress.codec",
-    "displayName": "tez.runtime.intermediate-input.compress.codec",
-    "displayType": "string",
-    "category": "General",
+    "name": "hive_log_dir",
+    "displayType": "directory",
+    "serviceName": "HIVE",
+    "filename": "hive-env.xml",
+    "category": "Advanced hive-env"
+  },
+  {
+    "name": "hive_pid_dir",
+    "displayType": "directory",
+    "serviceName": "HIVE",
+    "filename": "hive-env.xml",
+    "category": "Advanced hive-env"
+  },
+  {
+    "name": "webhcatserver_host",
+    "displayName": "WebHCat Server host",
+    "value": "",
+    "recommendedValue": "",
+    "description": "The host that has been assigned to run WebHCat Server",
+    "displayType": "masterHost",
+    "isOverridable": false,
+    "isRequiredByAgent": false,
+    "serviceName": "HIVE",
+    "filename": "webhcat-env.xml",
+    "category": "WEBHCAT_SERVER"
+  },
+  {
+    "name": "hcat_log_dir",
+    "displayType": "directory",
+    "serviceName": "HIVE",
+    "filename": "hive-env.xml",
+    "category": "Advanced webhcat-env"
+  },
+  {
+    "name": "hcat_pid_dir",
+    "displayType": "directory",
+    "serviceName": "HIVE",
+    "filename": "hive-env.xml",
+    "category": "Advanced webhcat-env"
+  },
+  {
+    "name": "hive_database_name",
+    "serviceName": "HIVE",
+    "filename": "hive-env.xml",
+    "category": "Advanced hive-env"
+  },
+  {
+    "name": "hive_database_type",
+    "serviceName": "HIVE",
+    "filename": "hive-env.xml",
+    "category": "HIVE_METASTORE"
+  },
+/**********************************************TEZ*****************************************/
+  {
+    "name": "tez.am.resource.memory.mb",
+    "displayType": "int",
+    "category": "General",
+    "serviceName": "TEZ",
+    "filename": "tez-site.xml"
+  },
+  {
+    "name": "tez.am.java.opts",
+    "category": "General",
+    "serviceName": "TEZ",
+    "filename": "tez-site.xml"
+  },
+  {
+    "name": "tez.am.grouping.split-waves",
+    "displayType": "float",
+    "category": "General",
+    "serviceName": "TEZ",
+    "filename": "tez-site.xml"
+  },
+  {
+    "name": "tez.am.grouping.min-size",
+    "displayType": "int",
+    "category": "General",
+    "serviceName": "TEZ",
+    "filename": "tez-site.xml"
+  },
+  {
+    "name": "tez.am.grouping.max-size",
+    "displayType": "int",
+    "category": "General",
+    "serviceName": "TEZ",
+    "filename": "tez-site.xml"
+  },
+  {
+    "name": "tez.am.log.level",
+    "displayType": "string",
+    "category": "General",
+    "serviceName": "TEZ",
+    "filename": "tez-site.xml"
+  },
+  {
+    "name": "tez.runtime.intermediate-input.compress.codec",
+    "displayType": "string",
+    "category": "General",
     "serviceName": "TEZ",
     "filename": "tez-site.xml"
   },
   {
-    "id": "site property",
     "name": "tez.runtime.intermediate-input.is-compressed",
-    "displayName": "tez.runtime.intermediate-input.is-compressed",
     "displayType": "checkbox",
     "category": "General",
     "serviceName": "TEZ",
     "filename": "tez-site.xml"
   },
   {
-    "id": "site property",
     "name": "tez.runtime.intermediate-output.compress.codec",
-    "displayName": "tez.runtime.intermediate-output.compress.codec",
     "displayType": "string",
     "category": "General",
     "serviceName": "TEZ",
     "filename": "tez-site.xml"
   },
   {
-    "id": "site property",
     "name": "tez.runtime.intermediate-output.should-compress",
-    "displayName": "tez.runtime.intermediate-output.should-compress",
     "displayType": "checkbox",
     "category": "General",
     "serviceName": "TEZ",
     "filename": "tez-site.xml"
   },
 
-/**********************************************hbase-site***************************************/
+/**********************************************HBASE***************************************/
   {
-    "id": "site property",
     "name": "hbase.tmp.dir",
-    "displayName": "HBase tmp directory",
     "defaultDirectory": "/hadoop/hbase",
     "displayType": "directory",
     "category": "Advanced hbase-site",
@@ -677,48 +993,35 @@ var hdp2properties = [
     "filename": "hbase-site.xml"
   },
   {
-    "id": "site property",
     "name": "hbase.master.port",
-    "displayName": "HBase Master Port",
-    "isReconfigurable": true,
     "displayType": "int",
-    "isOverridable": false,
-    "isVisible": true,
     "serviceName": "HBASE",
     "filename": "hbase-site.xml",
     "category": "Advanced hbase-site"
   },
   {
-    "id": "site property",
     "name": "hbase.regionserver.global.memstore.upperLimit",
-    "displayName": "hbase.regionserver.global.memstore.upperLimit",
     "displayType": "float",
     "category": "Advanced hbase-site",
     "serviceName": "HBASE",
     "filename": "hbase-site.xml"
   },
   {
-    "id": "site property",
     "name": "hbase.regionserver.global.memstore.lowerLimit",
-    "displayName": "hbase.regionserver.global.memstore.lowerLimit",
     "displayType": "float",
     "category": "Advanced hbase-site",
     "serviceName": "HBASE",
     "filename": "hbase-site.xml"
   },
   {
-    "id": "site property",
     "name": "hbase.hstore.blockingStoreFiles",
-    "displayName": "hstore blocking storefiles",
     "displayType": "int",
     "category": "Advanced hbase-site",
     "serviceName": "HBASE",
     "filename": "hbase-site.xml"
   },
   {
-    "id": "site property",
     "name": "hbase.hstore.compactionThreshold",
-    "displayName": "HBase HStore compaction threshold",
     "displayType": "int",
     "category": "General",
     "serviceName": "HBASE",
@@ -726,9 +1029,7 @@ var hdp2properties = [
     "index": 0
   },
   {
-    "id": "site property",
     "name": "hfile.block.cache.size",
-    "displayName": "HFile block cache size ",
     "displayType": "float",
     "category": "General",
     "serviceName": "HBASE",
@@ -736,20 +1037,15 @@ var hdp2properties = [
     "index": 1
   },
   {
-    "id": "site property",
     "name": "hbase.hregion.max.filesize",
-    "displayName": "Maximum HStoreFile Size",
     "displayType": "int",
-    "unit": "bytes",
     "category": "General",
     "serviceName": "HBASE",
     "filename": "hbase-site.xml",
     "index": 2
   },
   {
-    "id": "site property",
     "name": "hbase.regionserver.handler.count",
-    "displayName": "RegionServer Handler",
     "displayType": "int",
     "category": "HBASE_REGIONSERVER",
     "serviceName": "HBASE",
@@ -757,20 +1053,15 @@ var hdp2properties = [
     "index": 2
   },
   {
-    "id": "site property",
     "name": "hbase.hregion.majorcompaction",
-    "displayName": "HBase Region Major Compaction Interval",
     "displayType": "int",
-    "unit": "ms",
     "category": "HBASE_REGIONSERVER",
     "serviceName": "HBASE",
     "filename": "hbase-site.xml",
     "index": 3
   },
   {
-    "id": "site property",
     "name": "hbase.hregion.memstore.block.multiplier",
-    "displayName": "HBase Region Block Multiplier",
     "displayType": "int",
     "category": "HBASE_REGIONSERVER",
     "serviceName": "HBASE",
@@ -778,109 +1069,155 @@ var hdp2properties = [
     "index": 4
   },
   {
-    "id": "site property",
     "name": "hbase.hregion.memstore.mslab.enabled",
-    "displayName": "hbase.hregion.memstore.mslab.enabled",
     "displayType": "checkbox",
     "category": "Advanced hbase-site",
     "serviceName": "HBASE",
     "filename": "hbase-site.xml"
   },
   {
-    "id": "site property",
     "name": "hbase.hregion.memstore.flush.size",
-    "displayName": "HBase Region Memstore Flush Size",
     "displayType": "int",
-    "unit": "bytes",
     "category": "HBASE_REGIONSERVER",
     "serviceName": "HBASE",
     "filename": "hbase-site.xml",
     "index": 5
   },
   {
-    "id": "site property",
     "name": "hbase.client.scanner.caching",
-    "displayName": "HBase Client Scanner Caching",
     "displayType": "int",
-    "unit": "rows",
     "category": "General",
     "serviceName": "HBASE",
     "filename": "hbase-site.xml",
     "index": 3
   },
   {
-    "id": "site property",
     "name": "zookeeper.session.timeout",
-    "displayName": "Zookeeper timeout for HBase Session",
     "displayType": "int",
-    "unit": "ms",
     "category": "General",
     "serviceName": "HBASE",
     "filename": "hbase-site.xml",
     "index": 4
   },
   {
-    "id": "site property",
     "name": "hbase.client.keyvalue.maxsize",
-    "displayName": "HBase Client Maximum key-value Size",
     "displayType": "int",
-    "unit": "bytes",
     "category": "General",
     "serviceName": "HBASE",
     "filename": "hbase-site.xml",
     "index": 5
   },
   {
-    "id": "site property",
     "name": "hbase.coprocessor.region.classes",
-    "displayName": "hbase.coprocessor.region.classes",
     "category": "Advanced hbase-site",
-    "isRequired": false,
     "serviceName": "HBASE",
     "filename": "hbase-site.xml"
   },
   {
-    "id": "site property",
     "name": "hbase.coprocessor.master.classes",
-    "displayName": "hbase.coprocessor.master.classes",
     "category": "Advanced hbase-site",
-    "isRequired": false,
     "serviceName": "HBASE",
     "filename": "hbase-site.xml"
   },
   {
-    "id": "site property",
     "name": "hbase.coprocessor.regionserver.classes",
-    "displayName": "hbase.coprocessor.regionserver.classes",
     "category": "Advanced hbase-site",
-    "isRequired": false,
     "serviceName": "HBASE",
     "filename": "hbase-site.xml"
   },
   {
-    "id": "site property",
     "name": "hbase.zookeeper.quorum",
-    "displayName": "hbase.zookeeper.quorum",
     "displayType": "multiLine",
     "serviceName": "HBASE",
     "filename": "hbase-site.xml",
     "category": "Advanced hbase-site"
   },
+  {
+    "name": "hbasemaster_host",
+    "displayName": "HBase Master hosts",
+    "value": "",
+    "recommendedValue": "",
+    "description": "The host that has been assigned to run HBase Master",
+    "displayType": "masterHosts",
+    "isOverridable": false,
+    "isRequiredByAgent": false,
+    "isVisible": true,
+    "serviceName": "HBASE",
+    "filename": "hbase-env.xml",
+    "category": "HBASE_MASTER",
+    "index": 0
+  },
+  {
+    "name": "hbase_master_heapsize",
+    "displayType": "int",
+    "serviceName": "HBASE",
+    "filename": "hbase-env.xml",
+    "category": "HBASE_MASTER",
+    "index": 1
+  },
+  {
+    "name": "regionserver_hosts",
+    "displayName": "RegionServer hosts",
+    "value": "",
+    "recommendedValue": "",
+    "description": "The hosts that have been assigned to run RegionServer",
+    "displayType": "slaveHosts",
+    "isOverridable": false,
+    "isRequiredByAgent": false,
+    "serviceName": "HBASE",
+    "filename": "hbase-env.xml",
+    "category": "HBASE_REGIONSERVER",
+    "index": 0
+  },
+  {
+    "name": "hbase_regionserver_heapsize",
+    "displayType": "int",
+    "serviceName": "HBASE",
+    "filename": "hbase-env.xml",
+    "category": "HBASE_REGIONSERVER",
+    "index": 1
+  },
+  {
+    "name": "hbase_regionserver_xmn_max",
+    "displayType": "int",
+    "serviceName": "HBASE",
+    "filename": "hbase-env.xml",
+    "category": "HBASE_REGIONSERVER",
+    "index": 6
+  },
+  {
+    "name": "hbase_regionserver_xmn_ratio",
+    "displayType": "float",
+    "serviceName": "HBASE",
+    "filename": "hbase-env.xml",
+    "category": "HBASE_REGIONSERVER",
+    "index": 7
+  },
+  {
+    "name": "hbase_log_dir",
+    "displayType": "directory",
+    "serviceName": "HBASE",
+    "filename": "hbase-env.xml",
+    "category": "Advanced hbase-env"
+  },
+  {
+    "name": "hbase_pid_dir",
+    "displayType": "directory",
+    "serviceName": "HBASE",
+    "filename": "hbase-env.xml",
+    "category": "Advanced hbase-env"
+  },
 
 /**********************************************storm-site***************************************/
   {
-    "id": "site property",
     "name": "storm.zookeeper.root",
-    "displayName": "storm.zookeeper.root",
     "displayType": "directory",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
     "category": "General"
   },
   {
-    "id": "site property",
     "name": "storm.local.dir",
-    "displayName": "storm.local.dir",
     "defaultDirectory": "/hadoop/storm",
     "displayType": "directory",
     "serviceName": "STORM",
@@ -888,525 +1225,362 @@ var hdp2properties = [
     "category": "General"
   },
   {
-    "id": "site property",
     "name": "storm.zookeeper.servers",
-    "displayName": "storm.zookeeper.servers",
     "displayType": "masterHosts",
-    "isOverridable": false,
-    "isReconfigurable": false,
     "serviceName": "STORM",
     "filename": "storm-site.xml",
     "category": "General"
   },
   {
-    "id": "site property",
     "name": "storm.zookeeper.port",
-    "displayName": "storm.zookeeper.port",
     "displayType": "int",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
     "category": "General"
   },
   {
-    "id": "site property",
     "name": "storm.zookeeper.session.timeout",
-    "displayName": "storm.zookeeper.session.timeout",
     "displayType": "int",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
     "category": "General"
   },
   {
-    "id": "site property",
     "name": "storm.zookeeper.connection.timeout",
-    "displayName": "storm.zookeeper.connection.timeout",
     "displayType": "int",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
     "category": "General"
   },
   {
-    "id": "site property",
     "name": "storm.zookeeper.retry.times",
-    "displayName": "storm.zookeeper.retry.times",
     "displayType": "int",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
     "category": "General"
   },
   {
-    "id": "site property",
     "name": "storm.zookeeper.retry.interval",
-    "displayName": "storm.zookeeper.retry.interval",
     "displayType": "int",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
-    "category": "General",
-    "unit": "ms"
+    "category": "General"
   },
   {
-    "id": "site property",
     "name": "storm.zookeeper.retry.intervalceiling.millis",
-    "displayName": "storm.zookeeper.retry.intervalceiling.millis",
     "displayType": "int",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
-    "category": "General",
-    "unit": "ms"
+    "category": "General"
   },
   {
-    "id": "site property",
     "name": "storm.cluster.mode",
-    "displayName": "storm.cluster.mode",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
     "category": "General"
   },
   {
-    "id": "site property",
     "name": "storm.local.mode.zmq",
-    "displayName": "storm.local.mode.zmq",
     "displayType": "checkbox",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
     "category": "General"
   },
   {
-    "id": "site property",
     "name": "storm.thrift.transport",
-    "displayName": "storm.thrift.transport",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
     "category": "General"
   },
   {
-    "id": "site property",
     "name": "storm.messaging.transport",
-    "displayName": "storm.messaging.transport",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
     "category": "General"
   },
   {
-    "id": "site property",
-    "serviceName": "STORM",
-    "category": "General",
-    "displayName": "storm.messaging.netty.buffer_size",
     "name": "storm.messaging.netty.buffer_size",
     "displayType": "int",
-    "unit": "bytes",
+    "category": "General",
+    "serviceName": "STORM",
     "filename": "storm-site.xml"
   },
   {
-    "id": "site property",
     "serviceName": "STORM",
     "category": "General",
-    "displayName": "storm.messaging.netty.max_retries",
     "name": "storm.messaging.netty.max_retries",
     "displayType": "int",
     "filename": "storm-site.xml"
   },
   {
-    "id": "site property",
-    "serviceName": "STORM",
-    "category": "General",
-    "displayName": "storm.messaging.netty.max_wait_ms",
     "name": "storm.messaging.netty.max_wait_ms",
     "displayType": "int",
-    "unit": "ms",
+    "category": "General",
+    "serviceName": "STORM",
     "filename": "storm-site.xml"
   },
   {
-    "id": "site property",
-    "serviceName": "STORM",
-    "category": "General",
-    "displayName": "storm.messaging.netty.min_wait_ms",
     "name": "storm.messaging.netty.min_wait_ms",
     "displayType": "int",
-    "unit": "ms",
+    "category": "General",
+    "serviceName": "STORM",
     "filename": "storm-site.xml"
   },
   {
-    "id": "site property",
-    "serviceName": "STORM",
-    "category": "General",
-    "displayName": "storm.messaging.netty.server_worker_threads",
     "name": "storm.messaging.netty.server_worker_threads",
     "displayType": "int",
+    "category": "General",
+    "serviceName": "STORM",
     "filename": "storm-site.xml"
   },
   {
-    "id": "site property",
-    "serviceName": "STORM",
-    "category": "General",
-    "displayName": "storm.messaging.netty.client_worker_threads",
     "name": "storm.messaging.netty.client_worker_threads",
     "displayType": "int",
+    "category": "General",
+    "serviceName": "STORM",
     "filename": "storm-site.xml"
   },
   {
-    "id": "site property",
     "name": "nimbus.host",
-    "displayName": "nimbus.host",
     "displayType": "masterHost",
-    "isOverridable": false,
-    "isReconfigurable": false,
     "serviceName": "STORM",
     "filename": "storm-site.xml",
     "category": "NIMBUS"
   },
   {
-    "id": "site property",
     "name": "nimbus.thrift.port",
-    "displayName": "nimbus.thrift.port",
     "displayType": "int",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
     "category": "NIMBUS"
   },
   {
-    "id": "site property",
     "name": "nimbus.thrift.max_buffer_size",
-    "displayName": "nimbus.thrift.max_buffer_size",
     "displayType": "int",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
-    "category": "NIMBUS",
-    "unit": "bytes"
+    "category": "NIMBUS"
   },
   {
-    "id": "site property",
     "name": "nimbus.childopts",
-    "displayName": "nimbus.childopts",
     "displayType": "multiLine",
-    "isOverridable": false,
     "serviceName": "STORM",
     "category": "NIMBUS",
     "filename": "storm-site.xml"
   },
   {
-    "id": "site property",
     "name": "nimbus.task.timeout.secs",
-    "displayName": "nimbus.task.timeout.secs",
     "displayType": "int",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
-    "category": "NIMBUS",
-    "unit": "seconds"
+    "category": "NIMBUS"
   },
   {
-    "id": "site property",
     "name": "nimbus.supervisor.timeout.secs",
-    "displayName": "nimbus.supervisor.timeout.secs",
     "displayType": "int",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
-    "category": "NIMBUS",
-    "unit": "seconds"
+    "category": "NIMBUS"
   },
   {
-    "id": "site property",
     "name": "nimbus.monitor.freq.secs",
-    "displayName": "nimbus.monitor.freq.secs",
     "displayType": "int",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
-    "category": "NIMBUS",
-    "unit": "seconds"
+    "category": "NIMBUS"
   },
   {
-    "id": "site property",
     "name": "nimbus.cleanup.inbox.freq.secs",
-    "displayName": "nimbus.cleanup.inbox.freq.secs",
     "displayType": "int",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
-    "category": "NIMBUS",
-    "unit": "seconds"
+    "category": "NIMBUS"
   },
   {
-    "id": "site property",
     "name": "nimbus.inbox.jar.expiration.secs",
-    "displayName": "nimbus.inbox.jar.expiration.secs",
     "displayType": "int",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
-    "category": "NIMBUS",
-    "unit": "seconds"
+    "category": "NIMBUS"
   },
   {
-    "id": "site property",
     "name": "nimbus.task.launch.secs",
-    "displayName": "nimbus.task.launch.secs",
     "displayType": "int",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
-    "category": "NIMBUS",
-    "unit": "seconds"
+    "category": "NIMBUS"
   },
   {
-    "id": "site property",
     "name": "nimbus.reassign",
-    "displayName": "nimbus.reassign",
     "displayType": "checkbox",
-    "isReconfigurable": true,
     "serviceName": "STORM",
     "filename": "storm-site.xml",
     "category": "NIMBUS"
   },
   {
-    "id": "site property",
     "name": "nimbus.file.copy.expiration.secs",
-    "displayName": "nimbus.file.copy.expiration.secs",
     "displayType": "int",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
-    "category": "NIMBUS",
-    "unit": "seconds"
+    "category": "NIMBUS"
   },
   {
-    "id": "site property",
     "name": "nimbus.topology.validator",
-    "displayName": "nimbus.topology.validator",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
     "category": "NIMBUS"
   },
   {
-    "id": "site property",
     "name": "supervisor.slots.ports",
-    "displayName": "supervisor.slots.ports",
     "displayType": "string",
     "serviceName": "STORM",
     "filename": "storm-site.xml",
     "category": "SUPERVISOR"
   },
   {
-    "id": "site property",
-    "isOverridable": false,
-    "serviceName": "STORM",
-    "category": "SUPERVISOR",
-    "displayName": "supervisor.childopts",
     "name": "supervisor.childopts",
     "displayType": "multiLine",
+    "category": "SUPERVISOR",
+    "serviceName": "STORM",
     "filename": "storm-site.xml"
   },
   {
-    "id": "site property",
-    "serviceName": "STORM",
-    "category": "SUPERVISOR",
-    "displayName": "supervisor.worker.start.timeout.secs",
     "name": "supervisor.worker.start.timeout.secs",
     "displayType": "int",
-    "unit": "seconds",
+    "category": "SUPERVISOR",
+    "serviceName": "STORM",
     "filename": "storm-site.xml"
   },
   {
-    "id": "site property",
-    "serviceName": "STORM",
-    "category": "SUPERVISOR",
-    "displayName": "supervisor.worker.timeout.secs",
     "name": "supervisor.worker.timeout.secs",
     "displayType": "int",
-    "unit": "seconds",
+    "category": "SUPERVISOR",
+    "serviceName": "STORM",
     "filename": "storm-site.xml"
   },
   {
-    "id": "site property",
-    "serviceName": "STORM",
-    "category": "SUPERVISOR",
-    "displayName": "supervisor.monitor.frequency.secs",
     "name": "supervisor.monitor.frequency.secs",
     "displayType": "int",
-    "unit": "seconds",
+    "category": "SUPERVISOR",
+    "serviceName": "STORM",
     "filename": "storm-site.xml"
   },
   {
-    "id": "site property",
-    "serviceName": "STORM",
-    "category": "SUPERVISOR",
-    "displayName": "supervisor.heartbeat.frequency.secs",
     "name": "supervisor.heartbeat.frequency.secs",
     "displayType": "int",
-    "unit": "seconds",
+    "category": "SUPERVISOR",
+    "serviceName": "STORM",
     "filename": "storm-site.xml"
   },
   {
-    "id": "site property",
-    "serviceName": "STORM",
-    "category": "DRPC_SERVER",
-    "displayName": "drpc.port",
     "name": "drpc.port",
     "displayType": "int",
+    "category": "DRPC_SERVER",
+    "serviceName": "STORM",
     "filename": "storm-site.xml"
   },
   {
-    "id": "site property",
-    "serviceName": "STORM",
-    "category": "DRPC_SERVER",
-    "displayName": "drpc.worker.threads",
     "name": "drpc.worker.threads",
     "displayType": "int",
+    "category": "DRPC_SERVER",
+    "serviceName": "STORM",
     "filename": "storm-site.xml"
   },
   {
-    "id": "site property",
-    "serviceName": "STORM",
-    "category": "DRPC_SERVER",
-    "displayName": "drpc.queue.size",
     "name": "drpc.queue.size",
     "displayType": "int",
+    "category": "DRPC_SERVER",
+    "serviceName": "STORM",
     "filename": "storm-site.xml"
   },
   {
-    "id": "site property",
-    "serviceName": "STORM",
-    "category": "DRPC_SERVER",
-    "displayName": "drpc.invocations.port",
     "name": "drpc.invocations.port",
     "displayType": "int",
+    "category": "DRPC_SERVER",
+    "serviceName": "STORM",
     "filename": "storm-site.xml"
   },
   {
-    "id": "site property",
-    "serviceName": "STORM",
-    "category": "DRPC_SERVER",
-    "displayName": "drpc.request.timeout.secs",
     "name": "drpc.request.timeout.secs",
     "displayType": "int",
-    "unit": "seconds",
+    "category": "DRPC_SERVER",
+    "serviceName": "STORM",
     "filename": "storm-site.xml"
   },
   {
-    "id": "site property",
-    "serviceName": "STORM",
-    "category": "DRPC_SERVER",
-    "displayName": "drpc.childopts",
     "name": "drpc.childopts",
     "displayType": "string",
+    "category": "DRPC_SERVER",
+    "serviceName": "STORM",
     "filename": "storm-site.xml"
   },
   {
-    "id": "site property",
-    "serviceName": "STORM",
-    "category": "STORM_UI_SERVER",
-    "displayName": "ui.port",
     "name": "ui.port",
     "displayType": "int",
+    "category": "STORM_UI_SERVER",
+    "serviceName": "STORM",
     "filename": "storm-site.xml"
   },
   {
-    "id": "site property",
-    "serviceName": "STORM",
-    "category": "STORM_UI_SERVER",
-    "displayName": "ui.childopts",
     "name": "ui.childopts",
     "displayType": "string",
+    "category": "STORM_UI_SERVER",
+    "serviceName": "STORM",
     "filename": "storm-site.xml"
   },
-  //@Todo: uncomment following properties when logviewer is treated as different section on storm service page
-  /*
-   {
-   "id": "site property",
-   "serviceName": "STORM",
-   "category": "LogviewerServer",
-   "displayName": "logviewer.port",
-   "name": "logviewer.port",
-   "displayType": "int"
-   },
-   {
-   "id": "site property",
-   "serviceName": "STORM",
-   "category": "LogviewerServer",
-   "displayName": "logviewer.childopts",
-   "name": "logviewer.childopts",
-   "displayType": "string"
-   },
-   {
-   "id": "site property",
-   "serviceName": "STORM",
-   "category": "LogviewerServer",
-   "displayName": "logviewer.appender.name",
-   "name": "logviewer.appender.name",
-   "displayType": "string"
-   },
-   */
-  {
-    "id": "site property",
-    "serviceName": "STORM",
-    "category": "Advanced storm-site",
-    "displayName": "worker.childopts",
+  {
     "name": "worker.childopts",
     "displayType": "multiLine",
+    "category": "Advanced storm-site",
+    "serviceName": "STORM",
     "filename": "storm-site.xml"
   },
 /*********************************************oozie-site for Falcon*****************************/
   {
-    "id": "site property",
-    "isReconfigurable": true,
-    "serviceName": "FALCON",
-    "category": "Falcon - Oozie integration",
-    "displayName": "oozie.service.ELService.ext.functions.coord-job-submit-instances",
     "name": "oozie.service.ELService.ext.functions.coord-job-submit-instances",
     "displayType": "custom",
+    "category": "Falcon - Oozie integration",
+    "serviceName": "FALCON",
     "filename": "oozie-site.xml"
   },
   {
-    "id": "site property",
-    "isReconfigurable": true,
     "serviceName": "FALCON",
     "category": "Falcon - Oozie integration",
-    "displayName": "oozie.service.ELService.ext.functions.coord-action-create-inst",
     "name": "oozie.service.ELService.ext.functions.coord-action-create-inst",
     "displayType": "custom",
     "filename": "oozie-site.xml"
   },
   {
-    "id": "site property",
-    "isReconfigurable": true,
     "serviceName": "FALCON",
     "category": "Falcon - Oozie integration",
-    "displayName": "oozie.service.ELService.ext.functions.coord-action-create",
     "name": "oozie.service.ELService.ext.functions.coord-action-create",
     "displayType": "custom",
     "filename": "oozie-site.xml"
   },
   {
-    "id": "site property",
-    "isReconfigurable": true,
     "serviceName": "FALCON",
     "category": "Falcon - Oozie integration",
-    "displayName": "oozie.service.ELService.ext.functions.coord-job-submit-data",
     "name": "oozie.service.ELService.ext.functions.coord-job-submit-data",
     "displayType": "custom",
     "filename": "oozie-site.xml"
   },
   {
-    "id": "site property",
-    "isReconfigurable": true,
     "serviceName": "FALCON",
     "category": "Falcon - Oozie integration",
-    "displayName": "oozie.service.ELService.ext.functions.coord-action-start",
     "name": "oozie.service.ELService.ext.functions.coord-action-start",
     "displayType": "custom",
     "filename": "oozie-site.xml"
   },
   {
-    "id": "site property",
-    "isReconfigurable": true,
     "serviceName": "FALCON",
     "category": "Falcon - Oozie integration",
-    "displayName": "oozie.service.ELService.ext.functions.coord-sla-submit",
     "name": "oozie.service.ELService.ext.functions.coord-sla-submit",
     "displayType": "custom",
     "filename": "oozie-site.xml"
   },
   {
-    "id": "site property",
-    "isReconfigurable": true,
     "serviceName": "FALCON",
     "category": "Falcon - Oozie integration",
-    "displayName": "oozie.service.ELService.ext.functions.coord-sla-create",
     "name": "oozie.service.ELService.ext.functions.coord-sla-create",
     "displayType": "custom",
     "filename": "oozie-site.xml"
@@ -1414,42 +1588,32 @@ var hdp2properties = [
 
   // Runtime properties
   {
-    "id": "site property",
     "name": "*.domain",
-    "displayName": "*.domain",
     "category": "FalconRuntimeSite",
     "serviceName": "FALCON",
     "filename": "falcon-runtime.properties.xml"
 
   },
   {
-    "id": "site property",
     "name": "*.log.cleanup.frequency.minutes.retention",
-    "displayName": "*.log.cleanup.frequency.minutes.retention",
     "category": "FalconRuntimeSite",
     "serviceName": "FALCON",
     "filename": "falcon-runtime.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.log.cleanup.frequency.hours.retention",
-    "displayName": "*.log.cleanup.frequency.hours.retention",
     "category": "FalconRuntimeSite",
     "serviceName": "FALCON",
     "filename": "falcon-runtime.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.log.cleanup.frequency.days.retention",
-    "displayName": "*.log.cleanup.frequency.days.retention",
     "category": "FalconRuntimeSite",
     "serviceName": "FALCON",
     "filename": "falcon-runtime.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.log.cleanup.frequency.months.retention",
-    "displayName": "*.log.cleanup.frequency.months.retention",
     "category": "FalconRuntimeSite",
     "serviceName": "FALCON",
     "filename": "falcon-runtime.properties.xml"
@@ -1458,233 +1622,176 @@ var hdp2properties = [
   //  Startup properties
 
   {
-    "id": "site property",
     "name": "*.domain",
-    "displayName": "*.domain",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.workflow.engine.impl",
-    "displayName": "*.workflow.engine.impl",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.oozie.process.workflow.builder",
-    "displayName": "*.oozie.process.workflow.builder",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.oozie.feed.workflow.builder",
-    "displayName": "*.oozie.feed.workflow.builder",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.SchedulableEntityManager.impl",
-    "displayName": "*.SchedulableEntityManager.impl",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.ConfigSyncService.impl",
-    "displayName": "*.ConfigSyncService.impl",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.ProcessInstanceManager.impl",
-    "displayName": "*.ProcessInstanceManager.impl",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.catalog.service.impl",
-    "displayName": "*.catalog.service.impl",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.application.services",
-    "displayName": "*.application.services",
     "displayType": "multiLine",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.configstore.listeners",
-    "displayName": "*.configstore.listeners",
     "displayType": "multiLine",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.broker.impl.class",
-    "displayName": "*.broker.impl.class",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.shared.libs",
-    "displayName": "*.shared.libs",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.config.store.uri",
-    "displayName": "*.config.store.uri",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.system.lib.location",
-    "displayName": "*.system.lib.location",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.retry.recorder.path",
-    "displayName": "*.retry.recorder.path",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.falcon.cleanup.service.frequency",
-    "displayName": "*.falcon.cleanup.service.frequency",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.broker.url",
-    "displayName": "*.broker.url",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.broker.ttlInMins",
-    "displayName": "*.broker.ttlInMins",
     "displayType": "int",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.entity.topic",
-    "displayName": "*.entity.topic",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.max.retry.failure.count",
-    "displayName": "*.max.retry.failure.count",
     "displayType": "int",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.internal.queue.size",
-    "displayName": "*.internal.queue.size",
     "displayType": "int",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.falcon.authentication.type",
-    "displayName": "*.falcon.authentication.type",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.falcon.http.authentication.type",
-    "displayName": "*.falcon.http.authentication.type",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.falcon.http.authentication.token.validity",
-    "displayName": "*.falcon.http.authentication.token.validity",
     "displayType": "int",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.falcon.http.authentication.signature.secret",
-    "displayName": "*.falcon.http.authentication.signature.secret",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.falcon.http.authentication.simple.anonymous.allowed",
-    "displayName": "*.falcon.http.authentication.simple.anonymous.allowed",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.falcon.http.authentication.kerberos.name.rules",
-    "displayName": "*.falcon.http.authentication.kerberos.name.rules",
     "category": "FalconStartupSite",
     "displayType": "multiLine",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.falcon.http.authentication.blacklisted.users",
-    "displayName": "*.falcon.http.authentication.blacklisted.users",
-    "isRequired": false,
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
     "filename": "falcon-startup.properties.xml"
@@ -1692,9 +1799,7 @@ var hdp2properties = [
 
   // Falcon Graph and Storage
   {
-    "id": "site property",
     "name": "*.falcon.graph.storage.directory",
-    "displayName": "*.falcon.graph.storage.directory",
     "defaultDirectory": "/hadoop/falcon/data/lineage/graphdb",
     "displayType": "directory",
     "category": "FalconStartupSite",
@@ -1702,9 +1807,7 @@ var hdp2properties = [
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.falcon.graph.serialize.path",
-    "displayName": "*.falcon.graph.serialize.path",
     "defaultDirectory": "/hadoop/falcon/data/lineage",
     "displayType": "directory",
     "category": "FalconStartupSite",
@@ -1712,10 +1815,7 @@ var hdp2properties = [
     "filename": "falcon-startup.properties.xml"
   },
   {
-    "id": "site property",
     "name": "*.falcon.graph.preserve.history",
-    "displayName": "*.falcon.graph.preserve.history",
-    "recommendedValue": false,
     "displayType": "checkbox",
     "category": "FalconStartupSite",
     "serviceName": "FALCON",
@@ -1724,27 +1824,19 @@ var hdp2properties = [
 
 /**********************************************webhcat-site***************************************/
   {
-    "id": "site property",
     "name": "templeton.hive.archive",
-    "displayName": "templeton.hive.archive",
-    "isRequired": false,
     "serviceName": "HIVE",
     "filename": "webhcat-site.xml",
     "category": "Advanced webhcat-site"
   },
   {
-    "id": "site property",
     "name": "templeton.pig.archive",
-    "displayName": "templeton.pig.archive",
-    "isRequired": false,
     "serviceName": "HIVE",
     "filename": "webhcat-site.xml",
     "category": "Advanced webhcat-site"
   },
   {
-    "id": "site property",
     "name": "templeton.zookeeper.hosts",
-    "displayName": "templeton.zookeeper.hosts",
     "displayType": "multiLine",
     "serviceName": "HIVE",
     "filename": "webhcat-site.xml",
@@ -1752,50 +1844,29 @@ var hdp2properties = [
   },
 /**********************************************pig.properties*****************************************/
   {
-    "id": "site property",
     "name": "content",
-    "displayName": "content",
-    "value": "",
-    "recommendedValue": "",
-    "description": "pig properties",
-    "displayType": "content",
-    "isRequired": false,
-    "showLabel": false,
+    "category": "Advanced pig-properties",
     "serviceName": "PIG",
-    "filename": "pig-properties.xml",
-    "category": "Advanced pig-properties"
+    "filename": "pig-properties.xml"
   },
 
 /**********************************************KNOX*****************************************/
   {
-    "id": "site property",
     "name": "content",
-    "displayName": "content",
-    "value": "",
-    "recommendedValue": "",
     "displayType": "content",
-    "isRequired": false,
-    "showLabel": false,
     "serviceName": "KNOX",
     "filename": "topology.xml",
     "category": "Advanced topology"
   },
 
   {
-    "id": "site property",
     "name": "content",
-    "displayName": "content",
-    "value": "",
-    "recommendedValue": "",
     "displayType": "content",
-    "isRequired": false,
-    "showLabel": false,
     "serviceName": "KNOX",
     "filename": "users-ldif.xml",
     "category": "Advanced users-ldif"
   },
   {
-    "id": "puppet var",
     "name": "knox_gateway_host",
     "displayName": "Knox Gateway host",
     "value": "",
@@ -1803,7 +1874,6 @@ var hdp2properties = [
     "description": "The hosts that have been assigned to run Knox Gateway",
     "displayType": "masterHosts",
     "isOverridable": false,
-    "isVisible": true,
     "isRequiredByAgent": false,
     "serviceName": "KNOX",
     "filename": "knox-env.xml",
@@ -1811,27 +1881,14 @@ var hdp2properties = [
     "index": 0
   },
   {
-    "id": "site property",
     "name": "knox_master_secret",
-    "displayName": "Knox Master Secret",
-    "value": "",
-    "recommendedValue": "",
-    "displayType": "password",
-    "isReconfigurable": false,
-    "isOverridable": false,
-    "isRequired": true,
     "serviceName": "KNOX",
     "filename": "knox-env.xml",
     "category": "KNOX_GATEWAY"
   },
   {
-    "id": "puppet var",
     "name": "knox_pid_dir",
-    "displayName": "Knox PID dir",
-    "value": "",
     "displayType": "directory",
-    "isReconfigurable": false,
-    "isOverridable": false,
     "serviceName": "KNOX",
     "filename": "knox-env.xml",
     "category": "Advanced knox-env"
@@ -1839,7 +1896,6 @@ var hdp2properties = [
 
 /********************************************* KAFKA *****************************/
   {
-    "id": "puppet var",
     "name": "kafka_broker_hosts",
     "displayName": "Kafka Broker host",
     "value": "",
@@ -1847,7 +1903,6 @@ var hdp2properties = [
     "description": "The host that has been assigned to run Kafka Broker",
     "displayType": "masterHosts",
     "isOverridable": false,
-    "isVisible": true,
     "isRequiredByAgent": false,
     "serviceName": "KAFKA",
     "filename": "kafka-broker.xml",
@@ -1855,11 +1910,7 @@ var hdp2properties = [
     "index": 0
   },
   {
-    "id": "site property",
     "name": "log.dirs",
-    "displayName": "log.dirs",
-    "value": "",
-    "recommendedValue": "",
     "defaultDirectory": "/kafka-logs",
     "displayType": "directories",
     "serviceName": "KAFKA",
@@ -1868,11 +1919,7 @@ var hdp2properties = [
     "index": 0
   },
   {
-    "id": "site property",
     "name": "port",
-    "displayName": "port",
-    "value": "",
-    "recommendedValue": "",
     "displayType": "int",
     "serviceName": "KAFKA",
     "filename": "kafka-broker.xml",
@@ -1880,22 +1927,14 @@ var hdp2properties = [
     "index": 0
   },
     {
-    "id": "site property",
     "name": "listeners",
-    "displayName": "listeners",
-    "value": "",
-    "recommendedValue": "",
     "displayType": "advanced",
     "serviceName": "KAFKA",
     "filename": "kafka-broker.xml",
     "category": "KAFKA_BROKER"
   },
   {
-    "id": "site property",
     "name": "log.roll.hours",
-    "displayName": "log.roll.hours",
-    "value": "",
-    "recommendedValue": "",
     "displayType": "advanced",
     "serviceName": "KAFKA",
     "filename": "kafka-broker.xml",
@@ -1903,11 +1942,7 @@ var hdp2properties = [
     "index": 0
   },
   {
-    "id": "site property",
     "name": "log.retention.hours",
-    "displayName": "log.retention.hours",
-    "value": "",
-    "recommendedValue": "",
     "displayType": "advanced",
     "serviceName": "KAFKA",
     "filename": "kafka-broker.xml",
@@ -1915,11 +1950,7 @@ var hdp2properties = [
     "index": 0
   },
   {
-    "id": "site property",
     "name": "zookeeper.connect",
-    "displayName": "zookeeper.connect",
-    "value": "",
-    "recommendedValue": "",
     "displayType": "advanced",
     "serviceName": "KAFKA",
     "filename": "kafka-broker.xml",
@@ -1927,13 +1958,7 @@ var hdp2properties = [
     "index": 0
   },
   {
-    "id": "site property",
     "name": "kafka_pid_dir",
-    "displayName": "Kafka PID dir",
-    "value": "",
-    "recommendedValue": "",
-    "isReconfigurable": false,
-    "isOverridable": false,
     "displayType": "directory",
     "serviceName": "KAFKA",
     "filename": "kafka-env.xml",
@@ -1943,188 +1968,127 @@ var hdp2properties = [
 
 /********************************************* ACCUMULO *****************************/
   {
-    "id": "site property",
     "name": "accumulo_instance_name",
-    "displayName": "Instance Name",
     "displayType": "string",
-    "isOverridable": false,
-    "isReconfigurable": false,
     "serviceName": "ACCUMULO",
     "filename": "accumulo-env.xml",
     "category": "General"
   },
   {
-    "id": "site property",
     "name": "accumulo_root_password",
-    "displayName": "Accumulo root password",
-    "displayType": "password",
-    "isOverridable": false,
     "serviceName": "ACCUMULO",
     "filename": "accumulo-env.xml",
     "category": "General"
   },
   {
-    "id": "site property",
     "name": "trace.user",
-    "displayName": "Trace user",
     "displayType": "string",
-    "isOverridable": false,
     "serviceName": "ACCUMULO",
     "filename": "accumulo-site.xml",
     "category": "General"
   },
   {
-    "id": "site property",
     "name": "trace_password",
-    "displayName": "Trace user password",
-    "displayType": "password",
-    "isOverridable": false,
     "serviceName": "ACCUMULO",
     "filename": "accumulo-env.xml",
     "category": "General"
   },
   {
-    "id": "site property",
     "name": "instance_secret",
-    "displayName": "Instance Secret",
     "displayType": "password",
-    "isOverridable": false,
-    "isReconfigurable": false,
     "serviceName": "ACCUMULO",
     "filename": "accumulo-env.xml",
     "category": "General"
   },
   {
-    "id": "site property",
     "name": "server_content",
-    "displayName": "Server accumulo-env template",
     "displayType": "content",
     "serviceName": "ACCUMULO",
     "filename": "accumulo-env.xml",
     "category": "Advanced accumulo-env"
   },
   {
-    "id": "puppet var",
     "name": "accumulo_master_heapsize",
-    "displayName": "Accumulo Master Maximum Java heap size",
     "displayType": "int",
-    "unit": "MB",
-    "isOverridable": false,
     "serviceName": "ACCUMULO",
     "filename": "accumulo-env.xml",
     "category": "Advanced accumulo-env"
   },
   {
-    "id": "puppet var",
     "name": "accumulo_tserver_heapsize",
-    "displayName": "Accumulo TServer Maximum Java heap size",
     "displayType": "int",
-    "unit": "MB",
     "serviceName": "ACCUMULO",
     "filename": "accumulo-env.xml",
     "category": "Advanced accumulo-env"
   },
   {
-    "id": "puppet var",
     "name": "accumulo_monitor_heapsize",
-    "displayName": "Accumulo Monitor Maximum Java heap size",
     "displayType": "int",
-    "unit": "MB",
-    "isOverridable": false,
     "serviceName": "ACCUMULO",
     "filename": "accumulo-env.xml",
     "category": "Advanced accumulo-env"
   },
   {
-    "id": "puppet var",
     "name": "accumulo_gc_heapsize",
-    "displayName": "Accumulo GC Maximum Java heap size",
     "displayType": "int",
-    "unit": "MB",
-    "isOverridable": false,
     "serviceName": "ACCUMULO",
     "filename": "accumulo-env.xml",
     "category": "Advanced accumulo-env"
   },
   {
-    "id": "puppet var",
     "name": "accumulo_other_heapsize",
-    "displayName": "Accumulo Other Maximum Java heap size",
     "displayType": "int",
-    "unit": "MB",
     "serviceName": "ACCUMULO",
     "filename": "accumulo-env.xml",
     "category": "Advanced accumulo-env"
   },
   {
-    "id": "puppet var",
     "name": "accumulo_log_dir",
-    "displayName": "Accumulo Log Dir",
-    "isReconfigurable": false,
     "displayType": "directory",
-    "isOverridable": false,
     "serviceName": "ACCUMULO",
     "filename": "accumulo-env.xml",
     "category": "Advanced accumulo-env"
   },
   {
-    "id": "puppet var",
     "name": "accumulo_pid_dir",
-    "displayName": "Accumulo PID Dir",
-    "isReconfigurable": false,
     "displayType": "directory",
-    "isOverridable": false,
     "serviceName": "ACCUMULO",
     "filename": "accumulo-env.xml",
     "category": "Advanced accumulo-env"
   },
   {
-    "id": "puppet var",
     "name": "accumulo_monitor_bind_all",
-    "displayName": "Monitor Bind All Interfaces",
     "displayType": "checkbox",
-    "recommendedValue": false,
     "serviceName": "ACCUMULO",
     "filename": "accumulo-env.xml",
     "category": "Advanced accumulo-env"
   },
   {
-    "id": "site property",
     "name": "instance.volumes",
-    "displayName": "instance.volumes",
     "displayType": "string",
-    "isOverridable": false,
     "serviceName": "ACCUMULO",
     "filename": "accumulo-site.xml",
     "category": "Advanced accumulo-site",
     "index": 0
   },
   {
-    "id": "site property",
     "name": "instance.zookeeper.host",
-    "displayName": "instance.zookeeper.host",
     "displayType": "string",
-    "isOverridable": false,
     "serviceName": "ACCUMULO",
     "filename": "accumulo-site.xml",
     "category": "Advanced accumulo-site",
     "index": 1
   },
   {
-    "id": "site property",
     "name": "instance.zookeeper.timeout",
-    "displayName": "instance.zookeeper.timeout",
     "displayType": "string",
-    "isOverridable": false,
     "serviceName": "ACCUMULO",
     "filename": "accumulo-site.xml",
     "category": "Advanced accumulo-site",
     "index": 2
   },
   {
-    "id": "site property",
     "name": "master.port.client",
-    "displayName": "master.port.client",
     "displayType": "int",
     "serviceName": "ACCUMULO",
     "filename": "accumulo-site.xml",
@@ -2132,9 +2096,7 @@ var hdp2properties = [
     "index": 3
   },
   {
-    "id": "site property",
     "name": "tserver.port.client",
-    "displayName": "tserver.port.client",
     "displayType": "int",
     "serviceName": "ACCUMULO",
     "filename": "accumulo-site.xml",
@@ -2142,9 +2104,7 @@ var hdp2properties = [
     "index": 4
   },
   {
-    "id": "site property",
     "name": "monitor.port.client",
-    "displayName": "monitor.port.client",
     "displayType": "int",
     "serviceName": "ACCUMULO",
     "filename": "accumulo-site.xml",
@@ -2152,9 +2112,7 @@ var hdp2properties = [
     "index": 5
   },
   {
-    "id": "site property",
     "name": "monitor.port.log4j",
-    "displayName": "monitor.port.log4j",
     "displayType": "int",
     "serviceName": "ACCUMULO",
     "filename": "accumulo-site.xml",
@@ -2162,9 +2120,7 @@ var hdp2properties = [
     "index": 6
   },
   {
-    "id": "site property",
     "name": "gc.port.client",
-    "displayName": "gc.port.client",
     "displayType": "int",
     "serviceName": "ACCUMULO",
     "filename": "accumulo-site.xml",
@@ -2172,9 +2128,7 @@ var hdp2properties = [
     "index": 7
   },
   {
-    "id": "site property",
     "name": "trace.port.client",
-    "displayName": "trace.port.client",
     "displayType": "int",
     "serviceName": "ACCUMULO",
     "filename": "accumulo-site.xml",
@@ -2182,20 +2136,15 @@ var hdp2properties = [
     "index": 8
   },
   {
-    "id": "site property",
     "name": "tserver.memory.maps.native.enabled",
-    "displayName": "tserver.memory.maps.native.enabled",
     "displayType": "checkbox",
-    "recommendedValue": true,
     "serviceName": "ACCUMULO",
     "filename": "accumulo-site.xml",
     "category": "Advanced accumulo-site",
     "index": 9
   },
   {
-    "id": "site property",
     "name": "general.classpaths",
-    "displayName": "general.classpaths",
     "displayType": "content",
     "serviceName": "ACCUMULO",
     "filename": "accumulo-site.xml",
@@ -2205,12 +2154,7 @@ var hdp2properties = [
 
 /*******************************************kerberos***********************************/
   {
-    "id": "puppet var",
     "name": "kdc_type",
-    "displayName": "KDC type",
-    "isOverridable": false,
-    "isVisible": true,
-    "isRequiredByAgent": true,
     "displayType": "masterHost",
     "serviceName": "KERBEROS",
     "filename": "kerberos-env.xml",
@@ -2218,12 +2162,7 @@ var hdp2properties = [
     "index": 0
   },
   {
-    "id": "puppet var",
     "name": "kdc_host",
-    "displayName": "KDC host",
-    "isOverridable": false,
-    "isVisible": true,
-    "isRequiredByAgent": true,
     "displayType": "supportTextConnection",
     "serviceName": "KERBEROS",
     "filename": "kerberos-env.xml",
@@ -2231,84 +2170,54 @@ var hdp2properties = [
     "index": 1
   },
   {
-    "id": "puppet var",
     "name": "realm",
-    "displayName": "Realm name",
     "displayType": "host",
-    "isOverridable": false,
-    "isVisible": true,
-    "isRequiredByAgent": true,
-    "isReconfigurable": false,
     "serviceName": "KERBEROS",
     "filename": "kerberos-env.xml",
     "category": "KDC",
     "index": 2
   },
   {
-    "id": "puppet var",
     "name": "ldap_url",
-    "displayName": "LDAP url",
     "displayType": "host",
-    "isOverridable": false,
-    "isVisible": false,
     "serviceName": "KERBEROS",
     "filename": "kerberos-env.xml",
     "category": "KDC",
     "index": 3
   },
   {
-    "id": "puppet var",
     "name": "container_dn",
-    "displayName": "Container DN",
-    "isVisible": false,
-    "isOverridable": false,
     "serviceName": "KERBEROS",
     "filename": "kerberos-env.xml",
     "category": "KDC",
     "index": 4
   },
   {
-    "id": "puppet var",
     "name": "manage_identities",
-    "displayName": "Manage Kerberos Identities",
     "displayType": "checkbox",
-    "isVisible": false,
-    "isOverridable": false,
     "serviceName": "KERBEROS",
     "filename": "kerberos-env.xml",
     "category": "Advanced kerberos-env",
     "index" : 0
   },
   {
-    "id": "puppet var",
     "name": "install_packages",
-    "displayName": "Install OS-specific Kerberos client package(s)",
     "displayType": "checkbox",
-    "isOverridable": false,
-    "isVisible": true,
     "serviceName": "KERBEROS",
     "filename": "kerberos-env.xml",
     "category": "Advanced kerberos-env",
     "index" : 1
   },
   {
-    "id": "puppet var",
     "name": "executable_search_paths",
-    "displayName": "Executable Search Paths",
     "displayType": "multiline",
-    "isOverridable": false,
-    "isVisible": true,
     "serviceName": "KERBEROS",
     "filename": "kerberos-env.xml",
     "category": "Advanced kerberos-env",
     "index" : 2
   },
   {
-    "id": "puppet var",
     "name": "encryption_types",
-    "displayName": "Encryption Types",
-    "isOverridable": false,
-    "isVisible": true,
     "serviceName": "KERBEROS",
     "filename": "kerberos-env.xml",
     "displayType": "multiLine",
@@ -2316,158 +2225,103 @@ var hdp2properties = [
     "index" : 3
   },
   {
-    "id": "puppet var",
     "name": "password_length",
-    "displayName": "Password Length",
     "displayType": "int",
-    "isOverridable": false,
-    "isVisible": true,
     "serviceName": "KERBEROS",
     "filename": "kerberos-env.xml",
     "category": "Advanced kerberos-env",
     "index" : 4
   },
   {
-    "id": "puppet var",
     "name": "password_min_lowercase_letters",
-    "displayName": "Password Minimum # Lowercase Letters",
     "displayType": "int",
-    "isOverridable": false,
-    "isVisible": true,
     "serviceName": "KERBEROS",
     "filename": "kerberos-env.xml",
     "category": "Advanced kerberos-env",
     "index" : 5
   },
   {
-    "id": "puppet var",
     "name": "password_min_uppercase_letters",
-    "displayName": "Password Minimum # Uppercase Letters",
     "displayType": "int",
-    "isOverridable": false,
-    "isVisible": true,
     "serviceName": "KERBEROS",
     "filename": "kerberos-env.xml",
     "category": "Advanced kerberos-env",
     "index" : 6
   },
   {
-    "id": "puppet var",
     "name": "password_min_digits",
-    "displayName": "Password Minimum # Digits",
     "displayType": "int",
-    "isOverridable": false,
-    "isVisible": true,
     "serviceName": "KERBEROS",
     "filename": "kerberos-env.xml",
     "category": "Advanced kerberos-env",
     "index" : 7
   },
   {
-    "id": "puppet var",
     "name": "password_min_punctuation",
-    "displayName": "Password Minimum # Punctuation Characters",
     "displayType": "int",
-    "isOverridable": false,
-    "isVisible": true,
     "serviceName": "KERBEROS",
     "filename": "kerberos-env.xml",
     "category": "Advanced kerberos-env",
     "index" : 8
   },
   {
-    "id": "puppet var",
     "name": "password_min_whitespace",
-    "displayName": "Password Minimum # Whitespace Characters",
     "displayType": "int",
-    "isOverridable": false,
-    "isVisible": true,
     "serviceName": "KERBEROS",
     "filename": "kerberos-env.xml",
     "category": "Advanced kerberos-env",
     "index" : 9
   },
   {
-    "id": "puppet var",
     "name": "service_check_principal_name",
-    "displayName": "Test Kerberos Principal",
-    "isOverridable": false,
-    "isVisible": true,
     "serviceName": "KERBEROS",
     "filename": "kerberos-env.xml",
     "category": "Advanced kerberos-env",
     "index" : 10
   },
   {
-    "id": "puppet var",
     "name": "ad_create_attributes_template",
-    "displayName": "Account Attribute Template",
     "displayType": "content",
-    "isOverridable": false,
-    "isVisible": true,
-    "isRequired": false,
     "serviceName": "KERBEROS",
     "filename": "kerberos-env.xml",
     "category": "Advanced kerberos-env",
     "index" : 11
   },
   {
-    "id": "puppet var",
     "name": "kdc_create_attributes",
-    "displayName": "Principal Attributes",
-    "isOverridable": false,
-    "isVisible": true,
-    "isRequired": false,
     "serviceName": "KERBEROS",
     "filename": "kerberos-env.xml",
     "category": "Advanced kerberos-env",
     "index" : 12
   },
   {
-    "id": "puppet var",
     "name": "case_insensitive_user

<TRUNCATED>

Mime
View raw message