You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/10/21 08:24:38 UTC
[2/3] ambari git commit: AMBARI-13485 Move all 'displayType' values
to stack. (ababiichuk)
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
index 236c4e8..634adee 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
@@ -48,6 +48,7 @@ limitations under the License.
org.apache.hadoop.hive.ql.lockmgr.zookeeper.ZooKeeperHiveLockManager,
2. When HiveServer2 supports service discovery via Zookeeper.</description>
<value-attributes>
+ <type>multiLine</type>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
</property>
@@ -124,6 +125,9 @@ limitations under the License.
when it is brought up. JDBC/ODBC clients should use the ZooKeeper ensemble: hive.zookeeper.quorum
in their connection string.
</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -1090,6 +1094,7 @@ limitations under the License.
</description>
<value-attributes>
<overridable>false</overridable>
+ <type>int</type>
</value-attributes>
</property>
<property>
@@ -1388,6 +1393,9 @@ limitations under the License.
<value>1024</value>
<deleted>true</deleted>
<description>Hive Java heap size</description>
+ <value-attributes>
+ <type>int</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
index 9e98b57..3eb3c0f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
@@ -61,6 +61,9 @@
<value>true</value>
<display-name>Audit to DB</display-name>
<description></description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -68,6 +71,9 @@
<value>false</value>
<display-name>Audit to HDFS</display-name>
<description></description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -167,6 +173,9 @@
<value>true</value>
<display-name>Should Hive GRANT/REVOKE update XA policies</display-name>
<description></description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml
index d698165..e2ff6fe 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml
@@ -48,6 +48,7 @@
</property>
</depends-on>
<value-attributes>
+ <type>boolean</type>
<overridable>false</overridable>
</value-attributes>
</property>
@@ -71,6 +72,9 @@
<value>true</value>
<display-name>Audit to DB</display-name>
<description></description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -78,6 +82,9 @@
<value>false</value>
<display-name>Audit to HDFS</display-name>
<description></description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml
index 884b3f1..00a1391 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml
@@ -60,6 +60,9 @@
<name>worker.childopts</name>
<value>-Xmx768m _JAAS_PLACEHOLDER -javaagent:/usr/hdp/current/storm-client/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8650,wireformat31x=true,mode=multicast,config=/usr/hdp/current/storm-client/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM</value>
<description>The jvm opts provided to workers launched by this supervisor. All \"%ID%\" substrings are replaced with an identifier for this worker.</description>
+ <value-attributes>
+ <type>multiLine</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml
index 72873b7..33920d6 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml
@@ -58,6 +58,9 @@
<description>The amount of memory to be used by the AppMaster.
Used only if the value is not specified explicitly by the DAG definition.
</description>
+ <value-attributes>
+ <type>int</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
index c69fd39..e75442f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
@@ -32,6 +32,9 @@
<description>
Is the registry enabled: does the RM start it up, create the user and system paths, and purge service records when containers, application attempts and applications complete
</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
<name>hadoop.registry.zk.quorum</name>
@@ -276,6 +279,9 @@
<description>
Enable age off of timeline store data.
</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -294,12 +300,18 @@
<name>yarn.timeline-service.leveldb-state-store.path</name>
<value>/hadoop/yarn/timeline</value>
<description>Store file name for leveldb state store.</description>
+ <value-attributes>
+ <type>directory</type>
+ </value-attributes>
</property>
<property>
<name>yarn.timeline-service.leveldb-timeline-store.path</name>
<value>/hadoop/yarn/timeline</value>
<description>Store file name for leveldb timeline store.</description>
+ <value-attributes>
+ <type>directory</type>
+ </value-attributes>
</property>
<property>
<name>yarn.timeline-service.leveldb-timeline-store.read-cache-size</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml
index 32ad416..45d7f8c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml
@@ -27,6 +27,7 @@
<description>The port the HBase Master should bind to.</description>
<value-attributes>
<overridable>false</overridable>
+ <type>int</type>
</value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml
index ec5aa29..989dee5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml
@@ -167,6 +167,7 @@ fi
<value>1024</value>
<description>Maximum Java heap size for NFSGateway (Java option -Xmx)</description>
<value-attributes>
+ <type>int</type>
<unit>MB</unit>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hdfs-site.xml
index fbce6e8..df2f3fe 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hdfs-site.xml
@@ -32,6 +32,9 @@
they are accumulated to exceed certain threshold (e.g., 1MB) in memory.
One needs to make sure the directory has enough space.
</description>
+ <value-attributes>
+ <type>directory</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml
index f29f611..8b96763 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml
@@ -62,6 +62,7 @@
</property>
</depends-on>
<value-attributes>
+ <type>boolean</type>
<overridable>false</overridable>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
index aea5857..6866043 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
@@ -400,6 +400,7 @@
<value>5151</value>
<description>Port for unix authentication service - only used if Authentication method is UNIX</description>
<value-attributes>
+ <type>int</type>
<overridable>false</overridable>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml
index 2227f53..ca6d2b6 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml
@@ -24,6 +24,7 @@
<value>localhost</value>
<description>Comma-delimited list of the hosts running nimbus server.</description>
<value-attributes>
+ <type>componentHosts</type>
<editable-only-at-install>true</editable-only-at-install>
<overridable>false</overridable>
</value-attributes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml
index c7723f6..439db46 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml
@@ -56,6 +56,7 @@
</property>
</depends-on>
<value-attributes>
+ <type>boolean</type>
<overridable>false</overridable>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/ambari-web/app/data/HDP2.2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.2/site_properties.js b/ambari-web/app/data/HDP2.2/site_properties.js
index 55d398f..f682989 100644
--- a/ambari-web/app/data/HDP2.2/site_properties.js
+++ b/ambari-web/app/data/HDP2.2/site_properties.js
@@ -44,21 +44,8 @@ var hdp22properties = hdp2properties.filter(function (item) {
hdp22properties.push(
{
- "name": "hive.zookeeper.quorum",
- "displayType": "multiLine",
- "serviceName": "HIVE",
- "filename": "hive-site.xml"
- },
- {
- "name": "hadoop.registry.rm.enabled",
- "displayType": "checkbox",
- "serviceName": "YARN",
- "filename": "yarn-site.xml"
- },
- {
"name": "yarn.timeline-service.leveldb-state-store.path",
"category": "APP_TIMELINE_SERVER",
- "displayType": "directory",
"serviceName": "YARN",
"filename": "yarn-site.xml"
},
@@ -83,20 +70,12 @@ hdp22properties.push(
/*********RANGER FOR HDFS************/
{
"name": "XAAUDIT.HDFS.IS_ENABLED",
- "displayType": "checkbox",
"dependentConfigPattern": "^XAAUDIT.HDFS",
"filename": "ranger-hdfs-plugin-properties.xml",
"serviceName": "HDFS"
},
{
- "name": "XAAUDIT.DB.IS_ENABLED",
- "displayType": "checkbox",
- "filename": "ranger-hdfs-plugin-properties.xml",
- "serviceName": "HDFS"
- },
- {
"name": "ranger-hdfs-plugin-enabled",
- "displayType": "checkbox",
"filename": "ranger-hdfs-plugin-properties.xml",
"serviceName": "HDFS",
"index": 1
@@ -104,67 +83,32 @@ hdp22properties.push(
/*********RANGER FOR HIVE************/
{
"name": "XAAUDIT.HDFS.IS_ENABLED",
- "displayType": "checkbox",
"dependentConfigPattern": "^XAAUDIT.HDFS",
"filename": "ranger-hive-plugin-properties.xml",
"serviceName": "HIVE"
},
- {
- "name": "XAAUDIT.DB.IS_ENABLED",
- "displayType": "checkbox",
- "filename": "ranger-hive-plugin-properties.xml",
- "serviceName": "HIVE"
- },
- {
- "name": "UPDATE_XAPOLICIES_ON_GRANT_REVOKE",
- "displayType": "checkbox",
- "filename": "ranger-hive-plugin-properties.xml",
- "serviceName": "HIVE"
- },
/*********RANGER FOR HBASE************/
{
"name": "XAAUDIT.HDFS.IS_ENABLED",
- "displayType": "checkbox",
"dependentConfigPattern": "^XAAUDIT.HDFS",
"filename": "ranger-hbase-plugin-properties.xml",
"serviceName": "HBASE"
},
{
- "name": "XAAUDIT.DB.IS_ENABLED",
- "displayType": "checkbox",
- "filename": "ranger-hbase-plugin-properties.xml",
- "serviceName": "HBASE"
- },
- {
"name": "ranger-hbase-plugin-enabled",
- "displayType": "checkbox",
"filename": "ranger-hbase-plugin-properties.xml",
"serviceName": "HBASE",
"index": 1
},
- {
- "name": "UPDATE_XAPOLICIES_ON_GRANT_REVOKE",
- "displayType": "checkbox",
- "filename": "ranger-hbase-plugin-properties.xml",
- "serviceName": "HBASE"
- },
/*********RANGER FOR STORM************/
{
"name": "XAAUDIT.HDFS.IS_ENABLED",
- "displayType": "checkbox",
"dependentConfigPattern": "^XAAUDIT.HDFS",
"filename": "ranger-storm-plugin-properties.xml",
"serviceName": "STORM"
},
{
- "name": "XAAUDIT.DB.IS_ENABLED",
- "displayType": "checkbox",
- "filename": "ranger-storm-plugin-properties.xml",
- "serviceName": "STORM"
- },
- {
"name": "ranger-storm-plugin-enabled",
- "displayType": "checkbox",
"filename": "ranger-storm-plugin-properties.xml",
"serviceName": "STORM",
"index": 1
@@ -172,20 +116,12 @@ hdp22properties.push(
/*********RANGER FOR KNOX************/
{
"name": "XAAUDIT.HDFS.IS_ENABLED",
- "displayType": "checkbox",
"dependentConfigPattern": "^XAAUDIT.HDFS",
"filename": "ranger-knox-plugin-properties.xml",
"serviceName": "KNOX"
},
{
- "name": "XAAUDIT.DB.IS_ENABLED",
- "displayType": "checkbox",
- "filename": "ranger-knox-plugin-properties.xml",
- "serviceName": "KNOX"
- },
- {
"name": "ranger-knox-plugin-enabled",
- "displayType": "checkbox",
"filename": "ranger-knox-plugin-properties.xml",
"serviceName": "KNOX",
"index": 1
@@ -314,7 +250,6 @@ hdp22properties.push(
},
{
"name": "policymgr_http_enabled",
- "displayType": "checkbox",
"serviceName": "RANGER",
"filename": "admin-properties.xml",
"category": "RangerSettings"
@@ -358,7 +293,6 @@ hdp22properties.push(
},
{
"name": "remoteLoginEnabled",
- "displayType": "checkbox",
"serviceName": "RANGER",
"filename": "admin-properties.xml",
"category": "UnixAuthenticationSettings"
@@ -371,7 +305,6 @@ hdp22properties.push(
},
{
"name": "authServicePort",
- "displayType": "int",
"serviceName": "RANGER",
"filename": "admin-properties.xml",
"category": "UnixAuthenticationSettings"
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/ambari-web/app/data/HDP2.3/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.3/site_properties.js b/ambari-web/app/data/HDP2.3/site_properties.js
index 3201301..b05170a 100644
--- a/ambari-web/app/data/HDP2.3/site_properties.js
+++ b/ambari-web/app/data/HDP2.3/site_properties.js
@@ -72,21 +72,18 @@ hdp23properties.push({
/**************************************** RANGER - HDFS Plugin ***************************************/
"name": "ranger-yarn-plugin-enabled",
- "displayType": "checkbox",
"filename": "ranger-yarn-plugin-properties.xml",
"serviceName": "YARN",
"index": 1
},
{
"name": "ranger-kafka-plugin-enabled",
- "displayType": "checkbox",
"filename": "ranger-kafka-plugin-properties.xml",
"serviceName": "KAFKA",
"index": 1
},
{
"name": "nimbus.seeds",
- "displayType": "componentHosts",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "NIMBUS"
@@ -136,7 +133,6 @@ hdp23properties.push({
},
{
"name": "ranger.unixauth.remote.login.enabled",
- "displayType": "checkbox",
"serviceName": "RANGER",
"filename": "ranger-admin-site.xml",
"category": "UnixAuthenticationSettings"
@@ -149,7 +145,6 @@ hdp23properties.push({
},
{
"name": "ranger.unixauth.service.port",
- "displayType": "int",
"serviceName": "RANGER",
"filename": "ranger-admin-site.xml",
"category": "UnixAuthenticationSettings"
@@ -247,7 +242,7 @@ hdp23properties.push({
/*********************************************** HAWQ **********************************************/
{
"name": "hawq_master_address_host",
- "displayType": "masterHost",
+ "displayType": "componentHost",
"filename": "hawq-site.xml",
"category": "General",
"serviceName": "HAWQ",
@@ -255,7 +250,7 @@ hdp23properties.push({
},
{
"name": "hawq_standby_address_host",
- "displayType": "masterHost",
+ "displayType": "componentHost",
"filename": "hawq-site.xml",
"category": "General",
"serviceName": "HAWQ",
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/ambari-web/app/data/HDP2/gluster_fs_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/gluster_fs_properties.js b/ambari-web/app/data/HDP2/gluster_fs_properties.js
new file mode 100644
index 0000000..5cec5f1
--- /dev/null
+++ b/ambari-web/app/data/HDP2/gluster_fs_properties.js
@@ -0,0 +1,94 @@
+/**
+ * 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 = [
+/**********************************************GLUSTERFS***************************************/
+ {
+ "name": "fs.glusterfs.impl",
+ "filename": "core-site.xml",
+ "serviceName": "GLUSTERFS",
+ "category": "General"
+ },
+ {
+ "name": "fs.AbstractFileSystem.glusterfs.impl",
+ "filename": "core-site.xml",
+ "serviceName": "GLUSTERFS",
+ "category": "General"
+ },
+ {
+ "name": "hadoop_heapsize",
+ "serviceName": "GLUSTERFS",
+ "filename": "hadoop-env.xml",
+ "category": "General Hadoop",
+ "index": 1
+ },
+ {
+ "name": "hdfs_log_dir_prefix",
+ "serviceName": "GLUSTERFS",
+ "filename": "hadoop-env.xml",
+ "category": "General Hadoop"
+ },
+ {
+ "name": "hadoop_pid_dir_prefix",
+ "serviceName": "GLUSTERFS",
+ "filename": "hadoop-env.xml",
+ "category": "General Hadoop"
+ },
+ {
+ "name": "namenode_heapsize",
+ "serviceName": "GLUSTERFS",
+ "filename": "hadoop-env.xml",
+ "category": "General Hadoop"
+ },
+ {
+ "name": "namenode_opt_newsize",
+ "serviceName": "GLUSTERFS",
+ "filename": "hadoop-env.xml",
+ "category": "General Hadoop"
+ },
+ {
+ "name": "namenode_opt_maxnewsize",
+ "serviceName": "GLUSTERFS",
+ "filename": "hadoop-env.xml",
+ "category": "General Hadoop"
+ },
+ {
+ "name": "namenode_opt_permsize",
+ "serviceName": "GLUSTERFS",
+ "filename": "hadoop-env.xml",
+ "category": "General Hadoop"
+ },
+ {
+ "name": "namenode_opt_maxpermsize",
+ "serviceName": "GLUSTERFS",
+ "filename": "hadoop-env.xml",
+ "category": "General Hadoop"
+ },
+ {
+ "name": "dtnode_heapsize",
+ "serviceName": "GLUSTERFS",
+ "filename": "hadoop-env.xml",
+ "category": "General Hadoop"
+ },
+ {
+ "name": "glusterfs_user",
+ "serviceName": "GLUSTERFS",
+ "filename": "hadoop-env.xml",
+ "category": "General Hadoop"
+ }
+];
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/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 66fda2a..7dfdbff 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -23,7 +23,6 @@ var hdp2properties = [
/**********************************************HDFS***************************************/
{
"name": "dfs.namenode.checkpoint.dir",
- "displayType": "directories",
"serviceName": "HDFS",
"filename": "hdfs-site.xml",
"category": "SECONDARY_NAMENODE",
@@ -31,7 +30,6 @@ var hdp2properties = [
},
{
"name": "dfs.namenode.checkpoint.period",
- "displayType": "int",
"category": "General",
"serviceName": "HDFS",
"filename": "hdfs-site.xml",
@@ -39,7 +37,6 @@ var hdp2properties = [
},
{
"name": "dfs.namenode.name.dir",
- "displayType": "directories",
"serviceName": "HDFS",
"filename": "hdfs-site.xml",
"category": "NAMENODE",
@@ -47,7 +44,6 @@ var hdp2properties = [
},
{
"name": "dfs.webhdfs.enabled",
- "displayType": "checkbox",
"category": "General",
"serviceName": "HDFS",
"filename": "hdfs-site.xml",
@@ -62,7 +58,6 @@ var hdp2properties = [
},
{
"name": "dfs.datanode.data.dir",
- "displayType": "directories",
"category": "DATANODE",
"serviceName": "HDFS",
"filename": "hdfs-site.xml",
@@ -70,14 +65,12 @@ var hdp2properties = [
},
{
"name": "dfs.datanode.data.dir.perm",
- "displayType": "int",
"category": "DATANODE",
"serviceName": "HDFS",
"filename": "hdfs-site.xml"
},
{
"name": "nfs.file.dump.dir",
- "displayType": "directory",
"category": "NFS_GATEWAY",
"serviceName": "HDFS",
"filename": "hdfs-site.xml",
@@ -85,7 +78,6 @@ var hdp2properties = [
},
{
"name": "dfs.namenode.accesstime.precision",
- "displayType": "long",
"category": "General",
"serviceName": "HDFS",
"filename": "hdfs-site.xml",
@@ -100,28 +92,19 @@ var hdp2properties = [
},
{
"name": "dfs.replication",
- "displayType": "int",
"category": "General",
"serviceName": "HDFS",
"filename": "hdfs-site.xml"
},
{
"name": "dfs.datanode.du.reserved",
- "displayType": "int",
"category": "General",
"serviceName": "HDFS",
"filename": "hdfs-site.xml",
"index": 2
},
{
- "name": "dfs.client.read.shortcircuit",
- "displayType": "checkbox",
- "serviceName": "HDFS",
- "filename": "hdfs-site.xml"
- },
- {
"name": "namenode_heapsize",
- "displayType": "int",
"serviceName": "HDFS",
"filename": "hadoop-env.xml",
"category": "NAMENODE",
@@ -129,7 +112,6 @@ var hdp2properties = [
},
{
"name": "namenode_opt_newsize",
- "displayType": "int",
"serviceName": "HDFS",
"filename": "hadoop-env.xml",
"category": "NAMENODE",
@@ -137,7 +119,6 @@ var hdp2properties = [
},
{
"name": "namenode_opt_permsize",
- "displayType": "int",
"serviceName": "HDFS",
"filename": "hadoop-env.xml",
"category": "NAMENODE",
@@ -145,7 +126,6 @@ var hdp2properties = [
},
{
"name": "namenode_opt_maxpermsize",
- "displayType": "int",
"serviceName": "HDFS",
"filename": "hadoop-env.xml",
"category": "NAMENODE",
@@ -153,7 +133,6 @@ var hdp2properties = [
},
{
"name": "namenode_opt_maxnewsize",
- "displayType": "int",
"serviceName": "HDFS",
"filename": "hadoop-env.xml",
"category": "NAMENODE",
@@ -161,7 +140,6 @@ var hdp2properties = [
},
{
"name": "dtnode_heapsize",
- "displayType": "int",
"serviceName": "HDFS",
"filename": "hadoop-env.xml",
"category": "DATANODE",
@@ -169,7 +147,6 @@ var hdp2properties = [
},
{
"name": "nfsgateway_heapsize",
- "displayType": "int",
"serviceName": "HDFS",
"filename": "hadoop-env.xml",
"category": "NFS_GATEWAY",
@@ -177,29 +154,15 @@ var hdp2properties = [
},
{
"name": "hadoop_heapsize",
- "displayType": "int",
"serviceName": "HDFS",
"filename": "hadoop-env.xml",
"category": "General",
"index": 1
},
- {
- "name": "hdfs_log_dir_prefix",
- "displayType": "directory",
- "serviceName": "HDFS",
- "filename": "hadoop-env.xml"
- },
- {
- "name": "hadoop_pid_dir_prefix",
- "displayType": "directory",
- "serviceName": "HDFS",
- "filename": "hadoop-env.xml"
- },
/**********************************************YARN***************************************/
{
"name": "yarn.acl.enable",
- "displayType": "checkbox",
"serviceName": "YARN",
"filename": "yarn-site.xml",
"category": "RESOURCEMANAGER"
@@ -212,7 +175,6 @@ var hdp2properties = [
},
{
"name": "yarn.log-aggregation-enable",
- "displayType": "checkbox",
"serviceName": "YARN",
"filename": "yarn-site.xml",
"category": "RESOURCEMANAGER"
@@ -225,21 +187,18 @@ var hdp2properties = [
},
{
"name": "yarn.scheduler.minimum-allocation-mb",
- "displayType": "int",
"serviceName": "YARN",
"filename": "yarn-site.xml",
"category": "CapacityScheduler"
},
{
"name": "yarn.scheduler.maximum-allocation-mb",
- "displayType": "int",
"serviceName": "YARN",
"filename": "yarn-site.xml",
"category": "CapacityScheduler"
},
{
"name": "yarn.nodemanager.resource.memory-mb",
- "displayType": "int",
"serviceName": "YARN",
"filename": "yarn-site.xml",
"category": "NODEMANAGER"
@@ -258,14 +217,12 @@ var hdp2properties = [
},
{
"name": "yarn.nodemanager.log-dirs",
- "displayType": "directories",
"serviceName": "YARN",
"filename": "yarn-site.xml",
"category": "NODEMANAGER"
},
{
"name": "yarn.nodemanager.local-dirs",
- "displayType": "directories",
"serviceName": "YARN",
"filename": "yarn-site.xml",
"category": "NODEMANAGER"
@@ -296,7 +253,6 @@ var hdp2properties = [
},
{
"name": "yarn_heapsize",
- "displayType": "int",
"serviceName": "YARN",
"filename": "yarn-env.xml",
"category": "General",
@@ -304,7 +260,6 @@ var hdp2properties = [
},
{
"name": "resourcemanager_heapsize",
- "displayType": "int",
"serviceName": "YARN",
"filename": "yarn-env.xml",
"category": "RESOURCEMANAGER",
@@ -312,33 +267,13 @@ var hdp2properties = [
},
{
"name": "nodemanager_heapsize",
- "displayType": "int",
"serviceName": "YARN",
"filename": "yarn-env.xml",
"category": "NODEMANAGER",
"index": 1
},
{
- "name": "yarn_log_dir_prefix",
- "displayType": "directory",
- "serviceName": "YARN",
- "filename": "yarn-env.xml"
- },
- {
- "name": "yarn_pid_dir_prefix",
- "displayType": "directory",
- "serviceName": "YARN",
- "filename": "yarn-env.xml"
- },
- {
- "name": "min_user_id",
- "displayType": "int",
- "serviceName": "YARN",
- "filename": "yarn-env.xml"
- },
- {
"name": "apptimelineserver_heapsize",
- "displayType": "int",
"serviceName": "YARN",
"filename": "yarn-env.xml",
"category": "APP_TIMELINE_SERVER",
@@ -347,61 +282,32 @@ var hdp2properties = [
/**********************************************MAPREDUCE2***************************************/
{
"name": "mapreduce.map.memory.mb",
- "displayType": "int",
"category": "General",
"serviceName": "MAPREDUCE2",
"filename": "mapred-site.xml"
},
{
"name": "mapreduce.reduce.memory.mb",
- "displayType": "int",
"category": "General",
"serviceName": "MAPREDUCE2",
"filename": "mapred-site.xml"
},
{
"name": "mapreduce.task.io.sort.mb",
- "displayType": "int",
"category": "General",
"serviceName": "MAPREDUCE2",
"filename": "mapred-site.xml"
},
{
- "name": "hadoop.security.auth_to_local",
- "displayType": "multiLine",
- "serviceName": "HDFS",
- "filename": "core-site.xml"
- },
- {
- "name": "yarn.app.mapreduce.am.resource.mb",
- "displayType": "int",
- "serviceName": "MAPREDUCE2",
- "filename": "mapred-site.xml"
- },
- {
"name": "jobhistory_heapsize",
- "displayType": "int",
"serviceName": "MAPREDUCE2",
"filename": "mapred-env.xml",
"category": "HISTORYSERVER",
"index": 1
},
- {
- "name": "mapred_log_dir_prefix",
- "displayType": "directory",
- "serviceName": "MAPREDUCE2",
- "filename": "mapred-env.xml"
- },
- {
- "name": "mapred_pid_dir_prefix",
- "displayType": "directory",
- "serviceName": "MAPREDUCE2",
- "filename": "mapred-env.xml"
- },
/**********************************************oozie-site***************************************/
{
"name": "oozie.db.schema.name",
- "displayType": "host",
"category": "OOZIE_SERVER",
"serviceName": "OOZIE",
"filename": "oozie-site.xml",
@@ -409,7 +315,6 @@ var hdp2properties = [
},
{
"name": "oozie.service.JPAService.jdbc.username",
- "displayType": "user",
"category": "OOZIE_SERVER",
"serviceName": "OOZIE",
"filename": "oozie-site.xml",
@@ -431,7 +336,6 @@ var hdp2properties = [
},
{
"name": "oozie.service.JPAService.jdbc.url",
- "displayType": "advanced",
"category": "OOZIE_SERVER",
"serviceName": "OOZIE",
"filename": "oozie-site.xml",
@@ -470,7 +374,6 @@ var hdp2properties = [
},
{
"name": "oozie_data_dir",
- "displayType": "directory",
"serviceName": "OOZIE",
"filename": "oozie-env.xml",
"category": "OOZIE_SERVER",
@@ -485,24 +388,6 @@ var hdp2properties = [
"category": "OOZIE_SERVER",
"index": 3
},
- {
- "name": "oozie_log_dir",
- "displayType": "directory",
- "serviceName": "OOZIE",
- "filename": "oozie-env.xml"
- },
- {
- "name": "oozie_pid_dir",
- "displayType": "directory",
- "serviceName": "OOZIE",
- "filename": "oozie-env.xml"
- },
- {
- "name": "oozie_admin_port",
- "displayType": "int",
- "serviceName": "OOZIE",
- "filename": "oozie-env.xml"
- },
/**********************************************HIVE***************************************/
{
@@ -517,12 +402,10 @@ var hdp2properties = [
"category": "HIVE_METASTORE",
"serviceName": "HIVE",
"filename": "hive-env.xml",
- "displayType": "int",
"index": 11
},
{
"name": "hive.heapsize",
- "displayType": "int",
"serviceName": "HIVE",
"filename": "hive-site.xml",
"category": "HIVE_SERVER2",
@@ -533,12 +416,10 @@ var hdp2properties = [
"category": "HIVE_CLIENT",
"serviceName": "HIVE",
"filename": "hive-env.xml",
- "displayType": "int",
"index": 10
},
{
"name": "javax.jdo.option.ConnectionUserName",
- "displayType": "user",
"category": "HIVE_METASTORE",
"serviceName": "HIVE",
"filename": "hive-site.xml",
@@ -546,7 +427,6 @@ var hdp2properties = [
},
{
"name": "javax.jdo.option.ConnectionPassword",
- "displayType": "password",
"category": "HIVE_METASTORE",
"serviceName": "HIVE",
"filename": "hive-site.xml",
@@ -554,7 +434,6 @@ var hdp2properties = [
},
{
"name": "javax.jdo.option.ConnectionURL",
- "displayType": "advanced",
"category": "HIVE_METASTORE",
"serviceName": "HIVE",
"filename": "hive-site.xml",
@@ -562,31 +441,12 @@ var hdp2properties = [
},
{
"name": "ambari.hive.db.schema.name",
- "displayType": "host",
"serviceName": "HIVE",
"filename": "hive-site.xml",
"category": "HIVE_METASTORE",
"index": 4
},
{
- "name": "hive.server2.thrift.port",
- "displayType": "int",
- "serviceName": "HIVE",
- "filename": "hive-site.xml"
- },
- {
- "name": "hive.server2.support.dynamic.service.discovery",
- "displayType": "checkbox",
- "serviceName": "HIVE",
- "filename": "hive-site.xml"
- },
- {
- "name": "hive.security.authorization.enabled",
- "displayType": "checkbox",
- "serviceName": "HIVE",
- "filename": "hive-site.xml"
- },
- {
"name": "hive_database",
"options": [
{
@@ -633,37 +493,18 @@ var hdp2properties = [
"index": 3
},
{
- "name": "hive_log_dir",
- "displayType": "directory",
- "serviceName": "HIVE",
- "filename": "hive-env.xml"
- },
- {
- "name": "hive_pid_dir",
- "displayType": "directory",
- "serviceName": "HIVE",
- "filename": "hive-env.xml"
- },
- {
"name": "hcat_log_dir",
- "displayType": "directory",
"serviceName": "HIVE",
"filename": "hive-env.xml",
"category": "Advanced webhcat-env"
},
{
"name": "hcat_pid_dir",
- "displayType": "directory",
"serviceName": "HIVE",
"filename": "hive-env.xml",
"category": "Advanced webhcat-env"
},
{
- "name": "hive_database_name",
- "serviceName": "HIVE",
- "filename": "hive-env.xml"
- },
- {
"name": "hive_database_type",
"serviceName": "HIVE",
"filename": "hive-env.xml",
@@ -672,7 +513,6 @@ var hdp2properties = [
/**********************************************TEZ*****************************************/
{
"name": "tez.am.resource.memory.mb",
- "displayType": "int",
"category": "General",
"serviceName": "TEZ",
"filename": "tez-site.xml"
@@ -685,21 +525,18 @@ var hdp2properties = [
},
{
"name": "tez.am.grouping.split-waves",
- "displayType": "float",
"category": "General",
"serviceName": "TEZ",
"filename": "tez-site.xml"
},
{
"name": "tez.am.grouping.min-size",
- "displayType": "int",
"category": "General",
"serviceName": "TEZ",
"filename": "tez-site.xml"
},
{
"name": "tez.am.grouping.max-size",
- "displayType": "int",
"category": "General",
"serviceName": "TEZ",
"filename": "tez-site.xml"
@@ -718,7 +555,6 @@ var hdp2properties = [
},
{
"name": "tez.runtime.intermediate-input.is-compressed",
- "displayType": "checkbox",
"category": "General",
"serviceName": "TEZ",
"filename": "tez-site.xml"
@@ -731,7 +567,6 @@ var hdp2properties = [
},
{
"name": "tez.runtime.intermediate-output.should-compress",
- "displayType": "checkbox",
"category": "General",
"serviceName": "TEZ",
"filename": "tez-site.xml"
@@ -739,38 +574,7 @@ var hdp2properties = [
/**********************************************HBASE***************************************/
{
- "name": "hbase.tmp.dir",
- "displayType": "directory",
- "serviceName": "HBASE",
- "filename": "hbase-site.xml"
- },
- {
- "name": "hbase.master.port",
- "displayType": "int",
- "serviceName": "HBASE",
- "filename": "hbase-site.xml"
- },
- {
- "name": "hbase.regionserver.global.memstore.upperLimit",
- "displayType": "float",
- "serviceName": "HBASE",
- "filename": "hbase-site.xml"
- },
- {
- "name": "hbase.regionserver.global.memstore.lowerLimit",
- "displayType": "float",
- "serviceName": "HBASE",
- "filename": "hbase-site.xml"
- },
- {
- "name": "hbase.hstore.blockingStoreFiles",
- "displayType": "int",
- "serviceName": "HBASE",
- "filename": "hbase-site.xml"
- },
- {
"name": "hbase.hstore.compactionThreshold",
- "displayType": "int",
"category": "General",
"serviceName": "HBASE",
"filename": "hbase-site.xml",
@@ -778,7 +582,6 @@ var hdp2properties = [
},
{
"name": "hfile.block.cache.size",
- "displayType": "float",
"category": "General",
"serviceName": "HBASE",
"filename": "hbase-site.xml",
@@ -786,7 +589,6 @@ var hdp2properties = [
},
{
"name": "hbase.hregion.max.filesize",
- "displayType": "int",
"category": "General",
"serviceName": "HBASE",
"filename": "hbase-site.xml",
@@ -794,7 +596,6 @@ var hdp2properties = [
},
{
"name": "hbase.regionserver.handler.count",
- "displayType": "int",
"category": "HBASE_REGIONSERVER",
"serviceName": "HBASE",
"filename": "hbase-site.xml",
@@ -802,7 +603,6 @@ var hdp2properties = [
},
{
"name": "hbase.hregion.majorcompaction",
- "displayType": "int",
"category": "HBASE_REGIONSERVER",
"serviceName": "HBASE",
"filename": "hbase-site.xml",
@@ -810,21 +610,13 @@ var hdp2properties = [
},
{
"name": "hbase.hregion.memstore.block.multiplier",
- "displayType": "int",
"category": "HBASE_REGIONSERVER",
"serviceName": "HBASE",
"filename": "hbase-site.xml",
"index": 4
},
{
- "name": "hbase.hregion.memstore.mslab.enabled",
- "displayType": "checkbox",
- "serviceName": "HBASE",
- "filename": "hbase-site.xml"
- },
- {
"name": "hbase.hregion.memstore.flush.size",
- "displayType": "int",
"category": "HBASE_REGIONSERVER",
"serviceName": "HBASE",
"filename": "hbase-site.xml",
@@ -832,7 +624,6 @@ var hdp2properties = [
},
{
"name": "hbase.client.scanner.caching",
- "displayType": "int",
"category": "General",
"serviceName": "HBASE",
"filename": "hbase-site.xml",
@@ -840,7 +631,6 @@ var hdp2properties = [
},
{
"name": "zookeeper.session.timeout",
- "displayType": "int",
"category": "General",
"serviceName": "HBASE",
"filename": "hbase-site.xml",
@@ -848,21 +638,13 @@ var hdp2properties = [
},
{
"name": "hbase.client.keyvalue.maxsize",
- "displayType": "int",
"category": "General",
"serviceName": "HBASE",
"filename": "hbase-site.xml",
"index": 5
},
{
- "name": "hbase.zookeeper.quorum",
- "displayType": "multiLine",
- "serviceName": "HBASE",
- "filename": "hbase-site.xml"
- },
- {
"name": "hbase_master_heapsize",
- "displayType": "int",
"serviceName": "HBASE",
"filename": "hbase-env.xml",
"category": "HBASE_MASTER",
@@ -870,7 +652,6 @@ var hdp2properties = [
},
{
"name": "hbase_regionserver_heapsize",
- "displayType": "int",
"serviceName": "HBASE",
"filename": "hbase-env.xml",
"category": "HBASE_REGIONSERVER",
@@ -878,7 +659,6 @@ var hdp2properties = [
},
{
"name": "hbase_regionserver_xmn_max",
- "displayType": "int",
"serviceName": "HBASE",
"filename": "hbase-env.xml",
"category": "HBASE_REGIONSERVER",
@@ -886,85 +666,63 @@ var hdp2properties = [
},
{
"name": "hbase_regionserver_xmn_ratio",
- "displayType": "float",
"serviceName": "HBASE",
"filename": "hbase-env.xml",
"category": "HBASE_REGIONSERVER",
"index": 7
},
- {
- "name": "hbase_log_dir",
- "displayType": "directory",
- "serviceName": "HBASE",
- "filename": "hbase-env.xml"
- },
- {
- "name": "hbase_pid_dir",
- "displayType": "directory",
- "serviceName": "HBASE",
- "filename": "hbase-env.xml"
- },
/**********************************************storm-site***************************************/
{
"name": "storm.zookeeper.root",
- "displayType": "directory",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "General"
},
{
"name": "storm.local.dir",
- "displayType": "directory",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "General"
},
{
"name": "storm.zookeeper.servers",
- "displayType": "componentHosts",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "General"
},
{
"name": "storm.zookeeper.port",
- "displayType": "int",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "General"
},
{
"name": "storm.zookeeper.session.timeout",
- "displayType": "int",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "General"
},
{
"name": "storm.zookeeper.connection.timeout",
- "displayType": "int",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "General"
},
{
"name": "storm.zookeeper.retry.times",
- "displayType": "int",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "General"
},
{
"name": "storm.zookeeper.retry.interval",
- "displayType": "int",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "General"
},
{
"name": "storm.zookeeper.retry.intervalceiling.millis",
- "displayType": "int",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "General"
@@ -977,7 +735,6 @@ var hdp2properties = [
},
{
"name": "storm.local.mode.zmq",
- "displayType": "checkbox",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "General"
@@ -996,7 +753,6 @@ var hdp2properties = [
},
{
"name": "storm.messaging.netty.buffer_size",
- "displayType": "int",
"category": "General",
"serviceName": "STORM",
"filename": "storm-site.xml"
@@ -1005,117 +761,100 @@ var hdp2properties = [
"serviceName": "STORM",
"category": "General",
"name": "storm.messaging.netty.max_retries",
- "displayType": "int",
"filename": "storm-site.xml"
},
{
"name": "storm.messaging.netty.max_wait_ms",
- "displayType": "int",
"category": "General",
"serviceName": "STORM",
"filename": "storm-site.xml"
},
{
"name": "storm.messaging.netty.min_wait_ms",
- "displayType": "int",
"category": "General",
"serviceName": "STORM",
"filename": "storm-site.xml"
},
{
"name": "storm.messaging.netty.server_worker_threads",
- "displayType": "int",
"category": "General",
"serviceName": "STORM",
"filename": "storm-site.xml"
},
{
"name": "storm.messaging.netty.client_worker_threads",
- "displayType": "int",
"category": "General",
"serviceName": "STORM",
"filename": "storm-site.xml"
},
{
"name": "nimbus.host",
- "displayType": "componentHost",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "NIMBUS"
},
{
"name": "nimbus.thrift.port",
- "displayType": "int",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "NIMBUS"
},
{
"name": "nimbus.thrift.max_buffer_size",
- "displayType": "int",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "NIMBUS"
},
{
"name": "nimbus.childopts",
- "displayType": "multiLine",
"serviceName": "STORM",
"category": "NIMBUS",
"filename": "storm-site.xml"
},
{
"name": "nimbus.task.timeout.secs",
- "displayType": "int",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "NIMBUS"
},
{
"name": "nimbus.supervisor.timeout.secs",
- "displayType": "int",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "NIMBUS"
},
{
"name": "nimbus.monitor.freq.secs",
- "displayType": "int",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "NIMBUS"
},
{
"name": "nimbus.cleanup.inbox.freq.secs",
- "displayType": "int",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "NIMBUS"
},
{
"name": "nimbus.inbox.jar.expiration.secs",
- "displayType": "int",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "NIMBUS"
},
{
"name": "nimbus.task.launch.secs",
- "displayType": "int",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "NIMBUS"
},
{
"name": "nimbus.reassign",
- "displayType": "checkbox",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "NIMBUS"
},
{
"name": "nimbus.file.copy.expiration.secs",
- "displayType": "int",
"serviceName": "STORM",
"filename": "storm-site.xml",
"category": "NIMBUS"
@@ -1134,70 +873,60 @@ var hdp2properties = [
},
{
"name": "supervisor.childopts",
- "displayType": "multiLine",
"category": "SUPERVISOR",
"serviceName": "STORM",
"filename": "storm-site.xml"
},
{
"name": "supervisor.worker.start.timeout.secs",
- "displayType": "int",
"category": "SUPERVISOR",
"serviceName": "STORM",
"filename": "storm-site.xml"
},
{
"name": "supervisor.worker.timeout.secs",
- "displayType": "int",
"category": "SUPERVISOR",
"serviceName": "STORM",
"filename": "storm-site.xml"
},
{
"name": "supervisor.monitor.frequency.secs",
- "displayType": "int",
"category": "SUPERVISOR",
"serviceName": "STORM",
"filename": "storm-site.xml"
},
{
"name": "supervisor.heartbeat.frequency.secs",
- "displayType": "int",
"category": "SUPERVISOR",
"serviceName": "STORM",
"filename": "storm-site.xml"
},
{
"name": "drpc.port",
- "displayType": "int",
"category": "DRPC_SERVER",
"serviceName": "STORM",
"filename": "storm-site.xml"
},
{
"name": "drpc.worker.threads",
- "displayType": "int",
"category": "DRPC_SERVER",
"serviceName": "STORM",
"filename": "storm-site.xml"
},
{
"name": "drpc.queue.size",
- "displayType": "int",
"category": "DRPC_SERVER",
"serviceName": "STORM",
"filename": "storm-site.xml"
},
{
"name": "drpc.invocations.port",
- "displayType": "int",
"category": "DRPC_SERVER",
"serviceName": "STORM",
"filename": "storm-site.xml"
},
{
"name": "drpc.request.timeout.secs",
- "displayType": "int",
"category": "DRPC_SERVER",
"serviceName": "STORM",
"filename": "storm-site.xml"
@@ -1210,7 +939,6 @@ var hdp2properties = [
},
{
"name": "ui.port",
- "displayType": "int",
"category": "STORM_UI_SERVER",
"serviceName": "STORM",
"filename": "storm-site.xml"
@@ -1221,16 +949,9 @@ var hdp2properties = [
"serviceName": "STORM",
"filename": "storm-site.xml"
},
- {
- "name": "worker.childopts",
- "displayType": "multiLine",
- "serviceName": "STORM",
- "filename": "storm-site.xml"
- },
/*********************************************oozie-site for Falcon*****************************/
{
"name": "oozie.service.ELService.ext.functions.coord-job-submit-instances",
- "displayType": "custom",
"category": "Falcon - Oozie integration",
"serviceName": "FALCON",
"filename": "oozie-site.xml"
@@ -1239,42 +960,36 @@ var hdp2properties = [
"serviceName": "FALCON",
"category": "Falcon - Oozie integration",
"name": "oozie.service.ELService.ext.functions.coord-action-create-inst",
- "displayType": "custom",
"filename": "oozie-site.xml"
},
{
"serviceName": "FALCON",
"category": "Falcon - Oozie integration",
"name": "oozie.service.ELService.ext.functions.coord-action-create",
- "displayType": "custom",
"filename": "oozie-site.xml"
},
{
"serviceName": "FALCON",
"category": "Falcon - Oozie integration",
"name": "oozie.service.ELService.ext.functions.coord-job-submit-data",
- "displayType": "custom",
"filename": "oozie-site.xml"
},
{
"serviceName": "FALCON",
"category": "Falcon - Oozie integration",
"name": "oozie.service.ELService.ext.functions.coord-action-start",
- "displayType": "custom",
"filename": "oozie-site.xml"
},
{
"serviceName": "FALCON",
"category": "Falcon - Oozie integration",
"name": "oozie.service.ELService.ext.functions.coord-sla-submit",
- "displayType": "custom",
"filename": "oozie-site.xml"
},
{
"serviceName": "FALCON",
"category": "Falcon - Oozie integration",
"name": "oozie.service.ELService.ext.functions.coord-sla-create",
- "displayType": "custom",
"filename": "oozie-site.xml"
},
@@ -1363,14 +1078,12 @@ var hdp2properties = [
},
{
"name": "*.application.services",
- "displayType": "multiLine",
"category": "FalconStartupSite",
"serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
"name": "*.configstore.listeners",
- "displayType": "multiLine",
"category": "FalconStartupSite",
"serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
@@ -1419,7 +1132,6 @@ var hdp2properties = [
},
{
"name": "*.broker.ttlInMins",
- "displayType": "int",
"category": "FalconStartupSite",
"serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
@@ -1432,14 +1144,12 @@ var hdp2properties = [
},
{
"name": "*.max.retry.failure.count",
- "displayType": "int",
"category": "FalconStartupSite",
"serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
"name": "*.internal.queue.size",
- "displayType": "int",
"category": "FalconStartupSite",
"serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
@@ -1458,7 +1168,6 @@ var hdp2properties = [
},
{
"name": "*.falcon.http.authentication.token.validity",
- "displayType": "int",
"category": "FalconStartupSite",
"serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
@@ -1478,7 +1187,6 @@ var hdp2properties = [
{
"name": "*.falcon.http.authentication.kerberos.name.rules",
"category": "FalconStartupSite",
- "displayType": "multiLine",
"serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
@@ -1492,34 +1200,23 @@ var hdp2properties = [
// Falcon Graph and Storage
{
"name": "*.falcon.graph.storage.directory",
- "displayType": "directory",
"category": "FalconStartupSite",
"serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
"name": "*.falcon.graph.serialize.path",
- "displayType": "directory",
"category": "FalconStartupSite",
"serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
{
"name": "*.falcon.graph.preserve.history",
- "displayType": "checkbox",
"category": "FalconStartupSite",
"serviceName": "FALCON",
"filename": "falcon-startup.properties.xml"
},
-/**********************************************webhcat-site***************************************/
- {
- "name": "templeton.zookeeper.hosts",
- "displayType": "multiLine",
- "serviceName": "HIVE",
- "filename": "webhcat-site.xml"
- },
-
/**********************************************KNOX*****************************************/
{
"name": "knox_master_secret",
@@ -1527,17 +1224,10 @@ var hdp2properties = [
"filename": "knox-env.xml",
"category": "KNOX_GATEWAY"
},
- {
- "name": "knox_pid_dir",
- "displayType": "directory",
- "serviceName": "KNOX",
- "filename": "knox-env.xml"
- },
/********************************************* KAFKA *****************************/
{
"name": "log.dirs",
- "displayType": "directories",
"serviceName": "KAFKA",
"filename": "kafka-broker.xml",
"category": "KAFKA_BROKER",
@@ -1545,7 +1235,6 @@ var hdp2properties = [
},
{
"name": "port",
- "displayType": "int",
"serviceName": "KAFKA",
"filename": "kafka-broker.xml",
"category": "KAFKA_BROKER",
@@ -1553,14 +1242,12 @@ var hdp2properties = [
},
{
"name": "listeners",
- "displayType": "advanced",
"serviceName": "KAFKA",
"filename": "kafka-broker.xml",
"category": "KAFKA_BROKER"
},
{
"name": "log.roll.hours",
- "displayType": "advanced",
"serviceName": "KAFKA",
"filename": "kafka-broker.xml",
"category": "KAFKA_BROKER",
@@ -1568,7 +1255,6 @@ var hdp2properties = [
},
{
"name": "log.retention.hours",
- "displayType": "advanced",
"serviceName": "KAFKA",
"filename": "kafka-broker.xml",
"category": "KAFKA_BROKER",
@@ -1576,7 +1262,6 @@ var hdp2properties = [
},
{
"name": "zookeeper.connect",
- "displayType": "advanced",
"serviceName": "KAFKA",
"filename": "kafka-broker.xml",
"category": "KAFKA_BROKER",
@@ -1584,7 +1269,6 @@ var hdp2properties = [
},
{
"name": "kafka_pid_dir",
- "displayType": "directory",
"serviceName": "KAFKA",
"filename": "kafka-env.xml",
"index": 0
@@ -1617,66 +1301,11 @@ var hdp2properties = [
},
{
"name": "instance_secret",
- "displayType": "password",
"serviceName": "ACCUMULO",
"filename": "accumulo-env.xml",
"category": "General"
},
{
- "name": "server_content",
- "displayType": "content",
- "serviceName": "ACCUMULO",
- "filename": "accumulo-env.xml"
- },
- {
- "name": "accumulo_master_heapsize",
- "displayType": "int",
- "serviceName": "ACCUMULO",
- "filename": "accumulo-env.xml"
- },
- {
- "name": "accumulo_tserver_heapsize",
- "displayType": "int",
- "serviceName": "ACCUMULO",
- "filename": "accumulo-env.xml"
- },
- {
- "name": "accumulo_monitor_heapsize",
- "displayType": "int",
- "serviceName": "ACCUMULO",
- "filename": "accumulo-env.xml"
- },
- {
- "name": "accumulo_gc_heapsize",
- "displayType": "int",
- "serviceName": "ACCUMULO",
- "filename": "accumulo-env.xml"
- },
- {
- "name": "accumulo_other_heapsize",
- "displayType": "int",
- "serviceName": "ACCUMULO",
- "filename": "accumulo-env.xml"
- },
- {
- "name": "accumulo_log_dir",
- "displayType": "directory",
- "serviceName": "ACCUMULO",
- "filename": "accumulo-env.xml"
- },
- {
- "name": "accumulo_pid_dir",
- "displayType": "directory",
- "serviceName": "ACCUMULO",
- "filename": "accumulo-env.xml"
- },
- {
- "name": "accumulo_monitor_bind_all",
- "displayType": "checkbox",
- "serviceName": "ACCUMULO",
- "filename": "accumulo-env.xml"
- },
- {
"name": "instance.volumes",
"serviceName": "ACCUMULO",
"filename": "accumulo-site.xml",
@@ -1696,56 +1325,48 @@ var hdp2properties = [
},
{
"name": "master.port.client",
- "displayType": "int",
"serviceName": "ACCUMULO",
"filename": "accumulo-site.xml",
"index": 3
},
{
"name": "tserver.port.client",
- "displayType": "int",
"serviceName": "ACCUMULO",
"filename": "accumulo-site.xml",
"index": 4
},
{
"name": "monitor.port.client",
- "displayType": "int",
"serviceName": "ACCUMULO",
"filename": "accumulo-site.xml",
"index": 5
},
{
"name": "monitor.port.log4j",
- "displayType": "int",
"serviceName": "ACCUMULO",
"filename": "accumulo-site.xml",
"index": 6
},
{
"name": "gc.port.client",
- "displayType": "int",
"serviceName": "ACCUMULO",
"filename": "accumulo-site.xml",
"index": 7
},
{
"name": "trace.port.client",
- "displayType": "int",
"serviceName": "ACCUMULO",
"filename": "accumulo-site.xml",
"index": 8
},
{
"name": "tserver.memory.maps.native.enabled",
- "displayType": "checkbox",
"serviceName": "ACCUMULO",
"filename": "accumulo-site.xml",
"index": 9
},
{
"name": "general.classpaths",
- "displayType": "content",
"serviceName": "ACCUMULO",
"filename": "accumulo-site.xml",
"index": 10
@@ -1754,7 +1375,6 @@ var hdp2properties = [
/*******************************************kerberos***********************************/
{
"name": "kdc_type",
- "displayType": "componentHost",
"serviceName": "KERBEROS",
"filename": "kerberos-env.xml",
"category": "KDC",
@@ -1770,7 +1390,6 @@ var hdp2properties = [
},
{
"name": "realm",
- "displayType": "host",
"serviceName": "KERBEROS",
"filename": "kerberos-env.xml",
"category": "KDC",
@@ -1778,7 +1397,6 @@ var hdp2properties = [
},
{
"name": "ldap_url",
- "displayType": "host",
"serviceName": "KERBEROS",
"filename": "kerberos-env.xml",
"category": "KDC",
@@ -1800,7 +1418,6 @@ var hdp2properties = [
},
{
"name": "manage_identities",
- "displayType": "checkbox",
"serviceName": "KERBEROS",
"filename": "kerberos-env.xml",
"category": "Advanced kerberos-env",
@@ -1808,7 +1425,6 @@ var hdp2properties = [
},
{
"name": "install_packages",
- "displayType": "checkbox",
"serviceName": "KERBEROS",
"filename": "kerberos-env.xml",
"category": "Advanced kerberos-env",
@@ -1816,7 +1432,6 @@ var hdp2properties = [
},
{
"name": "executable_search_paths",
- "displayType": "multiline",
"serviceName": "KERBEROS",
"filename": "kerberos-env.xml",
"category": "Advanced kerberos-env",
@@ -1826,13 +1441,11 @@ var hdp2properties = [
"name": "encryption_types",
"serviceName": "KERBEROS",
"filename": "kerberos-env.xml",
- "displayType": "multiLine",
"category": "Advanced kerberos-env",
"index" : 3
},
{
"name": "password_length",
- "displayType": "int",
"serviceName": "KERBEROS",
"filename": "kerberos-env.xml",
"category": "Advanced kerberos-env",
@@ -1840,7 +1453,6 @@ var hdp2properties = [
},
{
"name": "password_min_lowercase_letters",
- "displayType": "int",
"serviceName": "KERBEROS",
"filename": "kerberos-env.xml",
"category": "Advanced kerberos-env",
@@ -1848,7 +1460,6 @@ var hdp2properties = [
},
{
"name": "password_min_uppercase_letters",
- "displayType": "int",
"serviceName": "KERBEROS",
"filename": "kerberos-env.xml",
"category": "Advanced kerberos-env",
@@ -1856,7 +1467,6 @@ var hdp2properties = [
},
{
"name": "password_min_digits",
- "displayType": "int",
"serviceName": "KERBEROS",
"filename": "kerberos-env.xml",
"category": "Advanced kerberos-env",
@@ -1864,7 +1474,6 @@ var hdp2properties = [
},
{
"name": "password_min_punctuation",
- "displayType": "int",
"serviceName": "KERBEROS",
"filename": "kerberos-env.xml",
"category": "Advanced kerberos-env",
@@ -1872,7 +1481,6 @@ var hdp2properties = [
},
{
"name": "password_min_whitespace",
- "displayType": "int",
"serviceName": "KERBEROS",
"filename": "kerberos-env.xml",
"category": "Advanced kerberos-env",
@@ -1887,7 +1495,6 @@ var hdp2properties = [
},
{
"name": "ad_create_attributes_template",
- "displayType": "content",
"serviceName": "KERBEROS",
"filename": "kerberos-env.xml",
"category": "Advanced kerberos-env",
@@ -1902,7 +1509,6 @@ var hdp2properties = [
},
{
"name": "case_insensitive_username_rules",
- "displayType": "checkbox",
"serviceName": "KERBEROS",
"filename": "kerberos-env.xml",
"category": "Advanced kerberos-env",
@@ -1910,7 +1516,6 @@ var hdp2properties = [
},
{
"name": "admin_server_host",
- "displayType": "host",
"serviceName": "KERBEROS",
"filename": "kerberos-env.xml",
"category": "Kadmin",
@@ -1940,7 +1545,6 @@ var hdp2properties = [
},
{
"name": "manage_krb5_conf",
- "displayType": "checkbox",
"dependentConfigPattern": "CATEGORY",
"serviceName": "KERBEROS",
"filename": "krb5-conf.xml",
@@ -1949,7 +1553,6 @@ var hdp2properties = [
},
{
"name": "conf_dir",
- "displayType": "directory",
"serviceName": "KERBEROS",
"filename": "krb5-conf.xml",
"category": "Advanced krb5-conf",
@@ -1957,7 +1560,6 @@ var hdp2properties = [
},
{
"name": "content",
- "displayType": "content",
"serviceName": "KERBEROS",
"filename": "krb5-conf.xml",
"category": "Advanced krb5-conf",
@@ -1966,126 +1568,26 @@ var hdp2properties = [
/********************************************* flume-agent *****************************/
{
"name": "content",
- "displayType": "content",
"serviceName": "FLUME",
"category": "FLUME_HANDLER",
"filename": "flume-conf.xml"
},
{
"name": "flume_conf_dir",
- "displayType": "directory",
- "isOverridable": false,
"serviceName": "FLUME",
"filename": "flume-env.xml",
"index": 0
},
{
"name": "flume_log_dir",
- "displayType": "directory",
"serviceName": "FLUME",
"filename": "flume-env.xml",
"index": 1
},
- //***************************************** GLUSTERFS stack********************************************
- {
- "name": "fs.glusterfs.impl",
- "filename": "core-site.xml",
- "serviceName": "GLUSTERFS",
- "category": "General"
- },
- {
- "name": "fs.AbstractFileSystem.glusterfs.impl",
- "filename": "core-site.xml",
- "serviceName": "GLUSTERFS",
- "category": "General"
- },
-
-/***************************************** ECS stack********************************************/
- {
- "name": "hdfs_log_dir_prefix",
- "displayType": "directory",
- "serviceName": "ECS",
- "filename": "hadoop-env.xml",
- "category": "General Hadoop"
- },
-
-/**********************************************GLUSTERFS***************************************/
- {
- "name": "hadoop_heapsize",
- "displayType": "int",
- "serviceName": "GLUSTERFS",
- "filename": "hadoop-env.xml",
- "category": "General Hadoop",
- "index": 1
- },
- {
- "name": "hdfs_log_dir_prefix",
- "displayType": "directory",
- "serviceName": "GLUSTERFS",
- "filename": "hadoop-env.xml",
- "category": "General Hadoop"
- },
- {
- "name": "hadoop_pid_dir_prefix",
- "displayType": "directory",
- "serviceName": "GLUSTERFS",
- "filename": "hadoop-env.xml",
- "category": "General Hadoop"
- },
- {
- "name": "namenode_heapsize",
- "displayType": "int",
- "serviceName": "GLUSTERFS",
- "filename": "hadoop-env.xml",
- "category": "General Hadoop"
- },
- {
- "name": "namenode_opt_newsize",
- "displayType": "int",
- "serviceName": "GLUSTERFS",
- "filename": "hadoop-env.xml",
- "category": "General Hadoop"
- },
- {
- "name": "namenode_opt_maxnewsize",
- "displayType": "int",
- "serviceName": "GLUSTERFS",
- "filename": "hadoop-env.xml",
- "category": "General Hadoop"
- },
- {
- "name": "namenode_opt_permsize",
- "displayType": "int",
- "serviceName": "GLUSTERFS",
- "filename": "hadoop-env.xml",
- "category": "General Hadoop"
- },
- {
- "name": "namenode_opt_maxpermsize",
- "displayType": "int",
- "serviceName": "GLUSTERFS",
- "filename": "hadoop-env.xml",
- "category": "General Hadoop"
- },
- {
- "name": "dtnode_heapsize",
- "displayType": "int",
- "serviceName": "GLUSTERFS",
- "filename": "hadoop-env.xml",
- "category": "General Hadoop"
- },
- {
- "name": "glusterfs_user",
- "serviceName": "GLUSTERFS",
- "filename": "hadoop-env.xml",
- "category": "General Hadoop"
- },
-
/**********************************************ZOOKEEPER***************************************/
{
"name": "dataDir",
- "displayType": "directory",
"serviceName": "ZOOKEEPER",
"filename": "zoo.cfg.xml",
"category": "ZOOKEEPER_SERVER",
@@ -2093,7 +1595,6 @@ var hdp2properties = [
},
{
"name": "tickTime",
- "displayType": "int",
"serviceName": "ZOOKEEPER",
"filename": "zoo.cfg.xml",
"category": "ZOOKEEPER_SERVER",
@@ -2101,7 +1602,6 @@ var hdp2properties = [
},
{
"name": "initLimit",
- "displayType": "int",
"serviceName": "ZOOKEEPER",
"filename": "zoo.cfg.xml",
"category": "ZOOKEEPER_SERVER",
@@ -2109,7 +1609,6 @@ var hdp2properties = [
},
{
"name": "syncLimit",
- "displayType": "int",
"serviceName": "ZOOKEEPER",
"filename": "zoo.cfg.xml",
"category": "ZOOKEEPER_SERVER",
@@ -2117,7 +1616,6 @@ var hdp2properties = [
},
{
"name": "clientPort",
- "displayType": "int",
"serviceName": "ZOOKEEPER",
"filename": "zoo.cfg.xml",
"category": "ZOOKEEPER_SERVER",
@@ -2125,14 +1623,12 @@ var hdp2properties = [
},
{
"name": "zk_log_dir",
- "displayType": "directory",
"serviceName": "ZOOKEEPER",
"filename": "zookeeper-env.xml",
"index": 0
},
{
"name": "zk_pid_dir",
- "displayType": "directory",
"serviceName": "ZOOKEEPER",
"filename": "zookeeper-env.xml",
"index": 1
@@ -2140,14 +1636,12 @@ var hdp2properties = [
/**********************************************FALCON***************************************/
{
"name": "falcon_port",
- "displayType": "int",
"serviceName": "FALCON",
"filename": "falcon-env.xml",
"category": "FALCON_SERVER"
},
{
"name": "falcon_local_dir",
- "displayType": "directory",
"serviceName": "FALCON",
"filename": "falcon-env.xml",
"category": "FALCON_SERVER"
@@ -2158,50 +1652,6 @@ var hdp2properties = [
"filename": "falcon-env.xml",
"category": "FALCON_SERVER"
},
- {
- "name": "falcon_log_dir",
- "displayType": "directory",
- "serviceName": "FALCON",
- "filename": "falcon-env.xml"
- },
- {
- "name": "falcon_pid_dir",
- "displayType": "directory",
- "serviceName": "FALCON",
- "filename": "falcon-env.xml"
- },
- {
- "name": "falcon.embeddedmq.data",
- "displayType": "directory",
- "serviceName": "FALCON",
- "filename": "falcon-env.xml"
- },
-/**********************************************STORM***************************************/
- {
- "name": "storm_log_dir",
- "displayType": "directory",
- "serviceName": "STORM",
- "filename": "storm-env.xml"
- },
- {
- "name": "storm_pid_dir",
- "displayType": "directory",
- "serviceName": "STORM",
- "filename": "storm-env.xml"
- },
-/**********************************************MISC***************************************/
- {
- "name": "ignore_groupsusers_create",
- "displayType": "checkbox",
- "filename": "cluster-env.xml",
- "category": "Users and Groups"
- },
- {
- "name": "override_uid",
- "displayType": "checkbox",
- "filename": "cluster-env.xml",
- "category": "Users and Groups"
- },
/************************************************AMBARI_METRICS******************************************/
{
"name": "timeline.metrics.service.operation.mode",
@@ -2240,7 +1690,6 @@ var hdp2properties = [
},
{
"name": "timeline.metrics.aggregator.checkpoint.dir",
- "displayType": "directory",
"serviceName": "AMBARI_METRICS",
"filename": "ams-site.xml",
"category": "MetricCollector",
@@ -2248,7 +1697,6 @@ var hdp2properties = [
},
{
"name": "timeline.metrics.cluster.aggregator.hourly.checkpointCutOffMultiplier",
- "displayType": "int",
"serviceName": "AMBARI_METRICS",
"filename": "ams-site.xml",
"category": "MetricCollector",
@@ -2263,7 +1711,6 @@ var hdp2properties = [
},
{
"name": "timeline.metrics.cluster.aggregator.hourly.interval",
- "displayType": "int",
"serviceName": "AMBARI_METRICS",
"filename": "ams-site.xml",
"category": "MetricCollector",
@@ -2271,7 +1718,6 @@ var hdp2properties = [
},
{
"name": "timeline.metrics.cluster.aggregator.minute.checkpointCutOffMultiplier",
- "displayType": "int",
"serviceName": "AMBARI_METRICS",
"filename": "ams-site.xml",
"category": "MetricCollector",
@@ -2286,7 +1732,6 @@ var hdp2properties = [
},
{
"name": "timeline.metrics.cluster.aggregator.minute.interval",
- "displayType": "int",
"serviceName": "AMBARI_METRICS",
"filename": "ams-site.xml",
"category": "MetricCollector",
@@ -2294,7 +1739,6 @@ var hdp2properties = [
},
{
"name": "timeline.metrics.cluster.aggregator.minute.timeslice.interval",
- "displayType": "int",
"serviceName": "AMBARI_METRICS",
"filename": "ams-site.xml",
"category": "MetricCollector",
@@ -2302,7 +1746,6 @@ var hdp2properties = [
},
{
"name": "timeline.metrics.host.aggregator.hourly.checkpointCutOffMultiplier",
- "displayType": "int",
"serviceName": "AMBARI_METRICS",
"filename": "ams-site.xml",
"category": "MetricCollector",
@@ -2317,7 +1760,6 @@ var hdp2properties = [
},
{
"name": "timeline.metrics.host.aggregator.hourly.interval",
- "displayType": "int",
"serviceName": "AMBARI_METRICS",
"filename": "ams-site.xml",
"category": "MetricCollector",
@@ -2325,7 +1767,6 @@ var hdp2properties = [
},
{
"name": "timeline.metrics.host.aggregator.minute.checkpointCutOffMultiplier",
- "displayType": "int",
"serviceName": "AMBARI_METRICS",
"filename": "ams-site.xml",
"category": "MetricCollector",
@@ -2340,7 +1781,6 @@ var hdp2properties = [
},
{
"name": "timeline.metrics.host.aggregator.minute.interval",
- "displayType": "int",
"serviceName": "AMBARI_METRICS",
"filename": "ams-site.xml",
"category": "MetricCollector",
@@ -2348,7 +1788,6 @@ var hdp2properties = [
},
{
"name": "timeline.metrics.service.checkpointDelay",
- "displayType": "int",
"serviceName": "AMBARI_METRICS",
"filename": "ams-site.xml",
"category": "MetricCollector",
@@ -2356,7 +1795,6 @@ var hdp2properties = [
},
{
"name": "timeline.metrics.service.default.result.limit",
- "displayType": "int",
"serviceName": "AMBARI_METRICS",
"filename": "ams-site.xml",
"category": "MetricCollector",
@@ -2364,7 +1802,6 @@ var hdp2properties = [
},
{
"name": "timeline.metrics.service.resultset.fetchSize",
- "displayType": "int",
"serviceName": "AMBARI_METRICS",
"filename": "ams-site.xml",
"category": "MetricCollector",
@@ -2455,7 +1892,7 @@ var hdp2properties = [
"filename": "storm-env.xml",
"index": 12
}
-].concat(require('data/HDP2/alert_notification'));
+].concat(require('data/HDP2/alert_notification')).concat(require('data/HDP2/gluster_fs_properties'));
if (App.get('isHadoopWindowsStack')) {
var excludedWindowsConfigs = [
@@ -2474,7 +1911,6 @@ if (App.get('isHadoopWindowsStack')) {
hdp2properties.push(
{
"name": "hadoop.user.name",
- "displayType": "user",
"serviceName": "MISC",
"filename": "cluster-env.xml",
"category": "Users and Groups",
@@ -2535,20 +1971,17 @@ var atsProperties = [
{
"name": "yarn.timeline-service.enabled",
"category": "APP_TIMELINE_SERVER",
- "displayType": "checkbox",
"serviceName": "YARN",
"filename": "yarn-site.xml"
},
{
"name": "yarn.timeline-service.leveldb-timeline-store.path",
"category": "APP_TIMELINE_SERVER",
- "displayType": "directory",
"serviceName": "YARN",
"filename": "yarn-site.xml"
},
{
"name": "yarn.timeline-service.leveldb-timeline-store.ttl-interval-ms",
- "displayType": "int",
"category": "APP_TIMELINE_SERVER",
"serviceName": "YARN",
"filename": "yarn-site.xml"
@@ -2561,14 +1994,12 @@ var atsProperties = [
},
{
"name": "yarn.timeline-service.ttl-enable",
- "displayType": "checkbox",
"category": "APP_TIMELINE_SERVER",
"serviceName": "YARN",
"filename": "yarn-site.xml"
},
{
"name": "yarn.timeline-service.ttl-ms",
- "displayType": "int",
"category": "APP_TIMELINE_SERVER",
"serviceName": "YARN",
"filename": "yarn-site.xml"
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/ambari-web/app/mixins/common/configs/configs_comparator.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/configs/configs_comparator.js b/ambari-web/app/mixins/common/configs/configs_comparator.js
index cda5407..0b30cb6 100644
--- a/ambari-web/app/mixins/common/configs/configs_comparator.js
+++ b/ambari-web/app/mixins/common/configs/configs_comparator.js
@@ -270,8 +270,8 @@ App.ConfigsComparator = Em.Mixin.create({
* @method hasCompareDiffs
*/
hasCompareDiffs: function (originalConfig, compareConfig) {
- var originalValue = App.config.trimProperty({ value: Em.get(originalConfig, 'value'), displayType: 'advanced' });
- var compareValue = App.config.trimProperty({ value: Em.get(compareConfig, 'value'), displayType: 'advanced' });
+ var originalValue = App.config.trimProperty({ value: Em.get(originalConfig, 'value'), displayType: 'string' });
+ var compareValue = App.config.trimProperty({ value: Em.get(compareConfig, 'value'), displayType: 'string' });
if (originalValue.toArray) {
originalValue = originalValue.toArray();
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/ambari-web/app/models/configs/objects/service_config_property.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/configs/objects/service_config_property.js b/ambari-web/app/models/configs/objects/service_config_property.js
index 100de5d..d58731c 100644
--- a/ambari-web/app/models/configs/objects/service_config_property.js
+++ b/ambari-web/app/models/configs/objects/service_config_property.js
@@ -302,7 +302,6 @@ App.ServiceConfigProperty = Em.Object.extend({
var supportsFinal = this.get('supportsFinal');
var isFinal = this.get('isFinal');
var valueRange = this.get('valueRange');
- var values = [];//value split by "," to check UNIX users, groups list
var isError = false;
var isWarn = false;
@@ -346,21 +345,6 @@ App.ServiceConfigProperty = Em.Object.extend({
isError = true;
}
break;
- case 'UNIXList':
- if(value != '*'){
- values = value.split(',');
- for(var i = 0, l = values.length; i < l; i++){
- if(!validator.isValidUNIXUser(values[i])){
- if(this.get('type') == 'USERS'){
- this.set('errorMessage', 'Must be a valid list of user names');
- } else {
- this.set('errorMessage', 'Must be a valid list of group names');
- }
- isError = true;
- }
- }
- }
- break;
case 'checkbox':
break;
case 'directories':
@@ -413,9 +397,16 @@ App.ServiceConfigProperty = Em.Object.extend({
}
}
break;
+ case 'password':
+ // retypedPassword is set by the retypePasswordView child view of App.ServiceConfigPasswordField
+ if (value !== this.get('retypedPassword')) {
+ this.set('errorMessage', 'Passwords do not match');
+ isError = true;
+ }
+ break;
case 'multiLine':
case 'content':
- case 'advanced':
+ default:
if(this.get('name')=='javax.jdo.option.ConnectionURL' || this.get('name')=='oozie.service.JPAService.jdbc.url') {
if (validator.isConfigValueLink(value)) {
isError = false;
@@ -432,12 +423,6 @@ App.ServiceConfigProperty = Em.Object.extend({
}
}
break;
- case 'password':
- // retypedPassword is set by the retypePasswordView child view of App.ServiceConfigPasswordField
- if (value !== this.get('retypedPassword')) {
- this.set('errorMessage', 'Passwords do not match');
- isError = true;
- }
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 037c420..b168763 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -319,7 +319,7 @@ App.config = Em.Object.create({
supportsFinal: this.shouldSupportFinal(serviceName, fileName),
serviceName: serviceName,
displayName: this.getDefaultDisplayName(name, fileName),
- displayType: this.getDefaultDisplayType(name, fileName, coreObject ? coreObject.value : ''),
+ displayType: this.getDefaultDisplayType(name, fileName, coreObject ? coreObject.value : '', serviceName),
description: null,
category: this.getDefaultCategory(definedInStack, fileName),
isSecureConfig: this.getIsSecure(name),
@@ -422,13 +422,20 @@ App.config = Em.Object.create({
* @param name
* @param type
* @param value
+ * @param serviceName
* @returns {string}
*/
- getDefaultDisplayType: function(name, type, value) {
+ getDefaultDisplayType: function(name, type, value, serviceName) {
if (this.isContentProperty(name, type)) {
return 'content';
+ } else if (serviceName && serviceName == 'FALCON' && this.getConfigTagFromFileName(type) == 'oozie-site') {
+ /**
+ * This specific type for 'oozie-site' configs of FALCON service.
+ * After this type will be moved to stack definition this hard-code should be removed
+ */
+ return 'custom';
}
- return value && !stringUtils.isSingleLine(value) ? 'multiLine' : 'advanced';
+ return value && !stringUtils.isSingleLine(value) ? 'multiLine' : 'string';
},
/**
@@ -484,7 +491,7 @@ App.config = Em.Object.create({
category = Em.get(serviceConfigProperty, 'category');
switch (displayType) {
case 'content':
- case 'advanced':
+ case 'string':
case 'multiLine':
return this.trimProperty({ displayType: displayType, value: value });
break;
@@ -703,7 +710,7 @@ App.config = Em.Object.create({
propertyData.category = 'Users and Groups';
propertyData.isVisible = !App.get('isHadoopWindowsStack');
propertyData.serviceName = 'MISC';
- propertyData.displayType = checkboxProperties.contains(config.property_name) ? 'checkbox' : 'user';
+ propertyData.displayType = checkboxProperties.contains(config.property_name) ? 'boolean' : 'user';
if (config.property_type.contains('ADDITIONAL_USER_PROPERTY')) {
propertyData.index = 999;
} else if (config.service_name) {
@@ -969,11 +976,10 @@ App.config = Em.Object.create({
break;
case 'password':
break;
- case 'advanced':
+ default:
if (name == 'javax.jdo.option.ConnectionURL' || name == 'oozie.service.JPAService.jdbc.url') {
rez = value.trim();
}
- default:
rez = (typeof value == 'string') ? value.replace(/(\s+$)/g, '') : value;
}
return ((rez == '') || (rez == undefined)) ? value : rez;
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/ambari-web/app/views/common/configs/service_configs_by_category_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/service_configs_by_category_view.js b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
index a2080d0..ffbea76 100644
--- a/ambari-web/app/views/common/configs/service_configs_by_category_view.js
+++ b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
@@ -347,7 +347,7 @@ App.ServiceConfigsByCategoryView = Em.View.extend(App.UserPref, App.ConfigOverri
name: propertyObj.name,
displayName: propertyObj.displayName || propertyObj.name,
value: propertyObj.value,
- displayType: stringUtils.isSingleLine(propertyObj.value) ? 'advanced' : 'multiLine',
+ displayType: stringUtils.isSingleLine(propertyObj.value) ? 'string' : 'multiLine',
isSecureConfig: isSecureConfig,
category: propertyObj.categoryName,
serviceName: propertyObj.serviceName,
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5b7d404/ambari-web/test/controllers/main/admin/kerberos/step2_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/kerberos/step2_controller_test.js b/ambari-web/test/controllers/main/admin/kerberos/step2_controller_test.js
index 701fcf3..9a06024 100644
--- a/ambari-web/test/controllers/main/admin/kerberos/step2_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/kerberos/step2_controller_test.js
@@ -37,12 +37,13 @@ describe('App.KerberosWizardStep2Controller', function() {
controller.tweakManualKdcProperties.restore();
});
- var _createProperty = function(name, value) {
+ var _createProperty = function(name, value, displayType) {
var preDefProp = App.config.get('preDefinedSiteProperties').findProperty('name', name);
if (preDefProp) {
return App.ServiceConfigProperty.create(
$.extend(true, {}, preDefProp, {
value: value, filename: 'some-site.xml',
+ 'displayType': displayType,
isRequiredByAgent: preDefProp.isRequiredByAgent == undefined ? true : preDefProp.isRequiredByAgent
}));
} else {
@@ -53,10 +54,10 @@ describe('App.KerberosWizardStep2Controller', function() {
var tests = [
{
stepConfigs: [
- ['realm', ' SPACES '],
- ['admin_server_host', ' space_left'],
- ['kdc_host', ' space_left_and_right '],
- ['ldap_url', 'space_right ']
+ ['realm', ' SPACES ', 'host'],
+ ['admin_server_host', ' space_left', 'host'],
+ ['kdc_host', ' space_left_and_right ', 'host'],
+ ['ldap_url', 'space_right ', 'host']
],
e: {
realm: 'SPACES',
@@ -72,7 +73,7 @@ describe('App.KerberosWizardStep2Controller', function() {
sinon.stub(App.StackService, 'find').returns([Em.Object.create({serviceName: 'KERBEROS'})]);
controller.set('stepConfigs', [
App.ServiceConfig.create({
- configs: test.stepConfigs.map(function(item) { return _createProperty(item[0], item[1]); })
+ configs: test.stepConfigs.map(function(item) { return _createProperty(item[0], item[1], item[2]); })
})
]);
var result = controller.createKerberosSiteObj('some-site', 'random-tag');