Browse Source

update dist

master
zeus 3 months ago
parent
commit
1dedd5a19c
24 changed files with 560 additions and 778 deletions
  1. +0
    -8
      client/css/app.b5111772.css
  2. +0
    -9
      client/css/chunk-vendors.b9dd8f74.css
  3. BIN
      client/favicon.ico
  4. BIN
      client/fonts/themify.2c454669.eot
  5. BIN
      client/fonts/themify.a1ecc3b8.woff
  6. BIN
      client/fonts/themify.e23a7dca.ttf
  7. BIN
      client/img/docker.7b56657d.png
  8. BIN
      client/img/hybrid-1.852eef88.png
  9. BIN
      client/img/loading.f4404720.gif
  10. +0
    -362
      client/img/themify.9c8e96ec.svg
  11. BIN
      client/img/venus1.826d0774.png
  12. BIN
      client/img/warning.f9cebb9b.png
  13. +0
    -1
      client/index.html
  14. +0
    -2
      client/js/app.928e7c0e.js
  15. +0
    -1
      client/js/app.928e7c0e.js.map
  16. +0
    -394
      client/js/chunk-vendors.f00828c9.js
  17. +0
    -1
      client/js/chunk-vendors.f00828c9.js.map
  18. +535
    -0
      llo/connect-new.js
  19. +1
    -0
      package.json
  20. +1
    -0
      tmp/connect-client
  21. +1
    -0
      tmp/run.sh
  22. +0
    -0
      tmp/share/hello
  23. +0
    -0
      tmp/share/hello1
  24. +22
    -0
      tmp/startnfs.yml

+ 0
- 8
client/css/app.b5111772.css
File diff suppressed because it is too large
View File


+ 0
- 9
client/css/chunk-vendors.b9dd8f74.css
File diff suppressed because it is too large
View File


BIN
client/favicon.ico View File

Before After

BIN
client/fonts/themify.2c454669.eot View File


BIN
client/fonts/themify.a1ecc3b8.woff View File


BIN
client/fonts/themify.e23a7dca.ttf View File


BIN
client/img/docker.7b56657d.png View File

Before After
Width: 200  |  Height: 200  |  Size: 16KB

BIN
client/img/hybrid-1.852eef88.png View File

Before After
Width: 151  |  Height: 165  |  Size: 12KB

BIN
client/img/loading.f4404720.gif View File

Before After
Width: 441  |  Height: 291  |  Size: 17KB

+ 0
- 362
client/img/themify.9c8e96ec.svg
File diff suppressed because it is too large
View File


BIN
client/img/venus1.826d0774.png View File

Before After
Width: 511  |  Height: 634  |  Size: 80KB

BIN
client/img/warning.f9cebb9b.png View File

Before After
Width: 407  |  Height: 43  |  Size: 4.8KB

+ 0
- 1
client/index.html View File

@@ -1 +0,0 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><title>Vue App</title><link href=/css/app.b5111772.css rel=preload as=style><link href=/css/chunk-vendors.b9dd8f74.css rel=preload as=style><link href=/js/app.928e7c0e.js rel=preload as=script><link href=/js/chunk-vendors.f00828c9.js rel=preload as=script><link href=/css/chunk-vendors.b9dd8f74.css rel=stylesheet><link href=/css/app.b5111772.css rel=stylesheet></head><body><div id=app></div><script src=/js/chunk-vendors.f00828c9.js></script><script src=/js/app.928e7c0e.js></script></body></html>

+ 0
- 2
client/js/app.928e7c0e.js
File diff suppressed because it is too large
View File


+ 0
- 1
client/js/app.928e7c0e.js.map
File diff suppressed because it is too large
View File


+ 0
- 394
client/js/chunk-vendors.f00828c9.js
File diff suppressed because it is too large
View File


+ 0
- 1
client/js/chunk-vendors.f00828c9.js.map
File diff suppressed because it is too large
View File


+ 535
- 0
llo/connect-new.js View File

@@ -7,6 +7,8 @@ var app = express();
const cors = require('cors')
const helmet = require('helmet');
var MongoClient = require('mongodb').MongoClient;
const yaml = require('js-yaml');
var mpath = require("path");

