You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2012/12/09 13:43:34 UTC

svn commit: r1418917 [3/4] - in /incubator/ambari/branches/AMBARI-666: ./ ambari-web/app/ ambari-web/app/assets/data/wizard/stack/ ambari-web/app/assets/data/wizard/stack/hdp/ ambari-web/app/assets/data/wizard/stack/hdp/version01/ ambari-web/app/contro...

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/data/config_properties.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/data/config_properties.js?rev=1418917&r1=1418916&r2=1418917&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/data/config_properties.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/data/config_properties.js Sun Dec  9 12:43:31 2012
@@ -65,363 +65,522 @@ module.exports =
 {
   "configProperties": [
     {
+      "id": "puppet var",
       "name": "hbasemaster.host",
       "displayName": "HBase Master host",
       "value": "",
       "defaultValue": "",
       "description": "The host that has been assigned to run HBase Master",
       "displayType": "masterHost",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HBASE",
       "category": "HBase Master"
     },
     {
-      "name": "regionserver.hosts",
+      "id": "puppet var",
+      "name": "regionserver_hosts",
       "displayName": "RegionServer hosts",
       "value": "",
       "defaultValue": "",
       "description": "The hosts that have been assigned to run RegionServer",
       "displayType": "slaveHosts",
-      "isVisible":  true,
+      "isVisible": true,
+      "isRequired": false,
       "serviceName": "HBASE",
       "category": "RegionServer"
     },
     {
+      "id": "puppet var",
       "name": "hbase_log_dir",
       "displayName": "HBase Log Dir",
       "description": "Directory for HBase logs",
       "defaultValue": "/var/log/hbase",
       "isReconfigurable": false,
       "displayType": "directory",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HBASE",
       "category": "Advanced"
     },
     {
+      "id": "puppet var",
       "name": "hbase_pid_dir",
       "displayName": "HBase PID Dir",
       "description": "Directory in which the pid files for HBase processes will be created",
       "defaultValue": "/var/run/hbase",
       "isReconfigurable": false,
       "displayType": "directory",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HBASE",
       "category": "Advanced"
     },
     {
+      "id": "puppet var",
       "name": "hbase_regionserver_heapsize",
       "displayName": "HBase Region Servers maximum Java heap size",
       "description": "Maximum Java heap size for HBase Region Servers (Java option -Xmx)",
       "defaultValue": "1024",
       "displayType": "int",
       "unit": "MB",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HBASE",
       "category": "RegionServer"
     },
     {
+      "id": "puppet var",
       "name": "hbase_master_heapsize",
       "displayName": "HBase Master Maximum Java heap size",
       "description": "Maximum Java heap size for HBase master (Java option -Xmx)",
       "defaultValue": "1024",
       "displayType": "int",
       "unit": "MB",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HBASE",
       "category": "HBase Master"
     },
     {
+      "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,
+      "isVisible": true,
       "serviceName": "HBASE"
     },
     {
+      "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.25",
       "displayType": "float",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HBASE"
     },
     {
+      "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": "1073741824",
       "displayType": "int",
       "unit": "bytes",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HBASE"
     },
     {
+      "id": "puppet var",
       "name": "regionserver_handlers",
       "displayName": "HBase Region Server Handler",
       "description": "Count of RPC Listener instances spun up on RegionServers",
       "defaultValue": "30",
       "displayType": "int",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HBASE",
       "category": "RegionServer"
     },
     {
+      "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,
+      "isVisible": true,
       "serviceName": "HBASE",
       "category": "RegionServer"
     },
     {
+      "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,
+      "isVisible": true,
       "serviceName": "HBASE",
       "category": "RegionServer"
     },
     {
+      "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,
+      "isVisible": true,
       "serviceName": "HBASE",
       "category": "RegionServer"
     },
     {
+      "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,
+      "isVisible": true,
       "serviceName": "HBASE"
     },
     {
+      "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,
+      "isVisible": true,
       "serviceName": "HBASE"
     },
     {
+      "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,
+      "isVisible": true,
       "serviceName": "HBASE"
     },
-    {
+   /* {
+      "id": "puppet var",
       "name": "hbase-site.xml",
       "displayName": "Custom HBase Configs",
       "description": "If you wish to set configuration parameters not exposed through this page, you can specify them here.<br>The text you specify here will be injected into hbase-site.xml verbatim.",
       "defaultValue": "",
       "isRequired": false,
       "displayType": "custom",
-      "isVisible":  true,
+      "isVisible": true,
+      "serviceName": "HBASE",
+      "category": "Advanced"
+    }, */
+    {
+      "id": "puppet var",
+      "name": "hbase_hdfs_root_dir",
+      "displayName": "Hbase relative path to HDFS",
+      "description": "Hbase relative directory to HDFS",
+      "defaultValue": "/apps/hbase/data",
+      "isRequired": true,
+      "displayType": "advanced",
+      "isVisible": false,
+      "serviceName": "HBASE",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "hbase_tmp_dir",
+      "displayName": "Hbase temp directory",
+      "description": "",
+      "defaultValue": "/var/log/hbase",
+      "isRequired": false,
+      "displayType": "advanced",
+      "isVisible": false,
+      "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,
+      "serviceName": "HBASE",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "hdfs_enable_shortcircuit_skipchecksum",
+      "displayName": "HDFS shortcircuit skip checksum",
+      "description": "skip checksum for short circuit read",
+      "defaultValue": false,
+      "isRequired": false,
+      "displayType": "checkbox",
+      "isVisible": true,
+      "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,
+      "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,
+      "serviceName": "HBASE",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "regionserver_memstore_lab",
+      "displayName": "regionserver_memstore_lab",
+      "description": "",
+      "defaultValue": true,
+      "isRequired": false,
+      "displayType": "checkbox",
+      "isVisible": false,
+      "serviceName": "HBASE",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "regionserver_memstore_lowerlimit",
+      "displayName": "regionserver_memstore_lowerlimit",
+      "description": "",
+      "defaultValue": "0.35",
+      "isRequired": false,
+      "displayType": "float",
+      "isVisible": false,
+      "serviceName": "HBASE",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "regionserver_memstore_upperlimitt",
+      "displayName": "regionserver_memstore_upperlimit",
+      "description": "",
+      "defaultValue": "0.4",
+      "isRequired": true,
+      "displayType": "float",
+      "isVisible": false,
       "serviceName": "HBASE",
       "category": "Advanced"
     },
     {
-      "name": "namenode.host",
+      "id": "puppet var",
+      "name": "hbase_conf_dir",
+      "displayName": "HBase conf dir",
+      "description": "",
+      "defaultValue": "/etc/hbase",
+      "isRequired": false,
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "MISC",
+      "category": "General"
+    },
+    {
+      "id": "puppet var",
+      "name": "namenode_host",
       "displayName": "NameNode host",
       "value": "",
       "defaultValue": "",
       "description": "The host that has been assigned to run NameNode",
       "displayType": "masterHost",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HDFS",
       "category": "NameNode"
     },
     {
+      "id": "puppet var",
       "name": "dfs_name_dir",
       "displayName": "NameNode directories",
       "description": "NameNode directories for HDFS to store the file system image",
-      "defaultValue": "",
+      "defaultValue": "/grid/0/hadoop/hdfs/namenode\n/grid/1/hadoop/hdfs/namenode\n",
       "isReconfigurable": false,
       "displayType": "directories",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HDFS",
       "category": "NameNode"
     },
     {
-      "name": "snamenode.host",
+      "id": "puppet var",
+      "name": "snamenode_host",
       "displayName": "SNameNode host",
       "value": "",
       "defaultValue": "",
       "description": "The host that has been assigned to run SecondaryNameNode",
       "displayType": "masterHost",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HDFS",
       "category": "SNameNode"
     },
     {
+      "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": "",
+      "defaultValue": "/grid/0/hadoop/hdfs/namesecondary",
       "isReconfigurable": false,
       "displayType": "directory",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HDFS",
       "category": "SNameNode"
     },
     {
-      "name": "datanode.hosts",
+      "id": "puppet var",
+      "name": "datanode_hosts", //not in the schema. For UI purpose
       "displayName": "DataNode hosts",
       "value": "",
       "defaultValue": "",
       "description": "The hosts that have been assigned to run DataNode",
       "displayType": "slaveHosts",
-      "isVisible":  true,
+      "isRequired": false,
+      "isVisible": true,
       "serviceName": "HDFS",
       "category": "DataNode"
     },
     {
+      "id": "puppet var",
       "name": "dfs_data_dir",
       "displayName": "DataNode directories",
       "description": "DataNode directories for HDFS to store the data blocks",
-      "defaultValue": "",
+      "defaultValue": "/tmp/hadoop-hdfs/dfs/data",
       "isReconfigurable": false,
       "displayType": "directories",
-      "isVisible":  true,
-      "serviceName": "HDFS",
-      "category": "DataNode"
-    },
-    {
-      "name": "dfs.datanode.data.dir.perm",
-      "displayName": "Directory Permission",
-      "description": "DataNode directories for HDFS to store the data blocks",
-      "defaultValue": "750",
-      "isReconfigurable": false,
-      "displayType": "int",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HDFS",
       "category": "DataNode"
     },
     {
+      "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}.",
       "defaultValue": "/var/log/hadoop",
       "isReconfigurable": false,
       "displayType": "directory",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HDFS",
       "category": "Advanced"
     },
     {
+      "id": "puppet var",
       "name": "hadoop_pid_dir_prefix",
       "displayName": "Hadoop PID Dir Prefix",
       "description": "The parent directory in which the PID files for Hadoop processes will be created.  The HDFS PID directory will be ${hadoop_pid_dir_prefix} / ${hdfs_user} and the MapReduce PID directory will be ${hadoop_pid_dir_prefix} / ${mapred_user}.",
       "defaultValue": "/var/run/hadoop",
       "isReconfigurable": false,
       "displayType": "directory",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HDFS",
       "category": "Advanced"
     },
     {
+      "id": "puppet var",
       "name": "dfs_support_append",
       "displayName": "Append enabled",
       "description": "Whether to enable HDFS Append feature",
       "defaultValue": true,
       "displayType": "checkbox",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HDFS"
     },
     {
+      "id": "puppet var",
       "name": "dfs_webhdfs_enabled",
       "displayName": "WebHDFS enabled",
       "description": "Whether to enable WebHDFS feature",
       "defaultValue": false,
       "displayType": "checkbox",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HDFS"
     },
     {
+      "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)",
       "defaultValue": "1024",
       "displayType": "int",
       "unit": "MB",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HDFS"
     },
     {
+      "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)",
       "defaultValue": "1024",
       "displayType": "int",
       "unit": "MB",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HDFS",
       "category": "NameNode"
     },
     {
+      "id": "puppet var",
       "name": "namenode_opt_newsize",
       "displayName": "NameNode new generation size",
       "description": "Default size of Java new generation for NameNode (Java option -XX:NewSize)",
       "defaultValue": "200",
       "displayType": "int",
       "unit": "MB",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HDFS",
       "category": "NameNode"
     },
     {
+      "id": "puppet var",
+      "name": "namenode_opt_maxnewsize",
+      "displayName": "NameNode maximum new generation size",
+      "description": "",
+      "defaultValue": "640",
+      "displayType": "int",
+      "unit": "MB",
+      "isVisible": false,
+      "serviceName": "HDFS",
+      "category": "NameNode"
+    },
+    {
+      "id": "puppet var",
       "name": "datanode_du_reserved",
       "displayName": "Reserved space for HDFS",
       "description": "Reserved space in GB per volume",
       "defaultValue": "1",
       "displayType": "int",
       "unit": "GB",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HDFS"
     },
     {
+      "id": "puppet var",
       "name": "dtnode_heapsize",
       "displayName": "DataNode maximum Java heap size",
       "description": "Maximum Java heap size for DataNode (Java option -Xmx)",
       "defaultValue": "1024",
       "displayType": "int",
       "unit": "MB",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HDFS",
       "category": "DataNode"
     },
     {
+      "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,
+      "isVisible": true,
       "serviceName": "HDFS",
       "category": "DataNode"
     },
     {
+      "id": "puppet var",
       "name": "fs_checkpoint_period",
       "displayName": "HDFS Maximum Checkpoint Delay",
       "description": "Maximum delay between two consecutive checkpoints for HDFS",
@@ -429,10 +588,13 @@ module.exports =
       "isReconfigurable": false,
       "displayType": "int",
       "unit": "seconds",
-      "isVisible":  true,
+      "isVisible": true,
+      "filename": "core-site.xml",
       "serviceName": "HDFS"
     },
+
     {
+      "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",
@@ -440,422 +602,863 @@ module.exports =
       "isReconfigurable": false,
       "displayType": "float",
       "unit": "GB",
-      "isVisible":  true,
+      "isVisible": true,
+      "filename": "core-site.xml",
       "serviceName": "HDFS"
     },
     {
+      "id": "puppet var",
+      "name": "proxyuser_group",
+      "displayName": "Proxy group for Hive, templeton and oozie.",
+      "description": "Maximum size of the edits log file that forces an urgent checkpoint even if the maximum checkpoint delay is not reached",
+      "defaultValue": "users",
+      "isReconfigurable": false,
+      "displayType": "advanced",
+      "isVisible": true,
+      "filename": "core-site.xml",
+      "serviceName": "MISC",
+      "category": "Users/Groups"
+    },
+    {
+      "id": "puppet var",
+      "name": "dfs_exclude",
+      "displayName": "Exclude hosts",
+      "description": "Exclude entered hosts",
+      "defaultValue": "dfs.exclude",
+      "isReconfigurable": false,
+      "displayType": "advanced",
+      "isVisible": true,
+      "filename": "hdfs-site.xml",
+      "serviceName": "HDFS",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "dfs_include",
+      "displayName": "Include hosts",
+      "description": "Include entered hosts",
+      "defaultValue": "dfs.include",
+      "isReconfigurable": false,
+      "displayType": "advanced",
+      "isVisible": true,
+      "filename": "hdfs-site.xml",
+      "serviceName": "HDFS",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "dfs_replication",
+      "displayName": "Include hosts",
+      "description": "Include entered hosts",
+      "displayType": "int",
+      "defaultValue": "3",
+      "isReconfigurable": false,
+      "isVisible": true,
+      "filename": "hdfs-site.xml",
+      "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",
+      "isReconfigurable": false,
+      "isVisible": true,
+      "filename": "hdfs-site.xml",
+      "serviceName": "HDFS",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "dfs_datanode_address",
+      "displayName": "dfs_datanode_address",
+      "description": "",
+      "defaultValue": "50010",
+      "isReconfigurable": true,
+      "displayType": "int",
+      "isVisible": true,
+      "filename": "hdfs-site.xml",
+      "serviceName": "MISC",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "dfs_datanode_http_address",
+      "displayName": "dfs_datanode_http_address",
+      "description": "",
+      "defaultValue": "50075",
+      "isReconfigurable": true,
+      "displayType": "int",
+      "isVisible": true,
+      "filename": "hdfs-site.xml",
+      "serviceName": "MISC",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "dfs_datanode_http_address",
+      "displayName": "dfs_datanode_http_address",
+      "description": "",
+      "defaultValue": "50075",
+      "isReconfigurable": true,
+      "displayType": "int",
+      "isVisible": true,
+      "filename": "hdfs-site.xml",
+      "serviceName": "MISC",
+      "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",
+      "serviceName": "HDFS",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "security_enabled",
+      "displayName": "Hadoop Security",
+      "description": "Enable hadoop security",
+      "defaultValue": false,
+      "isRequired": false,
+      "displayType": "checkbox",
+      "isVisible": false,
+      "serviceName": "HDFS",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "kerberos_domain",
+      "displayName": "Kerberos realm",
+      "description": "Kerberos realm",
+      "defaultValue": "EXAMPLE.COM",
+      "isRequired": true,
+      "isVisible": false,
+      "serviceName": "HDFS",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "kadmin_pw",
+      "displayName": "password",
+      "description": "Kerberos admin password",
+      "defaultValue": "",
+      "isRequired": true,
+      "displayType": "password",
+      "isVisible": false,
+      "serviceName": "HDFS",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "keytab_path",
+      "displayName": "Keytab directory",
+      "description": "Kerberos admin password",
+      "defaultValue": "/etc/security/keytabs",
+      "isRequired": true,
+      "displayType": "advanced",
+      "isVisible": false,
+      "serviceName": "HDFS",
+      "category": "Advanced"
+    },
+    /*{
+      "id": "puppet var",
       "name": "hdfs-site.xml",
       "displayName": "Custom HDFS Configs",
       "description": "If you wish to set configuration parameters not exposed through this page, you can specify them here.<br>The text you specify here will be injected into hdfs-site.xml verbatim.",
       "defaultValue": "",
       "isRequired": false,
       "displayType": "custom",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HDFS",
       "category": "Advanced"
-    },
+    }, */
     {
+      "id": "puppet var",
       "name": "hivemetastore.host",
       "displayName": "Hive Metastore host",
       "value": "",
       "defaultValue": "",
       "description": "The host that has been assigned to run Hive Metastore",
       "displayType": "masterHost",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HIVE",
       "category": "Hive Metastore"
     },
     {
+      "id": "puppet var",
       "name": "hive_database",
       "displayName": "Hive Database",
       "value": "",
       "defaultValue": "New PostgreSQL Database",
-      "options":  [
+      "options": [
         {
           displayName: 'New PostgreSQL Database',
-          foreignKeys: ['hive_ambari_database','hive_ambari_host']
+          foreignKeys: ['hive_ambari_database', 'hive_ambari_host']
         },
         {
           displayName: 'Existing Database',
-          foreignKeys: ['hive_existing_database','hive_existing_host']
+          foreignKeys: ['hive_existing_database', 'hive_existing_host']
         }
       ],
       "description": "PostgreSQL will be installed by ambari. Any other database will have to be installed by the user.",
       "displayType": "radio button",
       "radioName": "hive-database",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HIVE",
       "category": "Hive Metastore"
     },
     {
+      "id": "puppet var",
       "name": "hive_existing_database",
       "displayName": "Hive Database",
       "value": "",
       "defaultValue": "MySQL",
       "description": "Select the database, if you already have existing one for Hive Metastore.",
       "displayType": "combobox",
-      "isVisible":  false,
+      "isVisible": false,
       "options": ['MySQL', 'PostgreSQL'],
       "serviceName": "HIVE",
       "category": "Hive Metastore"
     },
     {
+      "id": "puppet var",
       "name": "hive_existing_host",
       "displayName": "Database host",
       "description": "Select the host on which the existing database is hosted.",
       "defaultValue": "",
       "isReconfigurable": false,
       "displayType": "host",
-      "isVisible":  false,
+      "isVisible": false,
       "serviceName": "HIVE",
       "category": "Hive Metastore"
     },
     {
+      "id": "puppet var",
       "name": "hive_ambari_database",
       "displayName": "Hive Database",
       "value": "",
       "defaultValue": "PostgreSQL",
       "description": "PostgreSQL will be installed by ambari.",
       "displayType": "masterHost",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HIVE",
       "category": "Hive Metastore"
     },
     {
+      "id": "puppet var",
       "name": "hive_ambari_host",
       "value": "",
       "defaultValue": "",
       "displayName": "PostgreSQL host",
       "description": "Host  on which the PostgreSQL database will be created by ambari. ",
-      "defaultValue": "",
       "isReconfigurable": false,
       "displayType": "masterHost",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HIVE",
       "category": "Hive Metastore"
     },
-
     {
+      "id": "puppet var",
       "name": "hive_database_name",
       "displayName": "Database name",
       "description": "Database name used as the Hive Metastore",
       "defaultValue": "hive",
       "isReconfigurable": false,
       "displayType": "host",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HIVE",
       "category": "Hive Metastore"
     },
     {
+      "id": "puppet var",
       "name": "hive_metastore_user_name",
       "displayName": "Database user",
       "description": "Database user name to use to connect to the database",
       "defaultValue": "hive",
       "isReconfigurable": false,
       "displayType": "user",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HIVE",
       "category": "Hive Metastore"
     },
     {
+      "id": "puppet var",
       "name": "hive_metastore_user_passwd",
       "displayName": "Database password",
       "description": "Database password to use to connect to the PostgreSQL database",
       "defaultValue": "",
       "isReconfigurable": false,
       "displayType": "password",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HIVE",
       "category": "Hive Metastore"
     },
     {
+      "id": "puppet var",
+      "name": "hive_metastore_port",
+      "displayName": "Hive metastore port",
+      "description": "",
+      "defaultValue": "9083",
+      "isReconfigurable": false,
+      "displayType": "int",
+      "isVisible": false,
+      "serviceName": "HIVE",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "hive_lib",
+      "displayName": "Hive library",
+      "description": "",
+      "defaultValue": "/usr/lib/hive/lib/",
+      "isReconfigurable": false,
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "HIVE",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "hive_conf_dir",
+      "displayName": "Hive lconf directory",
+      "description": "",
+      "defaultValue": "/etc/hive/conf",
+      "isReconfigurable": false,
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "HIVE",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "hive_dbroot",
+      "displayName": "Hive lconf directory",
+      "description": "",
+      "defaultValue": "/usr/lib/hive/lib",
+      "isReconfigurable": false,
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "HIVE",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
       "name": "hive_log_dir",
       "displayName": "Hive Log Dir",
       "description": "Directory for Hive log files",
       "defaultValue": "/var/log/hive",
       "isReconfigurable": false,
       "displayType": "directory",
-      "isVisible":  false,
+      "isVisible": false,
       "serviceName": "HIVE",
       "category": "Advanced"
     },
     {
+      "id": "puppet var",
       "name": "hive_pid_dir",
       "displayName": "Hive PID Dir",
       "description": "Directory in which the PID files for Hive processes will be created",
       "defaultValue": "/var/run/hive",
       "isReconfigurable": false,
       "displayType": "directory",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HIVE",
       "category": "Advanced"
     },
     {
+      "id": "puppet var",
+      "name": "gpl_artifacts_download_url",
+      "displayName": "gpl artifact download url",
+      "description": "",
+      "defaultValue": "",
+      "isReconfigurable": false,
+      "displayType": "advanced",
+      "isVisible": false,
+      "serviceName": "MISC",
+      "category": "General"
+    },
+    {
+      "id": "puppet var",
+      "name": "apache_artifacts_download_url",
+      "displayName": "apache artifact download url",
+      "description": "",
+      "defaultValue": "",
+      "isReconfigurable": false,
+      "displayType": "advanced",
+      "isVisible": false,
+      "serviceName": "MISC",
+      "category": "General"
+    },
+    {
+      "id": "puppet var",
+      "name": "mysql_connector_url",
+      "displayName": "MySQL connector url",
+      "description": "",
+      "defaultValue": "${download_url}/mysql-connector-java-5.1.18.zip",
+      "isReconfigurable": false,
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "HIVE",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "hive_aux_jars_path",
+      "displayName": "Hive auxilary jar path",
+      "description": "",
+      "defaultValue": "/usr/lib/hcatalog/share/hcatalog/hcatalog-0.4.0.14.jar",
+      "isReconfigurable": false,
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "HIVE",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "proxyuser_group",
+      "displayName": "Proxy group for Hive, templeton and oozie.",
+      "description": "Maximum size of the edits log file that forces an urgent checkpoint even if the maximum checkpoint delay is not reached",
+      "defaultValue": "users",
+      "isReconfigurable": false,
+      "displayType": "advanced",
+      "isVisible": false,
+      "serviceName": "Hive",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "ganglia_conf_dir",
+      "displayName": "Ganglia conf directory",
+      "description": "",
+      "defaultValue": "/etc/ganglia/hdp",
+      "isReconfigurable": false,
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "GANGLIA",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "ganglia_runtime_dir",
+      "displayName": "Ganglia runtime directory",
+      "description": "",
+      "defaultValue": "/var/run/ganglia/hdp",
+      "isReconfigurable": false,
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "MISC",
+      "category": "General"
+    },
+    {
+      "id": "puppet var",
+      "name": "gmetad_user",
+      "displayName": "gmetad_user",
+      "description": "",
+      "defaultValue": "nobody",
+      "isReconfigurable": false,
+      "displayType": "advanced",
+      "isVisible": false,
+      "serviceName": "MISC",
+      "category": "Users/Groups"
+    },
+    {
+      "id": "puppet var",
+      "name": "gmond_user",
+      "displayName": "gmond_user",
+      "description": "",
+      "defaultValue": "nobody",
+      "isReconfigurable": false,
+      "displayType": "advanced",
+      "isVisible": false,
+      "serviceName": "MISC",
+      "category": "Users/Groups"
+    },
+    {
+      "id": "puppet var",
+      "name": "ganglia_shell_cmds_dir",
+      "displayName": "ganglia_shell_cmds_dir",
+      "description": "",
+      "defaultValue": "/usr/libexec/hdp/ganglia",
+      "isReconfigurable": false,
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "MISC",
+      "category": "General"
+    },
+    {
+      "id": "puppet var",
+      "name": "webserver_group",
+      "displayName": "ganglia_shell_cmds_dir",
+      "description": "",
+      "defaultValue": "apache",
+      "isReconfigurable": false,
+      "displayType": "advanced",
+      "isVisible": false,
+      "serviceName": "MISC",
+      "category": "General"
+    },
+    {
+      "id": "puppet var",
       "name": "hcat_log_dir",
       "displayName": "HCat Log Dir",
       "description": "Directory for HCatalog log files",
       "defaultValue": "/var/log/hcatalog",
       "isReconfigurable": false,
       "displayType": "directory",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HIVE",
       "category": "Advanced"
     },
     {
+      "id": "puppet var",
       "name": "hcat_pid_dir",
       "displayName": "HCat PID Dir",
       "description": "Directory in which the PID files for HCatalog processes will be created",
       "defaultValue": "/var/run/hcatalog",
       "isReconfigurable": false,
       "displayType": "directory",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HIVE",
       "category": "Advanced"
     },
-    {
+   /* {
+      "id": "puppet var",
       "name": "hive-site.xml",
       "displayName": "Custom Hive Configs",
       "description": "If you wish to set configuration parameters not exposed through this page, you can specify them here.<br>The text you specify here will be injected into hive-site.xml verbatim.",
       "defaultValue": "",
       "isRequired": false,
       "displayType": "custom",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "HIVE",
       "category": "Advanced"
-    },
+    },*/
     {
+      "id": "puppet var",
       "name": "jobtracker.host",
       "displayName": "JobTracker host",
       "value": "",
       "defaultValue": "",
       "description": "The host that has been assigned to run JobTracker",
       "displayType": "masterHost",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MAPREDUCE",
       "category": "JobTracker"
     },
     {
-      "name": "tasktracker.hosts",
+      "id": "puppet var",
+      "name": "tasktracker_hosts",
       "displayName": "TaskTracer hosts",
       "value": "",
       "defaultValue": "",
       "description": "The hosts that have been assigned to run TaskTracker",
       "displayType": "slaveHosts",
-      "isVisible":  true,
+      "isVisible": true,
+      "isRequired": false,
       "serviceName": "MAPREDUCE",
       "category": "TaskTracker"
     },
     {
+      "id": "puppet var",
       "name": "mapred_local_dir",
       "displayName": "MapReduce local directories",
       "description": "Directories for MapReduce to store intermediate data files",
-      "defaultValue": "",
+      "defaultValue": "/grid/0/hadoop/mapred\n/grid/1/hadoop/mapred\n",
       "displayType": "directories",
       "isReconfigurable": false,
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MAPREDUCE"
     },
     {
+      "id": "puppet var",
+      "name": "mapred_system_dir",
+      "displayName": "MapReduce system directories",
+      "description": "",
+      "defaultValue": "",
+      "displayType": "directories",
+      "isReconfigurable": false,
+      "isVisible": true,
+      "isRequired": false,
+      "serviceName": "MAPREDUCE",
+      "category": "Advanced"
+    },
+    {
+      "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": "directory",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MAPREDUCE"
     },
     {
+      "id": "puppet var",
       "name": "jtnode_opt_newsize",
       "displayName": "JobTracker new generation size",
       "description": "Default size of Java new generation size for JobTracker in MB (Java option -XX:NewSize)",
       "defaultValue": "200",
       "displayType": "int",
       "unit": "MB",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MAPREDUCE",
       "category": "JobTracker"
     },
     {
+      "id": "puppet var",
       "name": "jtnode_opt_maxnewsize",
       "displayName": "JobTracker maximum new generation size",
       "description": "Maximum size of Java new generation for JobTracker in MB (Java option -XX:MaxNewSize)",
       "defaultValue": "200",
       "displayType": "int",
       "unit": "MB",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MAPREDUCE",
       "category": "JobTracker"
     },
     {
+      "id": "puppet var",
       "name": "jtnode_heapsize",
       "displayName": "JobTracker maximum Java heap size",
       "description": "Maximum Java heap size for JobTracker in MB (Java option -Xmx)",
       "defaultValue": "1024",
       "displayType": "int",
       "unit": "MB",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MAPREDUCE",
       "category": "JobTracker"
     },
     {
+      "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,
+      "isVisible": true,
       "serviceName": "MAPREDUCE",
       "category": "TaskTracker"
     },
     {
+      "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,
+      "isVisible": true,
+      "isRequired": false,
       "serviceName": "MAPREDUCE",
       "category": "TaskTracker"
     },
     {
+      "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": "-1",
       "displayType": "int",
       "unit": "MB",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MAPREDUCE"
     },
     {
+      "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": "-1",
       "displayType": "int",
       "unit": "MB",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MAPREDUCE"
     },
     {
+      "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": "-1",
       "displayType": "int",
       "unit": "MB",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MAPREDUCE"
     },
     {
+      "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": "-1",
       "displayType": "int",
       "unit": "MB",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MAPREDUCE"
     },
     {
+      "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": "-1",
       "displayType": "int",
       "unit": "MB",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MAPREDUCE"
     },
     {
+      "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": "-1",
       "displayType": "int",
       "unit": "MB",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MAPREDUCE"
     },
     {
+      "id": "puppet var",
       "name": "mapred_child_java_opts_sz",
       "displayName": "Java options for MapReduce tasks",
       "description": "Java options for the TaskTracker child processes.",
       "defaultValue": "768",
       "displayType": "int",
       "unit": "MB",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MAPREDUCE"
     },
     {
+      "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,
+      "isVisible": true,
       "serviceName": "MAPREDUCE"
     },
     {
+      "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,
+      "isVisible": true,
       "serviceName": "MAPREDUCE"
     },
     {
+      "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,
+      "isVisible": true,
       "serviceName": "MAPREDUCE"
     },
     {
+      "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,
+      "isVisible": true,
       "serviceName": "MAPREDUCE"
     },
     {
+      "id": "puppet var",
       "name": "lzo_enabled",
       "displayName": "LZO compression",
       "description": "LZO compression enabled",
       "defaultValue": false,
       "displayType": "checkbox",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MAPREDUCE"
     },
     {
+      "id": "puppet var",
       "name": "snappy_enabled",
       "displayName": "Snappy compression",
       "description": "Snappy compression enabled",
       "defaultValue": true,
       "isReconfigurable": false,
       "displayType": "checkbox",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MAPREDUCE"
     },
-    {
+    /*{
+      "id": "puppet var",
       "name": "mapred-site.xml",
       "displayName": "Custom MapReduce Configs",
       "description": "If you wish to set configuration parameters not exposed through this page, you can specify them here.<br>The text you specify here will be injected into mapred-site.xml verbatim.",
       "defaultValue": "",
       "isRequired": false,
       "displayType": "custom",
-      "isVisible":  true,
+      "isVisible": true,
+      "serviceName": "MAPREDUCE",
+      "category": "Advanced"
+    },*/
+    {
+      "id": "puppet var",
+      "name": "mapred_hosts_exclude",
+      "displayName": "Exclude hosts",
+      "description": "Exclude entered hosts",
+      "defaultValue": "mapred.exclude",
+      "displayType": "directories",
+      "isVisible": false,
+      "serviceName": "MAPREDUCE",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "mapred_hosts_include",
+      "displayName": "Include hosts",
+      "description": "Include enetered hosts",
+      "defaultValue": "mapred.include",
+      "displayType": "directories",
+      "isVisible": false,
+      "serviceName": "MAPREDUCE",
+      "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",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "task_controller",
+      "displayName": "task_controller",
+      "description": "",
+      "defaultValue": "org.apache.hadoop.mapred.DefaultTaskController",
+      "displayType": "advanced",
+      "isVisible": false,
       "serviceName": "MAPREDUCE",
       "category": "Advanced"
     },
     {
+      "id": "puppet var",
       "name": "jdk_location",
       "displayName": "URL to download 64-bit JDK",
       "description": "URL from where the 64-bit JDK binary can be downloaded",
@@ -863,10 +1466,11 @@ module.exports =
       "isRequired": false,
       "isReconfigurable": false,
       "displayType": "url",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MISC"
     },
     {
+      "id": "puppet var",
       "name": "java64_home",
       "displayName": "Path to 64-bit JAVA_HOME",
       "description": "Path to 64-bit JAVA_HOME",
@@ -874,11 +1478,112 @@ module.exports =
       "isRequired": false,
       "isReconfigurable": false,
       "displayType": "directory",
-      "isVisible":  true,
+      "isVisible": true,
+      "serviceName": "MISC"
+    },
+    {
+      "id": "puppet var",
+      "name": "run_dir",
+      "displayName": "Hadoop run directory",
+      "description": "",
+      "defaultValue": "/var/run/hadoop",
+      "isRequired": false,
+      "isReconfigurable": false,
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "MISC",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "hadoop_conf_dir",
+      "displayName": "Hadoop conf directory",
+      "description": "",
+      "defaultValue": "/etc/hadoop",
+      "isRequired": false,
+      "isReconfigurable": false,
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "MISC",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "namenode_formatted_mark_dir",
+      "displayName": "Hadoop formatted mark directory",
+      "description": "",
+      "defaultValue": "/var/run/hadoop/hdfs/namenode/formatted/",
+      "isRequired": false,
+      "isReconfigurable": false,
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "HDFS",
+      "category": "NameNode"
+    },
+    {
+      "id": "puppet var",
+      "name": "hcat_conf_dir",
+      "displayName": "HCat conf directory",
+      "description": "",
+      "defaultValue": "",
+      "isRequired": false,
+      "isReconfigurable": false,
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "HDFS",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
+      "name": "hcat_metastore_port",
+      "displayName": "hcat_metastore_port",
+      "description": "",
+      "defaultValue": "/usr/lib/hcatalog/share/hcatalog",
+      "isRequired": true,
+      "isReconfigurable": false,
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "MISC"
+    },
+    {
+      "id": "puppet var",
+      "name": "hcat_lib",
+      "displayName": "hcat_lib",
+      "description": "",
+      "defaultValue": "/usr/lib/hcatalog/share/hcatalog",
+      "isRequired": true,
+      "isReconfigurable": false,
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "MISC"
+    },
+    {
+      "id": "puppet var",
+      "name": "hcat_dbroot",
+      "displayName": "hcat_dbroot",
+      "description": "",
+      "defaultValue": "/usr/lib/hcatalog/share/hcatalog",
+      "isRequired": true,
+      "isReconfigurable": false,
+      "displayType": "directory",
+      "isVisible": false,
       "serviceName": "MISC"
     },
+    {
+      "id": "puppet var",
+      "name": "hcat_dbroot",
+      "displayName": "hcat_dbroot",
+      "description": "",
+      "defaultValue": "/usr/lib/hcatalog/share/hcatalog",
+      "isRequired": true,
+      "isReconfigurable": false,
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "MISC",
+    },
     /*
      {
+     "id": "puppet var",
      "name": "hadoop_log_dir",
      "displayName": "Hadoop Log Dir",
      "description": "Directory for Hadoop log files",
@@ -889,6 +1594,7 @@ module.exports =
      "category": "Advanced"
      },
      {
+     "id": "puppet var",
      "name": "hadoop_pid_dir",
      "displayName": "Hadoop PID Dir",
      "description": "Directory in which the pid files for Hadoop processes will be created",
@@ -900,406 +1606,536 @@ module.exports =
      },
      */
     {
+      "id": "puppet var",
       "name": "using_local_repo",
       "displayName": "Whether a local repo is being used",
       "description": "Whether a local repo is being used",
       "defaultValue": false,
       "isReconfigurable": false,
       "displayType": "checkbox",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MISC"
     },
     {
+      "id": "puppet var",
       "name": "yum_repo_file",
       "displayName": "Path to local repo file",
       "description": "Path to local repository file that configures from where to download software packages",
       "defaultValue": "/etc/yum.repos.d/hdp.repo",
       "isReconfigurable": false,
       "displayType": "directory",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MISC"
     },
     {
+      "id": "puppet var",
       "name": "hdfs_user",
       "displayName": "HDFS User",
       "description": "User to run HDFS as",
       "defaultValue": "hdfs",
       "isReconfigurable": false,
       "displayType": "user",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MISC",
       "category": "Users/Groups"
     },
     {
+      "id": "puppet var",
       "name": "mapred_user",
       "displayName": "MapReduce User",
       "description": "User to run MapReduce as",
       "defaultValue": "mapred",
       "isReconfigurable": false,
       "displayType": "user",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MISC",
       "category": "Users/Groups"
     },
     {
+      "id": "puppet var",
       "name": "hbase_user",
       "displayName": "HBase User",
       "description": "User to run HBase as",
       "defaultValue": "hbase",
       "isReconfigurable": false,
       "displayType": "user",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MISC",
       "category": "Users/Groups"
     },
     {
+      "id": "puppet var",
       "name": "hive_user",
       "displayName": "Hive User",
       "description": "User to run Hive as",
       "defaultValue": "hive",
       "isReconfigurable": false,
       "displayType": "user",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MISC",
       "category": "Users/Groups"
     },
     {
+      "id": "puppet var",
       "name": "hcat_user",
       "displayName": "HCat User",
       "description": "User to run HCatalog as",
       "defaultValue": "hcat",
       "isReconfigurable": false,
       "displayType": "user",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MISC",
       "category": "Users/Groups"
     },
     {
+      "id": "puppet var",
       "name": "oozie_user",
       "displayName": "Oozie User",
       "description": "User to run Oozie as",
       "defaultValue": "oozie",
       "isReconfigurable": false,
       "displayType": "user",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MISC",
       "category": "Users/Groups"
     },
     {
+      "id": "puppet var",
+      "name": "oozie_conf_dir",
+      "displayName": "Oozie conf dir",
+      "description": "",
+      "defaultValue": "/etc/oozie",
+      "isReconfigurable": false,
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "MISC",
+      "category": "General"
+    },
+    {
+      "id": "puppet var",
+      "name": "pig_conf_dir",
+      "displayName": "Pig conf dir",
+      "description": "",
+      "defaultValue": "/etc/pig",
+      "isReconfigurable": false,
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "MISC",
+      "category": "General"
+    },
+    {
+      "id": "puppet var",
       "name": "pig_user",
       "displayName": "Pig User",
       "description": "User to run Pig as",
       "defaultValue": "pig",
       "isReconfigurable": false,
       "displayType": "user",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MISC",
       "category": "Users/Groups"
     },
     {
+      "id": "puppet var",
+      "name": "sqoop_conf_dir",
+      "displayName": "sqoop conf dir",
+      "description": "",
+      "defaultValue": "/etc/sqoop",
+      "isReconfigurable": false,
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "MISC",
+      "category": "General"
+    },
+    {
+      "id": "puppet var",
+      "name": "sqoop_lib",
+      "displayName": "sqoop conf dir",
+      "description": "",
+      "defaultValue": "/usr/lib/sqoop/lib/",
+      "isReconfigurable": false,
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "MISC",
+      "category": "General"
+    },
+    {
+      "id": "puppet var",
       "name": "sqoop_user",
       "displayName": "Sqoop User",
       "description": "User to run Sqoop as",
       "defaultValue": "sqoop",
       "isReconfigurable": false,
       "displayType": "user",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MISC",
       "category": "Users/Groups"
     },
     {
+      "id": "puppet var",
       "name": "zk_user",
       "displayName": "ZooKeeper User",
       "description": "User to run ZooKeeper as",
       "defaultValue": "zookeeper",
       "isReconfigurable": false,
       "displayType": "user",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MISC",
       "category": "Users/Groups"
     },
     {
+      "id": "puppet var",
       "name": "user_group",
       "displayName": "Group",
       "description": "Group that the users specified above belong to",
       "defaultValue": "hadoop",
       "isReconfigurable": false,
       "displayType": "user",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "MISC",
       "category": "Users/Groups"
     },
     {
+      "id": "puppet var",
+      "name": "nagios_user",
+      "displayName": "Nagios username",
+      "description": "Nagios username",
+      "defaultValue": "nagios",
+      "isReconfigurable": false,
+      "displayType": "user",
+      "isVisible": false,
+      "serviceName": "NAGIOS"
+    },
+    {
+      "id": "puppet var",
+      "name": "nagios_group",
+      "displayName": "Nagios username",
+      "description": "Nagios username",
+      "defaultValue": "nagios",
+      "isReconfigurable": false,
+      "displayType": "user",
+      "isVisible": false,
+      "serviceName": "NAGIOS"
+    },
+    {
+      "id": "puppet var",
       "name": "nagios_web_login",
       "displayName": "Nagios Admin username",
       "description": "Nagios Web UI Admin username",
       "defaultValue": "nagiosadmin",
       "isReconfigurable": false,
       "displayType": "user",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "NAGIOS"
     },
     {
+      "id": "puppet var",
       "name": "nagios_web_password",
       "displayName": "Nagios Admin password",
       "description": "Nagios Web UI Admin password",
       "defaultValue": "",
       "isReconfigurable": false,
       "displayType": "password",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "NAGIOS"
     },
     {
+      "id": "puppet var",
       "name": "nagios_contact",
       "displayName": "Hadoop Admin email",
       "description": "Hadoop Administrator email for alert notification",
       "defaultValue": "",
       "displayType": "email",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "NAGIOS"
     },
     {
+      "id": "puppet var",
       "name": "oozieserver.host",
       "displayName": "Oozie Server host",
       "value": "",
       "defaultValue": "",
       "description": "The host that has been assigned to run Oozie Server",
       "displayType": "masterHost",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "OOZIE",
       "category": "Oozie Server"
     },
     {
+      "id": "puppet var",
       "name": "oozie_database",
       "displayName": "Oozie Database",
       "value": "",
       "defaultValue": "New PostgreSQL Database",
-      "options":  [
+      "options": [
         {
           displayName: 'New PostgreSQL Database',
-          foreignKeys: ['oozie_ambari_database','oozie_ambari_host']
+          foreignKeys: ['oozie_ambari_database', 'oozie_ambari_host']
         },
         {
           displayName: 'Existing Database',
-          foreignKeys: ['oozie_existing_database','oozie_existing_host']
+          foreignKeys: ['oozie_existing_database', 'oozie_existing_host']
         }
       ],
       "description": "PostgreSQL will be installed by ambari. Any other database will have to be installed by the user.",
       "displayType": "radio button",
       "radioName": "oozie-database",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "OOZIE",
       "category": "Oozie Server"
     },
     {
+      "id": "puppet var",
       "name": "oozie_existing_database",
       "displayName": "Oozie Database",
       "value": "",
       "defaultValue": "MySQL",
       "description": "Select the database, if you already have existing one for Oozie.",
       "displayType": "combobox",
-      "isVisible":  false,
-      "options": ['MySQL','PostgreSQL'],
+      "isVisible": false,
+      "options": ['MySQL', 'PostgreSQL'],
       "serviceName": "OOZIE",
       "category": "Oozie Server"
     },
     {
+      "id": "puppet var",
       "name": "oozie_existing_host",
       "displayName": "Database host",
       "description": "Select the host on which the existing database is hosted.",
       "defaultValue": "",
       "isReconfigurable": false,
       "displayType": "host",
-      "isVisible":  false,
+      "isVisible": false,
       "serviceName": "OOZIE",
       "category": "Oozie Server"
     },
     {
+      "id": "puppet var",
       "name": "oozie_ambari_database",
       "displayName": "Oozie Database",
       "value": "",
       "defaultValue": "PostgreSQL",
       "description": "PostgreSQL will be installed by ambari.",
       "displayType": "masterHost",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "OOZIE",
       "category": "Oozie Server"
     },
     {
+      "id": "puppet var",
       "name": "oozie_ambari_host",
       "value": "",
       "defaultValue": "",
       "displayName": "PostgreSQL host",
       "description": "Host  on which the PostgreSQL database will be created by ambari. ",
-      "defaultValue": "",
       "isReconfigurable": false,
       "displayType": "masterHost",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "OOZIE",
       "category": "Oozie Server"
     },
 
     {
+      "id": "puppet var",
       "name": "oozie_database_name",
       "displayName": "Database name",
       "description": "Database name used for the Oozie",
       "defaultValue": "oozie",
       "isReconfigurable": false,
       "displayType": "host",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "OOZIE",
       "category": "Oozie Server"
     },
     {
+      "id": "puppet var",
       "name": "oozie_metastore_user_name",
       "displayName": "Database user",
       "description": "Database user name to use to connect to the database",
       "defaultValue": "oozie",
       "isReconfigurable": false,
       "displayType": "user",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "OOZIE",
       "category": "Oozie Server"
     },
     {
+      "id": "puppet var",
       "name": "oozie_metastore_user_passwd",
       "displayName": "Database password",
       "description": "Database password to use to connect to the PostgreSQL database",
       "defaultValue": "",
       "isReconfigurable": false,
       "displayType": "password",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "OOZIE",
       "category": "Oozie Server"
     },
     {
+      "id": "puppet var",
       "name": "oozie_data_dir",
       "displayName": "Oozie Data Dir",
       "description": "Data directory in which the Oozie DB exists",
       "defaultValue": "",
       "isReconfigurable": false,
       "displayType": "directory",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "OOZIE",
       "category": "Oozie Server"
     },
     {
+      "id": "puppet var",
       "name": "oozie_log_dir",
       "displayName": "Oozie Log Dir",
       "description": "Directory for oozie logs",
       "defaultValue": "/var/log/oozie",
       "isReconfigurable": false,
       "displayType": "directory",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "OOZIE",
       "category": "Advanced"
     },
     {
+      "id": "puppet var",
       "name": "oozie_pid_dir",
       "displayName": "Oozie PID Dir",
       "description": "Directory in which the pid files for oozie processes will be created",
       "defaultValue": "/var/run/oozie",
       "isReconfigurable": false,
       "displayType": "directory",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "OOZIE",
       "category": "Advanced"
     },
-    {
+    /*{
+      "id": "puppet var",
       "name": "oozie-site.xml",
       "displayName": "Custom Oozie Configs",
       "description": "If you wish to set configuration parameters not exposed through this page, you can specify them here.<br>The text you specify here will be injected into oozie-site.xml verbatim.",
       "defaultValue": "",
       "isRequired": false,
       "displayType": "custom",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "OOZIE",
       "category": "Advanced"
-    },
+    },*/
     {
-      "name": "zookeeperserver.hosts",
+      "id": "puppet var",
+      "name": "zookeeperserver_hosts",
       "displayName": "ZooKeeper Server hosts",
       "value": "",
       "defaultValue": "",
       "description": "The host that has been assigned to run ZooKeeper Server",
       "displayType": "masterHosts",
-      "isVisible":  true,
+      "isVisible": true,
+      "isRequired": false,
       "serviceName": "ZOOKEEPER",
       "category": "ZooKeeper Server"
     },
     {
+      "id": "puppet var",
       "name": "zk_data_dir",
       "displayName": "ZooKeeper directory",
       "description": "Data directory for ZooKeeper",
-      "defaultValue": "",
+      "defaultValue": "/grid/0/hadoop/zookeeper",
       "isReconfigurable": false,
       "displayType": "directory",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "ZOOKEEPER",
       "category": "ZooKeeper Server"
     },
     {
+      "id": "puppet var",
       "name": "zk_log_dir",
       "displayName": "ZooKeeper Log Dir",
       "description": "Directory for ZooKeeper log files",
       "defaultValue": "/var/log/zookeeper",
       "isReconfigurable": false,
       "displayType": "directory",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "ZOOKEEPER",
       "category": "Advanced"
     },
     {
+      "id": "puppet var",
       "name": "zk_pid_dir",
       "displayName": "ZooKeeper PID Dir",
       "description": "Directory in which the pid files for zookeeper processes will be created",
       "defaultValue": "/var/run/zookeeper",
       "isReconfigurable": false,
       "displayType": "directory",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "ZOOKEEPER",
       "category": "Advanced"
     },
     {
+      "id": "puppet var",
+      "name": "zk_pid_file",
+      "displayName": "ZooKeeper PID File",
+      "description": "",
+      "defaultValue": "/var/run/zookeeper/zookeeper_server.pid",
+      "isReconfigurable": false,
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "ZOOKEEPER",
+      "category": "Advanced"
+    },
+    {
+      "id": "puppet var",
       "name": "tickTime",
       "displayName": "Length of single Tick",
       "description": "The length of a single tick in milliseconds, which is the basic time unit used by ZooKeeper",
       "defaultValue": "2000",
       "displayType": "int",
       "unit": "ms",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "ZOOKEEPER",
       "category": "ZooKeeper Server"
     },
     {
+      "id": "puppet var",
       "name": "initLimit",
       "displayName": "Ticks to allow for sync at Init",
       "description": "Amount of time, in ticks to allow followers to connect and sync to a leader",
       "defaultValue": "10",
       "displayType": "int",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "ZOOKEEPER",
       "category": "ZooKeeper Server"
     },
     {
+      "id": "puppet var",
       "name": "syncLimit",
       "displayName": "Ticks to allow for sync at Runtime",
       "description": "Amount of time, in ticks to allow followers to connect",
       "defaultValue": "5",
       "displayType": "int",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "ZOOKEEPER",
       "category": "ZooKeeper Server"
     },
     {
+      "id": "puppet var",
       "name": "clientPort",
       "displayName": "Port for running ZK Server",
       "description": "Port for running ZooKeeper server",
       "defaultValue": "2181",
       "displayType": "int",
-      "isVisible":  true,
+      "isVisible": true,
       "serviceName": "ZOOKEEPER",
       "category": "ZooKeeper Server"
+    },
+    {
+      "id": "puppet var",
+      "name": "zk_conf_dir",
+      "displayName": "zk_conf_dir",
+      "description": "",
+      "defaultValue": "/etc/conf/",
+      "displayType": "directory",
+      "isVisible": false,
+      "serviceName": "MISC",
+      "category": "General"
     }
+
   ]
 };

Added: incubator/ambari/branches/AMBARI-666/ambari-web/app/data/custom_configs.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/data/custom_configs.js?rev=1418917&view=auto
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/data/custom_configs.js (added)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/data/custom_configs.js Sun Dec  9 12:43:31 2012
@@ -0,0 +1,85 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+module.exports =
+  [
+
+    {
+      "id": "conf-site",
+      "name": "hdfs-site",
+      "displayName": "Custom HDFS Configs",
+      "value": "",
+      "defaultValue": "",
+      "description": "If you wish to set configuration parameters not exposed through this page, you can specify them here.<br>The text you specify here will be injected into hdfs-site.xml verbatim.",
+      "displayType": "custom",
+      "isVisible": true,
+      "isRequired": false,
+      "serviceName": "HDFS",
+      "category": "Advanced"
+    },
+    {
+      "id": "conf-site",
+      "name": "mapred-site",
+      "displayName": "Custom MapReduce Configs",
+      "value": "",
+      "defaultValue": "",
+      "description": "If you wish to set configuration parameters not exposed through this page, you can specify them here.<br>The text you specify here will be injected into mapred-site.xml verbatim.",
+      "displayType": "custom",
+      "isVisible": true,
+      "isRequired": false,
+      "serviceName": "MAPREDUCE",
+      "category": "Advanced"
+    },
+    {
+      "id": "conf-site",
+      "name": "hbase-site",
+      "displayName": "Custom HBase Configs",
+      "description": "If you wish to set configuration parameters not exposed through this page, you can specify them here.<br>The text you specify here will be injected into hbase-site.xml verbatim.",
+      "defaultValue": "",
+      "isRequired": false,
+      "displayType": "custom",
+      "isVisible": true,
+      "serviceName": "HBASE",
+      "category": "Advanced"
+    },
+    {
+      "id": "conf-site",
+      "name": "hive-site",
+      "displayName": "Custom Hive Configs",
+      "description": "If you wish to set configuration parameters not exposed through this page, you can specify them here.<br>The text you specify here will be injected into hive-site.xml verbatim.",
+      "defaultValue": "",
+      "isRequired": false,
+      "displayType": "custom",
+      "isVisible": true,
+      "serviceName": "HIVE",
+      "category": "Advanced"
+    },
+    {
+      "id": "conf-site",
+      "name": "oozie-site",
+      "displayName": "Custom Oozie Configs",
+      "description": "If you wish to set configuration parameters not exposed through this page, you can specify them here.<br>The text you specify here will be injected into oozie-site.xml verbatim.s",
+      "defaultValue": "",
+      "isRequired": false,
+      "displayType": "custom",
+      "isVisible": true,
+      "serviceName": "OOZIE",
+      "category": "Advanced"
+    }
+  ]
\ No newline at end of file

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/data/service_configs.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/data/service_configs.js?rev=1418917&r1=1418916&r2=1418917&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/data/service_configs.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/data/service_configs.js Sun Dec  9 12:43:31 2012
@@ -25,6 +25,7 @@ module.exports = [
   {
     serviceName: 'HDFS',
     displayName: 'HDFS',
+    filename: 'hdfs-site',
     configCategories: [
       App.ServiceConfigCategory.create({ name: 'NameNode'}),
       App.ServiceConfigCategory.create({ name: 'SNameNode'}),
@@ -38,6 +39,7 @@ module.exports = [
   {
     serviceName: 'MAPREDUCE',
     displayName: 'MapReduce',
+    filename: 'mapred-site',
     configCategories: [
       App.ServiceConfigCategory.create({ name: 'JobTracker'}),
       App.ServiceConfigCategory.create({ name: 'TaskTracker'}),
@@ -50,6 +52,7 @@ module.exports = [
   {
     serviceName: 'HIVE',
     displayName: 'Hive/HCat',
+    filename: 'hive-site',
     configCategories: [
       App.ServiceConfigCategory.create({ name: 'Hive Metastore'}),
       App.ServiceConfigCategory.create({ name: 'Advanced'})
@@ -60,6 +63,7 @@ module.exports = [
   {
     serviceName: 'HBASE',
     displayName: 'HBase',
+    filename: 'hbase-site',
     configCategories: [
       App.ServiceConfigCategory.create({ name: 'HBase Master'}),
       App.ServiceConfigCategory.create({ name: 'RegionServer'}),
@@ -82,6 +86,7 @@ module.exports = [
   {
     serviceName: 'OOZIE',
     displayName: 'Oozie',
+    filename: 'oozie-site',
     configCategories: [
       App.ServiceConfigCategory.create({ name: 'Oozie Server'}),
       App.ServiceConfigCategory.create({ name: 'Advanced'})

Added: incubator/ambari/branches/AMBARI-666/ambari-web/app/models/quick_links.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/models/quick_links.js?rev=1418917&view=auto
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/models/quick_links.js (added)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/models/quick_links.js Sun Dec  9 12:43:31 2012
@@ -0,0 +1,136 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+var App = require('app');
+
+App.QuickLinks = DS.Model.extend({
+  label: DS.attr('string'),
+  url: DS.attr('string'),
+  service_id: DS.attr('string')
+});
+
+App.QuickLinks.FIXTURES = [
+  {
+    id:1,
+    label:'NameNode UI',
+    url:'http://%@:50070/dfshealth.jsp',
+    service_id: 'HDFS'
+  },
+  {
+    id:2,
+    label:'NameNode logs',
+    url:'http://%@:50070/logs',
+    service_id: 'HDFS'
+  },
+  {
+    id:3,
+    label:'NameNode JMX',
+    url:'http://%@:50070/jmx',
+    service_id: 'HDFS'
+  },
+  {
+    id:4,
+    label:'Thread Stacks',
+    url:'http://%@:50070/stacks',
+    service_id: 'HDFS'
+  },
+  {
+    id:5,
+    label:'JobTracker UI',
+    url:'http://%@:50030/jobtracker.jsp',
+    service_id: 'MAPREDUCE'
+  },
+  {
+    id:6,
+    label:'Scheduling Info',
+    url:'http://%@:50030/scheduler',
+    service_id: 'MAPREDUCE'
+  },
+  {
+    id:7,
+    label:'Running Jobs',
+    url:'http://%@:50030/jobtracker.jsp#running_jobs',
+    service_id: 'MAPREDUCE'
+  },
+  {
+    id:8,
+    label:'Retired Jobs',
+    url:'http://%@:50030/jobtracker.jsp#retired_jobs',
+    service_id: 'MAPREDUCE'
+  },
+  {
+    id:9,
+    label:'JobHistory Server',
+    url:'http://%@:51111/jobhistoryhome.jsp',
+    service_id: 'MAPREDUCE'
+  },
+  {
+    id:10,
+    label:'JobTracker Logs',
+    url:'http://%@:50030/logs',
+    service_id: 'MAPREDUCE'
+  },
+  {
+    id:11,
+    label:'JobTracker JMX',
+    url:'http://%@:50030/jmx',
+    service_id: 'MAPREDUCE'
+  },
+  {
+    id:12,
+    label:'Thread Stacks',
+    url:'http://%@:50030/stacks',
+    service_id: 'MAPREDUCE'
+  },
+  {
+    id:13,
+    label:'HBase Master UI',
+    url:'http://%@:60010/master-status',
+    service_id: 'HBASE'
+  },
+  {
+    id:14,
+    label:'HBase Logs',
+    url:'http://%@:60010/logs',
+    service_id: 'HBASE'
+  },
+  {
+    id:15,
+    label:'Zookeeper Info',
+    url:'http://%@:60010/zk.jsp',
+    service_id: 'HBASE'
+  },
+  {
+    id:16,
+    label:'HBase Master JMX',
+    url:'http://%@:60010/jmx',
+    service_id: 'HBASE'
+  },
+  {
+    id:17,
+    label:'Debug Dump',
+    url:'http://%@:60010/dump',
+    service_id: 'HBASE'
+  },
+  {
+    id:18,
+    label:'Thread Stacks',
+    url:'http://%@:60010/stacks',
+    service_id: 'HBASE'
+  }
+];

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/models/service_config.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/models/service_config.js?rev=1418917&r1=1418916&r2=1418917&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/models/service_config.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/models/service_config.js Sun Dec  9 12:43:31 2012
@@ -29,8 +29,8 @@ App.ServiceConfig = Ember.Object.extend(
   configs: null,
 
   errorCount: function () {
-    return this.get('configs').filterProperty('isValid', false).filterProperty('isVisible',true).get('length');
-  }.property('configs.@each.isValid','configs.@each.isVisible')
+    return this.get('configs').filterProperty('isValid', false).filterProperty('isVisible', true).get('length');
+  }.property('configs.@each.isValid', 'configs.@each.isVisible')
 });
 
 App.ServiceConfigCategory = Ember.Object.extend({
@@ -51,6 +51,7 @@ App.ServiceConfigCategory = Ember.Object
 
 App.ServiceConfigProperty = Ember.Object.extend({
 
+  id: '', //either 'puppet var' or 'site property'
   name: '',
   displayName: '',
   value: '',
@@ -64,77 +65,47 @@ App.ServiceConfigProperty = Ember.Object
   isEditable: true, // by default a config property is editable
   errorMessage: '',
   serviceConfig: null, // points to the parent App.ServiceConfig object
+  filename: '',
 
   init: function () {
-    this.set('value', this.get('defaultValue'));
-    // TODO: remove mock data
-    switch (this.get('name')) {
-      case 'datanode.hosts':
-        this.set('value', [ 'host0001.company.com', 'host0002.company.com', 'host0003.company.com' ]);
-        break;
-      case 'mapred_local_dir':
-        this.set('value', '/grid/0/hadoop/mapred\n/grid/1/hadoop/mapred\n');
-        break;
-      case 'zk_data_dir':
-        this.set('value', '/grid/0/hadoop/zookeeper');
-        break;
-      case 'oozie_data_dir':
-        this.set('value', '/grid/0/hadoop/oozie');
-        break;
-      case 'dfs_name_dir':
-        this.set('value', '/grid/0/hadoop/hdfs/namenode\n/grid/1/hadoop/hdfs/namenode\n');
-        break;
-      case 'fs_checkpoint_dir':
-        this.set('value', '/grid/0/hadoop/hdfs/namesecondary');
-        break;
-      case 'dfs_data_dir':
-        this.set('value', '/grid/0/hadoop/hdfs/data\n/grid/1/hadoop/hdfs/data\n');
-        break;
-      case 'tasktracker.hosts':
-        this.set('value', [ 'host0001.company.com', 'host0002.company.com', 'host0003.company.com' ]);
-        break;
-      case 'hbasemaster.host':
-        this.set('value', 'hbase.company.com');
-        break;
-      case 'regionserver.hosts':
-        this.set('value', [ 'host0001.company.com', 'host0002.company.com', 'host0003.company.com' ]);
-        break;
-      case 'zookeeperserver.hosts':
-        this.set('value', [ 'zk1.company.com', 'zk2.company.com', 'zk3.company.com' ]);
-        break;
+    if (this.get('id') === 'puppet var') {
+      this.set('value', this.get('defaultValue'));
     }
+    // TODO: remove mock data
   },
 
-  initialValue: function() {
+  initialValue: function () {
     var masterComponentHostsInDB = App.db.getMasterComponentHosts();
+    //console.log("value in initialvalue: " + JSON.stringify(masterComponentHostsInDB));
     switch (this.get('name')) {
-      case 'namenode.host':
-        var temp = masterComponentHostsInDB.findProperty('component','NAMENODE');
+      case 'namenode_host':
+        var temp = masterComponentHostsInDB.findProperty('component', 'NAMENODE');
+        console.log("********The value of namemenode host is: " + temp.hostName);
         this.set('value', temp.hostName);
         break;
-      case 'snamenode.host':
-        this.set('value', masterComponentHostsInDB.findProperty('component','SECONDARY_NAMENODE').hostName);
+      case 'snamenode_host':
+        this.set('value', masterComponentHostsInDB.findProperty('component', 'SECONDARY_NAMENODE').hostName);
         break;
       case 'jobtracker.host':
-        this.set('value', masterComponentHostsInDB.findProperty('component','JOBTRACKER').hostName);
+        this.set('value', masterComponentHostsInDB.findProperty('component', 'JOBTRACKER').hostName);
         break;
       case 'hbasemaster.host':
-        this.set('value', masterComponentHostsInDB.findProperty('component','HBASE_MASTER').hostName);
+        this.set('value', masterComponentHostsInDB.findProperty('component', 'HBASE_MASTER').hostName);
         break;
       case 'zookeeperserver.hosts':
-        this.set('value', masterComponentHostsInDB.filterProperty('component','ZOOKEEPER_SERVER').mapProperty('hostName'));
+        this.set('value', masterComponentHostsInDB.filterProperty('component', 'ZOOKEEPER_SERVER').mapProperty('hostName'));
         break;
       case 'hivemetastore.host':
-        this.set('value', masterComponentHostsInDB.findProperty('component','HIVE_SERVER').hostName);
+        this.set('value', masterComponentHostsInDB.findProperty('component', 'HIVE_SERVER').hostName);
         break;
       case 'hive_ambari_host':
-        this.set('value', masterComponentHostsInDB.findProperty('component','HIVE_SERVER').hostName);
+        this.set('value', masterComponentHostsInDB.findProperty('component', 'HIVE_SERVER').hostName);
         break;
       case 'oozieserver.host':
-        this.set('value', masterComponentHostsInDB.findProperty('component','OOZIE_SERVER').hostName);
+        this.set('value', masterComponentHostsInDB.findProperty('component', 'OOZIE_SERVER').hostName);
         break;
       case 'oozie_ambari_host':
-        this.set('value', masterComponentHostsInDB.findProperty('component','OOZIE_SERVER').hostName);
+        this.set('value', masterComponentHostsInDB.findProperty('component', 'OOZIE_SERVER').hostName);
         break;
     }
   },
@@ -156,6 +127,7 @@ App.ServiceConfigProperty = Ember.Object
         break;
       case 'directories':
         return App.ServiceConfigTextArea;
+        break;
       case 'custom':
         return App.ServiceConfigBigTextArea;
       case 'masterHost':