Repository: ambari Updated Branches: refs/heads/trunk 87d629b53 -> 10c099c17
AMBARI-19828. UI changes to resolve discrepancies between what the stack vs Ambari reports as "live" for NodeManagers. Additional fix. (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/10c099c1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/10c099c1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/10c099c1 Branch: refs/heads/trunk Commit: 10c099c17a031e3e0b9f65a4dcc506daf123efdd Parents: 87d629b Author: Alex Antonenko <[email protected]> Authored: Mon Feb 27 20:06:48 2017 +0200 Committer: Alex Antonenko <[email protected]> Committed: Mon Feb 27 20:06:59 2017 +0200 ---------------------------------------------------------------------- ambari-web/app/messages.js | 1 - .../app/templates/main/service/services/yarn.hbs | 15 +++++++++++++-- ambari-web/app/views/main/service/services/yarn.js | 1 - .../test/views/main/service/services/yarn_test.js | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/10c099c1/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index a06ff27..44bf13e 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -2937,7 +2937,6 @@ Em.I18n.translations = { 'dashboard.services.yarn.resourceManager.standby':'Standby ResourceManager', 'dashboard.services.resourceManager.nodes.heap':'ResourceManager Heap', 'dashboard.services.yarn.nodeManagers.status': 'NodeManagers Status', - 'dashboard.services.yarn.nodeManagers.status.msg': '{0} active / {1} lost / {2} unhealthy / {3} rebooted / {4} decommissioned', 'dashboard.services.yarn.nodeManagers.status.active': 'active', 'dashboard.services.yarn.nodeManagers.status.lost': 'lost', 'dashboard.services.yarn.nodeManagers.status.unhealthy': 'unhealthy', http://git-wip-us.apache.org/repos/asf/ambari/blob/10c099c1/ambari-web/app/templates/main/service/services/yarn.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/services/yarn.hbs b/ambari-web/app/templates/main/service/services/yarn.hbs index 1827c8e..32aad5d 100644 --- a/ambari-web/app/templates/main/service/services/yarn.hbs +++ b/ambari-web/app/templates/main/service/services/yarn.hbs @@ -42,7 +42,18 @@ {{! NodeManagers status }} <div class="row nodemanager-status"> <div class="col-md-6 summary-label">{{t dashboard.services.yarn.nodeManagers.status}}</div> - <div class="col-md-6 summary-value">{{view.nodeManagersStatus}}</div> + <div class="col-md-6 summary-value"> + <span {{translateAttr data-original-title="dashboard.services.yarn.nodeManagers.status.tooltip.active"}} rel="tooltip"> + {{view._nmActive}} {{t dashboard.services.yarn.nodeManagers.status.active}} </span> / + <span {{translateAttr data-original-title="dashboard.services.yarn.nodeManagers.status.tooltip.lost"}} rel="tooltip"> + {{view._nmLost}} {{t dashboard.services.yarn.nodeManagers.status.lost}} </span> / + <span {{translateAttr data-original-title="dashboard.services.yarn.nodeManagers.status.tooltip.unhealthy"}} rel="tooltip"> + {{view._nmUnhealthy}} {{t dashboard.services.yarn.nodeManagers.status.unhealthy}} </span> / + <span {{translateAttr data-original-title="dashboard.services.yarn.nodeManagers.status.tooltip.rebooted"}} rel="tooltip"> + {{view._nmRebooted}} {{t dashboard.services.yarn.nodeManagers.status.rebooted}} </span> / + <span {{translateAttr data-original-title="dashboard.services.yarn.nodeManagers.status.tooltip.decommissioned"}} rel="tooltip"> + {{view._nmDecom}} {{t dashboard.services.yarn.nodeManagers.status.decommissioned}} </span> + </div> </div> {{! YARN Clients }} <div {{bindAttr class=":row :component view.yarnClientComponent.componentName"}}> @@ -97,4 +108,4 @@ </div> </div> {{! right column end }} -</div> \ No newline at end of file +</div> http://git-wip-us.apache.org/repos/asf/ambari/blob/10c099c1/ambari-web/app/views/main/service/services/yarn.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/service/services/yarn.js b/ambari-web/app/views/main/service/services/yarn.js index 11edd22..84ba520 100644 --- a/ambari-web/app/views/main/service/services/yarn.js +++ b/ambari-web/app/views/main/service/services/yarn.js @@ -55,7 +55,6 @@ App.MainDashboardServiceYARNView = App.MainDashboardServiceView.extend({ _nmUnhealthy: Em.computed.formatUnavailable('service.nodeManagersCountUnhealthy'), _nmRebooted: Em.computed.formatUnavailable('service.nodeManagersCountRebooted'), _nmDecom: Em.computed.formatUnavailable('service.nodeManagersCountDecommissioned'), - nodeManagersStatus: Em.computed.i18nFormat('dashboard.services.yarn.nodeManagers.status.msg', '_nmActive', '_nmLost', '_nmUnhealthy', '_nmRebooted', '_nmDecom'), _allocated: Em.computed.formatUnavailable('service.containersAllocated'), _pending: Em.computed.formatUnavailable('service.containersPending'), http://git-wip-us.apache.org/repos/asf/ambari/blob/10c099c1/ambari-web/test/views/main/service/services/yarn_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/main/service/services/yarn_test.js b/ambari-web/test/views/main/service/services/yarn_test.js index 57b3b05..d422d47 100644 --- a/ambari-web/test/views/main/service/services/yarn_test.js +++ b/ambari-web/test/views/main/service/services/yarn_test.js @@ -151,4 +151,4 @@ describe('App.MainDashboardServiceYARNView', function () { }); }); -}); \ No newline at end of file +});
