You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2013/10/23 00:56:57 UTC

[2/4] AMBARI-3568: Clean up unnecessary globals from Ambari Web. (jaimin)

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/88f51325/ambari-web/app/data/HDP2/global_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/global_properties.js b/ambari-web/app/data/HDP2/global_properties.js
index fc2a670..e96ccfc 100644
--- a/ambari-web/app/data/HDP2/global_properties.js
+++ b/ambari-web/app/data/HDP2/global_properties.js
@@ -93,21 +93,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "dfs_namenode_name_dir",
-      "displayName": "NameNode directories",
-      "description": "NameNode directories for HDFS to store the file system image",
-      "defaultValue": "",
-      "defaultDirectory": "/hadoop/hdfs/namenode",
-      "displayType": "directories",
-      "isOverridable": false,
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HDFS",
-      "category": "NameNode",
-      "index": 1
-    },
-    {
-      "id": "puppet var",
       "name": "namenode_heapsize",
       "displayName": "NameNode Java heap size",
       "description": "Initial and maximum Java heap size for NameNode (Java options -Xms and -Xmx).  This also applies to the Secondary NameNode.",
@@ -153,21 +138,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "dfs_namenode_checkpoint_dir",
-      "displayName": "SecondaryNameNode Checkpoint directory",
-      "description": "Directory on the local filesystem where the Secondary NameNode should store the temporary images to merge",
-      "defaultValue": "",
-      "defaultDirectory": "/hadoop/hdfs/namesecondary",
-      "displayType": "directory",
-      "isOverridable": false,
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HDFS",
-      "category": "SNameNode",
-      "index": 1
-    },
-    {
-      "id": "puppet var",
       "name": "datanode_hosts", //not in the schema. For UI purpose
       "displayName": "DataNode hosts",
       "value": "",
@@ -184,20 +154,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "dfs_datanode_data_dir",
-      "displayName": "DataNode directories",
-      "description": "DataNode directories for HDFS to store the data blocks",
-      "defaultValue": "",
-      "defaultDirectory": "/hadoop/hdfs/data",
-      "displayType": "directories",
-      "isVisible": true,
-      "domain": "datanode-global",
-      "serviceName": "HDFS",
-      "category": "DataNode",
-      "index": 1
-    },
-    {
-      "id": "puppet var",
       "name": "dtnode_heapsize",
       "displayName": "DataNode maximum Java heap size",
       "description": "Maximum Java heap size for DataNode (Java option -Xmx)",
@@ -212,32 +168,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "dfs_datanode_failed_volume_tolerated",
-      "displayName": "DataNode volumes failure toleration",
-      "description": "The number of volumes that are allowed to fail before a DataNode stops offering service",
-      "defaultValue": "0",
-      "displayType": "int",
-      "isVisible": true,
-      "domain": "datanode-global",
-      "serviceName": "HDFS",
-      "category": "DataNode",
-      "index": 3
-    },
-    {
-      "id": "puppet var",
-      "name": "dfs_webhdfs_enabled",
-      "displayName": "WebHDFS enabled",
-      "description": "Whether to enable WebHDFS feature",
-      "defaultValue": true,
-      "displayType": "checkbox",
-      "isOverridable": false,
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HDFS",
-      "index": 0
-    },
-    {
-      "id": "puppet var",
       "name": "hadoop_heapsize",
       "displayName": "Hadoop maximum Java heap size",
       "description": "Maximum Java heap size for daemons such as Balancer (Java option -Xmx)",
@@ -251,47 +181,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "datanode_du_reserved",
-      "displayName": "Reserved space for HDFS",
-      "description": "Reserved space in GB per volume",
-      "defaultValue": "1073741824",
-      "displayType": "int",
-      "unit": "bytes",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HDFS",
-      "index": 2
-    },
-    {
-      "id": "puppet var",
-      "name": "dfs_namenode_checkpoint_period",
-      "displayName": "HDFS Maximum Checkpoint Delay",
-      "description": "Maximum delay between two consecutive checkpoints for HDFS",
-      "defaultValue": "21600",
-      "displayType": "int",
-      "unit": "seconds",
-      "isVisible": true,
-      "domain": "global",
-      "filename": "hdfs-site.xml",
-      "serviceName": "HDFS",
-      "index": 3
-    },
-    {
-      "id": "puppet var",
-      "name": "fs_checkpoint_size",
-      "displayName": "HDFS Maximum Edit Log Size for Checkpointing",
-      "description": "Maximum size of the edits log file that forces an urgent checkpoint even if the maximum checkpoint delay is not reached",
-      "defaultValue": "0.5",
-      "displayType": "float",
-      "unit": "GB",
-      "isVisible": true,
-      "domain": "global",
-      "filename": "core-site.xml",
-      "serviceName": "HDFS",
-      "index": 4
-    },
-    {
-      "id": "puppet var",
       "name": "hdfs_log_dir_prefix",
       "displayName": "Hadoop Log Dir Prefix",
       "description": "The parent directory for Hadoop log files.  The HDFS log directory will be ${hadoop_log_dir_prefix} / ${hdfs_user} and the MapReduce log directory will be ${hadoop_log_dir_prefix} / ${mapred_user}.",
@@ -347,33 +236,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "dfs_replication",
-      "displayName": "Block replication",
-      "description": "Default block replication.",
-      "displayType": "int",
-      "defaultValue": "3",
-      "isVisible": true,
-      "filename": "hdfs-site.xml",
-      "domain": "global",
-      "serviceName": "HDFS",
-      "category": "Advanced"
-    },
-    {
-      "id": "puppet var",
-      "name": "dfs_datanode_data_dir_perm",
-      "displayName": "dfs_datanode_data_dir_perm",
-      "description": "",
-      "defaultValue": "750",
-      "isReconfigurable": true,
-      "displayType": "int",
-      "isVisible": false,
-      "filename": "hdfs-site.xml",
-      "domain": "global",
-      "serviceName": "HDFS",
-      "category": "Advanced"
-    },
-    {
-      "id": "puppet var",
       "name": "security_enabled",
       "displayName": "Hadoop Security",
       "description": "Enable hadoop security",
@@ -645,136 +507,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "regionserver_handlers",
-      "displayName": "HBase RegionServer Handler",
-      "description": "Count of RPC Listener instances spun up on RegionServers",
-      "defaultValue": "60",
-      "displayType": "int",
-      "isVisible": true,
-      "domain": "regionserver-global",
-      "serviceName": "HBASE",
-      "category": "RegionServer",
-      "index": 2
-    },
-    {
-      "id": "puppet var",
-      "name": "hregion_majorcompaction",
-      "displayName": "HBase Region Major Compaction",
-      "description": "The time between major compactions of all HStoreFiles in a region. Set to 0 to disable automated major compactions.",
-      "defaultValue": "604800000",
-      "displayType": "int",
-      "unit": "ms",
-      "isVisible": true,
-      "domain": "regionserver-global",
-      "serviceName": "HBASE",
-      "category": "RegionServer",
-      "index": 3
-    },
-    {
-      "id": "puppet var",
-      "name": "hregion_blockmultiplier",
-      "displayName": "HBase Region Block Multiplier",
-      "description": "Block updates if memstore has \"Multiplier * HBase Region Memstore Flush Size\" bytes. Useful preventing runaway memstore during spikes in update traffic",
-      "defaultValue": "2",
-      "displayType": "int",
-      "isVisible": true,
-      "domain": "regionserver-global",
-      "serviceName": "HBASE",
-      "category": "RegionServer",
-      "index": 4
-    },
-    {
-      "id": "puppet var",
-      "name": "hregion_memstoreflushsize",
-      "displayName": "HBase Region Memstore Flush Size",
-      "description": "Memstore will be flushed to disk if size of the memstore exceeds this number of bytes.",
-      "defaultValue": "134217728",
-      "displayType": "int",
-      "unit": "bytes",
-      "isVisible": true,
-      "domain": "regionserver-global",
-      "serviceName": "HBASE",
-      "category": "RegionServer",
-      "index": 5
-    },
-    {
-      "id": "puppet var",
-      "name": "hstore_compactionthreshold",
-      "displayName": "HBase HStore compaction threshold",
-      "description": "If more than this number of HStoreFiles in any one HStore then a compaction is run to rewrite all HStoreFiles files as one.",
-      "defaultValue": "3",
-      "displayType": "int",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "index": 0
-    },
-    {
-      "id": "puppet var",
-      "name": "hfile_blockcache_size",
-      "displayName": "HFile block cache size ",
-      "description": "Percentage of maximum heap (-Xmx setting) to allocate to block cache used by HFile/StoreFile. Set to 0 to disable but it's not recommended.",
-      "defaultValue": "0.40",
-      "displayType": "float",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "index": 1
-    },
-    {
-      "id": "puppet var",
-      "name": "hstorefile_maxsize",
-      "displayName": "Maximum HStoreFile Size",
-      "description": "If any one of a column families' HStoreFiles has grown to exceed this value, the hosting HRegion is split in two.",
-      "defaultValue": "10737418240",
-      "displayType": "int",
-      "unit": "bytes",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "index": 2
-    },
-    {
-      "id": "puppet var",
-      "name": "client_scannercaching",
-      "displayName": "HBase Client Scanner Caching",
-      "description": "Number of rows that will be fetched when calling next on a scanner if it is not served from (local, client) memory. Do not set this value such that the time between invocations is greater than the scanner timeout",
-      "defaultValue": "100",
-      "displayType": "int",
-      "unit": "rows",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "index": 3
-    },
-    {
-      "id": "puppet var",
-      "name": "zookeeper_sessiontimeout",
-      "displayName": "Zookeeper timeout for HBase Session",
-      "description": "HBase passes this to the zk quorum as suggested maximum time for a session",
-      "defaultValue": "30000",
-      "displayType": "int",
-      "unit": "ms",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "index": 4
-    },
-    {
-      "id": "puppet var",
-      "name": "hfile_max_keyvalue_size",
-      "displayName": "HBase Client Maximum key-value Size",
-      "description": "Specifies the combined maximum allowed size of a KeyValue instance. It should be set to a fraction of the maximum region size.",
-      "defaultValue": "10485760",
-      "displayType": "int",
-      "unit": "bytes",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "index": 5
-    },
-    {
-      "id": "puppet var",
       "name": "hbase_log_dir",
       "displayName": "HBase Log Dir",
       "description": "Directory for HBase logs",
@@ -814,72 +546,6 @@ module.exports =
       "serviceName": "HBASE",
       "category": "Advanced"
     },
