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 2014/02/27 02:02:10 UTC

git commit: AMBARI-4860. Falcon Service Check failed during install. (jaimin)

Repository: ambari
Updated Branches:
  refs/heads/trunk 1b311dcbf -> 4635717ad


AMBARI-4860. Falcon Service Check failed during install. (jaimin)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4635717a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4635717a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4635717a

Branch: refs/heads/trunk
Commit: 4635717adc5b96da600eb950b54e00a5b1aa4fd5
Parents: 1b311dc
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Wed Feb 26 17:01:47 2014 -0800
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Wed Feb 26 17:01:54 2014 -0800

----------------------------------------------------------------------
 .../configuration/falcon-startup.properties.xml |   4 +-
 ambari-web/app/data/HDP2/site_properties.js     | 850 +++++++------------
 ambari-web/app/data/service_configs.js          |   2 +
 ambari-web/app/utils/config.js                  |  58 +-
 4 files changed, 347 insertions(+), 567 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4635717a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/FALCON/configuration/falcon-startup.properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/FALCON/configuration/falcon-startup.properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/FALCON/configuration/falcon-startup.properties.xml
index dc12528..fd8e487 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/FALCON/configuration/falcon-startup.properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/FALCON/configuration/falcon-startup.properties.xml
@@ -100,9 +100,7 @@
   </property>
   <property>
     <name>*.shared.libs</name>
-    <value>
-      activemq-core,ant,geronimo-j2ee-management,hadoop-distcp,jms,json-simple,oozie-client,spring-jms
-    </value>
+    <value>activemq-core,ant,geronimo-j2ee-management,hadoop-distcp,jms,json-simple,oozie-client,spring-jms</value>
     <description></description>
   </property>
   <property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/4635717a/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 d916f84..39ffb13 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -26,12 +26,9 @@ module.exports =
       "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
@@ -40,8 +37,6 @@ module.exports =
       "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,
@@ -53,12 +48,9 @@ module.exports =
       "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
@@ -67,11 +59,8 @@ module.exports =
       "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
@@ -80,8 +69,6 @@ module.exports =
       "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",
@@ -92,11 +79,8 @@ module.exports =
       "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
@@ -105,10 +89,7 @@ module.exports =
       "id": "site property",
       "name": "dfs.datanode.data.dir.perm",
       "displayName": "DataNode directories permission",
-      "description": "",
-      "defaultValue": "",
       "displayType": "int",
-      "isVisible": true,
       "category": "DataNode",
       "serviceName": "HDFS"
     },
@@ -116,10 +97,7 @@ module.exports =
       "id": "site property",
       "name": "dfs.replication",
       "displayName": "Block replication",
-      "description": "Default block replication.",
       "displayType": "int",
-      "defaultValue": "",
-      "isVisible": true,
       "category": "Advanced",
       "serviceName": "HDFS"
     },
@@ -127,11 +105,8 @@ module.exports =
       "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
@@ -140,8 +115,6 @@ module.exports =
       "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"
@@ -154,8 +127,6 @@ module.exports =
       "name": "yarn.acl.enable",
       "displayName": "yarn.acl.enable",
       "displayType": "checkbox",
-      "value": "",
-      "defaultValue": "",
       "serviceName": "YARN",
       "category": "ResourceManager"
     },
@@ -163,8 +134,6 @@ module.exports =
       "id": "site property",
       "name": "yarn.admin.acl",
       "displayName": "yarn.admin.acl",
-      "value": "",
-      "defaultValue": "",
       "serviceName": "YARN",
       "category": "ResourceManager"
     },
@@ -173,8 +142,6 @@ module.exports =
       "name": "yarn.log-aggregation-enable",
       "displayName": "yarn.log-aggregation-enable",
       "displayType": "checkbox",
-      "value": "",
-      "defaultValue": "",
       "serviceName": "YARN",
       "category": "ResourceManager"
     },
@@ -182,8 +149,6 @@ module.exports =
       "id": "site property",
       "name": "yarn.resourcemanager.scheduler.class",
       "displayName": "yarn.resourcemanager.scheduler.class",
-      "value": "",
-      "defaultValue": "",
       "serviceName": "YARN",
       "category": "CapacityScheduler"
     },
@@ -192,8 +157,6 @@ module.exports =
       "name": "yarn.scheduler.minimum-allocation-mb",
       "displayName": "yarn.scheduler.minimum-allocation-mb",
       "displayType": "int",
-      "value": "",
-      "defaultValue": "",
       "serviceName": "YARN",
       "category": "CapacityScheduler"
     },
@@ -202,8 +165,6 @@ module.exports =
       "name": "yarn.scheduler.maximum-allocation-mb",
       "displayName": "yarn.scheduler.maximum-allocation-mb",
       "displayType": "int",
-      "value": "",
-      "defaultValue": "",
       "serviceName": "YARN",
       "category": "CapacityScheduler"
     },
@@ -212,8 +173,6 @@ module.exports =
       "name": "yarn.nodemanager.resource.memory-mb",
       "displayName": "yarn.nodemanager.resource.memory-mb",
       "displayType": "int",
-      "value": "",
-      "defaultValue": "",
       "serviceName": "YARN",
       "category": "NodeManager"
     },
@@ -221,8 +180,6 @@ module.exports =
       "id": "site property",
       "name": "yarn.nodemanager.vmem-pmem-ratio",
       "displayName": "yarn.nodemanager.vmem-pmem-ratio",
-      "value": "",
-      "defaultValue": "",
       "serviceName": "YARN",
       "category": "NodeManager"
     },
@@ -230,8 +187,6 @@ module.exports =
       "id": "site property",
       "name": "yarn.nodemanager.linux-container-executor.group",
       "displayName": "yarn.nodemanager.linux-container-executor.group",
-      "value": "hadoop",
-      "defaultValue": "hadoop",
       "serviceName": "YARN",
       "category": "NodeManager"
     },
@@ -239,12 +194,6 @@ module.exports =
       "id": "site property",
       "name": "yarn.nodemanager.log-dirs",
       "displayName": "yarn.nodemanager.log-dirs",
-      "defaultValue": "",
-      "description": "Where to store container logs. An application's localized log directory\
-      will be found in ${yarn.nodemanager.log-dirs}/application_${appid}.\
-      Individual containers' log directories will be below this, in directories\
-      named container_{$contid}. Each container directory will contain the files\
-      stderr, stdin, and syslog generated by that container.",
       "defaultDirectory": "/hadoop/yarn/log",
       "displayType": "directories",
       "serviceName": "YARN",
@@ -254,11 +203,6 @@ module.exports =
       "id": "site property",
       "name": "yarn.nodemanager.local-dirs",
       "displayName": "yarn.nodemanager.local-dirs",
-      "defaultValue": "",
-      "description": "List of directories to store localized files in.\
-      An application's localized file directory will be found in:\
-      ${yarn.nodemanager.local-dirs}/usercache/${user}/appcache/application_${appid}.\
-      Individual containers' work directories, called container_${contid}, will be subdirectories of this.",
       "defaultDirectory": "/hadoop/yarn/local",
       "displayType": "directories",
       "serviceName": "YARN",
