feat(jsbattle-admin): display info about all nodes

jamro · jamro · commit c1ef38dbf70c · 2020-06-12T15:49:14.000+02:00
diff --git a/packages/jsbattle-admin/src/containers/SystemView.js b/packages/jsbattle-admin/src/containers/SystemView.js
@@ -5,9 +5,16 @@ import Col from 'react-bootstrap/Col';
 import Breadcrumb from 'react-bootstrap/Breadcrumb';
 import SideMenu from '../components/SideMenu.js';
 import Loading from '../components/Loading.js';
-import SmartTable from '../components/SmartTable.js';
 import {connect} from 'react-redux';
 import {getSystemInfo} from '../actions';
+import {
+  faServer,
+  faCheckCircle
+} from '@fortawesome/free-solid-svg-icons';
+import {
+  faCircle
+} from '@fortawesome/free-regular-svg-icons';
+import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
 
 class SystemView extends Component {
 
@@ -52,10 +59,107 @@ class SystemView extends Component {
     return output.join(' ');
   }
 
+  renderNode(node) {
+
+    let cardClass = 'card';
+    let headerClass = "card-header";
+    if(node.nodeID.startsWith('gateway')) {
+      cardClass += " bg-dark";
+      headerClass += " text-white";
+    }
+    return <Col md={6} key={node.nodeID}>
+      <div className={cardClass}>
+        <div className={headerClass}>
+          <FontAwesomeIcon size="lg" icon={faServer} /> &nbsp; <strong>{node.nodeID}</strong>
+        </div>
+        <ul className="list-group list-group-flush">
+          <li className="list-group-item d-flex justify-content-between align-items-center">
+            Cluster
+            <span className="badge badge-primary badge-pill">{node.clusterName}</span>
+          </li>
+          <li className="list-group-item d-flex justify-content-between align-items-center">
+            Host
+            <span className="badge badge-primary badge-pill">{node.hostname}</span>
+          </li>
+          <li className="list-group-item d-flex justify-content-between align-items-center">
+            OS up time
+            <span className="badge badge-primary badge-pill">{this.formaUptime(node.os.uptime)}</span>
+          </li>
+          <li className="list-group-item d-flex justify-content-between align-items-center">
+            Application up time
+            <span className="badge badge-primary badge-pill">{this.formaUptime(node.processUptime)}</span>
+          </li>
+          <li className="list-group-item d-flex justify-content-between align-items-center">
+            Client
+            <span className="badge badge-primary badge-pill">{node.client}</span>
+          </li>
+          <li className="list-group-item d-flex justify-content-between align-items-center">
+            Running services
+            <span className="badge badge-primary badge-pill">{node.services.length}</span>
+          </li>
+          <li className="list-group-item d-flex justify-content-between align-items-center">
+            CPU (15min average)
+            <span className="badge badge-primary badge-pill">{node.cpu.load15.toFixed(1)}%</span>
+          </li>
+          <li className="list-group-item d-flex justify-content-between align-items-center">
+            Memory
+            <span className="badge badge-primary badge-pill">{node.memory.percent.toFixed(1)}%</span>
+          </li>
+          <li className="list-group-item d-flex justify-content-between align-items-center">
+            Server time
+            <span className="badge badge-primary badge-pill">{node.time.utc}</span>
+          </li>
+        </ul>
+      </div>
+    </Col>;
+  }
+
+  renderServices(nodes, allServices) {
+    if(!allServices || !nodes) return;
+    let data = [];
+    let header = nodes.map((node) => node.nodeID);
+    for(let serviceName of allServices) {
+      data.push({
+        name: serviceName,
+        status: nodes.map((node) => node.services.indexOf(serviceName) != -1)
+      });
+    }
+
+    function checkbox(value) {
+      if(value) {
+        return <FontAwesomeIcon size="lg" icon={faCheckCircle} />;
+      } else {
+        return <FontAwesomeIcon size="lg" icon={faCircle} />;
+      }
+    }
+
+    let grid = data.map((row) => (
+      <tr key={row.name}>
+        <th scope="row">{row.name}</th>
+        {row.status.map((s, i) => <td key={i} className="text-center">{checkbox(s)}</td>)}
+      </tr>
+    ));
+
+    return <Col md={12}>
+      <table className="table table-sm">
+        <thead className="thead-dark">
+          <tr>
+            <th scope="col">Service</th>
+            {header.map((h, i) => <th key={i} scope="col" className="text-center">{h}</th>)}
+          </tr>
+        </thead>
+        <tbody>
+          {grid}
+        </tbody>
+      </table>
+    </Col>;
+  }
+
   render() {
     if(this.props.isLoading) {
       return<Loading />;
     }
+    let nodes = this.props.nodes ? this.props.nodes.map((n) => this.renderNode(n)) : null;
     return (
       <div>
         <Container fluid>
@@ -68,48 +172,13 @@ class SystemView extends Component {
                 <Breadcrumb.Item>Dashboard</Breadcrumb.Item>
                 <Breadcrumb.Item active>System</Breadcrumb.Item>
               </Breadcrumb>
+              <h1 className="display-5">Nodes</h1>
+              <Row>
+                {nodes}
+              </Row>
+              <h1 className="display-5">Services</h1>
               <Row>
-                <Col md={7}>
-                  <ul className="list-group">
-                    <li className="list-group-item d-flex justify-content-between align-items-center">
-                      OS up time
-                      <span className="badge badge-primary badge-pill">{this.formaUptime(this.props.osUptime)}</span>
-                    </li>
-                    <li className="list-group-item d-flex justify-content-between align-items-center">
-                      Application up time
-                      <span className="badge badge-primary badge-pill">{this.formaUptime(this.props.appUptime)}</span>
-                    </li>
-                    <li className="list-group-item d-flex justify-content-between align-items-center">
-                      Client
-                      <span className="badge badge-primary badge-pill">{this.props.client}</span>
-                    </li>
-                    <li className="list-group-item d-flex justify-content-between align-items-center">
-                      Running services
-                      <span className="badge badge-primary badge-pill">{this.props.node.upServiceCount}/{this.props.node.totalServiceCount}</span>
-                    </li>
-                    <li className="list-group-item d-flex justify-content-between align-items-center">
-                      CPU (15min average)
-                      <span className="badge badge-primary badge-pill">{this.props.cpu.toFixed(1)}%</span>
-                    </li>
-                    <li className="list-group-item d-flex justify-content-between align-items-center">
-                      Memory
-                      <span className="badge badge-primary badge-pill">{this.props.mem.toFixed(1)}%</span>
-                    </li>
-                    <li className="list-group-item d-flex justify-content-between align-items-center">
-                      Server time
-                      <span className="badge badge-primary badge-pill">{this.props.time}</span>
-                    </li>
-                  </ul>
-                </Col>
-                <Col md={5}>
-                  <SmartTable
-                    columns={[
-                      {name: 'Service Name', field: 'name'},
-                      {name: 'Running', field: 'up', format: 'check'},
-                    ]}
-                    data={{rows: this.props.node.services}}
-                  />
-                </Col>
+                {this.renderServices(this.props.nodes, this.props.allServices)}
               </Row>
             </Col>
           </Row>
@@ -122,14 +191,8 @@ class SystemView extends Component {
 // eslint-disable-next-line no-unused-vars
 const mapStateToProps = (state) => ({
   isLoading: state.loading.SYSTEM_INFO,
-  node: state.system.info.node,
-  cpu: state.system.info.health.cpu.load15,
-  mem: state.system.info.health.mem.percent,
-  client: state.system.info.health.client.type + " " + state.system.info.health.client.langVersion,
-  os: state.system.info.health.os,
-  time: state.system.info.health.time.utc,
-  osUptime: state.system.info.health.os.uptime,
-  appUptime: state.system.info.health.process.uptime,
+  nodes: state.system.info.nodes,
+  allServices: state.system.info.allServices,
 });
 
 const mapDispatchToProps = (dispatch) => ({
diff --git a/packages/jsbattle-admin/src/reducers/systemReducer.js b/packages/jsbattle-admin/src/reducers/systemReducer.js
@@ -1,20 +1,6 @@
 const initState = {
   info: {
-    health: {
-      client: {},
-      mem: {
-        percent: 0
-      },
-      cpu: {
-        load15: 0
-      },
-      process: {},
-      os: {},
-      time: {}
-    },
-    node: {
-      serrvices: []
-    }
+    nodes: []
   }
 };
 
diff --git a/packages/jsbattle-mockserver/app/init_db.json b/packages/jsbattle-mockserver/app/init_db.json
@@ -1,5 +1,5 @@
 {
-  "admin,info": {"memoryUsage":{"rss":112005120,"heapTotal":73895936,"heapUsed":48082320,"external":20602467,"arrayBuffers":19050402},"health":{"cpu":{"load1":2.88671875,"load5":2.86572265625,"load15":2.9169921875,"cores":8,"utilization":36},"mem":{"free":290983936,"total":17179869184,"percent":1.6937494277954102},"os":{"uptime":420572,"type":"Darwin","release":"19.5.0","hostname":"kjamroz-mbp13.home","arch":"x64","platform":"darwin","user":{"uid":991631923,"gid":1971932948,"username":"kjamroz","homedir":"/Users/kjamroz","shell":"/bin/zsh"}},"process":{"pid":23816,"memory":{"rss":112029696,"heapTotal":73895936,"heapUsed":48108080,"external":20602531,"arrayBuffers":19050426},"uptime":84642.942465808,"argv":["/Users/kjamroz/.nvm/versions/node/v14.2.0/bin/node","/Users/kjamroz/Documents/dev/jsbattle/packages/jsbattle-server/app/runner.js"]},"client":{"type":"nodejs","version":"0.14.7","langVersion":"v14.2.0"},"net":{"ip":["192.168.1.30"]},"time":{"now":1591723813396,"iso":"2020-06-09T17:30:13.396Z","utc":"Tue, 09 Jun 2020 17:30:13 GMT"}},"node":{"hostname":"kjamroz-mbp13.home","totalServiceCount":12,"upServiceCount":11,"downServiceCount":1,"services":[{"name":"$node","up":true},{"name":"auth","up":true},{"name":"ubdValidator","up":true},{"name":"apiGateway","up":true},{"name":"leagueScheduler","up":true},{"name":"challenges","up":true},{"name":"league","up":true},{"name":"scriptStore","up":true},{"name":"userStore","up":true},{"name":"battleStore","up":true},{"name":"ubdPlayer","up":true},{"name":"challenge","up":false}]}},
+  "admin,info": {"nodeCount":2,"allServices":["apiGateway","auth","battleStore","challenges","league","leagueScheduler","node","queue","scriptStore","ubdPlayer","ubdValidator","userStore"],"nodes":[{"nodeID":"gateway-jsbattle-dev-47845","clusterName":"jsbattle-dev","hostname":"kjamroz-mbp13.home","processUptime":83.16542054,"client":"nodejs v14.2.0","cpu":{"load1":3.3076171875,"load5":3.20068359375,"load15":3.18359375,"cores":8,"utilization":41},"memory":{"free":307081216,"total":17179869184,"percent":1.7874479293823242},"os":{"uptime":659143,"platform":"darwin","user":"kjamroz"},"time":{"now":1591962384717,"iso":"2020-06-12T11:46:24.717Z","utc":"Fri, 12 Jun 2020 11:46:24 GMT"},"services":["queue","auth","ubdValidator","apiGateway","leagueScheduler","node","league","userStore","challenges","scriptStore","battleStore"]},{"nodeID":"worker-jsbattle-dev-47997","clusterName":"jsbattle-dev","hostname":"kjamroz-mbp13.home","processUptime":6.688126715,"client":"nodejs v14.2.0","cpu":{"load1":3.595703125,"load5":3.2548828125,"load15":3.20263671875,"cores":8,"utilization":44},"memory":{"free":305311744,"total":17179869184,"percent":1.7771482467651367},"os":{"uptime":659141,"platform":"darwin","user":"kjamroz"},"time":{"now":1591962382283,"iso":"2020-06-12T11:46:22.283Z","utc":"Fri, 12 Jun 2020 11:46:22 GMT"},"services":["node","ubdPlayer"]}]},
   "admin,users": [
     {
       "username": "fredric.murphy",
diff --git a/packages/jsbattle-server/app/Node.js b/packages/jsbattle-server/app/Node.js
@@ -48,10 +48,14 @@ class Node {
             'LeagueScheduler',
             'ScriptStore',
             'UbdValidator',
+            'Node',
           ];
           break;
         case WORKER:
-          serviceList = ['UbdPlayer'];
+          serviceList = [
+            'UbdPlayer',
+            'Node',
+          ];
           break;
         default:
           throw Error('unknown node type: ' + this.type);
diff --git a/packages/jsbattle-server/app/runner.js b/packages/jsbattle-server/app/runner.js
@@ -15,11 +15,11 @@ let config = {
     "gaCode": "AB-123456789-Z"
   },
   "league": {
-    "scheduleInterval": 1000,
+    "scheduleInterval": 100000,
     "timeLimit": 10000
   },
   "ubdPlayer": {
-    "enabled": true,
+    "enabled": false,
     "queueLimit": 3,
     "queueQueryTime": 1000,
     "speed": 5,
diff --git a/packages/jsbattle-server/app/services/ApiGateway.service.js b/packages/jsbattle-server/app/services/ApiGateway.service.js
@@ -8,13 +8,11 @@ const stringReplace = require('../lib/stringReplaceMiddleware.js');
 const authorize = require('./apiGateway/authorize.js');
 const configPassport = require('./apiGateway/configPassport.js');
 const IO = require("socket.io");
-const fs = require('fs');
 
 class ApiGatewayService extends Service {
 
   constructor(broker) {
     super(broker);
-    this._broker = broker;
     let corsOrigin = broker.serviceConfig.web.corsOrigin;
     if(!Array.isArray(corsOrigin)) {
       corsOrigin = [corsOrigin]
@@ -23,7 +21,7 @@ class ApiGatewayService extends Service {
     this.parseServiceSchema({
       name: "apiGateway",
       actions: {
-        "getInfo": this.getInfo
+
       },
       started() {
         const svc = broker.createService({
@@ -55,7 +53,7 @@ class ApiGatewayService extends Service {
                   "PATCH battles/:id": "battleStore.update",
                   "REST battles": "battleStore",
                   "GET ubdPlayer/info": "ubdPlayer.getInfo",
-                  "GET info": "apiGateway.getInfo"
+                  "GET info": "node.getInfo"
                 },
                 bodyParsers: {
                   json: true,
@@ -209,43 +207,6 @@ class ApiGatewayService extends Service {
     });
   }
 
-  async getInfo() {
-    let nodeInfo = this._broker.getLocalNodeInfo();
-
-    let upServices = nodeInfo.services.map((s) => s.name);
-
-    let downServices = fs
-      .readdirSync(__dirname)
-      .filter((name) => name.endsWith('.service.js'))
-      .map((name) => name.replace(/\.service\.js$/, ''))
-      .map((name) => name.charAt(0).toLowerCase() + name.slice(1))
-      .filter((name) => upServices.indexOf(name) == -1);
-
-    upServices = upServices.map((name) => ({
-      name,
-      up: true
-    }));
-    downServices = downServices.map((name) => ({
-      name,
-      up: false
-    }));
-
-    let allServices = upServices.concat(downServices);
-
-    return {
-      clusterName: this._broker.serviceConfig.clusterName,
-      memoryUsage: await process.memoryUsage(),
-      health: await this._broker.getHealthStatus(),
-      node: {
-        hostname: nodeInfo.hostname,
-        totalServiceCount: allServices.length,
-        upServiceCount: upServices.length,
-        downServiceCount: downServices.length,
-        services: allServices
-      }
-    }
-  }
-
 }
 
 module.exports = ApiGatewayService;
diff --git a/packages/jsbattle-server/app/services/Node.service.js b/packages/jsbattle-server/app/services/Node.service.js

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		- "admin,info": {"memoryUsage":{"rss":112005120,"heapTotal":73895936,"heapUsed":48082320,"external":20602467,"arrayBuffers":19050402},"health":{"cpu":{"load1":2.88671875,"load5":2.86572265625,"load15":2.9169921875,"cores":8,"utilization":36},"mem":{"free":290983936,"total":17179869184,"percent":1.6937494277954102},"os":{"uptime":420572,"type":"Darwin","release":"19.5.0","hostname":"kjamroz-mbp13.home","arch":"x64","platform":"darwin","user":{"uid":991631923,"gid":1971932948,"username":"kjamroz","homedir":"/Users/kjamroz","shell":"/bin/zsh"}},"process":{"pid":23816,"memory":{"rss":112029696,"heapTotal":73895936,"heapUsed":48108080,"external":20602531,"arrayBuffers":19050426},"uptime":84642.942465808,"argv":["/Users/kjamroz/.nvm/versions/node/v14.2.0/bin/node","/Users/kjamroz/Documents/dev/jsbattle/packages/jsbattle-server/app/runner.js"]},"client":{"type":"nodejs","version":"0.14.7","langVersion":"v14.2.0"},"net":{"ip":["192.168.1.30"]},"time":{"now":1591723813396,"iso":"2020-06-09T17:30:13.396Z","utc":"Tue, 09 Jun 2020 17:30:13 GMT"}},"node":{"hostname":"kjamroz-mbp13.home","totalServiceCount":12,"upServiceCount":11,"downServiceCount":1,"services":[{"name":"$node","up":true},{"name":"auth","up":true},{"name":"ubdValidator","up":true},{"name":"apiGateway","up":true},{"name":"leagueScheduler","up":true},{"name":"challenges","up":true},{"name":"league","up":true},{"name":"scriptStore","up":true},{"name":"userStore","up":true},{"name":"battleStore","up":true},{"name":"ubdPlayer","up":true},{"name":"challenge","up":false}]}},
	`2`	+ "admin,info": {"nodeCount":2,"allServices":["apiGateway","auth","battleStore","challenges","league","leagueScheduler","node","queue","scriptStore","ubdPlayer","ubdValidator","userStore"],"nodes":[{"nodeID":"gateway-jsbattle-dev-47845","clusterName":"jsbattle-dev","hostname":"kjamroz-mbp13.home","processUptime":83.16542054,"client":"nodejs v14.2.0","cpu":{"load1":3.3076171875,"load5":3.20068359375,"load15":3.18359375,"cores":8,"utilization":41},"memory":{"free":307081216,"total":17179869184,"percent":1.7874479293823242},"os":{"uptime":659143,"platform":"darwin","user":"kjamroz"},"time":{"now":1591962384717,"iso":"2020-06-12T11:46:24.717Z","utc":"Fri, 12 Jun 2020 11:46:24 GMT"},"services":["queue","auth","ubdValidator","apiGateway","leagueScheduler","node","league","userStore","challenges","scriptStore","battleStore"]},{"nodeID":"worker-jsbattle-dev-47997","clusterName":"jsbattle-dev","hostname":"kjamroz-mbp13.home","processUptime":6.688126715,"client":"nodejs v14.2.0","cpu":{"load1":3.595703125,"load5":3.2548828125,"load15":3.20263671875,"cores":8,"utilization":44},"memory":{"free":305311744,"total":17179869184,"percent":1.7771482467651367},"os":{"uptime":659141,"platform":"darwin","user":"kjamroz"},"time":{"now":1591962382283,"iso":"2020-06-12T11:46:22.283Z","utc":"Fri, 12 Jun 2020 11:46:22 GMT"},"services":["node","ubdPlayer"]}]},
`3`	`3`	`"admin,users": [`
`4`	`4`	`{`
`5`	`5`	`"username": "fredric.murphy",`