svn commit: r1491534 - in /incubator/ambari/branches/branch-1.4.0/ambari-web/app: mappers/service_mapper.js messages.js templates/main/service/info/summary/mapreduce2.hbs views/main/service/info/summary.js

[sr...@apache.org]

Author: srimanth
Date: Mon Jun 10 17:28:39 2013
New Revision: 1491534

URL: http://svn.apache.org/r1491534
Log:
AMBARI-2339. Provide History server URL and link on the MapReduce 2 service page. (yusaku via srimanth)

Modified:
    incubator/ambari/branches/branch-1.4.0/ambari-web/app/mappers/service_mapper.js
    incubator/ambari/branches/branch-1.4.0/ambari-web/app/messages.js
    incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/service/info/summary/mapreduce2.hbs
    incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/summary.js

Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/mappers/service_mapper.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/mappers/service_mapper.js?rev=1491534&r1=1491533&r2=1491534&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/mappers/service_mapper.js (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/mappers/service_mapper.js Mon Jun 10 17:28:39 2013
@@ -105,7 +105,7 @@ App.servicesMapper = App.QuickDataMapper
   mapReduce2Config: {
     version: 'jobHistoryServerComponent.ServiceComponentInfo.Version',
     job_history_server_id: 'jobHistoryServerComponent.host_components[0].HostRoles.host_name',
-    map_reduce2_clients: 'map_reduce2_clients',
+    map_reduce2_clients: 'map_reduce2_clients'
   },
   mapReduceConfig: {
     version: 'jobTrackerComponent.ServiceComponentInfo.Version',

Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/messages.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/messages.js?rev=1491534&r1=1491533&r2=1491534&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/messages.js (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/messages.js Mon Jun 10 17:28:39 2013
@@ -659,6 +659,7 @@ Em.I18n.translations = {
   'services.service.summary.masterHeap':'Master Heap',
   'services.service.summary.moreStats':'more stats here',
   'services.service.summary.clientCount': '{0} Client Hosts',
+  'services.service.summary.historyServer': 'History Server Web UI',
   'services.service.actions.run.rebalancer':'Run Rebalancer',
   'services.service.actions.run.compaction':'Run Compaction',
   'services.service.actions.run.smoke':'Run Smoke Test',

Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/service/info/summary/mapreduce2.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/service/info/summary/mapreduce2.hbs?rev=1491534&r1=1491533&r2=1491534&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/service/info/summary/mapreduce2.hbs (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/templates/main/service/info/summary/mapreduce2.hbs Mon Jun 10 17:28:39 2013
@@ -23,6 +23,12 @@
   <td>
       <a {{action selectHost component.host}} href="javascript:void(null)">{{component.host.publicHostName}}</a>
   </td>
+  <tr>
+    <td class="summary-label">{{t services.service.summary.historyServer}}</td>
+    <td>
+        <a {{bindAttr href="view.historyServerUI"}} target="_blank">{{component.host.publicHostName}}:19888</a>
+    </td>
+  </tr>
 </tr>
   {{/if}}
 {{/each}}

Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/summary.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/summary.js?rev=1491534&r1=1491533&r2=1491534&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/summary.js (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/service/info/summary.js Mon Jun 10 17:28:39 2013
@@ -102,6 +102,11 @@ App.MainServiceInfoSummaryView = Em.View
     return result;
   }.property('controller.content'),
 
+  historyServerUI: function(){
+    var service=this.get('controller.content');
+    return (App.singleNodeInstall ? "http://" + App.singleNodeAlias + ":19888" : "http://" + service.get("hostComponents").findProperty('isMaster', true).get("host").get("publicHostName")+":19888");
+  }.property('controller.content'),
+
   monitors: function () {
     var result = '';
     var service = this.get('controller.content');