@@ -268,8 +212,6 @@ module.exports =
       "id": "site property",
       "name": "yarn.nodemanager.remote-app-log-dir",
       "displayName": "yarn.nodemanager.remote-app-log-dir",
-      "value": "",
-      "defaultValue": "",
       "displayType": "directory",
       "serviceName": "YARN",
       "category": "NodeManager"
@@ -278,8 +220,6 @@ module.exports =
       "id": "site property",
       "name": "yarn.nodemanager.remote-app-log-dir-suffix",
       "displayName": "yarn.nodemanager.remote-app-log-dir-suffix",
-      "value": "",
-      "defaultValue": "",
       "serviceName": "YARN",
       "category": "NodeManager"
     },
@@ -287,8 +227,6 @@ module.exports =
       "id": "site property",
       "name": "yarn.nodemanager.aux-services",
       "displayName": "yarn.nodemanager.aux-services",
-      "value": "",
-      "defaultValue": "",
       "serviceName": "YARN",
       "category": "NodeManager"
     },
@@ -296,8 +234,6 @@ module.exports =
       "id": "site property",
       "name": "yarn.nodemanager.log.retain-second",
       "displayName": "yarn.nodemanager.log.retain-second",
-      "value": "",
-      "defaultValue": "",
       "serviceName": "YARN",
       "category": "NodeManager"
     },
@@ -305,8 +241,6 @@ module.exports =
       "id": "site property",
       "name": "yarn.log.server.url",
       "displayName": "yarn.log.server.url",
-      "value": "",
-      "defaultValue": "",
       "category": "Advanced",
       "serviceName": "YARN"
     },
@@ -314,9 +248,6 @@ module.exports =
       "id": "site property",
       "name": "yarn.timeline-service.leveldb-timeline-store.path",
       "displayName": "yarn.timeline-service.leveldb-timeline-store.path",
-      "value": "",
-      "defaultValue": "/var/log/hadoop-yarn/timeline",
-      "isVisible": App.supports.appTimelineServer, // @todo remove after Application Timeline Server approving
       "category": "AppTimelineServer",
       "displayType": "directory",
       "serviceName": "YARN"
@@ -325,9 +256,6 @@ module.exports =
       "id": "site property",
       "name": "yarn.timeline-service.store-class",
       "displayName": "yarn.timeline-service.store-class",
-      "value": "",
-      "defaultValue": "org.apache.hadoop.yarn.server.applicationhistoryservice.timeline.LeveldbTimelineStore",
-      "isVisible": App.supports.appTimelineServer, // @todo remove after Application Timeline Server approving
       "category": "AppTimelineServer",
       "serviceName": "YARN"
     },
@@ -335,9 +263,6 @@ module.exports =
       "id": "site property",
       "name": "yarn.timeline-service.generic-application-history.store-class",
       "displayName": "yarn.timeline-service.generic-application-history.store-class",
-      "value": "",
-      "defaultValue": "org.apache.hadoop.yarn.server.applicationhistoryservice.NullApplicationHistoryStore",
-      "isVisible": App.supports.appTimelineServer, // @todo remove after Application Timeline Server approving
       "category": "AppTimelineServer",
       "serviceName": "YARN"
     },
@@ -345,10 +270,7 @@ module.exports =
       "id": "site property",
       "name": "yarn.timeline-service.webapp.address",
       "displayName": "yarn.timeline-service.webapp.address",
-      "value": "",
-      "defaultValue": "0.0.0.0:8188",
       "displayType": "string",
-      "isVisible": App.supports.appTimelineServer, // @todo remove after Application Timeline Server approving
       "category": "AppTimelineServer",
       "serviceName": "YARN"
     },
@@ -356,10 +278,7 @@ module.exports =
       "id": "site property",
       "name": "yarn.timeline-service.webapp.https.address",
       "displayName": "yarn.timeline-service.webapp.https.address",
-      "value": "",
-      "defaultValue": "0.0.0.0:8190",
       "displayType": "string",
-      "isVisible": App.supports.appTimelineServer, // @todo remove after Application Timeline Server approving
       "category": "AppTimelineServer",
       "serviceName": "YARN"
     },
@@ -367,10 +286,7 @@ module.exports =
       "id": "site property",
       "name": "yarn.timeline-service.address",
       "displayName": "yarn.timeline-service.address",
-      "value": "",
-      "defaultValue": "0.0.0.0:10200",
       "displayType": "string",
-      "isVisible": App.supports.appTimelineServer, // @todo remove after Application Timeline Server approving
       "category": "AppTimelineServer",
       "serviceName": "YARN"
     },
@@ -379,9 +295,6 @@ module.exports =
       "id": "site property",
       "name": "mapreduce.map.memory.mb",
       "displayName": "Default virtual memory for a job's map-task",
-      "description": "Virtual memory for single Map task",
-      "value": "",
-      "defaultValue": "",
       "displayType": "int",
       "unit": "MB",
       "category": "General",
@@ -391,9 +304,6 @@ module.exports =
       "id": "site property",
       "name": "mapreduce.reduce.memory.mb",
       "displayName": "Default virtual memory for a job's reduce-task",
-      "description": "Virtual memory for single Reduce task",
-      "value": "",
-      "defaultValue": "",
       "displayType": "int",
       "unit": "MB",
       "category": "General",
@@ -403,9 +313,6 @@ module.exports =
       "id": "site property",
       "name": "mapreduce.task.io.sort.mb",
       "displayName": "Map-side sort buffer memory",
-      "description": "The total amount of buffer memory to use while sorting files, in megabytes.\
-       By default, gives each merge stream 1MB, which should minimize seeks.",
-      "defaultValue": "",
       "displayType": "int",
       "unit": "MB",
       "category": "General",
@@ -417,16 +324,12 @@ module.exports =
       "displayName": "hadoop.security.auth_to_local",
       "displayType": "multiLine",
       "serviceName": "HDFS",
