You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2012/11/07 05:41:24 UTC
svn commit: r1406461 - in /incubator/ambari/branches/AMBARI-666: ./
ambari-web/app/assets/data/dashboard/ ambari-web/app/controllers/wizard/
ambari-web/app/data/
Author: yusaku
Date: Wed Nov 7 04:41:23 2012
New Revision: 1406461
URL: http://svn.apache.org/viewvc?rev=1406461&view=rev
Log:
AMBARI-954. Support installation of Ganglia master and slaves via Ambari Web. (yusaku)
Modified:
incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/dashboard/services.json
incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/dashboard/servicesHealth.json
incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step5_controller.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step8_controller.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/data/service_components.js
Modified: incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt?rev=1406461&r1=1406460&r2=1406461&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt (original)
+++ incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt Wed Nov 7 04:41:23 2012
@@ -12,6 +12,9 @@ AMBARI-666 branch (unreleased changes)
NEW FEATURES
+ AMBARI-954. Support installation of Ganglia master and slaves via
+ Ambari Web. (yusaku)
+
AMBARI-980. Allow installation of various service components. (yusaku)
AMBARI-949. Provide metric graphs for individual hosts. (Srimanth
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/dashboard/services.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/dashboard/services.json?rev=1406461&r1=1406460&r2=1406461&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/dashboard/services.json (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/dashboard/services.json Wed Nov 7 04:41:23 2012
@@ -1023,28 +1023,28 @@
},
"components" : [
{
- "href" : "http://ambari/clusters/mycluster/services/GANGLIA/components/GANGLIA_MONITOR_SERVER",
+ "href" : "http://ambari/clusters/mycluster/services/GANGLIA/components/GANGLIA_SERVER",
"ServiceComponentInfo" : {
"cluster_name" : "mycluster",
- "component_name" : "GANGLIA_MONITOR_SERVER",
+ "component_name" : "GANGLIA_SERVER",
"service_name" : "GANGLIA"
},
"host_components" : [
{
- "href" : "http://ambari/clusters/mycluster/hosts/ip-10-38-5-128.ec2.internal/host_components/GANGLIA_MONITOR_SERVER",
+ "href" : "http://ambari/clusters/mycluster/hosts/ip-10-38-5-128.ec2.internal/host_components/GANGLIA_SERVER",
"HostRoles" : {
"cluster_name" : "mycluster",
"role_id" : "9",
- "component_name" : "GANGLIA_MONITOR_SERVER",
+ "component_name" : "GANGLIA_SERVER",
"state" : "STARTED",
"host_name" : "ip-10-38-5-128.ec2.internal"
},
"component" : [
{
- "href" : "http://ambari/clusters/mycluster/services/GANGLIA/components/GANGLIA_MONITOR_SERVER",
+ "href" : "http://ambari/clusters/mycluster/services/GANGLIA/components/GANGLIA_SERVER",
"ServiceComponentInfo" : {
"cluster_name" : "mycluster",
- "component_name" : "GANGLIA_MONITOR_SERVER",
+ "component_name" : "GANGLIA_SERVER",
"service_name" : "GANGLIA"
}
}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/dashboard/servicesHealth.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/dashboard/servicesHealth.json?rev=1406461&r1=1406460&r2=1406461&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/dashboard/servicesHealth.json (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/dashboard/servicesHealth.json Wed Nov 7 04:41:23 2012
@@ -270,11 +270,11 @@
},
"components" : [
{
- "href" : "http://ambari/clusters/mycluster/services/GANGLIA/components/GANGLIA_MONITOR_SERVER",
+ "href" : "http://ambari/clusters/mycluster/services/GANGLIA/components/GANGLIA_SERVER",
"ServiceComponentInfo" : {
"cluster_name" : "mycluster",
"state" : "STARTED",
- "component_name" : "GANGLIA_MONITOR_SERVER",
+ "component_name" : "GANGLIA_SERVER",
"service_name" : "GANGLIA"
}
},
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step5_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step5_controller.js?rev=1406461&r1=1406460&r2=1406461&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step5_controller.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step5_controller.js Wed Nov 7 04:41:23 2012
@@ -349,7 +349,7 @@ App.WizardStep5Controller = Em.Controlle
this.renderComponents(zooKeeperHosts);
var lastHost = zhosts[zhosts.length - 1];
return lastHost;
- } else if (componentName === 'GANGLIA_MONITOR_SERVER') {
+ } else if (componentName === 'GANGLIA_SERVER') {
return this.getGangliaServer(noOfHosts);
} else if (componentName === 'NAGIOS_SERVER') {
return this.getNagiosServer(noOfHosts);
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step8_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step8_controller.js?rev=1406461&r1=1406460&r2=1406461&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step8_controller.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step8_controller.js Wed Nov 7 04:41:23 2012
@@ -517,10 +517,6 @@ App.WizardStep8Controller = Em.Controlle
}
}, this);
}, this);
- //TODO: Remove below code after hooking up with all services.
- /* this.createComponent('HDFS','NAMENODE');
- this.createComponent('HDFS','DATANODE'); */
-
},
createComponent: function (service, component) {
@@ -586,10 +582,12 @@ App.WizardStep8Controller = Em.Controlle
var masterHosts = this.get('content.masterComponentHosts');
var slaveHosts = this.get('content.slaveComponentHosts');
+ var allHosts = this.get('content.hostsInfo');
masterHosts.forEach(function (_masterHost) {
this.createHostComponent(_masterHost);
}, this);
+
slaveHosts.forEach(function (_slaveHosts) {
var slaveObj = {};
if (_slaveHosts.componentName !== 'CLIENT') {
@@ -610,9 +608,12 @@ App.WizardStep8Controller = Em.Controlle
}
}, this);
- //TODO: Remove following code after hooking up with all services
- //this.createHostComponent({hostName:'localhost.localdomain',component:'NAMENODE'});
- //this.createHostComponent({hostName:'localhost.localdomain',component:'DATANODE'});
+ // add Ganglia Monitor (Slave) to all hosts
+ for (var hostName in allHosts) {
+ // TODO: filter for only confirmed hosts?
+ this.createHostComponent({ hostName: hostName, component: 'GANGLIA_MONITOR'});
+ }
+
},
createHostComponent: function (hostComponent) {
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/data/service_components.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/data/service_components.js?rev=1406461&r1=1406460&r2=1406461&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/data/service_components.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/data/service_components.js Wed Nov 7 04:41:23 2012
@@ -204,7 +204,7 @@ module.exports = new Ember.Set([
},
{
service_name: 'GANGLIA',
- component_name: 'GANGLIA_MONITOR_SERVER',
+ component_name: 'GANGLIA_SERVER',
display_name: 'Ganglia Collector',
isMaster: true,
isClient: false,