scottk/control-pane
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/control-pane.git synced 2025-11-03 11:27:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Charlie Root
2018-11-24 15:53:59 +03:00
parent 142351df74
commit 045e4d5399
4 changed files with 81 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
node/wsClonos.bsWatcher.js
View File

@@ -13,7 +13,7 @@ var bsWatcher=function(ip,port,tube,callback)
} }
bsWatcher.prototype.connect=function() bsWatcher.prototype.connect=function()
{ {
this.client=bs.Client('clonos.bsdstore.ru:11300'); this.client=bs.Client('localhost:11300');
this.client.addListener('connect', function() { this.client.addListener('connect', function() {
this.connectionError=false; this.connectionError=false;
}.bind(this)); }.bind(this));

43
public/css/styles.css
View File

@@ -1521,7 +1521,7 @@ div.smoothie-chart-tooltip {
font-size: 8pt; font-size: 8pt;
pointer-events: none; pointer-events: none;
border: 1px solid gray; border: 1px solid gray;
box-shadow:3px 3px 3px 0px rgba(0,0,0,0.1); box-shadow:3px 3px 3px 0px rgba(0,0,0,0.2);
line-height: 120%; line-height: 120%;
} }
.smoothie-chart-tooltip :nth-child(2):after, .smoothie-chart-tooltip :nth-child(2):after,
@@ -1532,13 +1532,20 @@ td.graph {
/*background-color:black;*/ /*background-color:black;*/
} }
.row2col div.smoothie-chart-tooltip { body.overview div.smoothie-chart-tooltip {
background:gray; background:#3a3a3a;
color:white;
} }
.main #cdown {
display:none;
}
.main.asplit #cdown {
display:block;
}
.asplit .tsimple tbody { .asplit .tsimple tbody {
display:block; display:block;
height:190px; height:190px;
@@ -1579,3 +1586,31 @@ td.graph {
/* border:1px inset white; /* border:1px inset white;
background-color:#fefefe;*/ background-color:#fefefe;*/
} }
#cinfo {
display:flex;
}
#cinfo .left {
width:calc(100% - 320px);
overflow-y:auto;
padding:10px;
}
#cinfo .right {
width:300px;
/*background-color:white;
border:1px inset white;*/
margin-left:20px;
overflow-y:auto;
/*padding:10px;*/
}
#cinfo h2 {
font-weight:bold;
color:#337ab7;
margin-bottom:4px;
}
#cinfo .graph {
height:70px;
width:260px;
padding-left:10px !important;
}

24
public/index.php
View File

@@ -77,7 +77,7 @@ if(!$user_info['error'])
<?php if(isset($user_info_txt)) echo $user_info_txt; ?> <?php if(isset($user_info_txt)) echo $user_info_txt; ?>
</script> </script>
</head> </head>
<body class="gadget1 login"> <body class="gadget1 login <?php echo $uri;?>">
<main><div class="main"><div id="content"><div id="ctop"> <main><div class="main"><div id="content"><div id="ctop">
<?php <?php
@@ -87,7 +87,27 @@ if(file_exists($file_name)) include($file_name); else
} }
$clonos->placeDialogs(); $clonos->placeDialogs();
?> ?>
</div><div id="cdown"><div id="cinfo"></div></div></div></div></main> </div><div id="cdown"><div id="cinfo">
<div class="left">
<dl>
<dt>Имя клетки:</dt>
<dd>Jail1</dd>
</dl>
</div>
<div class="right">
<h2>Загрузка процессора:</h2>
<div class="graph v-black g-!summary-cpu l-pcpu"></div>
<br />
<h2>Использование памяти:</h2>
<div class="graph v-black g-!summary-mem l-pmem"></div>
<br />
<h2>Операций ввода/вывода:</h2>
<div class="graph v-black g-!summary-iops l-readiops,writeiops"></div>
<br />
<h2>Загрузка сети:</h2>
<div class="graph v-black g-!summary-bps l-readbps,writebps"></div>
</div>
</div></div></div></div></main>
<div class="menu"><div id="menu"> <div class="menu"><div id="menu">
<div class="closer"></div> <div class="closer"></div>

19
public/js/clonos.js
View File

@@ -1699,7 +1699,10 @@ var clonos={
var tbl=$(tr).closest('table'); var tbl=$(tr).closest('table');
var tblid=$(tbl).attr('id'); var tblid=$(tbl).attr('id');
if(tblid=='jailslist'){var e=$(tr).parents('div.main');if(e){$(e).toggleClass('asplit');}} if(tblid=='jailslist'){
var e=$(tr).parents('div.main');if(e){$(e).toggleClass('asplit');}
this.openedJailSummary=trid;
}
var opt='jail'; var opt='jail';
if(tblid=='bhyveslist') opt='bhyve'; if(tblid=='bhyveslist') opt='bhyve';
@@ -3238,6 +3241,20 @@ graphs={
gr.line2.append(date.getTime(), mem); gr.line2.append(date.getTime(), mem);
var res=larr.indexOf(name); var res=larr.indexOf(name);
if(res>-1) larr.splice(res,1); if(res>-1) larr.splice(res,1);
//if($('#cdown').css('display')!='block')
if(clonos.openedJailSummary==name)
{
var gr1=this.list['!summary-cpu'];
gr1.line1.append(date.getTime(),inf.pcpu);
gr1=this.list['!summary-mem'];
gr1.line1.append(date.getTime(),inf.pmem);
gr1=this.list['!summary-iops'];
gr1.line1.append(date.getTime(),inf.readiops);
gr1.line2.append(date.getTime(),inf.writeiops);
gr1=this.list['!summary-bps'];
gr1.line1.append(date.getTime(),inf.readbps);
gr1.line2.append(date.getTime(),inf.writebps);
}
}else{ }else{
var nname=name+'-pcpu'; var nname=name+'-pcpu';
var gr=this.list[nname]; var gr=this.list[nname];