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 2014/11/26 11:51:51 UTC
ambari git commit: AMBARI-8442 - Fix for DB, Hbase, Zookeeper and UI
Repository: ambari
Updated Branches:
refs/heads/trunk 6961473c0 -> cab42f233
AMBARI-8442 - Fix for DB, Hbase, Zookeeper and UI
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cab42f23
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cab42f23
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cab42f23
Branch: refs/heads/trunk
Commit: cab42f233793c140412e3583300451a061f75f52
Parents: 6961473
Author: Artem Baranchuk <ab...@hortonworks.com>
Authored: Wed Nov 26 02:38:01 2014 +0200
Committer: Artem Baranchuk <ab...@hortonworks.com>
Committed: Wed Nov 26 12:51:16 2014 +0200
----------------------------------------------------------------------
.../resources/Ambari-DDL-SQLServer-CREATE.sql | 15 ++++--
.../resources/Ambari-DDL-SQLServer-DROP.sql | 34 ++++++--------
.../ZOOKEEPER/configuration/zoo.cfg.xml | 49 ++++++++++++++++++++
.../ZOOKEEPER/configuration/zookeeper-env.xml | 26 -----------
.../ZOOKEEPER/package/scripts/params.py | 13 ++----
ambari-web/app/data/HDP2/site_properties.js | 33 ++++++++-----
6 files changed, 102 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/cab42f23/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
index 69dc552..f553f6e 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
@@ -39,8 +39,9 @@ CREATE TABLE serviceconfigmapping (service_config_id BIGINT NOT NULL, config_id
CREATE TABLE clusterconfigmapping (cluster_id BIGINT NOT NULL, type_name VARCHAR(255) NOT NULL, version_tag VARCHAR(255) NOT NULL, create_timestamp BIGINT NOT NULL, selected INTEGER NOT NULL DEFAULT 0, user_name VARCHAR(255) NOT NULL DEFAULT '_db', PRIMARY KEY CLUSTERED (cluster_id, type_name, create_timestamp));
CREATE TABLE clusterservices (service_name VARCHAR(255) NOT NULL, cluster_id BIGINT NOT NULL, service_enabled INTEGER NOT NULL, PRIMARY KEY CLUSTERED (service_name, cluster_id));
CREATE TABLE clusterstate (cluster_id BIGINT NOT NULL, current_cluster_state VARCHAR(255) NOT NULL, current_stack_version VARCHAR(255) NOT NULL, PRIMARY KEY CLUSTERED (cluster_id));
+CREATE TABLE cluster_version (id BIGINT NOT NULL, cluster_id BIGINT NOT NULL, stack VARCHAR(255) NOT NULL, version VARCHAR(255) NOT NULL, state VARCHAR(255) NOT NULL, start_time BIGINT NOT NULL, end_time BIGINT, user_name VARCHAR(255), PRIMARY KEY (id));
CREATE TABLE hostcomponentdesiredstate (cluster_id BIGINT NOT NULL, component_name VARCHAR(255) NOT NULL, desired_stack_version VARCHAR(255) NOT NULL, desired_state VARCHAR(255) NOT NULL, host_name VARCHAR(255) NOT NULL, service_name VARCHAR(255) NOT NULL, admin_state VARCHAR(32), maintenance_state VARCHAR(32) NOT NULL, security_state VARCHAR(32) NOT NULL DEFAULT 'UNSECURED', restart_required BIT NOT NULL DEFAULT 0, PRIMARY KEY CLUSTERED (cluster_id, component_name, host_name, service_name));
-CREATE TABLE hostcomponentstate (cluster_id BIGINT NOT NULL, component_name VARCHAR(255) NOT NULL, current_stack_version VARCHAR(255) NOT NULL, current_state VARCHAR(255) NOT NULL, host_name VARCHAR(255) NOT NULL, service_name VARCHAR(255), security_state VARCHAR(32) NOT NULL DEFAULT 'UNSECURED' NOT NULL, PRIMARY KEY CLUSTERED (cluster_id, component_name, host_name, service_name));
+CREATE TABLE hostcomponentstate (cluster_id BIGINT NOT NULL, component_name VARCHAR(255) NOT NULL, current_stack_version VARCHAR(255) NOT NULL, current_state VARCHAR(255) NOT NULL, host_name VARCHAR(255) NOT NULL, service_name VARCHAR(255) NOT NULL, upgrade_state VARCHAR(32) NOT NULL DEFAULT 'NONE', security_state VARCHAR(32) NOT NULL DEFAULT 'UNSECURED', PRIMARY KEY CLUSTERED (cluster_id, component_name, host_name, service_name));
CREATE TABLE hosts (host_name VARCHAR(255) NOT NULL, cpu_count INTEGER NOT NULL, ph_cpu_count INTEGER, cpu_info VARCHAR(255) NOT NULL, discovery_status VARCHAR(2000) NOT NULL, host_attributes VARCHAR(MAX) NOT NULL, ipv4 VARCHAR(255), ipv6 VARCHAR(255), public_host_name VARCHAR(255), last_registration_time BIGINT NOT NULL, os_arch VARCHAR(255) NOT NULL, os_info VARCHAR(1000) NOT NULL, os_type VARCHAR(255) NOT NULL, rack_info VARCHAR(255) NOT NULL, total_mem BIGINT NOT NULL, PRIMARY KEY CLUSTERED (host_name));
CREATE TABLE hoststate (agent_version VARCHAR(255) NOT NULL, available_mem BIGINT NOT NULL, current_state VARCHAR(255) NOT NULL, health_status VARCHAR(255), host_name VARCHAR(255) NOT NULL, time_in_state BIGINT NOT NULL, maintenance_state VARCHAR(512), PRIMARY KEY CLUSTERED (host_name));
CREATE TABLE servicecomponentdesiredstate (component_name VARCHAR(255) NOT NULL, cluster_id BIGINT NOT NULL, desired_stack_version VARCHAR(255) NOT NULL, desired_state VARCHAR(255) NOT NULL, service_name VARCHAR(255) NOT NULL, PRIMARY KEY CLUSTERED (component_name, cluster_id, service_name));
@@ -83,6 +84,7 @@ CREATE TABLE adminprincipaltype (principal_type_id INTEGER NOT NULL, principal_t
CREATE TABLE adminprincipal (principal_id BIGINT NOT NULL, principal_type_id INTEGER NOT NULL, PRIMARY KEY(principal_id));
CREATE TABLE adminpermission (permission_id BIGINT NOT NULL, permission_name VARCHAR(255) NOT NULL, resource_type_id INTEGER NOT NULL, PRIMARY KEY(permission_id));
CREATE TABLE adminprivilege (privilege_id BIGINT, permission_id BIGINT NOT NULL, resource_id BIGINT NOT NULL, principal_id BIGINT NOT NULL, PRIMARY KEY(privilege_id));
+CREATE TABLE host_version (id BIGINT NOT NULL, host_name VARCHAR(255) NOT NULL, stack VARCHAR(255) NOT NULL, version VARCHAR(255) NOT NULL, state VARCHAR(32) NOT NULL, PRIMARY KEY (id));
-- altering tables by creating unique constraints----------
--------altering tables to add constraints----------
@@ -103,6 +105,7 @@ ALTER TABLE clusterconfig ADD CONSTRAINT FK_clusterconfig_cluster_id FOREIGN KEY
ALTER TABLE clusterservices ADD CONSTRAINT FK_clusterservices_cluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id);
ALTER TABLE clusterconfigmapping ADD CONSTRAINT clusterconfigmappingcluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id);
ALTER TABLE clusterstate ADD CONSTRAINT FK_clusterstate_cluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id);
+ALTER TABLE cluster_version ADD CONSTRAINT FK_cluster_version_cluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id);
ALTER TABLE hostcomponentdesiredstate ADD CONSTRAINT hstcmponentdesiredstatehstname FOREIGN KEY (host_name) REFERENCES hosts (host_name);
ALTER TABLE hostcomponentdesiredstate ADD CONSTRAINT hstcmpnntdesiredstatecmpnntnme FOREIGN KEY (component_name, cluster_id, service_name) REFERENCES servicecomponentdesiredstate (component_name, cluster_id, service_name);
ALTER TABLE hostcomponentstate ADD CONSTRAINT hstcomponentstatecomponentname FOREIGN KEY (component_name, cluster_id, service_name) REFERENCES servicecomponentdesiredstate (component_name, cluster_id, service_name);
@@ -152,6 +155,7 @@ ALTER TABLE adminprivilege ADD CONSTRAINT FK_privilege_principal_id FOREIGN KEY
ALTER TABLE users ADD CONSTRAINT FK_users_principal_id FOREIGN KEY (principal_id) REFERENCES adminprincipal(principal_id);
ALTER TABLE groups ADD CONSTRAINT FK_groups_principal_id FOREIGN KEY (principal_id) REFERENCES adminprincipal(principal_id);
ALTER TABLE clusters ADD CONSTRAINT FK_clusters_resource_id FOREIGN KEY (resource_id) REFERENCES adminresource(resource_id);
+ALTER TABLE host_version ADD CONSTRAINT FK_host_version_host_name FOREIGN KEY (host_name) REFERENCES hosts (host_name);
-- Alerting Framework
CREATE TABLE alert_definition (
@@ -168,6 +172,7 @@ CREATE TABLE alert_definition (
source_type VARCHAR(255) NOT NULL,
alert_source TEXT NOT NULL,
hash VARCHAR(64) NOT NULL,
+ ignore_host SMALLINT DEFAULT 0 NOT NULL,
PRIMARY KEY (definition_id),
FOREIGN KEY (cluster_id) REFERENCES clusters(cluster_id),
CONSTRAINT uni_alert_def_name UNIQUE(cluster_id,definition_name)
@@ -309,6 +314,8 @@ BEGIN TRANSACTION
UNION ALL
SELECT 'operation_level_id_seq', 1
UNION ALL
+ SELECT 'cluster_version_id_seq', 0
+ UNION ALL
SELECT 'view_instance_id_seq', 1
UNION ALL
SELECT 'resource_type_id_seq', 4
@@ -341,7 +348,9 @@ BEGIN TRANSACTION
UNION ALL
SELECT 'upgrade_id_seq', 0
UNION ALL
- SELECT 'upgrade_item_id_seq', 0;
+ SELECT 'upgrade_item_id_seq', 0
+ UNION ALL
+ SELECT 'host_version_id_seq', 0;
insert into adminresourcetype (resource_type_id, resource_type_name)
select 1, 'AMBARI'
@@ -725,4 +734,4 @@ BEGIN
from task t inner join deleted d on t.taskId = d.taskId
END
-GO
+GO
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/cab42f23/ambari-server/src/main/resources/Ambari-DDL-SQLServer-DROP.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-DROP.sql b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-DROP.sql
index 8f6b2b4..45b3168 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-DROP.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-DROP.sql
@@ -47,7 +47,6 @@ IF OBJECT_ID('job', 'U') IS NOT NULL DROP TABLE job
GO
IF OBJECT_ID('workflow', 'U') IS NOT NULL DROP TABLE workflow
GO
-
IF OBJECT_ID('qrtz_locks', 'U') IS NOT NULL DROP TABLE qrtz_locks
GO
IF OBJECT_ID('qrtz_scheduler_state', 'U') IS NOT NULL DROP TABLE qrtz_scheduler_state
@@ -70,7 +69,6 @@ IF OBJECT_ID('qrtz_triggers', 'U') IS NOT NULL DROP TABLE qrtz_triggers
GO
IF OBJECT_ID('qrtz_job_details', 'U') IS NOT NULL DROP TABLE qrtz_job_details
GO
-
IF OBJECT_ID('viewentity', 'U') IS NOT NULL DROP TABLE viewentity
GO
IF OBJECT_ID('viewresource', 'U') IS NOT NULL DROP TABLE viewresource
@@ -85,7 +83,6 @@ IF OBJECT_ID('viewinstance', 'U') IS NOT NULL DROP TABLE viewinstance
GO
IF OBJECT_ID('viewmain', 'U') IS NOT NULL DROP TABLE viewmain
GO
-
IF OBJECT_ID('hostgroup_configuration', 'U') IS NOT NULL DROP TABLE hostgroup_configuration
GO
IF OBJECT_ID('blueprint_configuration', 'U') IS NOT NULL DROP TABLE blueprint_configuration
@@ -96,7 +93,6 @@ IF OBJECT_ID('hostgroup', 'U') IS NOT NULL DROP TABLE hostgroup
GO
IF OBJECT_ID('blueprint', 'U') IS NOT NULL DROP TABLE blueprint
GO
-
IF OBJECT_ID('configgrouphostmapping', 'U') IS NOT NULL DROP TABLE configgrouphostmapping
GO
IF OBJECT_ID('confgroupclusterconfigmapping', 'U') IS NOT NULL DROP TABLE confgroupclusterconfigmapping
@@ -131,14 +127,18 @@ IF OBJECT_ID('roles', 'U') IS NOT NULL DROP TABLE roles
GO
IF OBJECT_ID('stage', 'U') IS NOT NULL DROP TABLE stage
GO
+IF OBJECT_ID('upgrade_item', 'U') IS NOT NULL DROP TABLE upgrade_item
+GO
+IF OBJECT_ID('upgrade', 'U') IS NOT NULL DROP TABLE upgrade
+GO
IF OBJECT_ID('requestoperationlevel', 'U') IS NOT NULL DROP TABLE requestoperationlevel
GO
IF OBJECT_ID('requestresourcefilter', 'U') IS NOT NULL DROP TABLE requestresourcefilter
GO
-IF OBJECT_ID('request', 'U') IS NOT NULL DROP TABLE request
-GO
IF OBJECT_ID('requestschedulebatchrequest', 'U') IS NOT NULL DROP TABLE requestschedulebatchrequest
GO
+IF OBJECT_ID('request', 'U') IS NOT NULL DROP TABLE request
+GO
IF OBJECT_ID('requestschedule', 'U') IS NOT NULL DROP TABLE requestschedule
GO
IF OBJECT_ID('hoststate', 'U') IS NOT NULL DROP TABLE hoststate
@@ -147,6 +147,8 @@ IF OBJECT_ID('hostcomponentdesiredstate', 'U') IS NOT NULL DROP TABLE hostcompon
GO
IF OBJECT_ID('hostcomponentstate', 'U') IS NOT NULL DROP TABLE hostcomponentstate
GO
+IF OBJECT_ID('host_version', 'U') IS NOT NULL DROP TABLE host_version
+GO
IF OBJECT_ID('hosts', 'U') IS NOT NULL DROP TABLE hosts
GO
IF OBJECT_ID('servicedesiredstate', 'U') IS NOT NULL DROP TABLE servicedesiredstate
@@ -159,7 +161,6 @@ IF OBJECT_ID('clusterservices', 'U') IS NOT NULL DROP TABLE clusterservices
GO
IF OBJECT_ID('clusterconfigmapping', 'U') IS NOT NULL DROP TABLE clusterconfigmapping
GO
-
IF OBJECT_ID('alert_notice', 'U') IS NOT NULL DROP TABLE alert_notice
GO
IF OBJECT_ID('alert_grouping', 'U') IS NOT NULL DROP TABLE alert_grouping
@@ -178,34 +179,27 @@ IF OBJECT_ID('alert_history', 'U') IS NOT NULL DROP TABLE alert_history
GO
IF OBJECT_ID('alert_definition', 'U') IS NOT NULL DROP TABLE alert_definition
GO
-
IF OBJECT_ID('serviceconfighosts', 'U') IS NOT NULL DROP TABLE serviceconfighosts
GO
IF OBJECT_ID('serviceconfigmapping', 'U') IS NOT NULL DROP TABLE serviceconfigmapping
GO
IF OBJECT_ID('serviceconfig', 'U') IS NOT NULL DROP TABLE serviceconfig
GO
-
IF OBJECT_ID('clusterconfig', 'U') IS NOT NULL DROP TABLE clusterconfig
GO
-IF OBJECT_ID('clusters', 'U') IS NOT NULL DROP TABLE clusters
+IF OBJECT_ID('cluster_version', 'U') IS NOT NULL DROP TABLE cluster_version
GO
-
IF OBJECT_ID('adminprivilege', 'U') IS NOT NULL DROP TABLE adminprivilege
GO
-IF OBJECT_ID('adminresource', 'U') IS NOT NULL DROP TABLE adminresource
-GO
IF OBJECT_ID('adminpermission', 'U') IS NOT NULL DROP TABLE adminpermission
GO
-IF OBJECT_ID('adminprincipal', 'U') IS NOT NULL DROP TABLE adminprincipal
+IF OBJECT_ID('clusters', 'U') IS NOT NULL DROP TABLE clusters
GO
-IF OBJECT_ID('adminprincipaltype', 'U') IS NOT NULL DROP TABLE adminprincipaltype
+IF OBJECT_ID('adminresource', 'U') IS NOT NULL DROP TABLE adminresource
GO
IF OBJECT_ID('adminresourcetype', 'U') IS NOT NULL DROP TABLE adminresourcetype
GO
-
-IF OBJECT_ID('upgrade_item', 'U') IS NOT NULL DROP TABLE upgrade_item
-GO
-IF OBJECT_ID('upgrade', 'U') IS NOT NULL DROP TABLE upgrade
+IF OBJECT_ID('adminprincipal', 'U') IS NOT NULL DROP TABLE adminprincipal
GO
-
+IF OBJECT_ID('adminprincipaltype', 'U') IS NOT NULL DROP TABLE adminprincipaltype
+GO
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/cab42f23/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zoo.cfg.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zoo.cfg.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zoo.cfg.xml
new file mode 100644
index 0000000..a28d3b2
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zoo.cfg.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+/**
+ * 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.
+ */
+-->
+
+<configuration>
+ <property>
+ <name>tickTime</name>
+ <value>2000</value>
+ <description>The length of a single tick in milliseconds, which is the basic time unit used by ZooKeeper</description>
+ </property>
+ <property>
+ <name>initLimit</name>
+ <value>10</value>
+ <description>Ticks to allow for sync at Init.</description>
+ </property>
+ <property>
+ <name>syncLimit</name>
+ <value>5</value>
+ <description>Ticks to allow for sync at Runtime.</description>
+ </property>
+ <property>
+ <name>clientPort</name>
+ <value>2181</value>
+ <description>Port for running ZK Server.</description>
+ </property>
+ <property>
+ <name>dataDir</name>
+ <value>C:\\\\hadoop\\\\zookeeper</value>
+ <description>Data directory for ZooKeeper.</description>
+ </property>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/cab42f23/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml
index e30a165..a8964fa 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml
@@ -26,32 +26,6 @@
<value>zookeeper</value>
<description>ZooKeeper User.</description>
</property>
- <property>
- <name>zk_data_dir</name>
- <value>C:\\\\hadoop\\\\zookeeper</value>
- <description>Data directory for ZooKeeper.</description>
- </property>
- <property>
- <name>tickTime</name>
- <value>2000</value>
- <description>The length of a single tick in milliseconds, which is the basic time unit used by ZooKeeper</description>
- </property>
- <property>
- <name>initLimit</name>
- <value>10</value>
- <description>Ticks to allow for sync at Init.</description>
- </property>
- <property>
- <name>syncLimit</name>
- <value>5</value>
- <description>Ticks to allow for sync at Runtime.</description>
- </property>
- <property>
- <name>clientPort</name>
- <value>2181</value>
- <description>Port for running ZK Server.</description>
- </property>
-
<!-- zookeeper-env.sh -->
<property>
<name>content</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/cab42f23/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/package/scripts/params.py
index 0c78c67..930b6f0 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/package/scripts/params.py
@@ -30,14 +30,11 @@ hdp_root = os.environ["HADOOP_NODE_INSTALL_ROOT"]
zk_user = "hadoop"
# notused zk_log_dir = config['configurations']['zookeeper-env']['zk_log_dir']
-#todo zk_data_dir must be dynamically changed
-zk_data_dir = "c:\\\\hadoop\\\\zookeeper"
-zk_data_dir = config['configurations']['zookeeper-env']['zk_data_dir']
-
-tickTime = config['configurations']['zookeeper-env']['tickTime']
-initLimit = config['configurations']['zookeeper-env']['initLimit']
-syncLimit = config['configurations']['zookeeper-env']['syncLimit']
-clientPort = config['configurations']['zookeeper-env']['clientPort']
+zk_data_dir = config['configurations']['zoo.cfg']['dataDir']
+tickTime = config['configurations']['zoo.cfg']['tickTime']
+initLimit = config['configurations']['zoo.cfg']['initLimit']
+syncLimit = config['configurations']['zoo.cfg']['syncLimit']
+clientPort = config['configurations']['zoo.cfg']['clientPort']
if 'zoo.cfg' in config['configurations']:
zoo_cfg_properties_map = config['configurations']['zoo.cfg']
http://git-wip-us.apache.org/repos/asf/ambari/blob/cab42f23/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 0f68c61..b4b5148 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -105,7 +105,8 @@ module.exports =
"isReconfigurable": false,
"serviceName": "HDFS",
"category": "MetricsSink",
- "index": 1
+ "index": 1,
+ "filename": "cluster-env.xml"
},
{
"id": "puppet var",
@@ -120,7 +121,8 @@ module.exports =
"isReconfigurable": false,
"serviceName": "HDFS",
"category": "MetricsSink",
- "index": 1
+ "index": 1,
+ "filename": "cluster-env.xml"
},
{
"id": "puppet var",
@@ -145,7 +147,8 @@ module.exports =
"isVisible": true,
"serviceName": "HDFS",
"category": "MetricsSink",
- "index": 2
+ "index": 2,
+ "filename": "cluster-env.xml"
},
{
"id": "site property",
@@ -160,7 +163,8 @@ module.exports =
"isVisible": false,
"category": "MetricsSink",
"serviceName": "HDFS",
- "index": 2
+ "index": 2,
+ "filename": "cluster-env.xml"
},
{
"id": "puppet var",
@@ -175,7 +179,8 @@ module.exports =
"isObserved": true,
"serviceName": "HDFS",
"category": "MetricsSink",
- "index": 3
+ "index": 3,
+ "filename": "cluster-env.xml"
},
{
"id": "puppet var",
@@ -190,7 +195,8 @@ module.exports =
"isObserved": true,
"serviceName": "HDFS",
"category": "MetricsSink",
- "index": 3
+ "index": 3,
+ "filename": "cluster-env.xml"
},
{
"id": "site property",
@@ -201,7 +207,8 @@ module.exports =
"isObserved": true,
"category": "MetricsSink",
"serviceName": "HDFS",
- "index": 4
+ "index": 4,
+ "filename": "cluster-env.xml"
},
{
"id": "site property",
@@ -211,7 +218,8 @@ module.exports =
"displayType": "user",
"category": "MetricsSink",
"serviceName": "HDFS",
- "index": 5
+ "index": 5,
+ "filename": "cluster-env.xml"
},
{
"id": "site property",
@@ -221,7 +229,8 @@ module.exports =
"displayType": "password",
"category": "MetricsSink",
"serviceName": "HDFS",
- "index": 6
+ "index": 6,
+ "filename": "cluster-env.xml"
},
{
"id": "site property",
@@ -230,7 +239,8 @@ module.exports =
"isOverridable": false,
"category": "MetricsSink",
"serviceName": "HDFS",
- "index": 7
+ "index": 7,
+ "filename": "cluster-env.xml"
},
{
"id": "site property",
@@ -240,7 +250,8 @@ module.exports =
"displayType": "advanced",
"category": "MetricsSink",
"serviceName": "HDFS",
- "index": 8
+ "index": 8,
+ "filename": "cluster-env.xml"
},
{