var allowedOrigins = [
'http://localhost:3080',
@@ -713,6 +715,163 @@ app.get('/getwginterfacesstats', (req, res, next) => {

});




app.get('/dockerservices', (req, res, next) => {
var RES = new Object();
const page = req.query["page"]
const per_page = req.query["per_page"]
var sort = req.query["sort"]
var filter = req.query["filter"]
var type = req.query["type"]
var sort = req.query["sort"]
var sorttmp1 = sort.split('|');
var sortname = sorttmp1[0];
var sortorder = sorttmp1[1];
var showexec = `docker ps --format '{"ID":"{{ .ID }}", "Image": "{{ .Image }}", "Names":"{{ .Names }}", "Ports":"{{.Ports}}", "Networks":"{{.Networks}}", "Status":"{{.Status}}","RunningFor":"{{.RunningFor}}","CreatedAt":"{{.CreatedAt}}"}' | jq . -s `
exec(showexec, (err, stdout, stderr) => {
if (err) {
console.error(`exec error: ${err}`);
return;
}
var nn = []
var string = stdout.toString()
var datajson = JSON.parse(string);

var results1 = []
var grep1 = new RegExp('swlabadminvenus');
var datalenth = datajson.length
for (var i=0 ; i < datalenth ; i++)
{
if(!grep1.test(datajson[i]['Names'])){
results1.push(datajson[i]);
}
}
datajson=results1
var results2 = []
var grep2 = new RegExp('swlabmongovenus');
datalenth = datajson.length
for (var i=0 ; i < datalenth ; i++)
{
if(!grep2.test(datajson[i]['Names'])){
results2.push(datajson[i]);
}
}
datajson=results2

var results3 = []
var grep3 = new RegExp('swarmlabwg-');
datalenth = datajson.length
for (var i=0 ; i < datalenth ; i++)
{
if(!grep3.test(datajson[i]['Names'])){
results3.push(datajson[i]);
}
}
datajson=results3

var results4 = []
var grep4 = new RegExp('swarmlab-hybrid-agent');
datalenth = datajson.length
for (var i=0 ; i < datalenth ; i++)
{
if(!grep4.test(datajson[i]['Names'])){
results4.push(datajson[i]);
}
}
datajson=results4

var results = []
if(filter !== 'NULL'){
var grep = new RegExp(filter);
var datalenth = datajson.length
for (var i=0 ; i < datalenth ; i++)
{
if(grep.test(datajson[i]['Names'])){
results.push(datajson[i]);
}
}
datajson=results
}
if(sortname == 'Names'){
datajson.sort(function (a, b) {
if(sortorder == 'asc'){
return a.Names.localeCompare(b.Names);
}else{
return b.Names.localeCompare(a.Names);
}
});
}else if(sortname == 'Status'){
datajson.sort(function (a, b) {
if(sortorder == 'asc'){
return a.Status.localeCompare(b.Status);
}else{
return b.Status.localeCompare(a.Status);
}
});
}
var resultid = []
var datalenth2 = datajson.length
for (var i=0 ; i < datalenth2 ; i++)
{
datajson[i].id=i
datajson[i]._id=i
resultid.push(datajson[i]);
}
datajson=resultid
var total = datajson.length;
var perpage = per_page
var lastpage = total/perpage;

if(lastpage <= 1) {
lastpage=1
}else{
lastpage++
}
lastpage = Math.trunc(lastpage);
var next=(page+1);
if(next >= lastpage){
next=lastpage;
}
var prev=(page-1);
if(prev == 0){
prev=1;
}
var from=((page-1)*perpage)+1;
var to=(perpage*page)
var myplaybooks = new Object();
var links = `
{
"pagination": {
"total": ${total},
"per_page": ${perpage},
"current_page": ${page},
"last_page": ${lastpage},
"next_page_url": "?page=${next}",
"prev_page_url": "?page=${prev}",
"from": ${from},
"to": ${to},
"frommongo": ${from},
"tomongo": ${to}
}
}
`
myplaybooks.links = JSON.parse(links);
from--
myplaybooks.data = datajson.slice(from,to);
var RES = new Object();
RES.code = req.query["action"]
RES.token = req.query["token"]
RES.error = false
RES.error_msg = "ok"
RES.data = myplaybooks;
res.json(RES.data)
});
});



async function mywgStatus(){
//var mongoserver = JSON.parse(fs.readFileSync('./hybrid/venus-stats/config.json', 'utf8'))
var mypath = process.cwd()
@@ -974,11 +1133,387 @@ setInterval(function(){
mywgRemoveClosedConnection()
}, 45000)



io.on('connection', function(socket) {
console.log('new connection');
socket.on('start', (value) => {
console.log('start'+ value);
});

socket.on('share_app_info', (value) => {
var service = {}
var mypath = process.cwd()
try {
service.Name = value.Names
console.log(JSON.stringify(value));
var showexec = `docker inspect --format '{{json .Config.Labels}}' ${service.Name}`
log = spawn(showexec, {
shell: true,
cwd: mypath,
detached: false,
stdio: 'pipe'
});
log.stdout.on('data', function (data) {
var n = {}
n.status = 'data'
n.exec = 'inspect'
n.data = data.toString()
var interfaces = JSON.parse(n.data);
io.emit('share_app_res', n);
});
log.stderr.on('data', function (data) {
var n = {}
n.status = 'error'
n.exec = 'inspect'
n.data = data.toString()
io.emit('share_app_reserror', n);
});
log.on('close', function (code) {
var n = {}
n.status = 'close'
n.exec = 'inspect'
n.data = code
io.emit('share_app_resclose', n);
});
var showexec1 = `docker ps --format '{"ID":"{{ .ID }}", "Image": "{{ .Image }}", "Names":"{{ .Names }}", "Ports":"{{.Ports}}", "Networks":"{{.Networks}}", "Status":"{{.Status}}","RunningFor":"{{.RunningFor}}","CreatedAt":"{{.CreatedAt}}"}' | jq . -s `
log1 = spawn(showexec1, {
shell: true,
cwd: mypath,
detached: false,
stdio: 'pipe'
});
log1.stdout.on('data', function (data) {
var n = {}
n.status = 'data'
n.exec = 'ps'
var string = data.toString()
var datajson = JSON.parse(string);

var results = []
var filter = `swarmlabwg-`
var grep = new RegExp(filter);
var datalenth = datajson.length
for (var i=0 ; i < datalenth ; i++)
{
if(grep.test(datajson[i]['Names'])){
results.push(datajson[i]);
}
}
n.data = results
io.emit('share_app_res', n);
});
log1.stderr.on('data', function (data) {
var n = {}
n.status = 'error'
n.exec = 'ps'
n.data = data.toString()
io.emit('share_app_reserror', n);
});
log1.on('close', function (code) {
var n = {}
n.status = 'close'
n.exec = 'ps'
n.data = code
io.emit('share_app_resclose', n);
});


} catch (err) {
console.log(err.stack || String(err));
}
});

socket.on('share_app', (value) => {
var service = {}
var mypath = process.cwd()
/*
* value.c
this.dockercompose.stack = 'com.docker.compose.project'
this.dockercompose.service = 'com.docker.compose.service'
this.dockercompose.file = 'com.docker.compose.project.config_files'
this.dockercompose.env = 'com.docker.compose.project.environment_file'
this.dockercompose.dir = 'com.docker.compose.project.working_dir'
value.s [{"ID":"36be0c53c700","Image":"hub.swarmlab.io:5480/venus-alpine:latest","Names":"swarmlabwg-AcwtSX5hswT4pmObytxBjoCd4rDJMwB1","Ports":"80/tcp, 443/tcp, 8080/tcp, 8088/tcp, 51820/udp","Networks":"swlabAcwtSX5hsw","Status":"Up 35 minutes","RunningFor":"35 minutes ago","CreatedAt":"2021-05-26 13:21:08 +0300 EEST"}]
value.n conatiner name
*/
console.log(JSON.stringify(value));
try {
service.Name = mpath.basename(value.c.file)
service.Dir = value.c.dir
service.stack = value.c.stack
service.env = value.c.env
service.service = value.c.service
service.network = value.n

console.log(JSON.stringify(value.c.statck));
if(value.c.stack){
var filename1 = service.Dir+"/"+service.stack+'_'+service.service+"-venus.yml"
var filenamedefault = service.Dir+"/"+service.stack+'_'+service.service+"-venus-default.yml"
var filenameyaml = service.Dir+"/"+service.Name
var contents = fs.readFileSync(filenameyaml, 'utf8')
var yamldata = yaml.load(contents)
fs.exists(filenamedefault, (exists) => {
if(exists){
}else{
fs.copyFile(filenameyaml, filenamedefault, (err) => {
if (err){
console.log('source.txt was not copied to '+ filenamedefault);
}
console.log('source.txt was copied to '+ filenamedefault);
});
}
});
console.log(JSON.stringify(yamldata));
delete yamldata.services[service.service].ports
delete yamldata.services[service.service].networks
//yamldata.services[service.service].network_mode: "service:masternfsserver"
yamldata.services[service.service].network_mode = "container:"+service.network
console.log(yamldata.services[service.service])


var yamldata_out = yaml.dump(yamldata, {
'styles': {
'!!null': '' // dump null as ~
//'!!null': 'canonical' // dump null as ~
},
'sortKeys': false // sort object keys
});
console.log(JSON.stringify(yamldata_out));
fs.writeFileSync(filename1, yamldata_out);
//var showexec = `cd ${service.Dir}; docker-compose -f ${filename1} --project-directory ${service.Dir} --env-file ${service.env} up -d ${service.service}`
var showexec = `cd ${service.Dir}; docker-compose -f ${filename1} --project-directory ${service.Dir} up -d ${service.service}`
console.log(showexec);
log = spawn(showexec, {
shell: true,
cwd: service.Dir,
detached: false,
stdio: 'pipe'
});
log.stdout.on('data', function (data) {
var n = {}
n.status = 'data'
n.exec = 'share'
n.compose = 'yes'
n.data = data.toString()
io.emit('share_app_exec_res', n);
});
log.stderr.on('data', function (data) {
var n = {}
n.status = 'error'
n.exec = 'share'
n.data = data.toString()
n.compose = 'yes'
io.emit('share_app_exec_reserror', n);
});
log.on('close', function (code) {
var n = {}
n.status = 'close'
n.exec = 'share'
n.compose = 'yes'
n.data = code
io.emit('share_app_exec_resclose', n);
});
}else{
var n = {}
n.status = 'close'
n.exec = 'share'
n.compose = 'no'
n.data = 'nodata'
io.emit('share_app_exec_resclose', n);
}

} catch (err) {
console.log(err.stack || String(err));
}
});

socket.on('share_app_default', (value) => {
var service = {}
var mypath = process.cwd()
console.log(JSON.stringify(value));
try {
service.Name = mpath.basename(value.c.file)
service.Dir = value.c.dir
service.stack = value.c.stack
service.env = value.c.env
service.service = value.c.service
service.network = value.n

if(value.c.stack){
var filenamedefault = service.Dir+"/"+service.stack+'_'+service.service+"-venus-default.yml"
//var showexec = `docker-compose -f ${filenamedefault} --project-directory ${service.Dir} --env-file ${service.env} up -d ${service.service}`
var showexec = `cd ${service.Dir}; docker-compose -f ${filenamedefault} --project-directory ${service.Dir} up -d ${service.service}`
console.log(showexec);
log = spawn(showexec, {
shell: true,
cwd: service.Dir,
detached: false,
stdio: 'pipe'
});
log.stdout.on('data', function (data) {
var n = {}
n.status = 'data'
n.exec = 'sharedefault'
n.compose = 'yes'
n.data = data.toString()
io.emit('share_app_exec_res', n);
});
log.stderr.on('data', function (data) {
var n = {}
n.status = 'error'
n.exec = 'sharedefault'
n.data = data.toString()
n.compose = 'yes'
io.emit('share_app_exec_reserror', n);
});
log.on('close', function (code) {
var n = {}
n.status = 'close'
n.exec = 'sharedefault'
n.compose = 'yes'
n.data = code
io.emit('share_app_exec_resclose', n);
});
}else{
var n = {}
n.status = 'close'
n.exec = 'sharedefault'
n.compose = 'no'
n.data = 'nodata'
io.emit('share_app_exec_resclose', n);
}
} catch (err) {
console.log(err.stack || String(err));
}
});

socket.on('container_info', (value) => {
var service = {}
var mypath = process.cwd()
console.log(JSON.stringify(value));
console.log('-----------------------------------');
try {
service.Name = mpath.basename(value.s.Names)
service.Dir = value.c.dir
var showexec = `docker inspect --format '{{json .HostConfig.NetworkMode}}' ${service.Name}`
// ip --brief address show
//var showexec = `docker inspect --format '{{json .Config}}' ${service.Name}`
log = spawn(showexec, {
shell: true,
cwd: service.Dir,
detached: false,
stdio: 'pipe'
});
log.stdout.on('data', function (data) {
var n = {}
n.status = 'data'
n.exec = 'info'
n.data = data.toString()
n.data = n.data.replace(/(\r\n|\n|\r)/gm, "");
n.data = n.data.replace(/["']/g, "");
console.log(JSON.stringify(n.data));
var grep1a = new RegExp(/^container/);
var grep1b = new RegExp(/^service/);
if(grep1a.test(n.data) || grep1b.test(n.data)){
var ndata = n.data.replace(/["']/g, "");
var grepsplit = new RegExp(':');
if(grepsplit.test(ndata)){ // network_mode container
var split = ndata.split(":")
var containername = split[1].replace(/(\r\n|\n|\r)/gm, "");
var showexec2 = `docker exec ${containername} /bin/sh -c "ip -j --brief address show"`
//docker exec -it microservice-jupyter26_masterservice_1 /bin/sh -c "jupyter notebook list"
console.log(showexec2)
log2 = spawn(showexec2, {
shell: true,
cwd: service.Dir,
detached: false,
stdio: 'pipe'
});
log2.stdout.on('data', function (data) {
var n = {}
n.status = 'error'
n.exec = 'info'
n.data = data.toString()
var nnn = 'yes1'
var grepjupyter = new RegExp('microservice-jupyter');
if(grepjupyter.test(service.Name)){
var showexec3 = `docker exec ${service.Name} /bin/sh -c "cat /home/jovyan/.local/share/jupyter/runtime/nbserver-46.json"`
log3 = spawn(showexec3, {
shell: true,
cwd: service.Dir,
detached: false,
stdio: 'pipe'
});
log3.stdout.on('data', function (data) {
var nn = {}
nn.status = 'error'
nn.exec = 'info'
nn.data = n.data
nn.jupyter = data.toString()
console.log(nn)
io.emit('container_info_res', nn);
});
}else{
io.emit('container_info_res', n);
console.log(n.data)
}

});
log2.stderr.on('data', function (data) {
var n = {}
n.status = 'error'
n.exec = 'sharedefault'
n.data = data.toString()
console.log(n.data)
io.emit('container_info_reserror', n);
});
}
} else{ // network mode other
var grep2a = new RegExp(/^microservice-/);
var grep2b = new RegExp(/^hybrid-/);
if(grep2a.test(n.data) || grep2b.test(n.data)){
var showexec2 = `docker exec ${service.Name} /bin/sh -c "ip -j --brief address show"`
log2 = spawn(showexec2, {
shell: true,
cwd: service.Dir,
detached: false,
stdio: 'pipe'
});
log2.stdout.on('data', function (data) {
var n = {}
n.status = 'error'
n.exec = 'info'
n.data = data.toString()
console.log(n)
io.emit('container_info_res', n);
});
}
}
//var showexec1 = `docker inspect --format '{{json .HostConfig.NetworkMode}}' ${service.Name}`
//io.emit('container_info_res', n);
});
log.stderr.on('data', function (data) {
var n = {}
n.status = 'error'
n.exec = 'info'
n.data = data.toString()
io.emit('container_info_reserror', n);
});
log.on('close', function (code) {
var n = {}
n.status = 'close'
n.exec = 'info'
n.data = code
io.emit('container_info_resclose', n);
});
} catch (err) {
console.log(err.stack || String(err));
}
});

});

server.listen(serverPort, function() {

+ 1
- 0
package.json View File

@@ -12,6 +12,7 @@
"cors": "^2.8.5",
"express": "^4.17.1",
"helmet": "^4.1.1",
"js-yaml": "^4.1.0",
"mongodb": "^3.6.6",
"pm2": "^4.5.1",
"read-last-lines": "^1.7.2",

+ 1
- 0
tmp/connect-client View File

@@ -0,0 +1 @@
xtightvncviewer -x11cursor 192.168.1.8:5901

+ 1
- 0
tmp/run.sh View File

@@ -0,0 +1 @@
docker run -it -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=unix$DISPLAY ellerbrock/alpine-firefox:latest "http://www.swarmlab.io"

+ 0
- 0
tmp/share/hello View File


+ 0
- 0
tmp/share/hello1 View File


+ 22
- 0
tmp/startnfs.yml View File

@@ -0,0 +1,22 @@
version: "3.8"

services:

nfsserver:
image: hub.swarmlab.io:5480/venus-fsshare-server:latest
#image: itsthenetwork/nfs-server-alpine:12
network_mode: "container:swarmlabwg-DyQr6vnRhsEsSwqIxh9WtYIxEVGf0IXr"
privileged: true
container_name: wg-masterfsserver
restart: unless-stopped
environment:
- SHARED_DIRECTORY=/data
- NFS_EXPORT_0='/data *(ro,fsid=0,async,no_subtree_check,no_auth_nlm,insecure,no_root_squash)'
volumes:
- /data/appl/ok/swarmlab-venus/src-local/tmp/share:/data
- /lib/modules:/lib/modules:ro
cap_add:
- SYS_ADMIN
#- SETPCAP
- SYS_MODULE


Loading…
Cancel
Save