You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2017/02/27 18:02:33 UTC
ambari git commit: AMBARI-19828. UI changes to resolve discrepancies
between what the stack vs Ambari reports as "live" for NodeManagers.
Additional fix. (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 1ba483fb9 -> 6330cfb69
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/6330cfb6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6330cfb6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6330cfb6
Branch: refs/heads/branch-2.5
Commit: 6330cfb69e5af6fa742ad50ef3075665905a943a
Parents: 1ba483f
Author: Alex Antonenko <hi...@gmail.com>
Authored: Mon Feb 27 20:01:06 2017 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Mon Feb 27 20:02:29 2017 +0200
----------------------------------------------------------------------
ambari-web/app/messages.js | 1 -
.../app/templates/main/service/services/yarn.hbs | 13 ++++++++++++-
ambari-web/app/views/main/service/services/yarn.js | 1 -
.../test/views/main/service/services/yarn_test.js | 2 +-
4 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6330cfb6/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 134990e..6684f32 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2894,7 +2894,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/6330cfb6/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 138742d..3769fbf 100644
--- a/ambari-web/app/templates/main/service/services/yarn.hbs
+++ b/ambari-web/app/templates/main/service/services/yarn.hbs
@@ -39,7 +39,18 @@
<!-- NodeManagers status -->
<tr class="nodemanager-status">
<td class="summary-label">{{t dashboard.services.yarn.nodeManagers.status}}</td>
- <td class="summary-value">{{view.nodeManagersStatus}}</td>
+ <td class="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>
+ </td>
</tr>
<!-- YARN Clients -->
<tr {{bindAttr class=":component view.yarnClientComponent.componentName"}}>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6330cfb6/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/6330cfb6/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
+});