You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2014/02/24 00:41:08 UTC
git commit: AMBARI-4798. AHS advanced configuration requires
additional configs. (srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk e5fbaa48e -> 64de9764f
AMBARI-4798. AHS advanced configuration requires additional configs. (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/64de9764
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/64de9764
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/64de9764
Branch: refs/heads/trunk
Commit: 64de9764fd78cdbfdb42436ff6533285c1d97a0a
Parents: e5fbaa4
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Sat Feb 22 20:46:06 2014 -0800
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Sun Feb 23 00:21:26 2014 -0800
----------------------------------------------------------------------
.../services/YARN/configuration/yarn-site.xml | 17 +++++++++++++++
ambari-web/app/data/HDP2/site_properties.js | 22 ++++++++++++++++++++
ambari-web/app/models/service_config.js | 6 +++++-
3 files changed, 44 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/64de9764/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/YARN/configuration/yarn-site.xml
index cf684e7..1bab6e3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/YARN/configuration/yarn-site.xml
@@ -370,4 +370,21 @@
The http address of the timeline service web application.
</description>
</property>
+
+ <property>
+ <name>yarn.timeline-service.webapp.https.address</name>
+ <value>0.0.0.0:8190</value>
+ <description>
+ The http address of the timeline service web application.
+ </description>
+ </property>
+
+ <property>
+ <name>yarn.timeline-service.address</name>
+ <value>0.0.0.0:10200</value>
+ <description>
+ This is default address for the timeline server to start
+ the RPC server.
+ </description>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/64de9764/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 baf014a..7f29b47 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -343,6 +343,28 @@ module.exports =
"category": "AppTimelineServer",
"serviceName": "YARN"
},
+ {
+ "id": "site property",
+ "name": "yarn.timeline-service.webapp.https.address",
+ "displayName": "yarn.timeline-service.webapp.https.address",
+ "value": "",
+ "defaultValue": "0.0.0.0:8190",
+ "displayType": "string",
+ "isVisible": App.supports.appTimelineServer, // @todo remove after Application Timeline Server approving
+ "category": "AppTimelineServer",
+ "serviceName": "YARN"
+ },
+ {
+ "id": "site property",
+ "name": "yarn.timeline-service.address",
+ "displayName": "yarn.timeline-service.address",
+ "value": "",
+ "defaultValue": "0.0.0.0:10200",
+ "displayType": "string",
+ "isVisible": App.supports.appTimelineServer, // @todo remove after Application Timeline Server approving
+ "category": "AppTimelineServer",
+ "serviceName": "YARN"
+ },
/**********************************************MAPREDUCE2***************************************/
{
"id": "site property",
http://git-wip-us.apache.org/repos/asf/ambari/blob/64de9764/ambari-web/app/models/service_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service_config.js b/ambari-web/app/models/service_config.js
index 46bebe8..2611bb0 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -343,7 +343,11 @@ App.ServiceConfigProperty = Ember.Object.extend({
this.setDefaultValue("(\\w*)(?=:)",rmHost);
break;
case 'yarn.timeline-service.webapp.address':
- var hsHost = masterComponentHostsInDB.findProperty('component', 'HISTORYSERVER').hostName;
+ var hsHost = masterComponentHostsInDB.findProperty('component', 'APP_TIMELINE_SERVER').hostName;
+ this.setDefaultValue("(0.0.0.0)(?=:)", hsHost);
+ break;
+ case 'yarn.timeline-service.webapp.https.address':
+ var hsHost = masterComponentHostsInDB.findProperty('component', 'APP_TIMELINE_SERVER').hostName;
this.setDefaultValue("(0.0.0.0)(?=:)", hsHost);
break;
case 'nm_hosts':