-      "category": "Advanced",
-      "value": "",
-      "defaultValue": ""
+      "category": "Advanced"
     },
     {
       "id": "site property",
       "name": "yarn.app.mapreduce.am.resource.mb",
       "displayName": "yarn.app.mapreduce.am.resource.mb",
-      "value": "",
-      "defaultValue": "",
       "displayType": "int",
       "category": "Advanced",
       "serviceName": "MAPREDUCE2"
@@ -437,11 +340,8 @@ module.exports =
       "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",
@@ -451,8 +351,6 @@ module.exports =
       "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",
@@ -463,11 +361,8 @@ module.exports =
       "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",
       "filename": "oozie-site.xml",
@@ -477,11 +372,8 @@ module.exports =
       "id": "site property",
       "name": "oozie.service.JPAService.jdbc.driver",
       "displayName": "JDBC Driver Class",
-      "defaultValue": "",
       "value": "",     // the value is overwritten in code
-      "isVisible": true,
       "isOverridable": false,
-      "description": "Database name used for the Oozie",
       "category": "Oozie Server",
       "serviceName": "OOZIE",
       "index": 6
@@ -490,8 +382,6 @@ module.exports =
       "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",
@@ -504,11 +394,8 @@ module.exports =
       "id": "site property",
       "name": "javax.jdo.option.ConnectionDriverName",
       "displayName": "JDBC Driver Class",
-      "defaultValue": "",
       "value": "",     // the value is overwritten in code
-      "isVisible": true,
       "isOverridable": false,
-      "description": "Driver class name for a JDBC metastore",
       "category": "Hive Metastore",
       "serviceName": "HIVE",
       "index": 7
@@ -517,8 +404,6 @@ module.exports =
       "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",
@@ -529,11 +414,8 @@ module.exports =
       "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
@@ -542,12 +424,8 @@ module.exports =
       "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": 8
@@ -556,9 +434,6 @@ module.exports =
       "id": "site property",
       "name": "ambari.hive.db.schema.name",
       "displayName": "Database Name",
-      "description": "Database name used as the Hive Metastore",
-      "defaultValue": "",
-      "isReconfigurable": true,
       "displayType": "host",
       "isOverridable": false,
       "isObserved": true,
@@ -572,11 +447,8 @@ module.exports =
       "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"
 
@@ -585,8 +457,6 @@ module.exports =
       "id": "site property",
       "name": "hbase.regionserver.global.memstore.upperLimit",
       "displayName": "hbase.regionserver.global.memstore.upperLimit",
-      "description": "",
-      "defaultValue": "",
       "displayType": "float",
       "category": "Advanced",
       "serviceName": "HBASE"
@@ -595,12 +465,6 @@ module.exports =
       "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"
@@ -609,11 +473,6 @@ module.exports =
       "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"
@@ -622,8 +481,6 @@ module.exports =
       "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",
@@ -633,8 +490,6 @@ module.exports =
       "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",
@@ -644,11 +499,8 @@ module.exports =
       "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
@@ -657,8 +509,6 @@ module.exports =
       "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",
@@ -668,11 +518,8 @@ module.exports =
       "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
@@ -681,8 +528,6 @@ module.exports =
       "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",
@@ -692,11 +537,6 @@ module.exports =
       "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"
@@ -705,8 +545,6 @@ module.exports =
       "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",
@@ -717,12 +555,8 @@ module.exports =
       "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
@@ -731,8 +565,6 @@ module.exports =
       "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",
@@ -743,8 +575,6 @@ module.exports =
       "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",
@@ -755,7 +585,6 @@ module.exports =
       "id": "site property",
       "name": "hbase.zookeeper.quorum",
       "displayName": "hbase.zookeeper.quorum",
-      "defaultValue": "",
       "displayType": "multiLine",
       "serviceName": "HBASE",
       "category": "Advanced"
@@ -766,12 +595,7 @@ module.exports =
       "id": "site property",
       "name": "storm.zookeeper.root",
       "displayName": "storm.zookeeper.root",
-      "description": "",
-      "defaultValue": "/storm",
-      "isReconfigurable": true,
       "displayType": "directory",
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "General"
     },
@@ -779,11 +603,6 @@ module.exports =
       "id": "site property",
       "name": "storm.local.dir",
       "displayName": "storm.local.dir",
-      "description": "",
-      "defaultValue": "storm-local",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "General"
     },
@@ -791,13 +610,9 @@ module.exports =
       "id": "site property",
       "name": "storm.zookeeper.servers",
       "displayName": "storm.zookeeper.servers",
-      "description": "",
-      "defaultValue": "",
       "displayType": "masterHosts",
       "isOverridable": false,
       "isReconfigurable": false,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "General"
     },
@@ -805,12 +620,7 @@ module.exports =
       "id": "site property",
       "name": "storm.zookeeper.port",
       "displayName": "storm.zookeeper.port",
-      "description": "",
-      "defaultValue": "",
-      "isReconfigurable": true,
       "displayType": "int",
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "General"
     },
@@ -818,12 +628,7 @@ module.exports =
       "id": "site property",
       "name": "storm.zookeeper.session.timeout",
       "displayName": "storm.zookeeper.session.timeout",
-      "description": "",
-      "defaultValue": "",
-      "isReconfigurable": true,
       "displayType": "int",
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "General"
     },
@@ -831,12 +636,7 @@ module.exports =
       "id": "site property",
       "name": "storm.zookeeper.connection.timeout",
       "displayName": "storm.zookeeper.connection.timeout",
-      "description": "",
-      "defaultValue": "",
-      "isReconfigurable": true,
       "displayType": "int",
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "General"
     },
@@ -844,12 +644,7 @@ module.exports =
       "id": "site property",
       "name": "storm.zookeeper.retry.times",
       "displayName": "storm.zookeeper.retry.times",
-      "description": "",
-      "defaultValue": "",
-      "isReconfigurable": true,
       "displayType": "int",
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "General"
     },
@@ -857,12 +652,7 @@ module.exports =
       "id": "site property",
       "name": "storm.zookeeper.retry.interval",
       "displayName": "storm.zookeeper.retry.interval",
-      "description": "",
-      "defaultValue": "",
-      "isReconfigurable": true,
       "displayType": "int",
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "General",
       "unit": "ms"
@@ -871,12 +661,7 @@ module.exports =
       "id": "site property",
       "name": "storm.zookeeper.retry.intervalceiling.millis",
       "displayName": "storm.zookeeper.retry.intervalceiling.millis",
-      "description": "",
-      "defaultValue": "",
-      "isReconfigurable": true,
       "displayType": "int",
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "General",
       "unit": "ms"
@@ -885,11 +670,6 @@ module.exports =
       "id": "site property",
       "name": "storm.cluster.mode",
       "displayName": "storm.cluster.mode",
-      "description": "",
-      "defaultValue": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "General"
     },
@@ -897,12 +677,7 @@ module.exports =
       "id": "site property",
       "name": "storm.local.mode.zmq",
       "displayName": "storm.local.mode.zmq",
-      "description": "",
-      "defaultValue": false,
-      "isReconfigurable": true,
       "displayType": "checkbox",
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "General"
     },
@@ -910,11 +685,6 @@ module.exports =
       "id": "site property",
       "name": "storm.thrift.transport",
       "displayName": "storm.thrift.transport",
-      "description": "",
-      "defaultValue": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "General"
     },
@@ -922,106 +692,65 @@ module.exports =
       "id": "site property",
       "name": "storm.messaging.transport",
       "displayName": "storm.messaging.transport",
