Skip to content
This repository has been archived by the owner on Jan 3, 2023. It is now read-only.

#1941 Add node statistic info in node page #1944

Merged
merged 2 commits into from
Sep 26, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ angular.module('org.apache.hadoop.ssm.models', [])
return get('cluster/primary/utilization/' + resourceName, decoder.default)
},
nodes: function () {
return get('cluster/primary/ssmnodesinfo', decoder.nodes);
return get('cluster/primary/ssmnodescmdletmetrics', decoder.nodes);
},
notebookInfo: function () {
return get('note/info', decoder.default)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@
<thead ng-show="nodes.length > 0">
<tr>
<th>Id</th>
<th>Location</th>
<th>Executor Type</th>
<th>Regist Time</th>
<th>Number of Executors</th>
<th>Cmdlets Executed</th>
<th>Cmdlets In Execution</th>
</tr>
</thead>
<thead ng-if="nodes.length <= 0">
Expand All @@ -41,9 +43,11 @@ <h4>No node is running</h4>
</thead>
<tbody>
<tr ng-repeat="node in nodes">
<td>{{node.id}}</td>
<td>{{node.host}}</td>
<td>{{node.executorType}}</td>
<td>{{node.nodeInfo.id}} (Pending Schedule: {{node.numPendingSchedule}} Pending Dispatch: {{node.numPendingDispatch}})</td>
<td>{{node.registTime}}</td>
<td>{{node.numExecutors}}</td>
<td>{{node.cmdletsExecuted}}</td>
<td>{{node.cmdletsInExecution}}</td>
</tr>
</tbody>
</table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,8 @@ angular.module('zeppelinWebApp')
NodesCtrl.$inject = ['$scope', '$filter', 'nodes0'];
function NodesCtrl($scope, $filter, nodes0) {
$scope.nodes = nodes0.body;
angular.forEach($scope.nodes, function (data,index) {
data.registTime = data.registTime === 0 ? "-" :
$filter('date')(data.registTime,'yyyy-MM-dd HH:mm:ss');
});
}