Browse Source

AMBARI-4798. AHS advanced configuration requires additional configs. (srimanth)

Srimanth Gunturi 11 years ago
parent
commit
64de9764fd

+ 17 - 0
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>

+ 22 - 0
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",

+ 5 - 1
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':