Repository: ambari Updated Branches: refs/heads/trunk 8cf83e953 -> 5796e12de
AMBARI-9908 add quicklinks and host config substitution for accumulo (billie) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5796e12d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5796e12d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5796e12d Branch: refs/heads/trunk Commit: 5796e12de7240dd47411eaa2f25be620b5dab2db Parents: 8cf83e9 Author: Billie Rinaldi <[email protected]> Authored: Mon Mar 16 09:34:20 2015 -0700 Committer: Billie Rinaldi <[email protected]> Committed: Mon Mar 16 09:34:20 2015 -0700 ---------------------------------------------------------------------- ambari-web/app/controllers/main/host/details.js | 3 +++ .../main/service/reassign/step4_controller.js | 3 +++ ambari-web/app/mappers/service_metrics_mapper.js | 3 ++- ambari-web/app/models/quick_links.js | 11 +++++++++++ ambari-web/app/models/service_config.js | 5 +++++ ambari-web/app/views/common/quick_view_link_view.js | 3 +++ 6 files changed, 27 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5796e12d/ambari-web/app/controllers/main/host/details.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/host/details.js b/ambari-web/app/controllers/main/host/details.js index cb5c5b2..e526b71 100644 --- a/ambari-web/app/controllers/main/host/details.js +++ b/ambari-web/app/controllers/main/host/details.js @@ -949,6 +949,9 @@ App.MainHostDetailsController = Em.Controller.extend({ if (configs['hbase-site']) { configs['hbase-site']['hbase.zookeeper.quorum'] = zks.join(','); } + if (configs['accumulo-site']) { + configs['accumulo-site']['instance.zookeeper.host'] = zksWithPort; + } if (configs['webhcat-site']) { configs['webhcat-site']['templeton.zookeeper.hosts'] = zksWithPort; } http://git-wip-us.apache.org/repos/asf/ambari/blob/5796e12d/ambari-web/app/controllers/main/service/reassign/step4_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/reassign/step4_controller.js b/ambari-web/app/controllers/main/service/reassign/step4_controller.js index 4a37f88..a8ea7ef 100644 --- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js +++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js @@ -661,6 +661,9 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro if (!App.get('isHaEnabled') && App.Service.find('HBASE').get('isLoaded')) { configs['hbase-site']['hbase.rootdir'] = configs['hbase-site']['hbase.rootdir'].replace(/\/\/[^\/]*/, '//' + targetHostName + ':8020'); } + if (!App.get('isHaEnabled') && App.Service.find('ACCUMULO').get('isLoaded')) { + configs['accumulo-site']['instance.volumes'] = configs['accumulo-site']['instance.volumes'].replace(/\/\/[^\/]*/, '//' + targetHostName + ':8020'); + } }, /** http://git-wip-us.apache.org/repos/asf/ambari/blob/5796e12d/ambari-web/app/mappers/service_metrics_mapper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mappers/service_metrics_mapper.js b/ambari-web/app/mappers/service_metrics_mapper.js index 3303369..ade8cd7 100644 --- a/ambari-web/app/mappers/service_metrics_mapper.js +++ b/ambari-web/app/mappers/service_metrics_mapper.js @@ -359,7 +359,8 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({ STORM: [31], FALCON: [32], RANGER: [33], - SPARK: [34] + SPARK: [34], + ACCUMULO: [35] }; if (quickLinks[item.ServiceInfo.service_name]) finalJson.quick_links = quickLinks[item.ServiceInfo.service_name]; http://git-wip-us.apache.org/repos/asf/ambari/blob/5796e12d/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 57f912a..0961eb0 100644 --- a/ambari-web/app/models/quick_links.js +++ b/ambari-web/app/models/quick_links.js @@ -311,5 +311,16 @@ App.QuickLinks.FIXTURES = [ site: 'spark-defaults', regex: '^(\\d+)$', default_http_port: 18080 + }, + { + id:35, + label:'Accumulo Monitor UI', + url:'%@://%@:%@/', + service_id: 'ACCUMULO', + template:'%@://%@:%@/', + http_config: 'monitor.port.client', + site: 'accumulo-site', + regex: '^(\\d+)$', + default_http_port: 50095 } ]; http://git-wip-us.apache.org/repos/asf/ambari/blob/5796e12d/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 73abf51..f269262 100644 --- a/ambari-web/app/models/service_config.js +++ b/ambari-web/app/models/service_config.js @@ -316,6 +316,10 @@ App.ServiceConfigProperty = Em.Object.extend({ var nnHost = masterComponentHostsInDB.filterProperty('component', 'NAMENODE').mapProperty('hostName'); this.setDefaultValue(hostWithPrefix,'://' + nnHost); break; + case 'instance.volumes': + var nnHost = masterComponentHostsInDB.filterProperty('component', 'NAMENODE').mapProperty('hostName'); + this.setDefaultValue(hostWithPrefix,'://' + nnHost); + break; case 'snamenode_host': // Secondary NameNode does not exist when NameNode HA is enabled var snn = masterComponentHostsInDB.findProperty('component', 'SECONDARY_NAMENODE'); @@ -556,6 +560,7 @@ App.ServiceConfigProperty = Em.Object.extend({ case 'templeton.zookeeper.hosts': case 'hadoop.registry.zk.quorum': case 'hive.cluster.delegation.token.store.zookeeper.connectString': + case 'instance.zookeeper.host': // for accumulo var zkHosts = masterComponentHostsInDB.filterProperty('component', 'ZOOKEEPER_SERVER').mapProperty('hostName'); var zkHostPort = zkHosts; var regex = "\\w*:(\\d+)"; //regex to fetch the port http://git-wip-us.apache.org/repos/asf/ambari/blob/5796e12d/ambari-web/app/views/common/quick_view_link_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/quick_view_link_view.js b/ambari-web/app/views/common/quick_view_link_view.js index f9ba942..a76cf36 100644 --- a/ambari-web/app/views/common/quick_view_link_view.js +++ b/ambari-web/app/views/common/quick_view_link_view.js @@ -268,6 +268,9 @@ App.QuickViewLinks = Em.View.extend({ case "STORM": hosts[0] = this.findComponentHost(response.items, "STORM_UI_SERVER"); break; + case "ACCUMULO": + hosts[0] = this.findComponentHost(response.items, "ACCUMULO_MONITOR"); + break; default: var service = App.StackService.find().findProperty('serviceName', serviceName); if (service && service.get('hasMaster')) {