-      "description": "",
-      "defaultValue": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "General"
     },
     {
       "id":"site property",
-      "description":"",
-      "isReconfigurable": true,
-      "isVisible":true,
-      "isRequiredByAgent":true,
       "serviceName":"STORM",
       "category":"General",
       "displayName":"storm.messaging.netty.buffer_size",
       "name":"storm.messaging.netty.buffer_size",
-      "defaultValue":"5242880",
       "displayType":"int",
       "unit": "bytes"
     },
     {
       "id":"site property",
-      "description":"",
-      "isReconfigurable": true,
-      "isVisible":true,
-      "isRequiredByAgent":true,
       "serviceName":"STORM",
       "category":"General",
       "displayName":"storm.messaging.netty.max_retries",
       "name":"storm.messaging.netty.max_retries",
-      "defaultValue":"30",
       "displayType":"int"
     },
     {
       "id":"site property",
-      "description":"",
-      "isReconfigurable": true,
-      "isVisible":true,
-      "isRequiredByAgent":true,
       "serviceName":"STORM",
       "category":"General",
       "displayName":"storm.messaging.netty.max_wait_ms",
       "name":"storm.messaging.netty.max_wait_ms",
-      "defaultValue":"1000",
       "displayType":"int",
       "unit": "ms"
     },
     {
       "id":"site property",
-      "description":"",
-      "isReconfigurable": true,
-      "isVisible":true,
-      "isRequiredByAgent":true,
       "serviceName":"STORM",
       "category":"General",
       "displayName":"storm.messaging.netty.min_wait_ms",
       "name":"storm.messaging.netty.min_wait_ms",
-      "defaultValue":"100",
       "displayType":"int",
       "unit": "ms"
     },
     {
       "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "General",
       "displayName": "storm.messaging.netty.server_worker_threads",
       "name": "storm.messaging.netty.server_worker_threads",
-      "defaultValue": "1",
       "displayType": "int"
     },
     {
       "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "General",
       "displayName": "storm.messaging.netty.client_worker_threads",
       "name": "storm.messaging.netty.client_worker_threads",
-      "defaultValue": "1",
       "displayType": "int"
     },
     {
       "id": "site property",
       "name": "nimbus.host",
-      "displayName": "Nimbus Host",
-      "description": "",
-      "defaultValue": "",
       "displayType": "masterHost",
       "isOverridable": false,
-      "isReconfigurable": false,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "Nimbus"
     },
@@ -1029,9 +758,6 @@ module.exports =
       "id": "site property",
       "name": "nimbus.thrift.port",
       "displayName": "nimbus.thrift.port",
-      "description": "",
-      "defaultValue": "6627",
-      "isReconfigurable": true,
       "displayType": "int",
       "isVisible": true,
       "isRequiredByAgent": true,
@@ -1042,12 +768,7 @@ module.exports =
       "id": "site property",
       "name": "nimbus.thrift.max_buffer_size",
       "displayName": "nimbus.thrift.max_buffer_size",
-      "description": "",
-      "defaultValue": "1048576",
-      "isReconfigurable": true,
       "displayType": "int",
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "Nimbus",
       "unit": "bytes"
@@ -1070,12 +791,7 @@ module.exports =
       "id": "site property",
       "name": "nimbus.task.timeout.secs",
       "displayName": "nimbus.task.timeout.secs",
-      "description": "",
-      "defaultValue": "",
       "displayType": "int",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "Nimbus",
       "unit": "seconds"
@@ -1084,12 +800,7 @@ module.exports =
       "id": "site property",
       "name": "nimbus.supervisor.timeout.secs",
       "displayName": "nimbus.supervisor.timeout.secs",
-      "description": "",
-      "defaultValue": "",
       "displayType": "int",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "Nimbus",
       "unit": "seconds"
@@ -1098,12 +809,7 @@ module.exports =
       "id": "site property",
       "name": "nimbus.monitor.freq.secs",
       "displayName": "nimbus.monitor.freq.secs",
-      "description": "",
-      "defaultValue": "",
       "displayType": "int",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "Nimbus",
       "unit": "seconds"
@@ -1112,12 +818,7 @@ module.exports =
       "id": "site property",
       "name": "nimbus.cleanup.inbox.freq.secs",
       "displayName": "nimbus.cleanup.inbox.freq.secs",
-      "description": "",
-      "defaultValue": "",
       "displayType": "int",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "Nimbus",
       "unit": "seconds"
@@ -1126,12 +827,7 @@ module.exports =
       "id": "site property",
       "name": "nimbus.inbox.jar.expiration.secs",
       "displayName": "nimbus.inbox.jar.expiration.secs",
-      "description": "",
-      "defaultValue": "",
       "displayType": "int",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "Nimbus",
       "unit": "seconds"
@@ -1140,12 +836,7 @@ module.exports =
       "id": "site property",
       "name": "nimbus.task.launch.secs",
       "displayName": "nimbus.task.launch.secs",
-      "description": "",
-      "defaultValue": "",
       "displayType": "int",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "Nimbus",
       "unit": "seconds"
@@ -1154,12 +845,8 @@ module.exports =
       "id": "site property",
       "name": "nimbus.reassign",
       "displayName": "nimbus.reassign",
-      "description": "",
-      "defaultValue": true,
       "displayType": "checkbox",
       "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "Nimbus"
     },
@@ -1167,12 +854,7 @@ module.exports =
       "id": "site property",
       "name": "nimbus.file.copy.expiration.secs",
       "displayName": "nimbus.file.copy.expiration.secs",
-      "description": "",
-      "defaultValue": "",
       "displayType": "int",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "Nimbus",
       "unit": "seconds"
@@ -1181,11 +863,6 @@ module.exports =
       "id": "site property",
       "name": "nimbus.topology.validator",
       "displayName": "nimbus.topology.validator",
-      "description": "",
-      "defaultValue": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "Nimbus"
     },
@@ -1193,22 +870,15 @@ module.exports =
       "id": "site property",
       "name": "supervisor.slots.ports",
       "displayName": "supervisor.slots.ports",
