vis fixes

build_push.sh

@@ -0,0 +1,5 @@
+docker build -t=datarails/datarailsserver:visualizer .
+docker push datarails/datarailsserver:visualizer
+
+
+# npm run dist && npm start

server.js

@@ -8,12 +8,14 @@ var http = require('http');
 var WS = require('ws');
 
 var WebSocketServer = WS.Server;
-var host = process.env.HOST;
-var port;
+var host =  process.env.HOST ||"localhost";
+process.env.HOST=host
+var port =process.env.PORT || 8080;
+process.env.PORT=port;
 var indexData;
 var app = express();
-var ms = process.env.MS;
-
+var ms = process.env.MS || 300;
+process.env.MS=ms
 
 app.use(express.static('dist'));
 

src/data-provider.js

@@ -45,7 +45,10 @@ function physicalStructProvider([initialNodes,initialContainers]){
     _.find(root,(cluster) => {
       var node = _.find(cluster.children,{ ID:NodeID });
       if(!node) return;
-      let imageTag = cloned.Spec.ContainerSpec.Image.split(':')[1];
+       var dt=new Date(cloned.UpdatedAt)
+      let imageTag = cloned.Spec.ContainerSpec.Image + " <br/> " + (cloned.Spec.ContainerSpec.Args?cloned.Spec.ContainerSpec.Args:"" ) +
+          " <br/> updated : "+dt.getDate()+"/"+(dt.getMonth()+1)+" "+ dt.getHours()+":"+dt.getMinutes()+"<br/> ID : "+cloned.Status.ContainerStatus.ContainerID+
+          "<br/> ip : ";
       cloned.tag = imageTag;
       node.children.push(cloned);
       return true;
@@ -110,14 +113,15 @@ function physicalStructProvider([initialNodes,initialContainers]){
     for (let node of nodes) {
       if(!nodeOrContainerExists(currentnodelist,node.ID)) {
         updateNode(node,'ready');
+
         addNode(node);
     } else {
       for (let currentnode of currentnodelist) {
         if (node.ID == currentnode.ID) {
           name = node.Description.Hostname;
           if(name.length>0) {
-            currentnode.Description.Hostname = name;
-            currentnode.name = name;
+            currentnode.Description.Hostname = name ;
+            currentnode.name = name+" <br/> "+ object.Spec.Role+" <br/>mem : "+(object.Description.Resources.MemoryBytes/100000000).toFixed(0)+"G";
           }
           updateNode(currentnode, node.state);
         } 
@@ -184,7 +188,7 @@ class DataProvider extends EventEmitter {
 
   start(){
     STARTED = 1;
-    console.log(STARTED);
+    //console.log(STARTED);
     var clusterInit = Promise.all([
       getAllNodes(),
       getAllTasks()
@@ -204,7 +208,7 @@ class DataProvider extends EventEmitter {
   reload() {
     if(STARTED ==0) return;
     STARTED++;
-    console.log(STARTED);
+   // console.log(STARTED);
     var clusterInit = Promise.all([
       getAllNodes(),
       getAllTasks()

src/utils/request.js

@@ -44,6 +44,7 @@ function filterStoppedNodes (objects) {
 	object.state = "down"	
     }
     object.name = object.Description.Hostname;
+    object.name= object.name+" <br/>"+object.Spec.Role+" <br/>"+"mem : "+(object.Description.Resources.MemoryBytes/1000000000).toFixed(0)+"G";
     readyNodes.push(object);
   }
   readyNodes.sort(function (a, b) {

src/vis-physical/index.js

@@ -83,18 +83,18 @@ function  render ({root}) {
 
   container
     .classed('foreign', (d) => !d.state)
-    .attr('tag',(d) => _.kebabCase(d.tag))
+    .attr('tag',(d) => _.kebabCase(d.tag)).html((d) => d.tag)
 
   container.on('mouseenter',null);
   container.on('mouseleave',null);
 
-  container.on('mouseenter',function(){
-    d3.select(this).html((d) => d.name);
-  });
+  //container.on('mouseenter',function(){
+  //  d3.select(this).html((d) => d.name);
+  //});
 
-  container.on('mouseleave',function(){
-    d3.select(this).html('');
-  });
+  //container.on('mouseleave',function(){
+  //  d3.select(this).html('');
+  //});
 
   cluster.exit().remove();
   container.exit().remove();