AMBARI-21562 HBaseRestServer not visible in HBase summary page. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/110c8cd6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/110c8cd6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/110c8cd6 Branch: refs/heads/branch-feature-AMBARI-21450 Commit: 110c8cd6e161c6a46c4ff4dffba4421fbc05f867 Parents: dae2c38 Author: Andrii Tkach <atk...@apache.org> Authored: Mon Jul 24 15:52:25 2017 +0300 Committer: Andrii Tkach <atk...@apache.org> Committed: Mon Jul 24 15:52:25 2017 +0300 ---------------------------------------------------------------------- .../app/mappers/components_state_mapper.js | 5 +++++ .../app/mappers/service_metrics_mapper.js | 3 +++ ambari-web/app/messages.js | 3 +++ ambari-web/app/models/service/hbase.js | 3 +++ .../templates/main/service/services/hbase.hbs | 20 ++++++++++++++++++++ .../app/views/main/service/services/hbase.js | 8 ++++++++ 6 files changed, 42 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/110c8cd6/ambari-web/app/mappers/components_state_mapper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mappers/components_state_mapper.js b/ambari-web/app/mappers/components_state_mapper.js index a7e6d60..0ac6a26 100644 --- a/ambari-web/app/mappers/components_state_mapper.js +++ b/ambari-web/app/mappers/components_state_mapper.js @@ -82,6 +82,11 @@ App.componentsStateMapper = App.QuickDataMapper.create({ region_servers_installed: 'INSTALLED_PATH', region_servers_total: 'TOTAL_PATH' }, + 'HBASE_REST_SERVER': { + rest_servers_started: 'STARTED_PATH', + rest_servers_installed: 'INSTALLED_PATH', + rest_servers_total: 'TOTAL_PATH' + }, 'PHOENIX_QUERY_SERVER': { phoenix_servers_started: 'STARTED_PATH', phoenix_servers_installed: 'INSTALLED_PATH', http://git-wip-us.apache.org/repos/asf/ambari/blob/110c8cd6/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 87b6149..f9b3548 100644 --- a/ambari-web/app/mappers/service_metrics_mapper.js +++ b/ambari-web/app/mappers/service_metrics_mapper.js @@ -117,6 +117,9 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({ region_servers_started: 'region_servers_started', region_servers_installed: 'region_servers_installed', region_servers_total: 'region_servers_total', + rest_servers_started: 'rest_servers_started', + rest_servers_installed: 'rest_servers_installed', + rest_servers_total: 'rest_servers_total', phoenix_servers_started: 'phoenix_servers_started', phoenix_servers_installed: 'phoenix_servers_installed', phoenix_servers_total: 'phoenix_servers_total' http://git-wip-us.apache.org/repos/asf/ambari/blob/110c8cd6/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 1bad287..9e640ed 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1879,6 +1879,7 @@ Em.I18n.translations = { 'services.service.summary.nodeManagersLive':'NodeManagers Live', 'services.service.summary.TrackersLive':'Trackers Live', 'services.service.summary.RegionServersLIVE':'RegionServers Live', + 'services.service.summary.RestServersLIVE':'HBaseRESTServer Live', 'services.service.summary.PhoenixServersLIVE':'Phoenix Query servers Live', 'services.service.summary.GangliaMonitorsLIVE':'Ganglia Monitors Live', 'services.service.summary.SupervisorsLIVE':'Supervisors Live', @@ -2952,6 +2953,8 @@ Em.I18n.translations = { 'dashboard.services.hbase.averageLoadPerServer':'{0} regions per RegionServer', 'dashboard.services.hbase.regionServers':'RegionServers', 'dashboard.services.hbase.regionServersSummary':'{0} live / {1} total', + 'dashboard.services.hbase.restServers':'HBaseRESTServer', + 'dashboard.services.hbase.restServersSummary':'{0} live / {1} total', 'dashboard.services.hbase.phoenixServers':'Phoenix Query Servers', 'dashboard.services.hbase.phoenixServersSummary':'{0} live / {1} total', 'dashboard.services.hbase.chart.label':'Request Count', http://git-wip-us.apache.org/repos/asf/ambari/blob/110c8cd6/ambari-web/app/models/service/hbase.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/service/hbase.js b/ambari-web/app/models/service/hbase.js index 09378fc..ccf7068 100644 --- a/ambari-web/app/models/service/hbase.js +++ b/ambari-web/app/models/service/hbase.js @@ -22,6 +22,9 @@ App.HBaseService = App.Service.extend({ regionServersStarted: DS.attr('number'), regionServersInstalled: DS.attr('number'), regionServersTotal: DS.attr('number'), + restServersStarted: DS.attr('number'), + restServersInstalled: DS.attr('number'), + restServersTotal: DS.attr('number'), phoenixServersStarted: DS.attr('number'), phoenixServersInstalled: DS.attr('number'), phoenixServersTotal: DS.attr('number'), http://git-wip-us.apache.org/repos/asf/ambari/blob/110c8cd6/ambari-web/app/templates/main/service/services/hbase.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/services/hbase.hbs b/ambari-web/app/templates/main/service/services/hbase.hbs index d575127..916d984 100644 --- a/ambari-web/app/templates/main/service/services/hbase.hbs +++ b/ambari-web/app/templates/main/service/services/hbase.hbs @@ -18,6 +18,26 @@ <!-- HBase Master Server --> {{view view.dashboardMasterComponentView}} +<!-- HBaseRESTServer --> +{{#if view.isRestServerCreated}} + <tr {{bindAttr class=":component view.restServerComponent.componentName"}}> + <td class="summary-label"><a + href="#" {{action filterHosts view.restServerComponent}}>{{t dashboard.services.hbase.restServers}}</a> + </td> + <td class="summary-value"> + {{#if App.router.clusterController.isServiceContentFullyLoaded}} + <span> + {{#view App.ComponentLiveTextView liveComponentsBinding="view.service.restServersStarted" totalComponentsBinding="view.service.restServersTotal"}} + {{view.liveComponents}}/{{view.totalComponents}} + {{/view}} + </span> + {{t services.service.summary.RestServersLIVE}} + {{else}} + {{t common.loading.eclipses}} + {{/if}} + </td> + </tr> +{{/if}} <!-- RegionServers --> {{#if view.isRegionServerCreated}} <tr {{bindAttr class=":component view.regionServerComponent.componentName"}}> http://git-wip-us.apache.org/repos/asf/ambari/blob/110c8cd6/ambari-web/app/views/main/service/services/hbase.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/service/services/hbase.js b/ambari-web/app/views/main/service/services/hbase.js index d2716aa..8a4bf80 100644 --- a/ambari-web/app/views/main/service/services/hbase.js +++ b/ambari-web/app/views/main/service/services/hbase.js @@ -89,6 +89,10 @@ App.MainDashboardServiceHbaseView = App.MainDashboardServiceView.extend({ componentName: 'HBASE_REGIONSERVER' }), + restServerComponent: Em.Object.create({ + componentName: 'HBASE_REST_SERVER' + }), + phoenixServerComponent: Em.Object.create({ componentName: 'PHOENIX_QUERY_SERVER' }), @@ -97,6 +101,10 @@ App.MainDashboardServiceHbaseView = App.MainDashboardServiceView.extend({ return this.isServiceComponentCreated('HBASE_REGIONSERVER'); }.property('App.router.clusterController.isComponentsStateLoaded'), + isRestServerCreated: function () { + return this.isServiceComponentCreated('HBASE_REST_SERVER'); + }.property('App.router.clusterController.isComponentsStateLoaded'), + isPhoenixQueryServerCreated: function () { return this.isServiceComponentCreated('PHOENIX_QUERY_SERVER'); }.property('App.router.clusterController.isComponentsStateLoaded')
