add cpu stats, make container list collapse by default
rodzic
ef45321c78
commit
b79ccd2969
|
@ -26,13 +26,13 @@
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading" role="tab">
|
<div class="panel-heading" role="tab">
|
||||||
<h4 class="panel-title">
|
<h4 class="panel-title">
|
||||||
<a role="button" data-toggle="collapse" aria-expanded="true" href="#container-list-collapse">
|
<a role="button" data-toggle="collapse" aria-expanded="false" href="#container-list-collapse">
|
||||||
<span id="selected-container">Containers</span>
|
<span id="selected-container">Containers</span>
|
||||||
<span class="caret"></span>
|
<span class="caret"></span>
|
||||||
</a>
|
</a>
|
||||||
</h4>
|
</h4>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-collapse collapse in" role="tabpanel" id="container-list-collapse">
|
<div class="panel-collapse collapse" aria-expanded="false" role="tabpanel" id="container-list-collapse">
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<table class="table" id="container-list">
|
<table class="table" id="container-list">
|
||||||
<thead>
|
<thead>
|
||||||
|
@ -67,6 +67,10 @@
|
||||||
<div class="divider"></div>
|
<div class="divider"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<h4>Cpu</h4>
|
||||||
|
<div id="cpu-chart" class="chart"></div>
|
||||||
|
<div class="alert alert-warning chart-warn" id="cpu-chart-warn" role="alert">No data for specified zoom level.</div>
|
||||||
|
|
||||||
<h4>Mem</h4>
|
<h4>Mem</h4>
|
||||||
<div id="mem-chart" class="chart"></div>
|
<div id="mem-chart" class="chart"></div>
|
||||||
<div class="alert alert-warning chart-warn" id="mem-chart-warn" role="alert">No data for specified zoom level.</div>
|
<div class="alert alert-warning chart-warn" id="mem-chart-warn" role="alert">No data for specified zoom level.</div>
|
||||||
|
|
|
@ -70,7 +70,7 @@
|
||||||
var options = {
|
var options = {
|
||||||
legend: { position: 'right' }
|
legend: { position: 'right' }
|
||||||
};
|
};
|
||||||
var chart = new google.visualization.LineChart(document.getElementById(elementId));
|
var chart = new google.visualization.AreaChart(document.getElementById(elementId));
|
||||||
chart.draw(data, options);
|
chart.draw(data, options);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
@ -78,6 +78,7 @@
|
||||||
var renderContainerStats = function(id) {
|
var renderContainerStats = function(id) {
|
||||||
console.log('Rendering stats for container ' + id);
|
console.log('Rendering stats for container ' + id);
|
||||||
renderLatestStats(id);
|
renderLatestStats(id);
|
||||||
|
renderChart('cpu-chart', id, 'cpu');
|
||||||
renderChart('mem-chart', id, 'mem');
|
renderChart('mem-chart', id, 'mem');
|
||||||
renderChart('net-in-chart', id, 'net_in');
|
renderChart('net-in-chart', id, 'net_in');
|
||||||
renderChart('net-out-chart', id, 'net_out');
|
renderChart('net-out-chart', id, 'net_out');
|
||||||
|
@ -95,6 +96,7 @@
|
||||||
|
|
||||||
var renderAllContainerStats = function() {
|
var renderAllContainerStats = function() {
|
||||||
console.log('Rendering all container stats');
|
console.log('Rendering all container stats');
|
||||||
|
renderChart('cpu-chart', null, 'cpu');
|
||||||
renderChart('mem-chart', null, 'mem');
|
renderChart('mem-chart', null, 'mem');
|
||||||
renderChart('net-in-chart', null, 'net_in');
|
renderChart('net-in-chart', null, 'net_in');
|
||||||
renderChart('net-out-chart', null, 'net_out');
|
renderChart('net-out-chart', null, 'net_out');
|
||||||
|
|
2
httpd.js
2
httpd.js
|
@ -9,7 +9,7 @@ var app = express();
|
||||||
var db = new sqlite3.Database(DB_FILE, sqlite3.OPEN_READONLY);
|
var db = new sqlite3.Database(DB_FILE, sqlite3.OPEN_READONLY);
|
||||||
|
|
||||||
var isValidChart = function(s) {
|
var isValidChart = function(s) {
|
||||||
return /^(net_in|net_out|block_in|block_out|mem)$/.test(s);
|
return /^(net_in|net_out|block_in|block_out|mem|cpu)$/.test(s);
|
||||||
};
|
};
|
||||||
|
|
||||||
var isValidZoom = function(s) {
|
var isValidZoom = function(s) {
|
||||||
|
|
Ładowanie…
Reference in New Issue