diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/services/models/models.js b/smart-zeppelin/zeppelin-web/src/app/dashboard/services/models/models.js index 7200bb320ac..a654d5965ec 100644 --- a/smart-zeppelin/zeppelin-web/src/app/dashboard/services/models/models.js +++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/services/models/models.js @@ -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) diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/nodeinfo/nodes.html b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/nodeinfo/nodes.html index a7d78a86dd2..32c9800439a 100644 --- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/nodeinfo/nodes.html +++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/nodeinfo/nodes.html @@ -23,8 +23,10 @@ Id - Location - Executor Type + Regist Time + Number of Executors + Cmdlets Executed + Cmdlets In Execution @@ -41,9 +43,11 @@

No node is running

- {{node.id}} - {{node.host}} - {{node.executorType}} + {{node.nodeInfo.id}} (Pending Schedule: {{node.numPendingSchedule}} Pending Dispatch: {{node.numPendingDispatch}}) + {{node.registTime}} + {{node.numExecutors}} + {{node.cmdletsExecuted}} + {{node.cmdletsInExecution}} diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/nodeinfo/nodes.js b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/nodeinfo/nodes.js index aceb7085f0c..59d9e15b11c 100644 --- a/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/nodeinfo/nodes.js +++ b/smart-zeppelin/zeppelin-web/src/app/dashboard/views/cluster/nodeinfo/nodes.js @@ -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'); + }); }