You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2015/10/02 23:12:22 UTC
[18/32] ambari git commit: AMBARI-13287 site_properties clean up.
(ababiichuk)
AMBARI-13287 site_properties clean up. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/13dc76c7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/13dc76c7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/13dc76c7
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 13dc76c72103056c5a8b9ed35587e59b0857f0f6
Parents: 6476985
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Fri Oct 2 09:43:24 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Fri Oct 2 09:43:24 2015 +0300
----------------------------------------------------------------------
.../configuration/ranger-kms-audit.xml | 12 +
.../HBASE/configuration/ranger-hbase-audit.xml | 12 +
.../configuration/ranger-hbase-security.xml | 3 +
.../HDFS/configuration/ranger-hdfs-audit.xml | 12 +
.../HIVE/configuration/ranger-hive-audit.xml | 12 +
.../HIVE/configuration/ranger-hive-security.xml | 3 +
.../KAFKA/configuration/ranger-kafka-audit.xml | 12 +
.../KNOX/configuration/ranger-knox-audit.xml | 12 +
.../RANGER/configuration/ranger-admin-site.xml | 1 +
.../STORM/configuration/ranger-storm-audit.xml | 12 +
.../YARN/configuration/ranger-yarn-audit.xml | 12 +
ambari-web/app/data/HDP2.2/site_properties.js | 22 +-
ambari-web/app/data/HDP2.3/site_properties.js | 278 -------------------
ambari-web/app/data/HDP2/alert_notification.js | 145 ++++++++++
ambari-web/app/data/HDP2/site_properties.js | 254 +++--------------
.../configs/objects/service_config_property.js | 1 +
16 files changed, 286 insertions(+), 517 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/13dc76c7/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml
index 4d42576..d5b0aa7 100644
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml
@@ -31,6 +31,9 @@
<value>false</value>
<display-name>Audit to DB</display-name>
<description>Is Audit to DB enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -74,6 +77,9 @@
<value>true</value>
<display-name>Audit to HDFS</display-name>
<description>Is Audit to HDFS enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -93,6 +99,9 @@
<value>true</value>
<display-name>Audit to SOLR</display-name>
<description>Is Solr audit enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -118,6 +127,9 @@
<value>false</value>
<display-name>Audit provider summary enabled</display-name>
<description>Enable Summary audit?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/13dc76c7/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml
index d466c4f..a45414d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml
@@ -31,6 +31,9 @@
<value>false</value>
<display-name>Audit to DB</display-name>
<description>Is Audit to DB enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -75,6 +78,9 @@
<value>true</value>
<display-name>Audit to HDFS</display-name>
<description>Is Audit to HDFS enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -94,6 +100,9 @@
<value>false</value>
<display-name>Audit to SOLR</display-name>
<description>Is Solr audit enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -119,6 +128,9 @@
<value>true</value>
<display-name>Audit provider summary enabled</display-name>
<description>Enable Summary audit?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/13dc76c7/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-security.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-security.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-security.xml
index 8aa741f..de739b7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-security.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-security.xml
@@ -60,6 +60,9 @@
<value>true</value>
<display-name>Should HBase GRANT/REVOKE update XA policies</display-name>
<description>Should HBase plugin update Ranger policies for updates to permissions done using GRANT/REVOKE?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/13dc76c7/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml
index cb29b7f..aba0357 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml
@@ -31,6 +31,9 @@
<value>false</value>
<display-name>Audit to DB</display-name>
<description>Is Audit to DB enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -75,6 +78,9 @@
<value>true</value>
<display-name>Audit to HDFS</display-name>
<description>Is Audit to HDFS enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -94,6 +100,9 @@
<value>false</value>
<display-name>Audit to SOLR</display-name>
<description>Is Solr audit enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -119,6 +128,9 @@
<value>false</value>
<display-name>Audit provider summary enabled</display-name>
<description>Enable Summary audit?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/13dc76c7/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml
index 4b41e49..c22d5ee 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml
@@ -31,6 +31,9 @@
<value>false</value>
<display-name>Audit to DB</display-name>
<description>Is Audit to DB enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -75,6 +78,9 @@
<value>true</value>
<display-name>Audit to HDFS</display-name>
<description>Is Audit to HDFS enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -94,6 +100,9 @@
<value>false</value>
<display-name>Audit to SOLR</display-name>
<description>Is Solr audit enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -119,6 +128,9 @@
<value>false</value>
<display-name>Audit provider summary enabled</display-name>
<description>Enable Summary audit?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/13dc76c7/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml
index def3828..1072747 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml
@@ -61,6 +61,9 @@
<value>true</value>
<display-name>Should Hive GRANT/REVOKE update XA policies</display-name>
<description>Should Hive plugin update Ranger policies for updates to permissions done using GRANT/REVOKE?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/13dc76c7/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-audit.xml
index 75e5efe..b181f29 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-audit.xml
@@ -31,6 +31,9 @@
<value>false</value>
<display-name>Audit to DB</display-name>
<description>Is Audit to DB enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -75,6 +78,9 @@
<value>true</value>
<display-name>Audit to HDFS</display-name>
<description>Is Audit to HDFS enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -94,6 +100,9 @@
<value>true</value>
<display-name>Audit to SOLR</display-name>
<description>Is Solr audit enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -119,6 +128,9 @@
<value>true</value>
<display-name>Audit provider summary enabled</display-name>
<description>Enable Summary audit?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/13dc76c7/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml
index 7b04544..cce87e3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml
@@ -31,6 +31,9 @@
<value>false</value>
<display-name>Audit to DB</display-name>
<description>Is Audit to DB enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -75,6 +78,9 @@
<value>true</value>
<display-name>Audit to HDFS</display-name>
<description>Is Audit to HDFS enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -94,6 +100,9 @@
<value>false</value>
<display-name>Audit to SOLR</display-name>
<description>Is Solr audit enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -119,6 +128,9 @@
<value>false</value>
<display-name>Audit provider summary enabled</display-name>
<description>Enable Summary audit?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/13dc76c7/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 7bd7bb3..97ba241 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
@@ -31,6 +31,7 @@
<description>Enable HTTP</description>
<value-attributes>
<overridable>false</overridable>
+ <type>boolean</type>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/13dc76c7/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml
index 0c9299d..6c2d7c8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml
@@ -31,6 +31,9 @@
<value>false</value>
<display-name>Audit to DB</display-name>
<description>Is Audit to DB enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -75,6 +78,9 @@
<value>true</value>
<display-name>Audit to HDFS</display-name>
<description>Is Audit to HDFS enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -94,6 +100,9 @@
<value>false</value>
<display-name>Audit to SOLR</display-name>
<description>Is Solr audit enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -119,6 +128,9 @@
<value>false</value>
<display-name>Audit provider summary enabled</display-name>
<description>Enable Summary audit?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/13dc76c7/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml
index 9837c0e..71c8cce 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml
@@ -31,6 +31,9 @@
<value>false</value>
<display-name>Audit to DB</display-name>
<description>Is Audit to DB enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -75,6 +78,9 @@
<value>true</value>
<display-name>Audit to HDFS</display-name>
<description>Is Audit to HDFS enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -94,6 +100,9 @@
<value>false</value>
<display-name>Audit to SOLR</display-name>
<description>Is Solr audit enabled?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
<property>
@@ -119,6 +128,9 @@
<value>false</value>
<display-name>Audit provider summary enabled</display-name>
<description>Enable Summary audit?</description>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/13dc76c7/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 141f3e9..55d398f 100644
--- a/ambari-web/app/data/HDP2.2/site_properties.js
+++ b/ambari-web/app/data/HDP2.2/site_properties.js
@@ -47,15 +47,13 @@ hdp22properties.push(
"name": "hive.zookeeper.quorum",
"displayType": "multiLine",
"serviceName": "HIVE",
- "filename": "hive-site.xml",
- "category": "Advanced hive-site"
+ "filename": "hive-site.xml"
},
{
"name": "hadoop.registry.rm.enabled",
"displayType": "checkbox",
"serviceName": "YARN",
- "filename": "yarn-site.xml",
- "category": "Advanced yarn-site"
+ "filename": "yarn-site.xml"
},
{
"name": "yarn.timeline-service.leveldb-state-store.path",
@@ -88,21 +86,18 @@ hdp22properties.push(
"displayType": "checkbox",
"dependentConfigPattern": "^XAAUDIT.HDFS",
"filename": "ranger-hdfs-plugin-properties.xml",
- "category": "Advanced ranger-hdfs-plugin-properties",
"serviceName": "HDFS"
},
{
"name": "XAAUDIT.DB.IS_ENABLED",
"displayType": "checkbox",
"filename": "ranger-hdfs-plugin-properties.xml",
- "category": "Advanced ranger-hdfs-plugin-properties",
"serviceName": "HDFS"
},
{
"name": "ranger-hdfs-plugin-enabled",
"displayType": "checkbox",
"filename": "ranger-hdfs-plugin-properties.xml",
- "category": "Advanced ranger-hdfs-plugin-properties",
"serviceName": "HDFS",
"index": 1
},
@@ -112,21 +107,18 @@ hdp22properties.push(
"displayType": "checkbox",
"dependentConfigPattern": "^XAAUDIT.HDFS",
"filename": "ranger-hive-plugin-properties.xml",
- "category": "Advanced ranger-hive-plugin-properties",
"serviceName": "HIVE"
},
{
"name": "XAAUDIT.DB.IS_ENABLED",
"displayType": "checkbox",
"filename": "ranger-hive-plugin-properties.xml",
- "category": "Advanced ranger-hive-plugin-properties",
"serviceName": "HIVE"
},
{
"name": "UPDATE_XAPOLICIES_ON_GRANT_REVOKE",
"displayType": "checkbox",
"filename": "ranger-hive-plugin-properties.xml",
- "category": "Advanced ranger-hive-plugin-properties",
"serviceName": "HIVE"
},
/*********RANGER FOR HBASE************/
@@ -135,21 +127,18 @@ hdp22properties.push(
"displayType": "checkbox",
"dependentConfigPattern": "^XAAUDIT.HDFS",
"filename": "ranger-hbase-plugin-properties.xml",
- "category": "Advanced ranger-hbase-plugin-properties",
"serviceName": "HBASE"
},
{
"name": "XAAUDIT.DB.IS_ENABLED",
"displayType": "checkbox",
"filename": "ranger-hbase-plugin-properties.xml",
- "category": "Advanced ranger-hbase-plugin-properties",
"serviceName": "HBASE"
},
{
"name": "ranger-hbase-plugin-enabled",
"displayType": "checkbox",
"filename": "ranger-hbase-plugin-properties.xml",
- "category": "Advanced ranger-hbase-plugin-properties",
"serviceName": "HBASE",
"index": 1
},
@@ -157,7 +146,6 @@ hdp22properties.push(
"name": "UPDATE_XAPOLICIES_ON_GRANT_REVOKE",
"displayType": "checkbox",
"filename": "ranger-hbase-plugin-properties.xml",
- "category": "Advanced ranger-hbase-plugin-properties",
"serviceName": "HBASE"
},
/*********RANGER FOR STORM************/
@@ -166,21 +154,18 @@ hdp22properties.push(
"displayType": "checkbox",
"dependentConfigPattern": "^XAAUDIT.HDFS",
"filename": "ranger-storm-plugin-properties.xml",
- "category": "Advanced ranger-storm-plugin-properties",
"serviceName": "STORM"
},
{
"name": "XAAUDIT.DB.IS_ENABLED",
"displayType": "checkbox",
"filename": "ranger-storm-plugin-properties.xml",
- "category": "Advanced ranger-storm-plugin-properties",
"serviceName": "STORM"
},
{
"name": "ranger-storm-plugin-enabled",
"displayType": "checkbox",
"filename": "ranger-storm-plugin-properties.xml",
- "category": "Advanced ranger-storm-plugin-properties",
"serviceName": "STORM",
"index": 1
},
@@ -190,21 +175,18 @@ hdp22properties.push(
"displayType": "checkbox",
"dependentConfigPattern": "^XAAUDIT.HDFS",
"filename": "ranger-knox-plugin-properties.xml",
- "category": "Advanced ranger-knox-plugin-properties",
"serviceName": "KNOX"
},
{
"name": "XAAUDIT.DB.IS_ENABLED",
"displayType": "checkbox",
"filename": "ranger-knox-plugin-properties.xml",
- "category": "Advanced ranger-knox-plugin-properties",
"serviceName": "KNOX"
},
{
"name": "ranger-knox-plugin-enabled",
"displayType": "checkbox",
"filename": "ranger-knox-plugin-properties.xml",
- "category": "Advanced ranger-knox-plugin-properties",
"serviceName": "KNOX",
"index": 1
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/13dc76c7/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 8041bc6..8495dee 100644
--- a/ambari-web/app/data/HDP2.3/site_properties.js
+++ b/ambari-web/app/data/HDP2.3/site_properties.js
@@ -71,59 +71,9 @@ var hdp23properties = hdp22properties.filter(function (item) {
hdp23properties.push({
/**************************************** RANGER - HDFS Plugin ***************************************/
- "name": "xasecure.audit.destination.db",
- "displayType": "checkbox",
- "filename": "ranger-hdfs-audit.xml",
- "category": "Advanced ranger-hdfs-audit",
- "serviceName": "HDFS"
- },
- {
- "name": "xasecure.audit.destination.hdfs",
- "displayType": "checkbox",
- "filename": "ranger-hdfs-audit.xml",
- "category": "Advanced ranger-hdfs-audit",
- "serviceName": "HDFS"
- },
- {
- "name": "xasecure.audit.destination.solr",
- "displayType": "checkbox",
- "filename": "ranger-hdfs-audit.xml",
- "category": "Advanced ranger-hdfs-audit",
- "serviceName": "HDFS"
- },
- {
- "name": "xasecure.audit.destination.db",
- "displayType": "checkbox",
- "filename": "ranger-kms-audit.xml",
- "category": "Advanced ranger-kms-audit",
- "serviceName": "RANGER_KMS"
- },
- {
- "name": "xasecure.audit.destination.hdfs",
- "displayType": "checkbox",
- "filename": "ranger-kms-audit.xml",
- "category": "Advanced ranger-kms-audit",
- "serviceName": "RANGER_KMS"
- },
- {
- "name": "xasecure.audit.destination.solr",
- "displayType": "checkbox",
- "filename": "ranger-kms-audit.xml",
- "category": "Advanced ranger-kms-audit",
- "serviceName": "RANGER_KMS"
- },
- {
- "name": "xasecure.audit.provider.summary.enabled",
- "displayType": "checkbox",
- "filename": "ranger-kms-audit.xml",
- "category": "Advanced ranger-kms-audit",
- "serviceName": "RANGER_KMS"
- },
- {
"name": "ranger-yarn-plugin-enabled",
"displayType": "checkbox",
"filename": "ranger-yarn-plugin-properties.xml",
- "category": "Advanced ranger-yarn-plugin-properties",
"serviceName": "YARN",
"index": 1
},
@@ -131,116 +81,10 @@ hdp23properties.push({
"name": "ranger-kafka-plugin-enabled",
"displayType": "checkbox",
"filename": "ranger-kafka-plugin-properties.xml",
- "category": "Advanced ranger-kafka-plugin-properties",
"serviceName": "KAFKA",
"index": 1
},
{
- "name": "xasecure.audit.destination.db",
- "displayType": "checkbox",
- "filename": "ranger-hbase-audit.xml",
- "category": "Advanced ranger-hbase-audit",
- "serviceName": "HBASE"
- },
- {
- "name": "xasecure.audit.destination.hdfs",
- "displayType": "checkbox",
- "filename": "ranger-hbase-audit.xml",
- "category": "Advanced ranger-hbase-audit",
- "serviceName": "HBASE"
- },
- {
- "name": "xasecure.audit.destination.solr",
- "displayType": "checkbox",
- "filename": "ranger-hbase-audit.xml",
- "category": "Advanced ranger-hbase-audit",
- "serviceName": "HBASE"
- },
- {
- "name": "xasecure.audit.destination.db",
- "displayType": "checkbox",
- "filename": "ranger-hive-audit.xml",
- "category": "Advanced ranger-hive-audit",
- "serviceName": "HIVE"
- },
- {
- "name": "xasecure.audit.destination.hdfs",
- "displayType": "checkbox",
- "filename": "ranger-hive-audit.xml",
- "category": "Advanced ranger-hive-audit",
- "serviceName": "HIVE"
- },
- {
- "name": "xasecure.audit.destination.solr",
- "displayType": "checkbox",
- "filename": "ranger-hive-audit.xml",
- "category": "Advanced ranger-hive-audit",
- "serviceName": "HIVE"
- },
- {
- "name": "xasecure.audit.destination.db",
- "displayType": "checkbox",
- "filename": "ranger-knox-audit.xml",
- "category": "Advanced ranger-knox-audit",
- "serviceName": "KNOX"
- },
- {
- "name": "xasecure.audit.destination.hdfs",
- "displayType": "checkbox",
- "filename": "ranger-knox-audit.xml",
- "category": "Advanced ranger-knox-audit",
- "serviceName": "KNOX"
- },
- {
- "name": "xasecure.audit.destination.solr",
- "displayType": "checkbox",
- "filename": "ranger-knox-audit.xml",
- "category": "Advanced ranger-knox-audit",
- "serviceName": "KNOX"
- },
- {
- "name": "xasecure.audit.destination.db",
- "displayType": "checkbox",
- "filename": "ranger-storm-audit.xml",
- "category": "Advanced ranger-storm-audit",
- "serviceName": "STORM"
- },
- {
- "name": "xasecure.audit.destination.hdfs",
- "displayType": "checkbox",
- "filename": "ranger-storm-audit.xml",
- "category": "Advanced ranger-storm-audit",
- "serviceName": "STORM"
- },
- {
- "name": "xasecure.audit.destination.solr",
- "displayType": "checkbox",
- "filename": "ranger-storm-audit.xml",
- "category": "Advanced ranger-storm-audit",
- "serviceName": "STORM"
- },
- {
- "name": "xasecure.audit.destination.db",
- "displayType": "checkbox",
- "filename": "ranger-yarn-audit.xml",
- "category": "Advanced ranger-yarn-audit",
- "serviceName": "YARN"
- },
- {
- "name": "xasecure.audit.destination.hdfs",
- "displayType": "checkbox",
- "filename": "ranger-yarn-audit.xml",
- "category": "Advanced ranger-yarn-audit",
- "serviceName": "YARN"
- },
- {
- "name": "xasecure.audit.destination.solr",
- "displayType": "checkbox",
- "filename": "ranger-yarn-audit.xml",
- "category": "Advanced ranger-yarn-audit",
- "serviceName": "YARN"
- },
- {
"name": "nimbus.seeds",
"displayType": "componentHosts",
"serviceName": "STORM",
@@ -248,111 +92,6 @@ hdp23properties.push({
"category": "NIMBUS"
},
{
- "name": "xasecure.audit.destination.db",
- "displayType": "checkbox",
- "filename": "ranger-kafka-audit.xml",
- "category": "Advanced ranger-kafka-audit",
- "serviceName": "KAFKA"
- },
- {
- "name": "xasecure.audit.destination.hdfs",
- "displayType": "checkbox",
- "filename": "ranger-kafka-audit.xml",
- "category": "Advanced ranger-kafka-audit",
- "serviceName": "KAFKA"
- },
- {
- "name": "xasecure.audit.destination.solr",
- "displayType": "checkbox",
- "filename": "ranger-kafka-audit.xml",
- "category": "Advanced ranger-kafka-audit",
- "serviceName": "KAFKA"
- },
- {
- "name": "xasecure.audit.provider.summary.enabled",
- "displayType": "checkbox",
- "filename": "ranger-hdfs-audit.xml",
- "category": "Advanced ranger-hdfs-audit",
- "serviceName": "HDFS"
- },
- {
- "name": "xasecure.audit.provider.summary.enabled",
- "displayType": "checkbox",
- "filename": "ranger-hbase-audit.xml",
- "category": "Advanced ranger-hbase-audit",
- "serviceName": "HBASE"
- },
- {
- "name": "xasecure.audit.provider.summary.enabled",
- "displayType": "checkbox",
- "filename": "ranger-hive-audit.xml",
- "category": "Advanced ranger-hive-audit",
- "serviceName": "HIVE"
- },
- {
- "name": "xasecure.audit.provider.summary.enabled",
- "displayType": "checkbox",
- "filename": "ranger-knox-audit.xml",
- "category": "Advanced ranger-knox-audit",
- "serviceName": "KNOX"
- },
- {
- "name": "xasecure.audit.provider.summary.enabled",
- "displayType": "checkbox",
- "filename": "ranger-yarn-audit.xml",
- "category": "Advanced ranger-yarn-audit",
- "serviceName": "YARN"
- },
- {
- "name": "xasecure.audit.provider.summary.enabled",
- "displayType": "checkbox",
- "filename": "ranger-storm-audit.xml",
- "category": "Advanced ranger-storm-audit",
- "serviceName": "STORM"
- },
- {
- "name": "xasecure.audit.provider.summary.enabled",
- "displayType": "checkbox",
- "filename": "ranger-kafka-audit.xml",
- "category": "Advanced ranger-kafka-audit",
- "serviceName": "KAFKA"
- },
- {
- "name": "ranger.jpa.jdbc.url",
- "serviceName": "RANGER",
- "filename": "ranger-admin-site.xml",
- "category": "DBSettings",
- "index": 9
- },
- {
- "name": "ranger.jpa.jdbc.driver",
- "serviceName": "RANGER",
- "filename": "ranger-admin-site.xml",
- "category": "DBSettings",
- "index": 8
- },
- {
- "name": "db_root_user",
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "DBSettings",
- "index": 5
- },
- {
- "name": "db_root_password",
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "DBSettings",
- "index": 6
- },
- {
- "name": "db_name",
- "serviceName": "RANGER",
- "filename": "admin-properties.xml",
- "category": "DBSettings",
- "index": 7
- },
- {
"name": "ranger.externalurl",
"serviceName": "RANGER",
"filename": "ranger-admin-site.xml",
@@ -360,7 +99,6 @@ hdp23properties.push({
},
{
"name": "ranger.service.http.enabled",
- "displayType": "checkbox",
"serviceName": "RANGER",
"filename": "ranger-admin-site.xml",
"category": "RangerSettings"
@@ -505,22 +243,6 @@ hdp23properties.push({
"serviceName": "RANGER",
"filename": "ranger-admin-site.xml",
"category": "ADSettings"
- },
- /*********RANGER FOR HBASE************/
- {
- "name": "xasecure.hbase.update.xapolicies.on.grant.revoke",
- "displayType": "checkbox",
- "filename": "ranger-hbase-security.xml",
- "category": "Advanced ranger-hbase-security",
- "serviceName": "HBASE"
- },
- /*********RANGER FOR HIVE************/
- {
- "name": "xasecure.hive.update.xapolicies.on.grant.revoke",
- "displayType": "checkbox",
- "filename": "ranger-hive-security.xml",
- "category": "Advanced ranger-hive-security",
- "serviceName": "HIVE"
}
);
http://git-wip-us.apache.org/repos/asf/ambari/blob/13dc76c7/ambari-web/app/data/HDP2/alert_notification.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/alert_notification.js b/ambari-web/app/data/HDP2/alert_notification.js
new file mode 100644
index 0000000..aba7436
--- /dev/null
+++ b/ambari-web/app/data/HDP2/alert_notification.js
@@ -0,0 +1,145 @@
+/**
+ * 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.
+ */
+
+/**
+ * Alert Notification Properties
+ */
+module.exports = [
+ {
+ "name": "create_notification",
+ "displayName": "Create Notification",
+ "isOverridable": false,
+ "isVisible": false,
+ "serviceName": "MISC",
+ "category": "Notifications",
+ "recommendedValue": "no",
+ "filename": "alert_notification"
+ },
+ {
+ "name": "mail.smtp.host",
+ "displayName": "SMTP Host",
+ "displayType": "host",
+ "isRequired": false,
+ "isReconfigurable": true,
+ "isOverridable": false,
+ "isVisible": true,
+ "serviceName": "MISC",
+ "category": "Notifications",
+ "rowStyleClass": "indent-1",
+ "filename": "alert_notification"
+ },
+ {
+ "name": "mail.smtp.port",
+ "displayName": "SMTP Port",
+ "displayType": "int",
+ "isRequired": false,
+ "isReconfigurable": true,
+ "isOverridable": false,
+ "isVisible": true,
+ "serviceName": "MISC",
+ "category": "Notifications",
+ "rowStyleClass": "indent-1",
+ "filename": "alert_notification"
+ },
+ {
+ "name": "mail.smtp.from",
+ "displayName": "FROM Email Address",
+ "displayType": "email",
+ "isRequired": false,
+ "isReconfigurable": true,
+ "isOverridable": false,
+ "isVisible": true,
+ "serviceName": "MISC",
+ "category": "Notifications",
+ "rowStyleClass": "indent-1",
+ "filename": "alert_notification"
+ },
+ {
+ "name": "ambari.dispatch.recipients",
+ "displayName": " TO Email Address",
+ "displayType": "email",
+ "isRequired": false,
+ "isReconfigurable": true,
+ "isOverridable": false,
+ "isVisible": true,
+ "serviceName": "MISC",
+ "category": "Notifications",
+ "rowStyleClass": "indent-1",
+ "filename": "alert_notification"
+ },
+ {
+ "name": "smtp_use_auth",
+ "displayName": "SMTP server requires authentication",
+ "displayType": "checkbox",
+ "isRequired": false,
+ "isReconfigurable": true,
+ "isOverridable": false,
+ "recommendedValue": true,
+ "isVisible": true,
+ "serviceName": "MISC",
+ "category": "Notifications",
+ "rowStyleClass": "indent-1",
+ "filename": "alert_notification"
+ },
+ {
+ "name": "ambari.dispatch.credential.username",
+ "displayName": "SMTP Username",
+ "isRequired": false,
+ "isReconfigurable": true,
+ "isOverridable": false,
+ "isVisible": true,
+ "serviceName": "MISC",
+ "category": "Notifications",
+ "rowStyleClass": "indent-2",
+ "filename": "alert_notification"
+ },
+ {
+ "name": "ambari.dispatch.credential.password",
+ "displayName": "SMTP Password",
+ "isRequired": false,
+ "isReconfigurable": true,
+ "isOverridable": false,
+ "isVisible": true,
+ "serviceName": "MISC",
+ "category": "Notifications",
+ "rowStyleClass": "indent-2",
+ "filename": "alert_notification"
+ },
+ {
+ "name": "mail.smtp.starttls.enable",
+ "isRequired": false,
+ "isReconfigurable": true,
+ "isOverridable": false,
+ "isVisible": false,
+ "serviceName": "MISC",
+ "category": "Notifications",
+ "rowStyleClass": "indent-1",
+ "filename": "alert_notification"
+ },
+ {
+ "name": "mail.smtp.startssl.enable",
+ "isRequired": false,
+ "isReconfigurable": true,
+ "isOverridable": false,
+ "isVisible": false,
+ "serviceName": "MISC",
+ "category": "Notifications",
+ "rowStyleClass": "indent-1",
+ "filename": "alert_notification"
+ }
+];
http://git-wip-us.apache.org/repos/asf/ambari/blob/13dc76c7/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 2f99772..7b2b5c5 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -116,7 +116,6 @@ var hdp2properties = [
{
"name": "dfs.client.read.shortcircuit",
"displayType": "checkbox",
- "category": "Advanced hdfs-site",
"serviceName": "HDFS",
"filename": "hdfs-site.xml"
},
@@ -188,15 +187,13 @@ var hdp2properties = [
"name": "hdfs_log_dir_prefix",
"displayType": "directory",
"serviceName": "HDFS",
- "filename": "hadoop-env.xml",
- "category": "Advanced hadoop-env"
+ "filename": "hadoop-env.xml"
},
{
"name": "hadoop_pid_dir_prefix",
"displayType": "directory",
"serviceName": "HDFS",
- "filename": "hadoop-env.xml",
- "category": "Advanced hadoop-env"
+ "filename": "hadoop-env.xml"
},
/**********************************************YARN***************************************/
@@ -325,22 +322,19 @@ var hdp2properties = [
"name": "yarn_log_dir_prefix",
"displayType": "directory",
"serviceName": "YARN",
- "filename": "yarn-env.xml",
- "category": "Advanced yarn-env"
+ "filename": "yarn-env.xml"
},
{
"name": "yarn_pid_dir_prefix",
"displayType": "directory",
"serviceName": "YARN",
- "filename": "yarn-env.xml",
- "category": "Advanced yarn-env"
+ "filename": "yarn-env.xml"
},
{
"name": "min_user_id",
"displayType": "int",
"serviceName": "YARN",
- "filename": "yarn-env.xml",
- "category": "Advanced yarn-env"
+ "filename": "yarn-env.xml"
},
{
"name": "apptimelineserver_heapsize",
@@ -376,13 +370,11 @@ var hdp2properties = [
"name": "hadoop.security.auth_to_local",
"displayType": "multiLine",
"serviceName": "HDFS",
- "filename": "core-site.xml",
- "category": "Advanced core-site"
+ "filename": "core-site.xml"
},
{
"name": "yarn.app.mapreduce.am.resource.mb",
"displayType": "int",
- "category": "Advanced mapred-site",
"serviceName": "MAPREDUCE2",
"filename": "mapred-site.xml"
},
@@ -398,15 +390,13 @@ var hdp2properties = [
"name": "mapred_log_dir_prefix",
"displayType": "directory",
"serviceName": "MAPREDUCE2",
- "filename": "mapred-env.xml",
- "category": "Advanced mapred-env"
+ "filename": "mapred-env.xml"
},
{
"name": "mapred_pid_dir_prefix",
"displayType": "directory",
"serviceName": "MAPREDUCE2",
- "filename": "mapred-env.xml",
- "category": "Advanced mapred-env"
+ "filename": "mapred-env.xml"
},
/**********************************************oozie-site***************************************/
{
@@ -498,22 +488,19 @@ var hdp2properties = [
"name": "oozie_log_dir",
"displayType": "directory",
"serviceName": "OOZIE",
- "filename": "oozie-env.xml",
- "category": "Advanced oozie-env"
+ "filename": "oozie-env.xml"
},
{
"name": "oozie_pid_dir",
"displayType": "directory",
"serviceName": "OOZIE",
- "filename": "oozie-env.xml",
- "category": "Advanced oozie-env"
+ "filename": "oozie-env.xml"
},
{
"name": "oozie_admin_port",
"displayType": "int",
"serviceName": "OOZIE",
- "filename": "oozie-env.xml",
- "category": "Advanced oozie-env"
+ "filename": "oozie-env.xml"
},
/**********************************************HIVE***************************************/
@@ -583,21 +570,18 @@ var hdp2properties = [
{
"name": "hive.server2.thrift.port",
"displayType": "int",
- "category": "Advanced hive-site",
"serviceName": "HIVE",
"filename": "hive-site.xml"
},
{
"name": "hive.server2.support.dynamic.service.discovery",
"displayType": "checkbox",
- "category": "Advanced hive-site",
"serviceName": "HIVE",
"filename": "hive-site.xml"
},
{
"name": "hive.security.authorization.enabled",
"displayType": "checkbox",
- "category": "Advanced hive-site",
"serviceName": "HIVE",
"filename": "hive-site.xml"
},
@@ -651,15 +635,13 @@ var hdp2properties = [
"name": "hive_log_dir",
"displayType": "directory",
"serviceName": "HIVE",
- "filename": "hive-env.xml",
- "category": "Advanced hive-env"
+ "filename": "hive-env.xml"
},
{
"name": "hive_pid_dir",
"displayType": "directory",
"serviceName": "HIVE",
- "filename": "hive-env.xml",
- "category": "Advanced hive-env"
+ "filename": "hive-env.xml"
},
{
"name": "hcat_log_dir",
@@ -678,8 +660,7 @@ var hdp2properties = [
{
"name": "hive_database_name",
"serviceName": "HIVE",
- "filename": "hive-env.xml",
- "category": "Advanced hive-env"
+ "filename": "hive-env.xml"
},
{
"name": "hive_database_type",
@@ -759,7 +740,6 @@ var hdp2properties = [
{
"name": "hbase.tmp.dir",
"displayType": "directory",
- "category": "Advanced hbase-site",
"serviceName": "HBASE",
"filename": "hbase-site.xml"
},
@@ -767,27 +747,23 @@ var hdp2properties = [
"name": "hbase.master.port",
"displayType": "int",
"serviceName": "HBASE",
- "filename": "hbase-site.xml",
- "category": "Advanced hbase-site"
+ "filename": "hbase-site.xml"
},
{
"name": "hbase.regionserver.global.memstore.upperLimit",
"displayType": "float",
- "category": "Advanced hbase-site",
"serviceName": "HBASE",
"filename": "hbase-site.xml"
},
{
"name": "hbase.regionserver.global.memstore.lowerLimit",
"displayType": "float",
- "category": "Advanced hbase-site",
"serviceName": "HBASE",
"filename": "hbase-site.xml"
},
{
"name": "hbase.hstore.blockingStoreFiles",
"displayType": "int",
- "category": "Advanced hbase-site",
"serviceName": "HBASE",
"filename": "hbase-site.xml"
},
@@ -842,7 +818,6 @@ var hdp2properties = [
{
"name": "hbase.hregion.memstore.mslab.enabled",
"displayType": "checkbox",
- "category": "Advanced hbase-site",
"serviceName": "HBASE",
"filename": "hbase-site.xml"
},
@@ -882,8 +857,7 @@ var hdp2properties = [
"name": "hbase.zookeeper.quorum",
"displayType": "multiLine",
"serviceName": "HBASE",
- "filename": "hbase-site.xml",
- "category": "Advanced hbase-site"
+ "filename": "hbase-site.xml"
},
{
"name": "hbase_master_heapsize",
@@ -921,15 +895,13 @@ var hdp2properties = [
"name": "hbase_log_dir",
"displayType": "directory",
"serviceName": "HBASE",
- "filename": "hbase-env.xml",
- "category": "Advanced hbase-env"
+ "filename": "hbase-env.xml"
},
{
"name": "hbase_pid_dir",
"displayType": "directory",
"serviceName": "HBASE",
- "filename": "hbase-env.xml",
- "category": "Advanced hbase-env"
+ "filename": "hbase-env.xml"
},
/**********************************************storm-site***************************************/
@@ -1251,7 +1223,6 @@ var hdp2properties = [
{
"name": "worker.childopts",
"displayType": "multiLine",
- "category": "Advanced storm-site",
"serviceName": "STORM",
"filename": "storm-site.xml"
},
@@ -1545,8 +1516,7 @@ var hdp2properties = [
"name": "templeton.zookeeper.hosts",
"displayType": "multiLine",
"serviceName": "HIVE",
- "filename": "webhcat-site.xml",
- "category": "Advanced webhcat-site"
+ "filename": "webhcat-site.xml"
},
/**********************************************KNOX*****************************************/
@@ -1560,8 +1530,7 @@ var hdp2properties = [
"name": "knox_pid_dir",
"displayType": "directory",
"serviceName": "KNOX",
- "filename": "knox-env.xml",
- "category": "Advanced knox-env"
+ "filename": "knox-env.xml"
},
/********************************************* KAFKA *****************************/
@@ -1617,7 +1586,6 @@ var hdp2properties = [
"displayType": "directory",
"serviceName": "KAFKA",
"filename": "kafka-env.xml",
- "category": "Advanced kafka-env",
"index": 0
},
@@ -1657,84 +1625,72 @@ var hdp2properties = [
"name": "server_content",
"displayType": "content",
"serviceName": "ACCUMULO",
- "filename": "accumulo-env.xml",
- "category": "Advanced accumulo-env"
+ "filename": "accumulo-env.xml"
},
{
"name": "accumulo_master_heapsize",
"displayType": "int",
"serviceName": "ACCUMULO",
- "filename": "accumulo-env.xml",
- "category": "Advanced accumulo-env"
+ "filename": "accumulo-env.xml"
},
{
"name": "accumulo_tserver_heapsize",
"displayType": "int",
"serviceName": "ACCUMULO",
- "filename": "accumulo-env.xml",
- "category": "Advanced accumulo-env"
+ "filename": "accumulo-env.xml"
},
{
"name": "accumulo_monitor_heapsize",
"displayType": "int",
"serviceName": "ACCUMULO",
- "filename": "accumulo-env.xml",
- "category": "Advanced accumulo-env"
+ "filename": "accumulo-env.xml"
},
{
"name": "accumulo_gc_heapsize",
"displayType": "int",
"serviceName": "ACCUMULO",
- "filename": "accumulo-env.xml",
- "category": "Advanced accumulo-env"
+ "filename": "accumulo-env.xml"
},
{
"name": "accumulo_other_heapsize",
"displayType": "int",
"serviceName": "ACCUMULO",
- "filename": "accumulo-env.xml",
- "category": "Advanced accumulo-env"
+ "filename": "accumulo-env.xml"
},
{
"name": "accumulo_log_dir",
"displayType": "directory",
"serviceName": "ACCUMULO",
- "filename": "accumulo-env.xml",
- "category": "Advanced accumulo-env"
+ "filename": "accumulo-env.xml"
},
{
"name": "accumulo_pid_dir",
"displayType": "directory",
"serviceName": "ACCUMULO",
- "filename": "accumulo-env.xml",
- "category": "Advanced accumulo-env"
+ "filename": "accumulo-env.xml"
},
{
"name": "accumulo_monitor_bind_all",
"displayType": "checkbox",
"serviceName": "ACCUMULO",
- "filename": "accumulo-env.xml",
- "category": "Advanced accumulo-env"
+ "filename": "accumulo-env.xml"
},
{
"name": "instance.volumes",
"serviceName": "ACCUMULO",
"filename": "accumulo-site.xml",
- "category": "Advanced accumulo-site",
"index": 0
},
{
"name": "instance.zookeeper.host",
"serviceName": "ACCUMULO",
"filename": "accumulo-site.xml",
- "category": "Advanced accumulo-site",
"index": 1
},
{
"name": "instance.zookeeper.timeout",
"serviceName": "ACCUMULO",
"filename": "accumulo-site.xml",
- "category": "Advanced accumulo-site",
"index": 2
},
{
@@ -1742,7 +1698,6 @@ var hdp2properties = [
"displayType": "int",
"serviceName": "ACCUMULO",
"filename": "accumulo-site.xml",
- "category": "Advanced accumulo-site",
"index": 3
},
{
@@ -1750,7 +1705,6 @@ var hdp2properties = [
"displayType": "int",
"serviceName": "ACCUMULO",
"filename": "accumulo-site.xml",
- "category": "Advanced accumulo-site",
"index": 4
},
{
@@ -1758,7 +1712,6 @@ var hdp2properties = [
"displayType": "int",
"serviceName": "ACCUMULO",
"filename": "accumulo-site.xml",
- "category": "Advanced accumulo-site",
"index": 5
},
{
@@ -1766,7 +1719,6 @@ var hdp2properties = [
"displayType": "int",
"serviceName": "ACCUMULO",
"filename": "accumulo-site.xml",
- "category": "Advanced accumulo-site",
"index": 6
},
{
@@ -1774,7 +1726,6 @@ var hdp2properties = [
"displayType": "int",
"serviceName": "ACCUMULO",
"filename": "accumulo-site.xml",
- "category": "Advanced accumulo-site",
"index": 7
},
{
@@ -1782,7 +1733,6 @@ var hdp2properties = [
"displayType": "int",
"serviceName": "ACCUMULO",
"filename": "accumulo-site.xml",
- "category": "Advanced accumulo-site",
"index": 8
},
{
@@ -1790,7 +1740,6 @@ var hdp2properties = [
"displayType": "checkbox",
"serviceName": "ACCUMULO",
"filename": "accumulo-site.xml",
- "category": "Advanced accumulo-site",
"index": 9
},
{
@@ -1798,7 +1747,6 @@ var hdp2properties = [
"displayType": "content",
"serviceName": "ACCUMULO",
"filename": "accumulo-site.xml",
- "category": "Advanced accumulo-site",
"index": 10
},
@@ -2020,7 +1968,6 @@ var hdp2properties = [
"isOverridable": false,
"serviceName": "FLUME",
"filename": "flume-env.xml",
- "category": "Advanced flume-env",
"index": 0
},
{
@@ -2028,7 +1975,6 @@ var hdp2properties = [
"displayType": "directory",
"serviceName": "FLUME",
"filename": "flume-env.xml",
- "category": "Advanced flume-env",
"index": 1
},
@@ -2173,7 +2119,6 @@ var hdp2properties = [
"displayType": "directory",
"serviceName": "ZOOKEEPER",
"filename": "zookeeper-env.xml",
- "category": "Advanced zookeeper-env",
"index": 0
},
{
@@ -2181,7 +2126,6 @@ var hdp2properties = [
"displayType": "directory",
"serviceName": "ZOOKEEPER",
"filename": "zookeeper-env.xml",
- "category": "Advanced zookeeper-env",
"index": 1
},
/**********************************************FALCON***************************************/
@@ -2209,37 +2153,32 @@ var hdp2properties = [
"name": "falcon_log_dir",
"displayType": "directory",
"serviceName": "FALCON",
- "filename": "falcon-env.xml",
- "category": "Advanced falcon-env"
+ "filename": "falcon-env.xml"
},
{
"name": "falcon_pid_dir",
"displayType": "directory",
"serviceName": "FALCON",
- "filename": "falcon-env.xml",
- "category": "Advanced falcon-env"
+ "filename": "falcon-env.xml"
},
{
"name": "falcon.embeddedmq.data",
"displayType": "directory",
"serviceName": "FALCON",
- "filename": "falcon-env.xml",
- "category": "Advanced falcon-env"
+ "filename": "falcon-env.xml"
},
/**********************************************STORM***************************************/
{
"name": "storm_log_dir",
"displayType": "directory",
"serviceName": "STORM",
- "filename": "storm-env.xml",
- "category": "Advanced storm-env"
+ "filename": "storm-env.xml"
},
{
"name": "storm_pid_dir",
"displayType": "directory",
"serviceName": "STORM",
- "filename": "storm-env.xml",
- "category": "Advanced storm-env"
+ "filename": "storm-env.xml"
},
/**********************************************MISC***************************************/
{
@@ -2254,129 +2193,6 @@ var hdp2properties = [
"filename": "cluster-env.xml",
"category": "Users and Groups"
},
- /******************************************Alert Notification***************************/
- {
- "name": "create_notification",
- "displayName": "Create Notification",
- "isOverridable": false,
- "isVisible": false,
- "serviceName": "MISC",
- "category": "Notifications",
- "recommendedValue": "no",
- "filename": "alert_notification"
- },
- {
- "name": "mail.smtp.host",
- "displayName": "SMTP Host",
- "displayType": "host",
- "isRequired": false,
- "isReconfigurable": true,
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "MISC",
- "category": "Notifications",
- "rowStyleClass": "indent-1",
- "filename": "alert_notification"
- },
- {
- "name": "mail.smtp.port",
- "displayName": "SMTP Port",
- "displayType": "int",
- "isRequired": false,
- "isReconfigurable": true,
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "MISC",
- "category": "Notifications",
- "rowStyleClass": "indent-1",
- "filename": "alert_notification"
- },
- {
- "name": "mail.smtp.from",
- "displayName": "FROM Email Address",
- "displayType": "email",
- "isRequired": false,
- "isReconfigurable": true,
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "MISC",
- "category": "Notifications",
- "rowStyleClass": "indent-1",
- "filename": "alert_notification"
- },
- {
- "name": "ambari.dispatch.recipients",
- "displayName": " TO Email Address",
- "displayType": "email",
- "isRequired": false,
- "isReconfigurable": true,
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "MISC",
- "category": "Notifications",
- "rowStyleClass": "indent-1",
- "filename": "alert_notification"
- },
- {
- "name": "smtp_use_auth",
- "displayName": "SMTP server requires authentication",
- "displayType": "checkbox",
- "isRequired": false,
- "isReconfigurable": true,
- "isOverridable": false,
- "recommendedValue": true,
- "isVisible": true,
- "serviceName": "MISC",
- "category": "Notifications",
- "rowStyleClass": "indent-1",
- "filename": "alert_notification"
- },
- {
- "name": "ambari.dispatch.credential.username",
- "displayName": "SMTP Username",
- "isRequired": false,
- "isReconfigurable": true,
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "MISC",
- "category": "Notifications",
- "rowStyleClass": "indent-2",
- "filename": "alert_notification"
- },
- {
- "name": "ambari.dispatch.credential.password",
- "displayName": "SMTP Password",
- "isRequired": false,
- "isReconfigurable": true,
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "MISC",
- "category": "Notifications",
- "rowStyleClass": "indent-2",
- "filename": "alert_notification"
- },
- {
- "name": "mail.smtp.starttls.enable",
- "isRequired": false,
- "isReconfigurable": true,
- "isOverridable": false,
- "isVisible": false,
- "serviceName": "MISC",
- "category": "Notifications",
- "rowStyleClass": "indent-1",
- "filename": "alert_notification"
- },
- {
- "name": "mail.smtp.startssl.enable",
- "isRequired": false,
- "isReconfigurable": true,
- "isOverridable": false,
- "isVisible": false,
- "serviceName": "MISC",
- "category": "Notifications",
- "rowStyleClass": "indent-1",
- "filename": "alert_notification"
- },
/************************************************AMBARI_METRICS******************************************/
{
"name": "timeline.metrics.service.operation.mode",
@@ -2630,7 +2446,7 @@ var hdp2properties = [
"filename": "storm-env.xml",
"index": 12
}
-];
+].concat(require('data/HDP2/alert_notification'));
if (App.get('isHadoopWindowsStack')) {
var excludedWindowsConfigs = [
http://git-wip-us.apache.org/repos/asf/ambari/blob/13dc76c7/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 632cc1e..01b4eb2 100644
--- a/ambari-web/app/models/configs/objects/service_config_property.js
+++ b/ambari-web/app/models/configs/objects/service_config_property.js
@@ -241,6 +241,7 @@ App.ServiceConfigProperty = Em.Object.extend({
viewClass: function () {
switch (this.get('displayType')) {
case 'checkbox':
+ case 'boolean':
if (this.get('dependentConfigPattern')) {
return App.ServiceConfigCheckboxWithDependencies;
} else {