Updated Branches: refs/heads/trunk 5f48900bd -> 1c9b15735
AMBARI-4312 Storm: Install wizard. Add master components Storm UI Server, DRPC Server, LogViewer Server. (Denys Buzhor via atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1c9b1573 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1c9b1573 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1c9b1573 Branch: refs/heads/trunk Commit: 1c9b15735cb85a5b9044de45575e8d7c3cf23836 Parents: 8c0e377 Author: atkach <atk...@hortonworks.com> Authored: Thu Jan 16 15:56:32 2014 +0200 Committer: atkach <atk...@hortonworks.com> Committed: Thu Jan 16 15:56:53 2014 +0200 ---------------------------------------------------------------------- .../configurations/cluster_level_configs.json | 5 ++- .../app/controllers/wizard/step5_controller.js | 3 ++ ambari-web/app/data/HDP2/global_properties.js | 39 ++++++++++++++++++++ ambari-web/app/data/service_components.js | 26 ++++++++++++- ambari-web/app/data/service_configs.js | 3 ++ ambari-web/app/mappers/server_data_mapper.js | 5 ++- ambari-web/app/models/host_component.js | 3 ++ ambari-web/app/models/quick_links.js | 10 ++--- ambari-web/app/models/service_config.js | 12 ++++++ 9 files changed, 97 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1c9b1573/ambari-web/app/assets/data/configurations/cluster_level_configs.json ---------------------------------------------------------------------- diff --git a/ambari-web/app/assets/data/configurations/cluster_level_configs.json b/ambari-web/app/assets/data/configurations/cluster_level_configs.json index 8e958df..9fc68d6 100644 --- a/ambari-web/app/assets/data/configurations/cluster_level_configs.json +++ b/ambari-web/app/assets/data/configurations/cluster_level_configs.json @@ -423,6 +423,7 @@ "dfs_name_dir" : "/hadoop/hdfs/namenode", "hfile_blockcache_size" : "0.25", "kadmin_pw" : "", + "logviewerserver_host" : "c6401.ambari.apache.org", "gmond_user" : "nobody", "hregion_majorcompaction" : "86400000", "user_group" : "hadoop", @@ -546,7 +547,9 @@ "oozie_database_name": "XE", "oozie_metastore_user_name" : "oozieuser", "oozie_metastore_user_passwd" : "ooziepassword", - "oozie_jdbc_connection_url": "jdbc:oracle:thin:@//oozie-orcl-host:1521/XE" + "oozie_jdbc_connection_url": "jdbc:oracle:thin:@//oozie-orcl-host:1521/XE", + "stormuiserver_host" : "c6401.ambari.apache.org", + "drpcserver_host" : "c6401.ambari.apache.org" } }, { http://git-wip-us.apache.org/repos/asf/ambari/blob/1c9b1573/ambari-web/app/controllers/wizard/step5_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step5_controller.js b/ambari-web/app/controllers/wizard/step5_controller.js index 2e3164c..a93d325 100644 --- a/ambari-web/app/controllers/wizard/step5_controller.js +++ b/ambari-web/app/controllers/wizard/step5_controller.js @@ -450,6 +450,9 @@ App.WizardStep5Controller = Em.Controller.extend({ "31" : 1, "else" : 2 }).host_name; + case 'STORM_UI_SERVER': + case 'LOGVIEWER_SERVER': + case 'DRPC_SERVER': case 'NIMBUS': return this.getNimbusServer(noOfHosts); default: http://git-wip-us.apache.org/repos/asf/ambari/blob/1c9b1573/ambari-web/app/data/HDP2/global_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/global_properties.js b/ambari-web/app/data/HDP2/global_properties.js index 8276a1a..04632ac 100644 --- a/ambari-web/app/data/HDP2/global_properties.js +++ b/ambari-web/app/data/HDP2/global_properties.js @@ -1323,6 +1323,45 @@ module.exports = "serviceName": "STORM", "category": "General" }, + { + "id": "puppet var", + "name": "stormuiserver_host", + "displayName": "Storm UI Server host", + "description": "", + "defaultValue": "", + "displayType": "masterHost", + "isReconfigurable": false, + "isVisible": true, + "isRequiredByAgent": true, + "serviceName": "STORM", + "category": "StormUIServer" + }, + { + "id": "puppet var", + "name": "logviewerserver_host", + "displayName": "Logviewer Server host", + "description": "", + "defaultValue": "", + "displayType": "masterHost", + "isReconfigurable": false, + "isVisible": true, + "isRequiredByAgent": true, + "serviceName": "STORM", + "category": "LogviewerServer" + }, + { + "id": "puppet var", + "name": "drpcserver_host", + "displayName": "DRPC Server host", + "description": "", + "defaultValue": "", + "displayType": "masterHost", + "isReconfigurable": false, + "isVisible": true, + "isRequiredByAgent": true, + "serviceName": "STORM", + "category": "DRPCServer" + }, /**********************************************MISC***************************************/ { "id": "puppet var", http://git-wip-us.apache.org/repos/asf/ambari/blob/1c9b1573/ambari-web/app/data/service_components.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/service_components.js b/ambari-web/app/data/service_components.js index d897805..b4c7e0e 100644 --- a/ambari-web/app/data/service_components.js +++ b/ambari-web/app/data/service_components.js @@ -338,7 +338,6 @@ module.exports = new Ember.Set([ isClient: false, description: 'Falcon Server for mirroring' }, - // @todo change with real info about service component { service_name: 'STORM', component_name: 'NIMBUS', @@ -347,7 +346,6 @@ module.exports = new Ember.Set([ isClient: false, description: 'Master component for STORM' }, - // @todo change with real info about service component { service_name: 'STORM', component_name: 'SUPERVISOR', @@ -355,5 +353,29 @@ module.exports = new Ember.Set([ isMaster: false, isClient: true, description: 'Client component for STORM' + }, + { + service_name: 'STORM', + component_name: 'STORM_UI_SERVER', + display_name: 'Storm UI Server', + isMaster: true, + isClient: false, + description: 'Master component for STORM' + }, + { + service_name: 'STORM', + component_name: 'LOGVIEWER_SERVER', + display_name: 'Logviewer Server', + isMaster: true, + isClient: false, + description: 'Master component for STORM' + }, + { + service_name: 'STORM', + component_name: 'DRPC_SERVER', + display_name: 'DRPC Server', + isMaster: true, + isClient: false, + description: 'Master component for STORM' } ]); http://git-wip-us.apache.org/repos/asf/ambari/blob/1c9b1573/ambari-web/app/data/service_configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/service_configs.js b/ambari-web/app/data/service_configs.js index d20a4ec..af6c4f4 100644 --- a/ambari-web/app/data/service_configs.js +++ b/ambari-web/app/data/service_configs.js @@ -233,6 +233,9 @@ module.exports = [ configCategories: [ App.ServiceConfigCategory.create({ name: 'Nimbus', displayName : 'Nimbus'}), App.ServiceConfigCategory.create({ name: 'Supervisor', displayName : 'SuperVisor'}), + App.ServiceConfigCategory.create({ name: 'StormUIServer', displayName : 'Storm UI Server'}), + App.ServiceConfigCategory.create({ name: 'DRPCServer', displayName : 'DRPC Server'}), + App.ServiceConfigCategory.create({ name: 'LogviewerServer', displayName : 'Logviewer Server'}), App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}), App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}) ], http://git-wip-us.apache.org/repos/asf/ambari/blob/1c9b1573/ambari-web/app/mappers/server_data_mapper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mappers/server_data_mapper.js b/ambari-web/app/mappers/server_data_mapper.js index 5f16a86..0ce6cf4 100644 --- a/ambari-web/app/mappers/server_data_mapper.js +++ b/ambari-web/app/mappers/server_data_mapper.js @@ -216,6 +216,9 @@ App.QuickDataMapper.componentServiceMap = function () { 'GLUSTERFS_CLIENT': 'GLUSTERFS', 'FALCON_SERVER': 'FALCON', 'NIMBUS': 'STORM', - 'SUPERVISOR': 'STORM' + 'SUPERVISOR': 'STORM', + 'STORM_UI_SERVER': 'STORM', + 'DRPC_SERVER': 'STORM', + 'LOGVIEWER_SERVER': 'STORM' } }; http://git-wip-us.apache.org/repos/asf/ambari/blob/1c9b1573/ambari-web/app/models/host_component.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/host_component.js b/ambari-web/app/models/host_component.js index a353b0a..17887ac 100644 --- a/ambari-web/app/models/host_component.js +++ b/ambari-web/app/models/host_component.js @@ -79,6 +79,9 @@ App.HostComponent = DS.Model.extend({ case 'FLUME_SERVER': case 'FALCON_SERVER': case 'NIMBUS': + case 'STORM_UI_SERVER': + case 'LOGVIEWER_SERVER': + case 'DRPC_SERVER': case 'RESOURCEMANAGER': return true; default: http://git-wip-us.apache.org/repos/asf/ambari/blob/1c9b1573/ambari-web/app/models/quick_links.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/quick_links.js b/ambari-web/app/models/quick_links.js index 5b98c04..97e728a 100644 --- a/ambari-web/app/models/quick_links.js +++ b/ambari-web/app/models/quick_links.js @@ -393,14 +393,14 @@ App.QuickLinks.FIXTURES = [ { id:31, label:'Nimbus UI', - url:'%@://%@:%@/stacks', + url:'%@://%@:%@/', service_id: 'STORM', - template:'%@://%@:%@/nimbus', - http_config: 'mapreduce.jobhistory.webapp.address', - https_config: 'mapreduce.jobhistory.webapp.https.address', + template:'%@://%@:%@/', + http_config: 'nimbus.host', + https_config: 'nimbus.host', site: 'storm-site', regex: portRegex, - default_http_port: 6627 + default_http_port: 8744 }, { id:32, http://git-wip-us.apache.org/repos/asf/ambari/blob/1c9b1573/ambari-web/app/models/service_config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/service_config.js b/ambari-web/app/models/service_config.js index a875265..2c6928a 100644 --- a/ambari-web/app/models/service_config.js +++ b/ambari-web/app/models/service_config.js @@ -399,6 +399,18 @@ App.ServiceConfigProperty = Ember.Object.extend({ if (!App.supports.storm) return; // @todo remove test mode check after Storm service integration this.set('value', masterComponentHostsInDB.findProperty('component', 'NIMBUS').hostName); break; + case 'logviewerserver_host': + if (!App.supports.storm) return; // @todo remove test mode check after Storm service integration + this.set('value', masterComponentHostsInDB.findProperty('component', 'LOGVIEWER_SERVER').hostName); + break; + case 'drpcserver_host': + if (!App.supports.storm) return; // @todo remove test mode check after Storm service integration + this.set('value', masterComponentHostsInDB.findProperty('component', 'DRPC_SERVER').hostName); + break; + case 'stormuiserver_host': + if (!App.supports.storm) return; // @todo remove test mode check after Storm service integration + this.set('value', masterComponentHostsInDB.findProperty('component', 'STORM_UI_SERVER').hostName); + break; case 'hbase.zookeeper.quorum': var zkHosts = masterComponentHostsInDB.filterProperty('component', 'ZOOKEEPER_SERVER').mapProperty('hostName'); this.setDefaultValue("(\\w*)", zkHosts);
