AMBARI-1036. Service Info/Quick Links do not display external hostnames. (Srimanth Gunturi via yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/AMBARI-666@1418979 13f79535-47bb-0310-9956-ffa450edef68

AMBARI-666-CHANGES.txt

@@ -424,6 +424,9 @@ AMBARI-666 branch (unreleased changes)
 
   IMPROVEMENTS
 
+  AMBARI-1036. Service Info/Quick Links do not display external hostnames.
+  (Srimanth Gunturi via yusaku)
+
   AMBARI-1035. Aggregate creation of multiple services and assignment of host
   to cluster. (Jaimin Jetly via yusaku)
 

ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs

@@ -16,7 +16,7 @@
 * limitations under the License.
 }}
 
-<b>{{view.details.hostName}}</b><br/>
+<b>{{view.details.publicHostName}}</b><br/>
 OS: {{view.details.osType}}<br/>
 IP: {{view.details.ip}}<br/>
 {{#if view.details.metricName}}

ambari-web/app/templates/main/dashboard/service/hbase.hbs

@@ -36,7 +36,7 @@
   <!-- HBase Master Server -->
   <tr>
     <td>{{t dashboard.services.hbase.masterServer}}</td>
-    <td><a href="#" {{action showDetails view.service.master}}>{{view.service.master.hostName}}</a></td>
+    <td><a href="#" {{action showDetails view.service.master}}>{{view.service.master.publicHostName}}</a></td>
   </tr>
   <!-- RegionServers -->
   <tr>
@@ -51,7 +51,7 @@
   <!-- HBaseMaster Web UI -->
   <tr>
     <td>{{t dashboard.services.hbase.masterWebUI}}</td>
-    <td><a {{bindAttr href="view.hbaseMasterWebUrl"}}>{{view.service.master.hostName}}:60010</a>
+    <td><a {{bindAttr href="view.hbaseMasterWebUrl"}} target="_blank">{{view.service.master.publicHostName}}:60010</a>
     </td>
   </tr>
   <!-- Regions in Transition -->
@@ -95,7 +95,7 @@
     </a>
     <ul class="dropdown-menu">
       {{#each view.quickLinks}}
-      <li><a {{bindAttr href="url"}}>{{label}}</a></li>
+        <li><a {{bindAttr href="url"}} target="_blank">{{label}}</a></li>
       {{/each}}
     </ul>
   </div>

ambari-web/app/templates/main/dashboard/service/hdfs.hbs

@@ -37,12 +37,12 @@
   <!-- NameNode -->
   <tr>
     <td>{{t dashboard.services.hdfs.nanmenode}}</td>
-    <td><a href="#" {{action showDetails view.service.nameNode}}>{{view.service.nameNode.hostName}}</a></td>
+    <td><a href="#" {{action showDetails view.service.nameNode}}>{{view.service.nameNode.publicHostName}}</a></td>
   </tr>
   <!-- SecondaryNameNode -->
   <tr>
     <td>{{t dashboard.services.hdfs.snanmenode}}</td>
-    <td><a href="#" {{action showDetails view.service.snameNode}}>{{view.service.snameNode.hostName}}</a></td>
+    <td><a href="#" {{action showDetails view.service.snameNode}}>{{view.service.snameNode.publicHostName}}</a></td>
   </tr>
   <!-- Data Nodes -->
   <tr>
@@ -59,7 +59,7 @@
   <!-- NameNode Web UI -->
   <tr>
     <td>{{t dashboard.services.hdfs.nameNodeWebUI}}</td>
-    <td><a {{bindAttr href="view.nodeWebUrl"}}>{{view.service.nameNode.hostName}}:50070</a>
+    <td><a {{bindAttr href="view.nodeWebUrl"}} target="_blank">{{view.service.nameNode.publicHostName}}:50070</a>
     </td>
   </tr>
   <!-- NameNode Uptime -->

ambari-web/app/templates/main/dashboard/service/mapreduce.hbs

@@ -36,7 +36,7 @@
   <!-- JobTracker -->
   <tr>
     <td>{{t services.service.summary.jobTracker}}</td>
-    <td><a href="#" {{action showDetails view.service.jobTracker}}>{{view.service.jobTracker.hostName}}</a></td>
+    <td><a href="#" {{action showDetails view.service.jobTracker}}>{{view.service.jobTracker.publicHostName}}</a></td>
   </tr>
   <!-- TaskTrackers -->
   <tr>
@@ -51,7 +51,7 @@
   <!-- JobTracker Web UI -->
   <tr>
     <td>{{t services.service.summary.jobTrackerWebUI}}</td>
-    <td><a {{bindAttr href="view.jobTrackerWebUrl"}}>{{view.service.jobTracker.hostName}}:50030</a>
+    <td><a {{bindAttr href="view.jobTrackerWebUrl"}} target="_blank">{{view.service.jobTracker.publicHostName}}:50030</a>
     </td>
   </tr>
   <!-- Job Tracker Uptime -->

ambari-web/app/templates/main/host.hbs

@@ -55,7 +55,7 @@
     <tr>
       <td class="name">
         <span {{bindAttr class="host.healthClass"}}></span>
-        <a href="#" {{action "showDetails" host}}>{{unbound host.hostName}}</a>
+        <a href="#" {{action "showDetails" host}}>{{unbound host.publicHostName}}</a>
       </td>
       <td>{{host.rack}}</td>
       <td>{{host.cpu}}</td>

ambari-web/app/templates/main/host/details.hbs

@@ -19,7 +19,7 @@
 <div id="host-details">
   <a href='#' {{action "routeHome" target="controller"}}><i class="icon-home"></i></a> /
   <a href="javascript:void(null)" data-toggle="modal" {{action backToHostsList}}>Hosts</a> /
-  <span {{bindAttr class=":host-title view.content.healthClass"}}>{{unbound view.content.hostName}}</span>
+  <span {{bindAttr class=":host-title view.content.healthClass"}}>{{unbound view.content.publicHostName}}</span>
   {{#if controller.isAdmin}}
   <div class="host-maintenance">
     <div class="host-maintenance-btn btn-group display-inline-block">

ambari-web/app/templates/main/service/info/summary.hbs

@@ -50,7 +50,7 @@
       <tr>
         {{#if component.isMaster}}
         <td class="summary-label">{{component.displayName}}</td>
-        <td><a {{action selectHost component.host}} href="javascript:void(null)">{{component.host.hostName}}</a></td>
+        <td><a {{action selectHost component.host}} href="javascript:void(null)">{{component.host.publicHostName}}</a></td>
         {{else}}
         <td class="summary-label">{{component.displayName}}s</td>
         <td><a {{action filterHosts component}} href="javascript:void(null)">{{component.displayName}}s</a></td>
@@ -77,7 +77,7 @@
           <td class="summary-label">Hosts</td>
           <td>
             {{#each component in controller.content.components}}
-              <a {{action selectHost component.host}} href="javascript:void(null)">{{component.host.hostName}}</a>
+              <a {{action selectHost component.host}} href="javascript:void(null)">{{component.host.publicHostName}}</a>
            {{/each}}
           </td>
         </tr>
@@ -87,7 +87,7 @@
           <td class="summary-label">Hosts</td>
           <td>
             {{#each component in controller.content.components}}
-              <a {{action selectHost component.host}} href="javascript:void(null)">{{component.host.hostName}}</a>
+              <a {{action selectHost component.host}} href="javascript:void(null)">{{component.host.publicHostName}}</a>
            {{/each}}
           </td>
         </tr>
@@ -97,7 +97,7 @@
           <td class="summary-label">Host</td>
           <td>
             {{#each component in controller.content.components}}
-              <a {{action selectHost component.host}} href="javascript:void(null)">{{component.host.hostName}}</a>
+              <a {{action selectHost component.host}} href="javascript:void(null)">{{component.host.publicHostName}}</a>
            {{/each}}
           </td>
         </tr>

ambari-web/app/views/common/quick_view_link_view.js

@@ -29,11 +29,11 @@ App.QuickViewLinks = Em.View.extend({
     var host;
 
     if (serviceName === 'HDFS') {
-      host = components.filterProperty('id', 'NAMENODE').objectAt(0).get('host.hostName');
+      host = components.filterProperty('id', 'NAMENODE').objectAt(0).get('host.publicHostName');
     } else if (serviceName === 'MAPREDUCE') {
-      host = components.filterProperty('id', 'JOBTRACKER').objectAt(0).get('host.hostName');
+      host = components.filterProperty('id', 'JOBTRACKER').objectAt(0).get('host.publicHostName');
     } else if (serviceName === 'HBASE') {
-      host = components.filterProperty('id', 'HBASE_MASTER').objectAt(0).get('host.hostName');
+      host = components.filterProperty('id', 'HBASE_MASTER').objectAt(0).get('host.publicHostName');
     }
     if (!host) {
       return [];
@@ -50,6 +50,7 @@ App.QuickViewLinks = Em.View.extend({
     switch (this.get('content.serviceName').toLowerCase()) {
       case "hdfs":
       case "mapreduce":
+      case "hbase":
         return "_blank";
         break;
       default:

ambari-web/app/views/main/charts/heatmap/heatmap_host_detail.js

@@ -24,6 +24,7 @@ App.MainChartsHeatmapHostDetailView = Em.View.extend({
   /** @private */ elementId:'heatmapDetailsBlock',
   /** @private */ details:{
     hostName:'test node',
+    publicHostName:'test node',
     osType: 'OS',
     ip: '192.168.0.0',
     metricName: 'metric-name',

ambari-web/app/views/main/dashboard/service/hbase.js

@@ -35,7 +35,7 @@ App.MainDashboardServiceHbaseView = App.MainDashboardServiceView.extend({
   }.property('service'),
 
   hbaseMasterWebUrl: function () {
-    return "http://" + this.get('service').get('master').get('hostName') + ":60010";
+    return "http://" + this.get('service').get('master').get('publicHostName') + ":60010";
   }.property('service.master'),
 
   averageLoad: function () {

ambari-web/app/views/main/dashboard/service/hdfs.js

@@ -36,7 +36,7 @@ App.MainDashboardServiceHdfsView = App.MainDashboardServiceView.extend({
   }.property("service.nameNodeStartTime"),
   
   nodeWebUrl: function(){
-    return "http://"+this.get('service').get('nameNode').get('hostName')+":50070";
+    return "http://"+this.get('service').get('nameNode').get('publicHostName')+":50070";
   }.property('service.nameNode'),
 
   nodeHeap:function () {

ambari-web/app/views/main/dashboard/service/mapreduce.js

@@ -21,7 +21,7 @@ App.MainDashboardServiceMapreduceView = App.MainDashboardServiceView.extend({
   templateName: require('templates/main/dashboard/service/mapreduce'),
   serviceName: 'MAPREDUCE',
   jobTrackerWebUrl: function () {
-    return "http://" + this.get('service').get('jobTracker').get('hostName') + ":50030";
+    return "http://" + this.get('service').get('jobTracker').get('publicHostName') + ":50030";
   }.property('service.nameNode'),
 
   Chart: App.ChartLinearView.extend({