Solve #1941, Add node statistic info in node page (#1944)

Intel-bigdata · Sep 26, 2018 · 9f17c76 · 9f17c76
1 parent 597d3a9
commit 9f17c76
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
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
@@ -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
@@ -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">
@@ -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>

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
@@ -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');
+    });
   }