-    {
-      "id": "puppet var",
-      "name": "hbase_tmp_dir",
-      "displayName": "HBase local directory",
-      "description": "Temporary directory on the local filesystem",
-      "defaultDirectory": "/hadoop/hbase",
-      "defaultValue": "",
-      "displayType": "directory",
-      "isVisible": true,
-      "serviceName": "HBASE",
-      "category": "Advanced"
-    },
-    {
-      "id": "puppet var",
-      "name": "hstore_blockingstorefiles",
-      "displayName": "hstore blocking storefiles",
-      "description": "If more than this number of StoreFiles in any one Store (one StoreFile is written per flush of " +
-        "MemStore) then updates are blocked for this HRegion until a compaction is completed, or until " +
-        "hbase.hstore.blockingWaitTime has been exceeded.",
-      "defaultValue": 10,
-      "isRequired": true,
-      "displayType": "init",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "category": "Advanced"
-    },
-    {
-      "id": "puppet var",
-      "name": "regionserver_memstore_lab",
-      "displayName": "regionserver_memstore_lab",
-      "description": "",
-      "defaultValue": true,
-      "isRequired": false,
-      "displayType": "checkbox",
-      "isVisible": false,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "category": "Advanced"
-    },
-    {
-      "id": "puppet var",
-      "name": "regionserver_memstore_lowerlimit",
-      "displayName": "regionserver_memstore_lowerlimit",
-      "description": "",
-      "defaultValue": "0.38",
-      "isRequired": false,
-      "displayType": "float",
-      "isVisible": false,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "category": "Advanced"
-    },
-    {
-      "id": "puppet var",
-      "name": "regionserver_memstore_upperlimit",
-      "displayName": "regionserver_memstore_upperlimit",
-      "description": "",
-      "defaultValue": "0.4",
-      "isRequired": true,
-      "displayType": "float",
-      "isVisible": false,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "category": "Advanced"
-    },
   /**********************************************HIVE***************************************/
     {
       "id": "puppet var",
@@ -1060,50 +726,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "hive_metastore_user_name",
-      "displayName": "Database Username",
-      "description": "Database user name to use to connect to the database",
-      "defaultValue": "hive",
-      "isReconfigurable": true,
-      "displayType": "host",
-      "isOverridable": false,
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HIVE",
-      "category": "Hive Metastore",
-      "index": 5
-    },
-    {
-      "id": "puppet var",
-      "name": "hive_metastore_user_passwd",
-      "displayName": "Database Password",
-      "description": "Database password to use to connect to the PostgreSQL database",
-      "defaultValue": "",
-      "isReconfigurable": true,
-      "displayType": "password",
-      "isOverridable": false,
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HIVE",
-      "category": "Hive Metastore",
-      "index": 6
-    },
-    {
-      "id": "puppet var",
-      "name": "hive_jdbc_connection_url",
-      "displayName": "Database URL",
-      "value": "",
-      "defaultValue": "jdbc", // set to a 'jdbc' to not include this in initial error count
-      "description": "The JDBC connection URL to the database",
-      "displayType": "advanced",
-      "isOverridable": false,
-      "isVisible": true,
-      "serviceName": "HIVE",
-      "category": "Hive Metastore",
-      "index": 7
-    },
-    {
-      "id": "puppet var",
       "name": "hive_metastore_port",
       "displayName": "Hive metastore port",
       "description": "",
@@ -1376,66 +998,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "oozie_database_name",
-      "displayName": "Database Name",
-      "description": "Database name used for the Oozie",
-      "defaultValue": "oozie",
-      "isReconfigurable": true,
-      "isOverridable": false,
-      "displayType": "host",
-      "isVisible": true,
-      "isObserved": true,
-      //"domain": "global",
-      "serviceName": "OOZIE",
-      "category": "Oozie Server",
-      "index": 3
-    },
-    {
-      "id": "puppet var",
-      "name": "oozie_metastore_user_name",
-      "displayName": "Database Username",
-      "description": "Database user name to use to connect to the database",
-      "defaultValue": "oozie",
-      "isReconfigurable": true,
-      "isOverridable": false,
-      "displayType": "host",
-      "isVisible": true,
-      //"domain": "global",
-      "serviceName": "OOZIE",
-      "category": "Oozie Server",
-      "index": 4
-    },
-    {
-      "id": "puppet var",
-      "name": "oozie_metastore_user_passwd",
-      "displayName": "Database Password",
-      "description": "Database password to use to connect to the database",
-      "defaultValue": "",
-      "isReconfigurable": true,
-      "isOverridable": false,
-      "displayType": "password",
-      "isVisible": true,
-      //"domain": "global",
-      "serviceName": "OOZIE",
-      "category": "Oozie Server",
-      "index": 5
-    },
-    {
-      "id": "puppet var",
-      "name": "oozie_jdbc_connection_url",
-      "displayName": "Database URL",
-      "description": "The JDBC connection URL to the database",
-      "defaultValue": "jdbc",  // set to a 'jdbc' to not include this in initial error count
-      "isReconfigurable": true,
-      "isOverridable": false,
-      "displayType": "advanced",
-      "isVisible": true,
-      "serviceName": "OOZIE",
-      "category": "Oozie Server",
-      "index": 6
-    },
-    {
-      "id": "puppet var",
       "name": "oozie_data_dir",
       "displayName": "Oozie Data Dir",
       "description": "Data directory in which the Oozie DB exists",

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/88f51325/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 c30660d..7326dc6 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -18,6 +18,147 @@
 module.exports =
 {
   "configProperties": [
+  /**********************************************HDFS***************************************/
+    {
+      "id": "site property",
+      "name": "dfs.namenode.checkpoint.dir",
+      "displayName": "SecondaryNameNode Checkpoint directory",
+      "description": "Directory on the local filesystem where the Secondary NameNode should store the temporary images to merge",
+      "defaultValue": "",
+      "defaultDirectory": "/hadoop/hdfs/namesecondary",
+      "displayType": "directory",
+      "isOverridable": false,
+      "isVisible": true,
+      "serviceName": "HDFS",
+      "category": "SNameNode",
+      "index": 1
+    },
+    {
+      "id": "site property",
+      "name": "dfs.namenode.checkpoint.period",
+      "displayName": "HDFS Maximum Checkpoint Delay",
+      "description": "Maximum delay between two consecutive checkpoints for HDFS",
+      "defaultValue": "",
+      "displayType": "int",
+      "unit": "seconds",
+      "isVisible": true,
+      "category": "General",
+      "serviceName": "HDFS",
+      "index": 3
+    },
+    {
+      "id": "site property",
+      "name": "fs.checkpoint.size",
+      "displayName": "HDFS Maximum Edit Log Size for Checkpointing",
+      "description": "Maximum size of the edits log file that forces an urgent checkpoint even if the maximum checkpoint delay is not reached",
+      "defaultValue": "",
+      "displayType": "int",
+      "unit": "bytes",
+      "isVisible": true,
+      "serviceName": "HDFS",
+      "category": "General",
+      "index": 4
+    },
+    {
+      "id": "site property",
+      "name": "dfs.namenode.name.dir",
+      "displayName": "NameNode directories",
+      "description": "NameNode directories for HDFS to store the file system image",
+      "defaultValue": "",
+      "defaultDirectory": "/hadoop/hdfs/namenode",
+      "displayType": "directories",
+      "isOverridable": false,
+      "isVisible": true,
+      "serviceName": "HDFS",
+      "category": "NameNode",
+      "index": 1
+    },
+    {
+      "id": "site property",
+      "name": "dfs.webhdfs.enabled",
+      "displayName": "WebHDFS enabled",
+      "description": "Whether to enable WebHDFS feature",
+      "defaultValue": true,
+      "displayType": "checkbox",
+      "isOverridable": false,
+      "isVisible": true,
+      "category": "General",
+      "serviceName": "HDFS",
+      "index": 0
+    },
+    {
+      "id": "site property",
+      "name": "dfs.datanode.failed.volumes.tolerated",
+      "displayName": "DataNode volumes failure toleration",
+      "description": "The number of volumes that are allowed to fail before a DataNode stops offering service",
+      "defaultValue": "0",
+      "displayType": "int",
+      "isVisible": true,
+      "category": "DataNode",
+      "serviceName": "HDFS",
+      "index": 3
+    },
+    {
+      "id": "site property",
+      "name": "dfs.datanode.data.dir",
+      "displayName": "DataNode directories",
+      "description": "DataNode directories for HDFS to store the data blocks",
+      "defaultValue": "",
+      "defaultDirectory": "/hadoop/hdfs/data",
+      "displayType": "directories",
+      "isVisible": true,
+      "category": "DataNode",
+      "serviceName": "HDFS",
+      "index": 1
+    },
+    {
+      "id": "site property",
+      "name": "dfs.datanode.data.dir.perm",
+      "displayName": "DataNode directories permission",
+      "description": "",
+      "defaultValue": "",
+      "displayType": "int",
+      "isVisible": false,
+      "category": "DataNode",
+      "serviceName": "HDFS"
+    },
+    {
+      "id": "site property",
+      "name": "dfs.replication",
+      "displayName": "Block replication",
+      "description": "Default block replication.",
+      "displayType": "int",
+      "defaultValue": "",
+      "isVisible": true,
+      "category": "Advanced",
+      "serviceName": "HDFS"
+    },
+    {
+      "id": "site property",
+      "name": "dfs.datanode.du.reserved",
+      "displayName": "Reserved space for HDFS",
+      "description": "Reserved space in bytes per volume. Always leave this much space free for non dfs use.",
+      "defaultValue": "1073741824",
+      "displayType": "int",
+      "unit": "bytes",
+      "isVisible": true,
+      "category": "General",
+      "serviceName": "HDFS",
+      "index": 2
+    },
+    {
+      "id": "site property",
+      "name": "dfs.client.read.shortcircuit",
+      "displayName": "HDFS Short-circuit read",
+      "description": "This configuration parameter turns on short-circuit local reads.",
+      "defaultValue": "",
+      "displayType": "checkbox",
+      "category": "Advanced",
+      "serviceName": "HDFS"
+
+    },
+
+  /**********************************************YARN***************************************/
     {
       "id": "site property",
       "name": "yarn.acl.enable",
@@ -158,6 +299,8 @@ module.exports =
       "serviceName": "YARN",
       "category": "NodeManager"
     },
+
+  /**********************************************MAPREDUCE2***************************************/
     {
       "id": "site property",
       "name": "mapreduce.map.memory.mb",
@@ -203,6 +346,307 @@ module.exports =
       "category": "Advanced",
       "value": "",
       "defaultValue": ""
+    },
+
+  /**********************************************oozie-site***************************************/
+    {
+      "id": "site property",
+      "name": "oozie.db.schema.name",
+      "displayName": "Database Name",
+      "description": "Database name used for the Oozie",
+      "defaultValue": "",
+      "isOverridable": false,
+      "displayType": "host",
+      "isVisible": true,
+      "isObserved": true,
+      "category": "Oozie Server",
+      "serviceName": "OOZIE",
+      "index": 3
+    },
+    {
+      "id": "site property",
+      "name": "oozie.service.JPAService.jdbc.username",
+      "displayName": "Database Username",
+      "description": "Database user name to use to connect to the database",
+      "defaultValue": "",
+      "isOverridable": false,
+      "displayType": "host",
+      "category": "Oozie Server",
+      "serviceName": "OOZIE",
+      "index": 4
+    },
+    {
+      "id": "site property",
+      "name": "oozie.service.JPAService.jdbc.password",
+      "displayName": "Database Password",
+      "description": "Database password to use to connect to the database",
+      "defaultValue": "",
+      "isOverridable": false,
+      "displayType": "password",
+      "isVisible": true,
+      "category": "Oozie Server",
+      "serviceName": "OOZIE",
+      "index": 5
+    },
+    {
+      "id": "site property",
+      "name": "oozie.service.JPAService.jdbc.driver",
+      "displayName": "JDBC driver class",
+      "defaultValue": "",
+      "value": "",     // the value is overwritten in code
+      "isVisible": false,
+      "description": "Database name used for the Oozie",
+      "category": "Advanced",
+      "serviceName": "OOZIE"
+    },
+    {
+      "id": "site property",
+      "name": "oozie.service.JPAService.jdbc.url",
+      "displayName": "Database URL",
+      "description": "The JDBC connection URL to the database",
+      "defaultValue": "",
+      "isOverridable": false,
+      "displayType": "advanced",
+      "category": "Oozie Server",
+      "serviceName": "OOZIE",
+      "index": 6
+    },
+
+  /**********************************************hive-site***************************************/
+    {
+      "id": "site property",
+      "name": "javax.jdo.option.ConnectionDriverName",
+      "displayName": "JDBC driver class",
+      "defaultValue": "",
+      "value": "",     // the value is overwritten in code
+      "isVisible": false,
+      "description": "Driver class name for a JDBC metastore",
+      "category": "Advanced",
+      "serviceName": "HIVE"
+    },
+    {
+      "id": "site property",
+      "name": "javax.jdo.option.ConnectionUserName",
+      "displayName": "Database Username",
+      "description": "Database user name to use to connect to the database",
+      "defaultValue": "hive",
+      "displayType": "host",
+      "isOverridable": false,
+      "category": "Hive Metastore",
+      "serviceName": "HIVE",
+      "index": 5
+    },
+    {
+      "id": "site property",
+      "name": "javax.jdo.option.ConnectionPassword",
+      "displayName": "Database Password",
+      "description": "Database password to use to connect to the metastore database",
+      "defaultValue": "",
+      "displayType": "password",
+      "isOverridable": false,
+      "isVisible": true,
+      "category": "Hive Metastore",
+      "serviceName": "HIVE",
+      "index": 6
+    },
+    {
+      "id": "site property",
+      "name": "javax.jdo.option.ConnectionURL",
+      "displayName": "Database URL",
+      "value": "",
+      "defaultValue": "", // set to a 'jdbc' to not include this in initial error count
+      "description": "The JDBC connection URL to the database",
+      "displayType": "advanced",
+      "isOverridable": false,
+      "isVisible": true,
+      "category": "Hive Metastore",
+      "serviceName": "HIVE",
+      "index": 7
+    },
+
+  /**********************************************hbase-site***************************************/
+    {
+      "id": "site property",
+      "name": "hbase.tmp.dir",
+      "displayName": "HBase local directory",
+      "description": "Temporary directory on the local filesystem",
+      "defaultDirectory": "/hadoop/hbase",
+      "defaultValue": "",
+      "displayType": "directory",
+      "isVisible": true,
+      "category": "Advanced",
+      "serviceName": "HBASE"
+
+    },
+    {
+      "id": "site property",
+      "name": "hbase.regionserver.global.memstore.upperLimit",
+      "displayName": "hbase.regionserver.global.memstore.upperLimit",
+      "description": "",
+      "defaultValue": "",
+      "displayType": "float",
+      "category": "Advanced",
+      "serviceName": "HBASE"
+    },
+    {
+      "id": "site property",
+      "name": "hbase.regionserver.global.memstore.lowerLimit",
+      "displayName": "hbase.regionserver.global.memstore.lowerLimit",
+      "defaultValue": "",
+      "description": "When memstores are being forced to flush to make room in\
+      memory, keep flushing until we hit this mark. Defaults to 35% of heap.\
+      This value equal to hbase.regionserver.global.memstore.upperLimit causes\
+      the minimum possible flushing to occur when updates are blocked due to\
+      memstore limiting.",
+      "displayType": "float",
+      "category": "Advanced",
+      "serviceName": "HBASE"
+    },
+    {
+      "id": "site property",
+      "name": "hbase.hstore.blockingStoreFiles",
+      "displayName": "hstore blocking storefiles",
+      "description": "If more than this number of StoreFiles in any one Store (one StoreFile is written per flush of " +
+        "MemStore) then updates are blocked for this HRegion until a compaction is completed, or until " +
+        "hbase.hstore.blockingWaitTime has been exceeded.",
+      "defaultValue": "",
+      "isRequired": true,
+      "displayType": "int",
+      "category": "Advanced",
+      "serviceName": "HBASE"
+    },
+    {
+      "id": "site property",
+      "name": "hbase.hstore.compactionThreshold",
+      "displayName": "HBase HStore compaction threshold",
+      "description": "If more than this number of HStoreFiles in any one HStore then a compaction is run to rewrite all HStoreFiles files as one.",
+      "defaultValue": "3",
+      "displayType": "int",
+      "category": "General",
+      "serviceName": "HBASE",
+      "index": 0
+    },
+    {
+      "id": "site property",
+      "name": "hfile.block.cache.size",
+      "displayName": "HFile block cache size ",
+      "description": "Percentage of maximum heap (-Xmx setting) to allocate to block cache used by HFile/StoreFile. Set to 0 to disable but it's not recommended.",
+      "defaultValue": "0.40",
+      "displayType": "float",
+      "category": "General",
+      "serviceName": "HBASE",
+      "index": 1
+    },
+    {
+      "id": "site property",
+      "name": "hbase.hregion.max.filesize",
+      "displayName": "Maximum HStoreFile Size",
+      "description": "If any one of a column families' HStoreFiles has grown to exceed this value, the hosting HRegion is split in two.",
+      "defaultValue": "",
+      "displayType": "int",
+      "unit": "bytes",
+      "isVisible": true,
+      "category": "General",
+      "serviceName": "HBASE",
+      "index": 2
+    },
+    {
+      "id": "site property",
+      "name": "hbase.regionserver.handler.count",
+      "displayName": "HBase RegionServer Handler",
+      "description": "Count of RPC Listener instances spun up on RegionServers",
+      "defaultValue": "60",
+      "displayType": "int",
+      "category": "RegionServer",
+      "serviceName": "HBASE",
+      "index": 2
+    },
+    {
+      "id": "site property",
+      "name": "hbase.hregion.majorcompaction",
+      "displayName": "HBase Region Major Compaction",
+      "description": "The time between major compactions of all HStoreFiles in a region. Set to 0 to disable automated major compactions.",
+      "defaultValue": "",
+      "displayType": "int",
+      "unit": "ms",
+      "isVisible": true,
+      "category": "RegionServer",
+      "serviceName": "HBASE",
+      "index": 3
+    },
+    {
+      "id": "site property",
+      "name": "hbase.hregion.memstore.block.multiplier",
+      "displayName": "HBase Region Block Multiplier",
+      "description": "Block updates if memstore has \"Multiplier * HBase Region Memstore Flush Size\" bytes. Useful preventing runaway memstore during spikes in update traffic",
+      "defaultValue": "",
+      "displayType": "int",
+      "category": "RegionServer",
+      "serviceName": "HBASE",
+      "index": 4
+    },
+    {
+      "id": "site property",
+      "name": "hbase.hregion.memstore.mslab.enabled",
+      "displayName": "hbase.hregion.memstore.mslab.enabled",
+      "description": "Enables the MemStore-Local Allocation Buffer,\
+      a feature which works to prevent heap fragmentation under\
+      heavy write loads. This can reduce the frequency of stop-the-world\
+      GC pauses on large heaps.",
+      "defaultValue": "",
+      "displayType": "checkbox",
+      "category": "Advanced",
+      "serviceName": "HBASE"
+    },
+    {
+      "id": "site property",
+      "name": "hbase.hregion.memstore.flush.size",
+      "displayName": "HBase Region Memstore Flush Size",
+      "description": "Memstore will be flushed to disk if size of the memstore exceeds this number of bytes.",
+      "defaultValue": "",
+      "displayType": "int",
+      "unit": "bytes",
+      "category": "RegionServer",
+      "serviceName": "HBASE",
+      "index": 5
+    },
+    {
+      "id": "site property",
+      "name": "hbase.client.scanner.caching",
+      "displayName": "HBase Client Scanner Caching",
+      "description": "Number of rows that will be fetched when calling next on a scanner if it is not served from \
+      (local, client) memory. Do not set this value such that the time between invocations is greater than the scanner timeout",
+      "defaultValue": "",
+      "displayType": "int",
+      "unit": "rows",
+      "isVisible": true,
+      "category": "General",
+      "serviceName": "HBASE",
+      "index": 3
+    },
+    {
+      "id": "site property",
+      "name": "zookeeper.session.timeout",
+      "displayName": "Zookeeper timeout for HBase Session",
+      "description": "HBase passes this to the zk quorum as suggested maximum time for a session",
+      "defaultValue": "",
+      "displayType": "int",
+      "unit": "ms",
+      "category": "General",
+      "serviceName": "HBASE",
+      "index": 4
+    },
+    {
+      "id": "site property",
+      "name": "hbase.client.keyvalue.maxsize",
+      "displayName": "HBase Client Maximum key-value Size",
+      "description": "Specifies the combined maximum allowed size of a KeyValue instance. It should be set to a fraction of the maximum region size.",
+      "defaultValue": "",
+      "displayType": "int",
+      "unit": "bytes",
+      "category": "General",
+      "serviceName": "HBASE",
+      "index": 5
     }
   ]
 };

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/88f51325/ambari-web/app/data/config_mapping.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/config_mapping.js b/ambari-web/app/data/config_mapping.js
index 9603dfb..8581b93 100644
--- a/ambari-web/app/data/config_mapping.js
+++ b/ambari-web/app/data/config_mapping.js
@@ -17,6 +17,7 @@
  */
 
 var configs = [
+  /**********************************************HDFS***************************************/
   {
     "name": "fs.default.name",
     "templateName": ["namenode_host"],
@@ -25,27 +26,6 @@ var configs = [
     "filename": "core-site.xml"
   },
   {
-    "name": "fs.checkpoint.dir",
-    "templateName": ["fs_checkpoint_dir"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "core-site.xml"
-  },
-  {
-    "name": "fs.checkpoint.period",
-    "templateName": ["fs_checkpoint_period"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "core-site.xml"
-  },
-  {
-    "name": "fs.checkpoint.size",
-    "templateName": ["fs_checkpoint_size"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "core-site.xml"
-  },
-  {
     "name": "hadoop.proxyuser.<foreignKey[0]>.groups",
     "templateName": ["proxyuser_group"],
     "foreignKey": ["hive_user"],
@@ -94,50 +74,6 @@ var configs = [
     "isOverridable" : true
   },
   {
-    "name": "dfs.name.dir",
-    "templateName": ["dfs_name_dir"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hdfs-site.xml"
-  },
-  /*
-  {
-    "name": "dfs.support.append",
-    "templateName": ["dfs_support_append"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hdfs-site.xml"
-  },
-  */
-  {
-    "name": "dfs.webhdfs.enabled",
-    "templateName": ["dfs_webhdfs_enabled"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hdfs-site.xml"
-  },
-  {
-    "name": "dfs.datanode.failed.volumes.tolerated",
-    "templateName": ["dfs_datanode_failed_volume_tolerated"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hdfs-site.xml"
-  },
-  {
-    "name": "dfs.block.local-path-access.user",
-    "templateName": ["dfs_block_local_path_access_user"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hdfs-site.xml"
-  },
-  {
-    "name": "dfs.data.dir",
-    "templateName": ["dfs_data_dir"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hdfs-site.xml"
-  },
-  {
     "name": "dfs.hosts.exclude",
     "templateName": ["hadoop_conf_dir", "dfs_exclude"],
     "foreignKey": null,
@@ -152,13 +88,6 @@ var configs = [
     "filename": "hdfs-site.xml"
   },
   {
-    "name": "dfs.replication",
-    "templateName": ["dfs_replication"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hdfs-site.xml"
-  },
-  {
     "name": "dfs.datanode.address",
     "templateName": ["dfs_datanode_address"],
     "foreignKey": null,
@@ -180,13 +109,6 @@ var configs = [
     "filename": "hdfs-site.xml"
   },
   {
-    "name": "dfs.datanode.du.reserved",
-    "templateName": ["datanode_du_reserved"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hdfs-site.xml"
-  },
-  {
     "name": "dfs.secondary.http.address",
     "templateName": ["snamenode_host"],
     "foreignKey": null,
@@ -200,160 +122,8 @@ var configs = [
     "value": "<templateName[0]>:50470",
     "filename": "hdfs-site.xml"
   },
-  {
-    "name": "dfs.datanode.data.dir.perm",
-    "templateName": ["dfs_datanode_data_dir_perm"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hdfs-site.xml"
-  },
-  {
-    "name": "mapred.local.dir",
-    "templateName": ["mapred_local_dir"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "mapred-site.xml"
-  },
-  {
-    "name": "oozie.base.url",
-    "templateName": ["oozieserver_host"],
-    "foreignKey": null,
-    "value": "http://<templateName[0]>:11000/oozie",
-    "filename": "oozie-site.xml"
-  },
-  {
-    "name": "oozie.service.JPAService.create.db.schema",
-    "templateName": [],
-    "foreignKey": null,
-    "value": "false",  // this is always false
-    "filename": "oozie-site.xml"
-  },
-  {
-    "name": "oozie.db.schema.name",
-    "templateName": ['oozie_database_name'],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "oozie-site.xml"
-  },
-  {
-    "name": "oozie.service.JPAService.jdbc.driver",
-    "templateName": [],
-    "foreignKey": null,
-    "value": "org.apache.derby.jdbc.EmbeddedDriver",  // this value is overwritten in code
-    "filename": "oozie-site.xml"
-  },
-  {
-    "name": "oozie.service.JPAService.jdbc.username",
-    "templateName": ['oozie_metastore_user_name'],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "oozie-site.xml"
-  },
-  {
-    "name": "oozie.service.JPAService.jdbc.password",
-    "templateName": ['oozie_metastore_user_passwd'],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "oozie-site.xml"
-  },
-  {
-    "name": "oozie.service.JPAService.jdbc.url",
-    "templateName": ["oozie_jdbc_connection_url"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "oozie-site.xml"
-  },
-  {
-    "name": "javax.jdo.option.ConnectionDriverName",
-    "templateName": [],
-    "foreignKey": null,
-    "value": "com.mysql.jdbc.Driver",  // this value is overwritten in code
-    "filename": "hive-site.xml"
-  },
-  {
-    "name": "javax.jdo.option.ConnectionUserName",
-    "templateName": ["hive_metastore_user_name"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hive-site.xml"
-  },
-  {
-    "name": "javax.jdo.option.ConnectionPassword",
-    "templateName": ["hive_metastore_user_passwd"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hive-site.xml"
-  },
-  {
-    "name": "javax.jdo.option.ConnectionURL",
-    "templateName": ["hive_jdbc_connection_url"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hive-site.xml"
-  },
-  {
-    "name": "hive.metastore.uris",
-    "templateName": ["hivemetastore_host"],
-    "foreignKey": null,
-    "value": "thrift://<templateName[0]>:9083",
-    "filename": "hive-site.xml"
-  },
-  {
-    "name": "mapred.jobtracker.taskScheduler",
-    "templateName": ["scheduler_name"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "mapred-site.xml"
-  },
-  {
-    "name": "mapred.tasktracker.map.tasks.maximum",
-    "templateName": ["mapred_map_tasks_max"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "mapred-site.xml"
-  },
-  {
-    "name": "mapred.tasktracker.reduce.tasks.maximum",
-    "templateName": ["mapred_red_tasks_max"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "mapred-site.xml"
-  },
-  {
-    "name": "mapred.cluster.reduce.memory.mb",
-    "templateName": ["mapred_cluster_red_mem_mb"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "mapred-site.xml"
-  },
-  {
-    "name": "mapred.job.map.memory.mb",
-    "templateName": ["mapred_job_map_mem_mb"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "mapred-site.xml"
-  },
-  {
-    "name": "mapred.cluster.max.map.memory.mb",
-    "templateName": ["mapred_cluster_max_map_mem_mb"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "mapred-site.xml"
-  },
-  {
-    "name": "mapred.cluster.max.reduce.memory.mb",
-    "templateName": ["mapred_cluster_max_red_mem_mb"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "mapred-site.xml"
-  },
-  {
-    "name": "mapred.job.reduce.memory.mb",
-    "templateName": ["mapred_job_red_mem_mb"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "mapred-site.xml"
-  },
+
+  /******************************************MAPREDUCE***************************************/
   {
     "name": "mapred.hosts",
     "templateName": ["hadoop_conf_dir", "mapred_hosts_include"],
@@ -369,13 +139,6 @@ var configs = [
     "filename": "mapred-site.xml"
   },
   {
-    "name": "mapred.healthChecker.script.path",
-    "templateName": ["mapred_jobstatus_dir"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "mapred-site.xml"
-  },
-  {
     "name": "mapred.job.tracker.persist.jobstatus.dir",
     "templateName": ["hadoop_conf_dir"],
     "foreignKey": null,
@@ -390,34 +153,6 @@ var configs = [
     "filename": "mapred-site.xml"
   },
   {
-    "name": "mapred.cluster.map.memory.mb",
-    "templateName": ["mapred_cluster_map_mem_mb"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "mapred-site.xml"
-  },
-  {
-    "name": "io.sort.mb",
-    "templateName": ["io_sort_mb"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "mapred-site.xml"
-  },
-  {
-    "name": "io.sort.spill.percent",
-    "templateName": ["io_sort_spill_percent"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "mapred-site.xml"
-  },
-  {
-    "name": "mapred.system.dir",
-    "templateName": ["mapred_system_dir"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "mapred-site.xml"
-  },
-  {
     "name": "mapred.job.tracker",
     "templateName": ["jobtracker_host"],
     "foreignKey": null,
@@ -432,190 +167,50 @@ var configs = [
     "filename": "mapred-site.xml"
   },
   {
-    "name": "mapred.userlog.retain.hours",
-    "templateName": ["mapreduce_userlog_retainhours"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "mapred-site.xml"
-  },
-  {
-    "name": "mapred.jobtracker.maxtasks.per.job",
-    "templateName": ["maxtasks_per_job"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "mapred-site.xml"
-  },
-  {
-    "name": "mapreduce.history.server.embedded",
-    "templateName": [],
-    "foreignKey": null,
-    "value": "false",
-    "filename": "mapred-site.xml"
-  },
-  {
     "name": "mapreduce.history.server.http.address",
     "templateName": ["jobtracker_host"],
     "foreignKey": null,
     "value": "<templateName[0]>:51111",
     "filename": "mapred-site.xml"
   },
+
+  /**********************************************oozie-site***************************************/
   {
-    "name": "hbase.rootdir",
-    "templateName": ["namenode_host", "hbase_hdfs_root_dir"],
-    "foreignKey": null,
-    "value": "hdfs://<templateName[0]>:8020<templateName[1]>",
-    "filename": "hbase-site.xml"
-  },
-  {
-    "name": "hbase.tmp.dir",
-    "templateName": ["hbase_tmp_dir"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hbase-site.xml"
-  },
-  /*
-   {
-   "name": "hbase.master.info.bindAddress",
-   "templateName": ["hbasemaster.host"],
-   "foreignKey": null,
-   "value": "<templateName[0]>",
-   "filename": "hbase-site.xml"
-   },
-   */
-  {
-    "name": "hbase.regionserver.global.memstore.upperLimit",
-    "templateName": ["regionserver_memstore_upperlimit"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hbase-site.xml"
-  },
-  {
-    "name": "hbase.hstore.blockingStoreFiles",
-    "templateName": ["hstore_blockingstorefiles"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hbase-site.xml"
-  },
-  {
-    "name": "hbase.hstore.compactionThreshold",
-    "templateName": ["hstore_compactionthreshold"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hbase-site.xml"
-  },
-  {
-    "name": "hfile.block.cache.size",
-    "templateName": ["hfile_blockcache_size"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hbase-site.xml"
-  },
-  {
-    "name": "hbase.hregion.max.filesize",
-    "templateName": ["hstorefile_maxsize"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hbase-site.xml"
-  },
-  {
-    "name": "hbase.regionserver.handler.count",
-    "templateName": ["regionserver_handlers"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hbase-site.xml"
-  },
-  {
-    "name": "hbase.hregion.majorcompaction",
-    "templateName": ["hregion_majorcompaction"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hbase-site.xml"
-  },
-  {
-    "name": "hbase.regionserver.global.memstore.lowerLimit",
-    "templateName": ["regionserver_memstore_lowerlimit"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hbase-site.xml"
-  },
-  {
-    "name": "hbase.hregion.memstore.block.multiplier",
-    "templateName": ["hregion_blockmultiplier"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hbase-site.xml"
-  },
-  {
-    "name": "hbase.hregion.memstore.mslab.enabled",
-    "templateName": ["regionserver_memstore_lab"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hbase-site.xml"
-  },
-  {
-    "name": "hbase.hregion.memstore.flush.size",
-    "templateName": ["hregion_memstoreflushsize"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hbase-site.xml"
-  },
-  {
-    "name": "hbase.client.scanner.caching",
-    "templateName": ["client_scannercaching"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hbase-site.xml"
-  },
-  {
-    "name": "hbase.client.scanner.caching",
-    "templateName": ["client_scannercaching"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hbase-site.xml"
-  },
-  {
-    "name": "hbase.cluster.distributed",
-    "templateName": [],
-    "foreignKey": null,
-    "value": "true",
-    "filename": "hbase-site.xml"
-  },
-  {
-    "name": "hbase.zookeeper.property.clientPort",
-    "templateName": [],
+    "name": "oozie.base.url",
+    "templateName": ["oozieserver_host"],
     "foreignKey": null,
-    "value": "2181",
-    "filename": "hbase-site.xml"
+    "value": "http://<templateName[0]>:11000/oozie",
+    "filename": "oozie-site.xml"
   },
+
+  /**********************************************hive-site***************************************/
+
   {
-    "name": "zookeeper.session.timeout",
-    "templateName": ["zookeeper_sessiontimeout"],
+    "name": "hive.metastore.uris",
+    "templateName": ["hivemetastore_host"],
     "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hbase-site.xml"
+    "value": "thrift://<templateName[0]>:9083",
+    "filename": "hive-site.xml"
   },
+
+/**********************************************hbase-site***************************************/
   {
-    "name": "hbase.client.keyvalue.maxsize",
-    "templateName": ["hfile_max_keyvalue_size"],
+    "name": "hbase.rootdir",
+    "templateName": ["namenode_host", "hbase_hdfs_root_dir"],
     "foreignKey": null,
-    "value": "<templateName[0]>",
+    "value": "hdfs://<templateName[0]>:8020<templateName[1]>",
     "filename": "hbase-site.xml"
   },
   {
-    "name": "dfs.support.append",
-    "templateName": ["hdfs_support_append"],
+    "name": "hbase.zookeeper.quorum",
+    "templateName": ["zookeeperserver_hosts"],
     "foreignKey": null,
     "value": "<templateName[0]>",
     "filename": "hbase-site.xml"
   },
 
-  {
-    "name": "dfs.client.read.shortcircuit",
-    "templateName": ["hdfs_enable_shortcircuit_read"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hbase-site.xml"
-  },
+/**********************************************webhcat-site***************************************/
+
   {
     "name": "templeton.zookeeper.hosts",
     "templateName": ["zookeeperserver_hosts"],
@@ -623,13 +218,8 @@ var configs = [
     "value": "<templateName[0]>",
     "filename": "webhcat-site.xml"
   },
-  {
-    "name": "hbase.zookeeper.quorum",
-    "templateName": ["zookeeperserver_hosts"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "hbase-site.xml"
-  },
+
+/**********************************************core-site for glusterfs***************************************/
   {
     "name": "fs.glusterfs.impl",
     "templateName": ["fs_glusterfs_impl"],

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/88f51325/ambari-web/app/data/global_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/global_properties.js b/ambari-web/app/data/global_properties.js
index 5b3e3fc..778af30 100644
--- a/ambari-web/app/data/global_properties.js
+++ b/ambari-web/app/data/global_properties.js
@@ -93,21 +93,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "dfs_name_dir",
-      "displayName": "NameNode directories",
-      "description": "NameNode directories for HDFS to store the file system image",
-      "defaultValue": "",
-      "defaultDirectory": "/hadoop/hdfs/namenode",
-      "displayType": "directories",
-      "isOverridable": false,
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HDFS",
-      "category": "NameNode",
-      "index": 1
-    },
-    {
-      "id": "puppet var",
       "name": "namenode_heapsize",
       "displayName": "NameNode Java heap size",
       "description": "Initial and maximum Java heap size for NameNode (Java options -Xms and -Xmx).  This also applies to the Secondary NameNode.",
@@ -153,21 +138,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "fs_checkpoint_dir",
-      "displayName": "SecondaryNameNode Checkpoint directory",
-      "description": "Directory on the local filesystem where the Secondary NameNode should store the temporary images to merge",
-      "defaultValue": "",
-      "defaultDirectory": "/hadoop/hdfs/namesecondary",
-      "displayType": "directory",
-      "isOverridable": false,
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HDFS",
-      "category": "SNameNode",
-      "index": 1
-    },
-    {
-      "id": "puppet var",
       "name": "datanode_hosts", //not in the schema. For UI purpose
       "displayName": "DataNode hosts",
       "value": "",
@@ -184,20 +154,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "dfs_data_dir",
-      "displayName": "DataNode directories",
-      "description": "DataNode directories for HDFS to store the data blocks",
-      "defaultValue": "",
-      "defaultDirectory": "/hadoop/hdfs/data",
-      "displayType": "directories",
-      "isVisible": true,
-      "domain": "datanode-global",
-      "serviceName": "HDFS",
-      "category": "DataNode",
-      "index": 1
-    },
-    {
-      "id": "puppet var",
       "name": "dtnode_heapsize",
       "displayName": "DataNode maximum Java heap size",
       "description": "Maximum Java heap size for DataNode (Java option -Xmx)",
@@ -212,32 +168,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "dfs_datanode_failed_volume_tolerated",
-      "displayName": "DataNode volumes failure toleration",
-      "description": "The number of volumes that are allowed to fail before a DataNode stops offering service",
-      "defaultValue": "0",
-      "displayType": "int",
-      "isVisible": true,
-      "domain": "datanode-global",
-      "serviceName": "HDFS",
-      "category": "DataNode",
-      "index": 3
-    },
-    {
-      "id": "puppet var",
-      "name": "dfs_webhdfs_enabled",
-      "displayName": "WebHDFS enabled",
-      "description": "Whether to enable WebHDFS feature",
-      "defaultValue": true,
-      "displayType": "checkbox",
-      "isOverridable": false,
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HDFS",
-      "index": 0
-    },
-    {
-      "id": "puppet var",
       "name": "hadoop_heapsize",
       "displayName": "Hadoop maximum Java heap size",
       "description": "Maximum Java heap size for daemons such as Balancer (Java option -Xmx)",
@@ -251,47 +181,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "datanode_du_reserved",
-      "displayName": "Reserved space for HDFS",
-      "description": "Reserved space in bytes per volume. Always leave this much space free for non dfs use.",
-      "defaultValue": "0",
-      "displayType": "int",
-      "unit": "bytes",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HDFS",
-      "index": 2
-    },
-    {
-      "id": "puppet var",
-      "name": "fs_checkpoint_period",
-      "displayName": "HDFS Maximum Checkpoint Delay",
-      "description": "Maximum delay between two consecutive checkpoints for HDFS",
-      "defaultValue": "21600",
-      "displayType": "int",
-      "unit": "seconds",
-      "isVisible": true,
-      "domain": "global",
-      "filename": "core-site.xml",
-      "serviceName": "HDFS",
-      "index": 3
-    },
-    {
-      "id": "puppet var",
-      "name": "fs_checkpoint_size",
-      "displayName": "HDFS Maximum Edit Log Size for Checkpointing",
-      "description": "Maximum size of the edits log file that forces an urgent checkpoint even if the maximum checkpoint delay is not reached",
-      "defaultValue": "67108864",
-      "displayType": "float",
-      "unit": "bytes",
-      "isVisible": true,
-      "domain": "global",
-      "filename": "core-site.xml",
-      "serviceName": "HDFS",
-      "index": 4
-    },
-    {
-      "id": "puppet var",
       "name": "hdfs_log_dir_prefix",
       "displayName": "Hadoop Log Dir Prefix",
       "description": "The parent directory for Hadoop log files.  The HDFS log directory will be ${hadoop_log_dir_prefix} / ${hdfs_user} and the MapReduce log directory will be ${hadoop_log_dir_prefix} / ${mapred_user}.",
@@ -373,46 +262,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "dfs_replication",
-      "displayName": "Block replication",
-      "description": "Default block replication.",
-      "displayType": "int",
-      "defaultValue": "3",
-      "isVisible": true,
-      "filename": "hdfs-site.xml",
-      "domain": "global",
-      "serviceName": "HDFS",
-      "category": "Advanced"
-    },
-    {
-      "id": "puppet var",
-      "name": "dfs_block_local_path_access_user",
-      "displayName": "dfs.block.local-path-access.user",
-      "description": "the user who is allowed to perform short circuit reads",
-      "displayType": "advanced",
-      "defaultValue": "hbase",
-      "isVisible": true,
-      "filename": "hdfs-site.xml",
-      "domain": "global",
-      "serviceName": "HDFS",
-      "category": "Advanced"
-    },
-    {
-      "id": "puppet var",
-      "name": "dfs_datanode_data_dir_perm",
-      "displayName": "dfs_datanode_data_dir_perm",
-      "description": "",
-      "defaultValue": "750",
-      "isReconfigurable": true,
-      "displayType": "int",
-      "isVisible": false,
-      "filename": "hdfs-site.xml",
-      "domain": "global",
-      "serviceName": "HDFS",
-      "category": "Advanced"
-    },
-    {
-      "id": "puppet var",
       "name": "security_enabled",
       "displayName": "Hadoop Security",
       "description": "Enable hadoop security",
@@ -617,48 +466,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "mapred_local_dir",
-      "displayName": "MapReduce local directories",
-      "description": "Directories for MapReduce to store intermediate data files",
-      "defaultValue": "",
-      "defaultDirectory": "/hadoop/mapred",
-      "displayType": "directories",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "domain": "tasktracker-global",
-      "serviceName": "MAPREDUCE",
-      "category": "TaskTracker",
-      "index": 1
-    },
-    {
-      "id": "puppet var",
-      "name": "mapred_map_tasks_max",
-      "displayName": "Number of Map slots per node",
-      "description": "Number of slots that Map tasks that run simultaneously can occupy on a TaskTracker",
-      "defaultValue": "4",
-      "displayType": "int",
-      "isVisible": true,
-      "domain": "tasktracker-global",
-      "serviceName": "MAPREDUCE",
-      "category": "TaskTracker",
-      "index": 2
-    },
-    {
-      "id": "puppet var",
-      "name": "mapred_red_tasks_max",
-      "displayName": "Number of Reduce slots per node",
-      "description": "Number of slots that Reduce tasks that run simultaneously can occupy on a TaskTracker.",
-      "defaultValue": "2",
-      "displayType": "int",
-      "isVisible": true,
-      "isRequired": false,
-      "domain": "tasktracker-global",
-      "serviceName": "MAPREDUCE",
-      "category": "TaskTracker",
-      "index": 3
-    },
-    {
-      "id": "puppet var",
       "name": "mapred_child_java_opts_sz",
       "displayName": "Java options for MapReduce tasks",
       "description": "Java options for the TaskTracker child processes.",
@@ -673,146 +480,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "scheduler_name",
-      "displayName": "MapReduce Capacity Scheduler",
-      "description": "The scheduler to use for scheduling of MapReduce jobs",
-      "defaultValue": "org.apache.hadoop.mapred.CapacityTaskScheduler",
-      "displayType": "advanced",
-      "isOverridable": false,
-      "isVisible": true,
-      "serviceName": "MAPREDUCE",
-      "index": 0
-    },
-    {
-      "id": "puppet var",
-      "name": "mapred_cluster_map_mem_mb",
-      "displayName": "Cluster's Map slot size (virtual memory)",
-      "description": "The virtual memory size of a single Map slot in the MapReduce framework",
-      "defaultValue": "1536",
-      "displayType": "int",
-      "unit": "MB",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "MAPREDUCE",
-      "index": 1
-    },
-    {
-      "id": "puppet var",
-      "name": "mapred_cluster_red_mem_mb",
-      "displayName": "Cluster's Reduce slot size (virtual memory)",
-      "description": "The virtual memory size of a single Reduce slot in the MapReduce framework",
-      "defaultValue": "2048",
-      "displayType": "int",
-      "unit": "MB",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "MAPREDUCE",
-      "index": 2
-    },
-    {
-      "id": "puppet var",
-      "name": "mapred_cluster_max_map_mem_mb",
-      "displayName": "Upper limit on virtual memory for single Map task",
-      "description": "Upper limit on virtual memory size for a single Map task of any MapReduce job",
-      "defaultValue": "6144",
-      "displayType": "int",
-      "unit": "MB",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "MAPREDUCE",
-      "index": 3
-    },
-    {
-      "id": "puppet var",
-      "name": "mapred_cluster_max_red_mem_mb",
-      "displayName": "Upper limit on virtual memory for single Reduce task",
-      "description": "Upper limit on virtual memory size for a single Reduce task of any MapReduce job",
-      "defaultValue": "4096",
-      "displayType": "int",
-      "unit": "MB",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "MAPREDUCE",
-      "index": 4
-    },
-    {
-      "id": "puppet var",
-      "name": "mapred_job_map_mem_mb",
-      "displayName": "Default virtual memory for a job's map-task",
-      "description": "Virtual memory for single Map task",
-      "defaultValue": "1536",
-      "displayType": "int",
-      "unit": "MB",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "MAPREDUCE",
-      "index": 5
-    },
-    {
-      "id": "puppet var",
-      "name": "mapred_job_red_mem_mb",
-      "displayName": "Default virtual memory for a job's reduce-task",
-      "description": "Virtual memory for single Reduce task",
-      "defaultValue": "2048",
-      "displayType": "int",
-      "unit": "MB",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "MAPREDUCE",
-      "index": 6
-    },
-    {
-      "id": "puppet var",
-      "name": "io_sort_mb",
-      "displayName": "Map-side sort buffer memory",
-      "description": "The total amount of Map-side buffer memory to use while sorting files (Expert-only configuration)",
-      "defaultValue": "200",
-      "displayType": "int",
-      "unit": "MB",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "MAPREDUCE",
-      "index": 7
-    },
-    {
-      "id": "puppet var",
-      "name": "io_sort_spill_percent",
-      "displayName": "Limit on buffer",
-      "description": "Percentage of sort buffer used for record collection (Expert-only configuration)",
-      "defaultValue": "0.9",
-      "displayType": "float",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "MAPREDUCE",
-      "index": 8
-    },
-    {
-      "id": "puppet var",
-      "name": "mapreduce_userlog_retainhours",
-      "displayName": "Job log retention (hours)",
-      "description": "The maximum time, in hours, for which the user-logs are to be retained after the job completion.",
-      "defaultValue": "24",
-      "displayType": "int",
-      "unit": "hours",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "MAPREDUCE",
-      "index": 9
-    },
-    {
-      "id": "puppet var",
-      "name": "maxtasks_per_job",
-      "displayName": "Maximum number tasks for a Job",
-      "description": "Maximum number of tasks for a single Job",
-      "defaultValue": "-1",
-      "displayType": "int",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "MAPREDUCE",
-      "index": 10
-    },
-    {
-      "id": "puppet var",
       "name": "lzo_enabled",
       "displayName": "LZO compression",
       "description": "LZO compression enabled",
@@ -854,19 +521,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "mapred_system_dir",
-      "displayName": "MapReduce system directories",
-      "description": "",
-      "defaultValue": "/mapred/system",
-      "displayType": "directories",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "MAPREDUCE",
-      "category": "Advanced"
-    },
-    {
-      "id": "puppet var",
       "name": "mapred_hosts_exclude",
       "displayName": "Exclude hosts",
       "description": "Exclude entered hosts",
@@ -889,34 +543,6 @@ module.exports =
       "domain": "global",
       "category": "Advanced"
     },
-    {
-      "id": "puppet var",
-      "name": "mapred_jobstatus_dir",
-      "displayName": "Job Status directory",
-      "description": "Directory path to view job status",
-      "defaultValue": "file:////mapred/jobstatus",
-      "displayType": "advanced",
-      "isVisible": false,
-      "serviceName": "MAPREDUCE",
-      "domain": "global",
-      "category": "Advanced"
-    },
-    /*{
-      "id": "site property",
-      "name": "mapred.capacity-scheduler.maximum-system-jobs",
-      "displayName": "Max system jobs",
-      "displayType": "int",
-      "value": '3000',
-      "defaultValue": '3000',
-      "description": "Maximum number of jobs in the system which can be initialized, concurrently, by the " +
-        "CapacityScheduler. Individual queue limits on initialized jobs are directly proportional to their queue " +
-        "capacities.",
-      "isVisible": true,
-      "isRequired": true,
-      "serviceName": "MAPREDUCE",
-      "category": "CapacityScheduler",
-      "filename": "capacity-scheduler.xml"
-    },*/
   /**********************************************HBASE***************************************/
     {
       "id": "puppet var",
@@ -980,136 +606,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "regionserver_handlers",
-      "displayName": "HBase RegionServer Handler",
-      "description": "Count of RPC Listener instances spun up on RegionServers",
-      "defaultValue": "60",
-      "displayType": "int",
-      "isVisible": true,
-      "domain": "regionserver-global",
-      "serviceName": "HBASE",
-      "category": "RegionServer",
-      "index": 2
-    },
-    {
-      "id": "puppet var",
-      "name": "hregion_majorcompaction",
-      "displayName": "HBase Region Major Compaction",
-      "description": "The time between major compactions of all HStoreFiles in a region. Set to 0 to disable automated major compactions.",
-      "defaultValue": "86400000",
-      "displayType": "int",
-      "unit": "ms",
-      "isVisible": true,
-      "domain": "regionserver-global",
-      "serviceName": "HBASE",
-      "category": "RegionServer",
-      "index": 3
-    },
-    {
-      "id": "puppet var",
-      "name": "hregion_blockmultiplier",
-      "displayName": "HBase Region Block Multiplier",
-      "description": "Block updates if memstore has \"Multiplier * HBase Region Memstore Flush Size\" bytes. Useful preventing runaway memstore during spikes in update traffic",
-      "defaultValue": "2",
-      "displayType": "int",
-      "isVisible": true,
-      "domain": "regionserver-global",
-      "serviceName": "HBASE",
-      "category": "RegionServer",
-      "index": 4
-    },
-    {
-      "id": "puppet var",
-      "name": "hregion_memstoreflushsize",
-      "displayName": "HBase Region Memstore Flush Size",
-      "description": "Memstore will be flushed to disk if size of the memstore exceeds this number of bytes.",
-      "defaultValue": "134217728",
-      "displayType": "int",
-      "unit": "bytes",
-      "isVisible": true,
-      "domain": "regionserver-global",
-      "serviceName": "HBASE",
-      "category": "RegionServer",
-      "index": 5
-    },
-    {
-      "id": "puppet var",
-      "name": "hstore_compactionthreshold",
-      "displayName": "HBase HStore compaction threshold",
-      "description": "If more than this number of HStoreFiles in any one HStore then a compaction is run to rewrite all HStoreFiles files as one.",
-      "defaultValue": "3",
-      "displayType": "int",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "index": 0
-    },
-    {
-      "id": "puppet var",
-      "name": "hfile_blockcache_size",
-      "displayName": "HFile block cache size ",
-      "description": "Percentage of maximum heap (-Xmx setting) to allocate to block cache used by HFile/StoreFile. Set to 0 to disable but it's not recommended.",
-      "defaultValue": "0.40",
-      "displayType": "float",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "index": 1
-    },
-    {
-      "id": "puppet var",
-      "name": "hstorefile_maxsize",
-      "displayName": "Maximum HStoreFile Size",
-      "description": "If any one of a column families' HStoreFiles has grown to exceed this value, the hosting HRegion is split in two.",
-      "defaultValue": "10737418240",
-      "displayType": "int",
-      "unit": "bytes",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "index": 2
-    },
-    {
-      "id": "puppet var",
-      "name": "client_scannercaching",
-      "displayName": "HBase Client Scanner Caching",
-      "description": "Number of rows that will be fetched when calling next on a scanner if it is not served from (local, client) memory. Do not set this value such that the time between invocations is greater than the scanner timeout",
-      "defaultValue": "100",
-      "displayType": "int",
-      "unit": "rows",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "index": 3
-    },
-    {
-      "id": "puppet var",
-      "name": "zookeeper_sessiontimeout",
-      "displayName": "Zookeeper timeout for HBase Session",
-      "description": "HBase passes this to the zk quorum as suggested maximum time for a session",
-      "defaultValue": "60000",
-      "displayType": "int",
-      "unit": "ms",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "index": 4
-    },
-    {
-      "id": "puppet var",
-      "name": "hfile_max_keyvalue_size",
-      "displayName": "HBase Client Maximum key-value Size",
-      "description": "Specifies the combined maximum allowed size of a KeyValue instance. It should be set to a fraction of the maximum region size.",
-      "defaultValue": "10485760",
-      "displayType": "int",
-      "unit": "bytes",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "index": 5
-    },
-    {
-      "id": "puppet var",
       "name": "hbase_log_dir",
       "displayName": "HBase Log Dir",
       "description": "Directory for HBase logs",
@@ -1149,98 +645,6 @@ module.exports =
       "serviceName": "HBASE",
       "category": "Advanced"
     },
-    {
-      "id": "puppet var",
-      "name": "hbase_tmp_dir",
-      "displayName": "HBase local directory",
-      "description": "Temporary directory on the local filesystem",
-      "defaultDirectory": "/hadoop/hbase",
-      "defaultValue": "",
-      "displayType": "directory",
-      "isVisible": true,
-      "serviceName": "HBASE",
-      "category": "Advanced"
-    },
-    {
-      "id": "puppet var",
-      "name": "hdfs_enable_shortcircuit_read",
-      "displayName": "HDFS Short-circuit read",
-      "description": "",
-      "defaultValue": true,
-      "isRequired": false,
-      "displayType": "checkbox",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "category": "Advanced"
-    },
-    {
-      "id": "puppet var",
-      "name": "hdfs_support_append",
-      "displayName": "HDFS append support",
-      "description": "HDFS append support",
-      "defaultValue": true,
-      "isRequired": false,
-      "displayType": "checkbox",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "category": "Advanced"
-    },
-    {
-      "id": "puppet var",
-      "name": "hstore_blockingstorefiles",
-      "displayName": "hstore blocking storefiles",
-      "description": "If more than this number of StoreFiles in any one Store (one StoreFile is written per flush of " +
-        "MemStore) then updates are blocked for this HRegion until a compaction is completed, or until " +
-        "hbase.hstore.blockingWaitTime has been exceeded.",
-      "defaultValue": 7,
-      "isRequired": true,
-      "displayType": "init",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "category": "Advanced"
-    },
-    {
-      "id": "puppet var",
-      "name": "regionserver_memstore_lab",
-      "displayName": "regionserver_memstore_lab",
-      "description": "",
-      "defaultValue": true,
-      "isRequired": false,
-      "displayType": "checkbox",
-      "isVisible": false,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "category": "Advanced"
-    },
-    {
-      "id": "puppet var",
-      "name": "regionserver_memstore_lowerlimit",
-      "displayName": "regionserver_memstore_lowerlimit",
-      "description": "",
-      "defaultValue": "0.38",
-      "isRequired": false,
-      "displayType": "float",
-      "isVisible": false,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "category": "Advanced"
-    },
-    {
-      "id": "puppet var",
-      "name": "regionserver_memstore_upperlimit",
-      "displayName": "regionserver_memstore_upperlimit",
-      "description": "",
-      "defaultValue": "0.4",
-      "isRequired": true,
-      "displayType": "float",
-      "isVisible": false,
-      "domain": "global",
-      "serviceName": "HBASE",
-      "category": "Advanced"
-    },
   /**********************************************HIVE***************************************/
     {
       "id": "puppet var",
@@ -1421,36 +825,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "hive_metastore_user_name",
-      "displayName": "Database Username",
-      "description": "Database user name to use to connect to the database",
-      "defaultValue": "hive",
-      "isReconfigurable": true,
-      "displayType": "host",  // don't apply user validation
-      "isOverridable": false,
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HIVE",
-      "category": "Hive Metastore",
-      "index": 5
-    },
-    {
-      "id": "puppet var",
-      "name": "hive_metastore_user_passwd",
-      "displayName": "Database Password",
-      "description": "Database password to use to connect to the PostgreSQL database",
-      "defaultValue": "",
-      "isReconfigurable": true,
-      "displayType": "password",
-      "isOverridable": false,
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "HIVE",
-      "category": "Hive Metastore",
-      "index": 6
-    },
-    {
-      "id": "puppet var",
       "name": "hive_jdbc_connection_url",
       "displayName": "Database URL",
       "value": "",
@@ -1798,66 +1172,6 @@ module.exports =
           "category": "Oozie Server",
           "index": 3
       },
-      {
-          "id": "puppet var",
-          "name": "oozie_database_name",
-          "displayName": "Database Name",
-          "description": "Database name used for the Oozie",
-          "defaultValue": "oozie",
-          "isReconfigurable": true,
-          "isOverridable": false,
-          "displayType": "host",
-          "isVisible": true,
-          "isObserved": true,
-          //"domain": "global",
-          "serviceName": "OOZIE",
-          "category": "Oozie Server",
-          "index": 4
-      },
-      {
-          "id": "puppet var",
-          "name": "oozie_metastore_user_name",
-          "displayName": "Database Username",
-          "description": "Database user name to use to connect to the database",
-          "defaultValue": "oozie",
-          "isReconfigurable": true,
-          "isOverridable": false,
-          "displayType": "host",  // don't apply user validation
-          "isVisible": true,
-          //"domain": "global",
-          "serviceName": "OOZIE",
-          "category": "Oozie Server",
-          "index": 5
-      },
-      {
-          "id": "puppet var",
-          "name": "oozie_metastore_user_passwd",
-          "displayName": "Database Password",
-          "description": "Database password to use to connect to the database",
-          "defaultValue": "",
-          "isReconfigurable": true,
-          "isOverridable": false,
-          "displayType": "password",
-          "isVisible": true,
-          //"domain": "global",
-          "serviceName": "OOZIE",
-          "category": "Oozie Server",
-          "index": 6
-      },
-    {
-      "id": "puppet var",
-      "name": "oozie_jdbc_connection_url",
-      "displayName": "Database URL",
-      "description": "The JDBC connection URL to the database",
-      "defaultValue": "jdbc",  // set to a 'jdbc' to not include this in initial error count
-      "isReconfigurable": true,
-      "isOverridable": false,
-      "displayType": "advanced",
-      "isVisible": true,
-      "serviceName": "OOZIE",
-      "category": "Oozie Server",
-      "index": 7
-    },
     {
       "id": "puppet var",
       "name": "oozie_data_dir",