-      "description": "",
-      "defaultValue": "",
       "displayType": "string",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "Supervisor"
     },
     {
       "id":"site property",
       "description":"This parameter is used by the storm-deploy project to configure the jvm options for the supervisor daemon.",
-      "isReconfigurable": true,
       "isVisible":false,
       "isOverrideable": false,
-      "isRequiredByAgent":true,
       "serviceName":"STORM",
       "category":"Supervisor",
       "displayName":"supervisor.childopts",
@@ -1219,215 +889,135 @@ module.exports =
     },
     {
       "id":"site property",
-      "description":"",
-      "isReconfigurable": true,
-      "isVisible":true,
-      "isRequiredByAgent":true,
       "serviceName":"STORM",
       "category":"Supervisor",
       "displayName":"supervisor.worker.start.timeout.secs",
       "name":"supervisor.worker.start.timeout.secs",
-      "defaultValue":"120",
       "displayType":"int",
       "unit": "seconds"
     },
     {
       "id":"site property",
-      "description":"",
-      "isReconfigurable": true,
-      "isVisible":true,
-      "isRequiredByAgent":true,
       "serviceName":"STORM",
       "category":"Supervisor",
       "displayName":"supervisor.worker.timeout.secs",
       "name":"supervisor.worker.timeout.secs",
-      "defaultValue":"30",
       "displayType":"int",
       "unit": "seconds"
     },
     {
       "id":"site property",
-      "description":"",
-      "isReconfigurable": true,
-      "isVisible":true,
-      "isRequiredByAgent":true,
       "serviceName":"STORM",
       "category":"Supervisor",
       "displayName":"supervisor.monitor.frequency.secs",
       "name":"supervisor.monitor.frequency.secs",
-      "defaultValue":"3",
       "displayType":"int",
       "unit": "seconds"
     },
     {
       "id":"site property",
-      "description":"",
-      "isReconfigurable": true,
-      "isVisible":true,
-      "isRequiredByAgent":true,
       "serviceName":"STORM",
       "category":"Supervisor",
       "displayName":"supervisor.heartbeat.frequency.secs",
       "name":"supervisor.heartbeat.frequency.secs",
-      "defaultValue":"5",
       "displayType":"int",
       "unit": "seconds"
     },
     {
       "id":"site property",
-      "description":"",
-      "isReconfigurable":true,
-      "isVisible":true,
-      "isRequiredByAgent": true,
       "serviceName":"STORM",
       "category":"Supervisor",
       "displayName":"supervisor.enable",
       "name":"supervisor.enable",
-      "defaultValue":true,
       "displayType":"checkbox"
     },
     {
       "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "DRPCServer",
       "displayName": "drpc.port",
       "name": "drpc.port",
-      "defaultValue": "3772",
       "displayType": "int"
     },
     {
       "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "DRPCServer",
       "displayName": "drpc.worker.threads",
       "name": "drpc.worker.threads",
-      "defaultValue": "64",
       "displayType": "int"
     },
     {
       "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "DRPCServer",
       "displayName": "drpc.queue.size",
       "name": "drpc.queue.size",
-      "defaultValue": "128",
       "displayType": "int"
     },
     {
       "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "DRPCServer",
       "displayName": "drpc.invocations.port",
       "name": "drpc.invocations.port",
-      "defaultValue": "3773",
       "displayType": "int"
     },
     {
       "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "DRPCServer",
       "displayName": "drpc.request.timeout.secs",
       "name": "drpc.request.timeout.secs",
-      "defaultValue": "600",
       "displayType": "int",
       "unit": "seconds"
     },
     {
       "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "DRPCServer",
       "displayName": "drpc.childopts",
       "name": "drpc.childopts",
-      "defaultValue": "-Xmx768m",
       "displayType": "string"
     },
     {
       "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "StormUIServer",
       "displayName": "ui.port",
       "name": "ui.port",
-      "defaultValue": "8744",
       "displayType": "int"
     },
     {
       "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "StormUIServer",
       "displayName": "ui.childopts",
       "name": "ui.childopts",
-      "defaultValue": "-Xmx768m",
       "displayType": "string"
     },
     {
       "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "LogviewerServer",
       "displayName": "logviewer.port",
       "name": "logviewer.port",
-      "defaultValue": "8000",
       "displayType": "int"
     },
     {
       "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "LogviewerServer",
       "displayName": "logviewer.childopts",
       "name": "logviewer.childopts",
-      "defaultValue": "-Xmx128m",
       "displayType": "string"
     },
     {
       "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "LogviewerServer",
       "displayName": "logviewer.appender.name",
       "name": "logviewer.appender.name",
-      "defaultValue": "A1",
       "displayType": "string"
     },
     {
@@ -1436,7 +1026,6 @@ module.exports =
       "isReconfigurable": true,
       "isVisible": false,
       "isOverridable": false,
-      "isRequiredByAgent": true,
       "serviceName": "STORM",
       "category": "Advanced",
       "displayName": "worker.childopts",
@@ -1448,182 +1037,369 @@ module.exports =
   /*********************************************oozie-site for Falcon*****************************/
     {
       "id":"site property",
-      "description":"",
-      "isReconfigurable":true,
-      "isVisible":true,
-      "isRequiredByAgent": true,
-      "serviceName":"FALCON",
-      "category":"Falcon - Oozie integration",
-      "displayName":"Falcon proxyuser hosts",
-      "name":"oozie.service.ProxyUserService.proxyuser.falcon.hosts",
-      "defaultValue":"*",
-      "displayType":"advanced"
-    },
-    {
-      "id":"site property",
-      "description":"",
-      "isReconfigurable":true,
-      "isVisible":true,
-      "isRequiredByAgent": true,
-      "serviceName":"FALCON",
-      "category":"Falcon - Oozie integration",
-      "displayName":"Falcon proxyuser groups",
-      "name":"oozie.service.ProxyUserService.proxyuser.falcon.groups",
-      "defaultValue":"*",
-      "displayType":"advanced"
-    },
-    {
-      "id":"site property",
-      "description":"",
       "isReconfigurable":false,
-      "isVisible":true,
-      "isRequiredByAgent": true,
       "serviceName":"FALCON",
       "category":"Falcon - Oozie integration",
       "displayName":"oozie.service.ELService.ext.functions.coord-job-submit-instances",
       "name":"oozie.service.ELService.ext.functions.coord-job-submit-instances",
-      "defaultValue":"now=org.apache.oozie.extensions.OozieELExtensions#ph1_now_echo,"
-        + "today=org.apache.oozie.extensions.OozieELExtensions#ph1_today_echo,"
-        + "yesterday=org.apache.oozie.extensions.OozieELExtensions#ph1_yesterday_echo,"
-        + "currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_currentMonth_echo,"
-        + "lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_lastMonth_echo,"
-        + "currentYear=org.apache.oozie.extensions.OozieELExtensions#ph1_currentYear_echo,"
-        + "lastYear=org.apache.oozie.extensions.OozieELExtensions#ph1_lastYear_echo,"
-        + "formatTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_formatTime_echo,"
-        + "latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,"
-        + "future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo",
-      "displayType":"custom"
+      "displayType":"custom",
+      "filename": "oozie-site.xml"
     },
     {
       "id":"site property",
-      "description":"",
       "isReconfigurable":false,
-      "isVisible":true,
-      "isRequiredByAgent": true,
       "serviceName":"FALCON",
       "category":"Falcon - Oozie integration",
       "displayName":"oozie.service.ELService.ext.functions.coord-action-create-inst",
       "name":"oozie.service.ELService.ext.functions.coord-action-create-inst",
-      "defaultValue":"now=org.apache.oozie.extensions.OozieELExtensions#ph2_now_inst,"
-        + "today=org.apache.oozie.extensions.OozieELExtensions#ph2_today_inst,"
-        + "yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday_inst,"
-        + "currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth_inst,"
-        + "lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth_inst,"
-        + "currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear_inst,"
-        + "lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear_inst,"
-        + "latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,"
-        + "future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo,"
-        + "formatTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_formatTime,"
-        + "user=org.apache.oozie.coord.CoordELFunctions#coord_user",
-      "displayType":"custom"
+      "displayType":"custom",
+      "filename": "oozie-site.xml"
     },
     {
       "id":"site property",
-      "description":"",
       "isReconfigurable":false,
-      "isVisible":true,
-      "isRequiredByAgent": true,
       "serviceName":"FALCON",
       "category":"Falcon - Oozie integration",
       "displayName":"oozie.service.ELService.ext.functions.coord-action-create",
       "name": "oozie.service.ELService.ext.functions.coord-action-create",
-      "defaultValue":"now=org.apache.oozie.extensions.OozieELExtensions#ph2_now,"
-        + "today=org.apache.oozie.extensions.OozieELExtensions#ph2_today,"
-        + "yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday,"
-        + "currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth,"
-        + "lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth,"
-        + "currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear,"
-        + "lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear,"
-        + "latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,"
-        + "future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo,"
-        + "formatTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_formatTime,"
-        + "user=org.apache.oozie.coord.CoordELFunctions#coord_user,",
-      "displayType":"custom"
+      "displayType":"custom",
+      "filename": "oozie-site.xml"
     },
     {
       "id":"site property",
-      "description":"",
       "isReconfigurable":false,
-      "isVisible":true,
-      "isRequiredByAgent": true,
       "serviceName":"FALCON",
       "category":"Falcon - Oozie integration",
       "displayName":"oozie.service.ELService.ext.functions.coord-job-submit-data",
       "name":"oozie.service.ELService.ext.functions.coord-job-submit-data",
-      "defaultValue":"now=org.apache.oozie.extensions.OozieELExtensions#ph1_now_echo,"
-        + "today=org.apache.oozie.extensions.OozieELExtensions#ph1_today_echo,"
-        + "yesterday=org.apache.oozie.extensions.OozieELExtensions#ph1_yesterday_echo,"
-        + "currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_currentMonth_echo,"
-        + "lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_lastMonth_echo,"
-        + "currentYear=org.apache.oozie.extensions.OozieELExtensions#ph1_currentYear_echo,"
-        + "lastYear=org.apache.oozie.extensions.OozieELExtensions#ph1_lastYear_echo,"
-        + "dataIn=org.apache.oozie.extensions.OozieELExtensions#ph1_dataIn_echo,"
-        + "instanceTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_nominalTime_echo_wrap,"
-        + "formatTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_formatTime_echo,"
-        + "dateOffset=org.apache.oozie.coord.CoordELFunctions#ph1_coord_dateOffset_echo,"
-        + "user=org.apache.oozie.coord.CoordELFunctions#coord_user",
-      "displayType":"custom"
+      "displayType":"custom",
+      "filename": "oozie-site.xml"
     },
     {
       "id":"site property",
-      "description":"",
       "isReconfigurable":false,
-      "isVisible":true,
-      "isRequiredByAgent": true,
       "serviceName":"FALCON",
       "category":"Falcon - Oozie integration",
       "displayName":"oozie.service.ELService.ext.functions.coord-action-start",
       "name":"oozie.service.ELService.ext.functions.coord-action-start",
-      "defaultValue":"now=org.apache.oozie.extensions.OozieELExtensions#ph2_now,"
-        + "today=org.apache.oozie.extensions.OozieELExtensions#ph2_today,"
-        + "yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday,"
-        + "currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth,"
-        + "lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth,"
-        + "currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear,"
-        + "lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear,"
-        + "latest=org.apache.oozie.coord.CoordELFunctions#ph3_coord_latest,"
-        + "future=org.apache.oozie.coord.CoordELFunctions#ph3_coord_future,"
-        + "dataIn=org.apache.oozie.extensions.OozieELExtensions#ph3_dataIn,"
-        + "instanceTime=org.apache.oozie.coord.CoordELFunctions#ph3_coord_nominalTime,"
-        + "dateOffset=org.apache.oozie.coord.CoordELFunctions#ph3_coord_dateOffset,"
-        + "formatTime=org.apache.oozie.coord.CoordELFunctions#ph3_coord_formatTime,"
-        + "user=org.apache.oozie.coord.CoordELFunctions#coord_user",
-      "displayType":"custom"
+      "displayType":"custom",
+      "filename": "oozie-site.xml"
     },
     {
       "id":"site property",
-      "description":"",
       "isReconfigurable":false,
-      "isVisible":true,
-      "isRequiredByAgent": true,
       "serviceName":"FALCON",
       "category":"Falcon - Oozie integration",
       "displayName":"oozie.service.ELService.ext.functions.coord-sla-submit",
       "name":"oozie.service.ELService.ext.functions.coord-sla-submit",
-      "defaultValue":"instanceTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_nominalTime_echo_fixed,"
-        + "user=org.apache.oozie.coord.CoordELFunctions#coord_user",
-      "displayType":"custom"
+      "displayType":"custom",
+      "filename": "oozie-site.xml"
     },
     {
       "id":"site property",
-      "description":"",
       "isReconfigurable":false,
-      "isVisible":true,
-      "isRequiredByAgent": true,
       "serviceName":"FALCON",
       "category":"Falcon - Oozie integration",
       "displayName":"oozie.service.ELService.ext.functions.coord-sla-create",
       "name":"oozie.service.ELService.ext.functions.coord-sla-create",
-      "defaultValue":"instanceTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_nominalTime,"
-        + "user=org.apache.oozie.coord.CoordELFunctions#coord_user",
-      "displayType":"custom"
+      "displayType":"custom",
+      "filename": "oozie-site.xml"
+    },
+
+    // Runtime properties
+    {
+      "id":"site property",
+      "name":"*.domain",
+      "displayName":"*.domain",
+      "category":"FalconRuntimeSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-runtime.properties.xml"
+
+    },
+    {
+      "id":"site property",
+      "name":"*.log.cleanup.frequency.minutes.retention",
+      "displayName":"*.log.cleanup.frequency.minutes.retention",
+      "category":"FalconRuntimeSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-runtime.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.log.cleanup.frequency.hours.retention",
+      "displayName":"*.log.cleanup.frequency.hours.retention",
+      "category":"FalconRuntimeSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-runtime.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.log.cleanup.frequency.days.retention",
+      "displayName":"*.log.cleanup.frequency.days.retention",
+      "category":"FalconRuntimeSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-runtime.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.log.cleanup.frequency.months.retention",
+      "displayName":"*.log.cleanup.frequency.months.retention",
+      "category":"FalconRuntimeSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-runtime.properties.xml"
+    },
+
+    //  Startup properties
+
+    {
+      "id":"site property",
+      "name":"*.domain",
+      "displayName":"*.domain",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.workflow.engine.impl",
+      "displayName":"*.workflow.engine.impl",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.oozie.process.workflow.builder",
+      "displayName":"*.oozie.process.workflow.builder",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.oozie.feed.workflow.builder",
+      "displayName":"*.oozie.feed.workflow.builder",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.SchedulableEntityManager.impl",
+      "displayName":"*.SchedulableEntityManager.impl",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.ConfigSyncService.impl",
+      "displayName":"*.ConfigSyncService.impl",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.ProcessInstanceManager.impl",
+      "displayName":"*.ProcessInstanceManager.impl",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.catalog.service.impl",
+      "displayName":"*.catalog.service.impl",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.application.services",
+      "displayName":"*.application.services",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"prism.application.services",
+      "displayName":"prism.application.services",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.configstore.listeners",
+      "displayName":"*.configstore.listeners",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"prism.configstore.listeners",
+      "displayName":"prism.configstore.listeners",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.broker.impl.class",
+      "displayName":"*.broker.impl.class",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.shared.libs",
+      "displayName":"*.shared.libs",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.config.store.uri",
+      "displayName":"*.config.store.uri",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.system.lib.location",
+      "displayName":"*.system.lib.location",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"prism.system.lib.location",
+      "displayName":"prism.system.lib.location",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.retry.recorder.path",
+      "displayName":"*.retry.recorder.path",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.falcon.cleanup.service.frequency",
+      "displayName":"*.falcon.cleanup.service.frequency",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.broker.url",
+      "displayName":"*.broker.url",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.broker.ttlInMins",
+      "displayName":"*.broker.ttlInMins",
+      "displayType": "int",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.entity.topic",
+      "displayName":"*.entity.topic",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.max.retry.failure.count",
+      "displayName":"*.max.retry.failure.count",
+      "displayType": "int",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.internal.queue.size",
+      "displayName":"*.internal.queue.size",
+      "displayType": "int",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.falcon.authentication.type",
+      "displayName":"*.falcon.authentication.type",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.falcon.http.authentication.type",
+      "displayName":"*.falcon.http.authentication.type",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.falcon.http.authentication.token.validity",
+      "displayName":"*.falcon.http.authentication.token.validity",
+      "displayType": "int",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.falcon.http.authentication.signature.secret",
+      "displayName":"*.falcon.http.authentication.signature.secret",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.falcon.http.authentication.simple.anonymous.allowed",
+      "displayName":"*.falcon.http.authentication.simple.anonymous.allowed",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
+    },
+    {
+      "id":"site property",
+      "name":"*.falcon.http.authentication.kerberos.name.rules",
+      "displayName":"*.falcon.http.authentication.kerberos.name.rules",
+      "category":"FalconStartupSite",
+      "serviceName":"FALCON",
+      "filename": "falcon-startup.properties.xml"
     },
   /**********************************************webhcat-site***************************************/
     {
       "id": "site property",
       "name": "templeton.zookeeper.hosts",
       "displayName": "templeton.zookeeper.hosts",
-      "defaultValue": "",
       "displayType": "multiLine",
       "serviceName": "WEBHCAT",
       "category": "Advanced"
@@ -1637,9 +1413,7 @@ module.exports =
      "defaultValue": "",
      "description": "log4j properties",
      "displayType": "custom",
-     "isOverridable": true,
      "isRequired": false,
-     "isVisible": true,
      "serviceName": "HDFS",
      "filename": "hdfs-log4j.xml",
      "category": "AdvancedHDFSLog4j"
@@ -1652,9 +1426,7 @@ module.exports =
      "defaultValue": "",
      "description": "log4j properties",
      "displayType": "custom",
-     "isOverridable": true,
      "isRequired": false,
-     "isVisible": true,
      "serviceName": "MAPREDUCE2",
      "filename": "mapreduce2-log4j.xml",
      "category": "AdvancedMapredLog4j"
@@ -1667,9 +1439,7 @@ module.exports =
      "defaultValue": "",
      "description": "log4j properties",
      "displayType": "custom",
-     "isOverridable": true,
      "isRequired": false,
-     "isVisible": true,
      "serviceName": "YARN",
      "filename": "yarn-log4j.xml",
      "category": "AdvancedYARNLog4j"
@@ -1682,9 +1452,7 @@ module.exports =
      "defaultValue": "",
      "description": "log4j properties",
      "displayType": "custom",
-     "isOverridable": true,
      "isRequired": false,
-     "isVisible": true,
      "serviceName": "HBASE",
      "filename": "hbase-log4j.xml",
      "category": "AdvancedHbaseLog4j"
@@ -1697,9 +1465,7 @@ module.exports =
      "defaultValue": "",
      "description": "log4j properties",
      "displayType": "custom",
-     "isOverridable": true,
      "isRequired": false,
-     "isVisible": true,
      "serviceName": "HIVE",
      "filename": "hive-exec-log4j.xml",
      "category": "AdvancedHiveExecLog4j"
@@ -1712,9 +1478,7 @@ module.exports =
      "defaultValue": "",
      "description": "log4j properties",
      "displayType": "custom",
-     "isOverridable": true,
      "isRequired": false,
-     "isVisible": true,
      "serviceName": "HIVE",
      "filename": "hive-log4j.xml",
      "category": "AdvancedHiveLog4j"
@@ -1729,7 +1493,6 @@ module.exports =
      "displayType": "custom",
      "isOverridable": true,
      "isRequired": false,
-     "isVisible": true,
      "serviceName": "OOZIE",
      "filename": "oozie-log4j.xml",
      "category": "AdvancedOozieLog4j"
@@ -1744,7 +1507,6 @@ module.exports =
      "displayType": "custom",
      "isOverridable": true,
      "isRequired": false,
-     "isVisible": true,
      "serviceName": "ZOOKEEPER",
      "filename": "zookeeper-log4j.xml",
      "category": "AdvancedZooLog4j"
@@ -1757,9 +1519,7 @@ module.exports =
      "defaultValue": "",
      "description": "log4j properties",
      "displayType": "custom",
-     "isOverridable": true,
      "isRequired": false,
-     "isVisible": true,
      "serviceName": "PIG",
      "filename": "pig-log4j.xml",
      "category": "AdvancedPigLog4j"

http://git-wip-us.apache.org/repos/asf/ambari/blob/4635717a/ambari-web/app/data/service_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/service_configs.js b/ambari-web/app/data/service_configs.js
index f87fa44..fd832e6 100644
--- a/ambari-web/app/data/service_configs.js
+++ b/ambari-web/app/data/service_configs.js
@@ -226,6 +226,8 @@ module.exports = [
     configCategories: [
       App.ServiceConfigCategory.create({ name: 'Falcon', displayName : 'Falcon Server'}),
       App.ServiceConfigCategory.create({ name: 'Falcon - Oozie integration', displayName : 'Falcon - Oozie integration'}),
+      App.ServiceConfigCategory.create({ name: 'FalconStartupSite', displayName : 'Falcon startup.properties'}),
+      App.ServiceConfigCategory.create({ name: 'FalconRuntimeSite', displayName : 'Falcon runtime.properties'}),
       App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
       App.ServiceConfigCategory.create({ name: 'AdvancedFalconStartupSite', displayName : 'Custom startup.properties', siteFileName: 'falcon-startup.properties.xml', canAddProperty: true}),
       App.ServiceConfigCategory.create({ name: 'AdvancedFalconRuntimeSite', displayName : 'Custom runtime.properties', siteFileName: 'falcon-runtime.properties.xml', canAddProperty: true})

http://git-wip-us.apache.org/repos/asf/ambari/blob/4635717a/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 0f372f6..153305c 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -205,7 +205,6 @@ App.config = Em.Object.create({
     } else {
       config.category = config.category ? config.category : 'Advanced';
       config.description = isAdvanced && advancedConfigs.findProperty('name', config.name).description;
-      config.filename = isAdvanced && advancedConfigs.findProperty('name', config.name).filename;
       config.isRequired = true;
     }
   },
@@ -244,6 +243,7 @@ App.config = Em.Object.create({
     var selectedServiceNames = App.Service.find().mapProperty('serviceName');
     tags.forEach(function (_tag) {
       var isAdvanced = null;
+      var filename = (filenameExceptions.contains(_tag.siteName)) ? _tag.siteName : _tag.siteName + ".xml";
       var properties = configGroups.filter(function (serviceConfigProperties) {
         return _tag.tagName === serviceConfigProperties.tag && _tag.siteName === serviceConfigProperties.type;
       });
@@ -251,24 +251,29 @@ App.config = Em.Object.create({
       properties = (properties.length) ? properties.objectAt(0).properties : {};
       for (var index in properties) {
         var configsPropertyDef =  null;
-        var preDefinedConfig;
+        var preDefinedConfig = [];
         if (_tag.siteName === 'global') {
         // Unlike other site where one site maps to ones service, global site contains configurations for multiple services
         // So Global Configuration should not be filtered out with serviceName.
           preDefinedConfig = preDefinedConfigs.filterProperty('name', index);
+          preDefinedConfig.forEach(function(_preDefinedConfig){
+            var isServiceInstalled = selectedServiceNames.contains(_preDefinedConfig.serviceName);
+              if ( isServiceInstalled || _preDefinedConfig.serviceName === 'MISC') {
+                configsPropertyDef = _preDefinedConfig;
+              }
+          },this);
         } else {
-          preDefinedConfig = preDefinedConfigs.filterProperty('serviceName',serviceName).filterProperty('name', index);
-        }
-        preDefinedConfig.forEach(function(_preDefinedConfig){
-          if (selectedServiceNames.contains(_preDefinedConfig.serviceName) || _preDefinedConfig.serviceName === 'MISC') {
-            configsPropertyDef = _preDefinedConfig;
+          configsPropertyDef = preDefinedConfigs.filterProperty('name',index).findProperty('filename',filename);
+          if (!configsPropertyDef) {
+            configsPropertyDef = preDefinedConfigs.filterProperty('name',index).findProperty('serviceName', serviceName);
           }
-        },this);
+        }
+
         var serviceConfigObj = App.ServiceConfig.create({
           name: index,
           value: properties[index],
           defaultValue: properties[index],
-          filename: (filenameExceptions.contains(_tag.siteName)) ? _tag.siteName : _tag.siteName + ".xml",
+          filename: filename,
           isUserProperty: false,
           isOverridable: true,
           serviceName: serviceName,
@@ -423,10 +428,10 @@ App.config = Em.Object.create({
       }, this);
 
       var configData = {};
+      var isAdvanced = advancedConfigs.someProperty('name', name);
       if (storedCfgs.length <= 1 && preDefinedCfgs.length <= 1) {
         var stored = storedCfgs[0];
         var preDefined = preDefinedCfgs[0];
-        var isAdvanced = advancedConfigs.someProperty('name', name);
         if (preDefined && stored) {
           configData = preDefined;
           configData.value = stored.value;
@@ -458,13 +463,7 @@ App.config = Em.Object.create({
           configData.isRequiredByAgent = (configData.isRequiredByAgent !== undefined) ? configData.isRequiredByAgent : true;
           if (isAdvanced) {
             var advanced = advancedConfigs.findProperty('name', configData.name);
-            // Password fields should be made blank by default in installer wizard
-            // irrespective of whatever value is sent from stack definition.
-            // This forces the user to fill the password field.
-            configData.value = configData.displayType == "password" ? '' : advanced.value;
-            configData.defaultValue = configData.value;
-            configData.filename = advanced.filename;
-            configData.description = advanced.description;
+            this.setPropertyFromStack(configData,advanced);
           }
         }
         if (configData.displayType === 'checkbox') {
@@ -475,6 +474,7 @@ App.config = Em.Object.create({
       } else {
         preDefinedCfgs.forEach(function (cfg) {
           configData = cfg;
+          configData.isRequiredByAgent = (configData.isRequiredByAgent !== undefined) ? configData.isRequiredByAgent : true;
           var storedCfg = storedCfgs.findProperty('filename', cfg.filename);
           if (storedCfg) {
             configData.value = storedCfg.value;
@@ -482,7 +482,9 @@ App.config = Em.Object.create({
             configData.overrides = storedCfg.overrides;
             configData.filename = storedCfg.filename;
             configData.description = storedCfg.description;
-            configData.isRequiredByAgent = (configData.isRequiredByAgent !== undefined) ? configData.isRequiredByAgent : true;
+          } else if (isAdvanced){
+              advanced = advancedConfigs.filterProperty('filename', configData.filename).findProperty('name', configData.name);
+              this.setPropertyFromStack(configData,advanced);
           }
           mergedConfigs.push(configData);
         }, this);
@@ -490,6 +492,24 @@ App.config = Em.Object.create({
     }, this);
     return mergedConfigs;
   },
+
+  /**
+   *
+   * @param configData {Object} Configs that will be binded to the view on step-7 of installer wizard
+   * @param advanced {Object} Config property loaded from Server side stack definition
+   */
+  setPropertyFromStack: function(configData,advanced) {
+
+    // Password fields should be made blank by default in installer wizard
+    // irrespective of whatever value is sent from stack definition.
+    // This forces the user to fill the password field.
+    configData.value = configData.displayType == "password" ? '' : advanced.value;
+    configData.defaultValue = configData.value;
+    configData.filename = advanced.filename;
+    configData.description = advanced.description;
+  },
+
+
   /**
    * look over advanced configs and add missing configs to serviceConfigs
    * filter fetched configs by service if passed
@@ -995,7 +1015,7 @@ App.config = Em.Object.create({
   addLog4jConfig: function (configs, serviceName) {
     var fileName = serviceName.toLowerCase() + '-log4j.xml';
     var content = configs.filterProperty('serviceName', serviceName).findProperty('name', 'content');
-    if (!content || !content.value.length) {
+    if (!content || (!content.value.length)) {
       var category = categotyConfigs.findProperty('serviceName', serviceName) && categotyConfigs.findProperty('serviceName', serviceName).configCategories.findProperty('siteFileName', fileName);
       if (category) {
         if (serviceName == 'HIVE') {