incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1494723 - in /incubator/ambari/branches/branch-1.4.0/ambari-web/app: controllers/global/cluster_controller.js views/main/dashboard/service/yarn.js views/main/service/info/summary.js
Date Wed, 19 Jun 2013 18:19:24 GMT
Author: yusaku
Date: Wed Jun 19 18:19:24 2013
New Revision: 1494723

URL: http://svn.apache.org/r1494723
Log:
AMBARI-2434. Services Summary: Web UI links for Ganglia, Nagios and ResourceManager don't
work. (Andrii Tkach via yusaku)

Modified:
    incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/global/cluster_controller.js
    incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/dashboard/service/yarn.js
    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/controllers/global/cluster_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/global/cluster_controller.js?rev=1494723&r1=1494722&r2=1494723&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/global/cluster_controller.js
(original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/controllers/global/cluster_controller.js
Wed Jun 19 18:19:24 2013
@@ -120,7 +120,7 @@ App.ClusterController = Em.Controller.ex
               if (host) {
                 hostName = host.get('publicHostName');
               }
-              return "http://" + (App.singleNodeInstall ? App.singleNodeAlias : hostName)
+ "/ganglia";
+              return "http://" + (App.singleNodeInstall ? App.singleNodeAlias + ":42080"
: hostName) + "/ganglia";
             }
           }
         }
@@ -154,7 +154,7 @@ App.ClusterController = Em.Controller.ex
               if (host) {
                 hostName = host.get('publicHostName');
               }
-              return "http://" + (App.singleNodeInstall ? App.singleNodeAlias : hostName)
+ "/nagios";
+              return "http://" + (App.singleNodeInstall ? App.singleNodeAlias + ":42080"
: hostName) + "/nagios";
             }
           }
         }

Modified: incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/dashboard/service/yarn.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/dashboard/service/yarn.js?rev=1494723&r1=1494722&r2=1494723&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/dashboard/service/yarn.js
(original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-web/app/views/main/dashboard/service/yarn.js
Wed Jun 19 18:19:24 2013
@@ -23,7 +23,8 @@ App.MainDashboardServiceYARNView = App.M
   serviceName: 'YARN',
 
   nodeWebUrl: function () {
-    return "http://" + this.get('service.resourceManagerNode').get('publicHostName') + ":8088";
+    var hostName = this.get('service.resourceManagerNode').get('publicHostName');
+    return "http://" + (App.singleNodeInstall ? App.singleNodeAlias : hostName)  + ":8088";
   }.property('service.resourceManagerNode'),
 
   nodeHeap: function () {

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=1494723&r1=1494722&r2=1494723&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
Wed Jun 19 18:19:24 2013
@@ -187,10 +187,10 @@ App.MainServiceInfoSummaryView = Em.View
     }
   },
   gangliaServer:function() {
-    return this.getServer("GANGLIA");
+    return (App.singleNodeInstall ? this.getServer("GANGLIA") + ":42080" : this.getServer("GANGLIA"));
   }.property('controller.content'),
   nagiosServer:function(){
-    return this.getServer("NAGIOS");
+    return (App.singleNodeInstall ? this.getServer("NAGIOS") + ":42080" : this.getServer("NAGIOS"));
   }.property('controller.content'),
   oozieServer:function(){
     return this.getServer("OOZIE");



Mime
View raw message