feature #1664: Update individual resource graphs

This commit is contained in:
Daniel Molina committed 2013-03-08 19:24:39 +01:00
1 parent 1187524cf3
commit e8b0d1ee42
6 files changed
+127 -82

No files matched your search

+19 -4
View File
@@ -6738,24 +6738,39 @@ a.footer.button {
}
/* line 740, ../sass/app.scss */
.graph_legend {
text-align: center;
}
/* line 744, ../sass/app.scss */
.graph_legend table {
background: #f2f2f2;
background: inherit;
border: 0px;
width: 100%;
}
/* line 746, ../sass/app.scss */
/* line 750, ../sass/app.scss */
.graph_legend h3 {
margin-top: 0px;
}
/* line 754, ../sass/app.scss */
.graph_legend .subheader {
margin-bottom: 5px;
}
/* line 750, ../sass/app.scss */
/* line 758, ../sass/app.scss */
.dashboard hr {
margin: 0;
margin-bottom: 8px;
}
/* line 755, ../sass/app.scss */
/* line 763, ../sass/app.scss */
.graph {
margin-bottom: 15px !important;
}
/* line 767, ../sass/app.scss */
.dashboard-panel {
height: 517px;
}
@@ -200,7 +200,7 @@ var dashboard_tab_content = '\
</div>\
<div class="row">\
<div class="six columns">\
<div class="panel">\
<div class="panel dashboard-panel">\
<div class="row">\
<h5 class="subheader header-dashboard"><span class="span-dashboard"><i class="icon-hdd"></i> '+tr("Hosts")+'</span></h5>\
</div>\
@@ -218,7 +218,7 @@ var dashboard_tab_content = '\
</h3>\
</div>\
</div>\
<hr>\
<br>\
<div class="row graph_legend">\
<h3 class="subheader"><small>'+tr("CPU")+'</small></h3>\
</div>\
@@ -243,7 +243,7 @@ var dashboard_tab_content = '\
</div>\
</div>\
<div class="six columns">\
<div class="panel">\
<div class="panel dashboard-panel">\
<div class="row">\
<h5 class="subheader header-dashboard"><span class="span-dashboard"><i class="icon-cloud"></i> '+tr("Virtual Machines")+'</span></h5>\
</div>\
@@ -269,9 +269,9 @@ var dashboard_tab_content = '\
</h3>\
</div>\
</div>\
<hr>\
<br>\
<div class="row graph_legend">\
<h3 class="subheader"><small>'+tr("NET DOWNLOAD SLEEP")+'</small></h3>\
<h3 class="subheader"><small>'+tr("NET DOWNLOAD SPEED")+'</small></h3>\
<div class="ten columns " id="dash_vm_net_rx_legend">\
</div>\
</div>\
@@ -281,7 +281,7 @@ var dashboard_tab_content = '\
</div>\
<br>\
<div class="row graph_legend">\
<h3 class="subheader"><small>'+tr("NET UPLOAD SLEEP")+'</small></h3>\
<h3 class="subheader"><small>'+tr("NET UPLOAD SPEED")+'</small></h3>\
<div class="ten columns" id="dash_vm_net_tx_legend">\
</div>\
</div>\
+20 -14
View File
@@ -294,14 +294,14 @@ var host_actions = {
var host_graphs = [
{
monitor_resources : "HOST_SHARE/CPU_USAGE,HOST_SHARE/USED_CPU,HOST_SHARE/MAX_CPU",
labels : "Allocated CPU,Real CPU,Total CPU",
labels : "Allocated,Real,Total",
humanize_figures : false,
div_graph : $("#host_cpu_graph"),
div_legend : $("#host_cpu_legend")
},
{
monitor_resources : "HOST_SHARE/MEM_USAGE,HOST_SHARE/USED_MEM,HOST_SHARE/MAX_MEM",
labels : "Allocated MEM,Real MEM,Total MEM",
labels : "Allocated,Real,Total",
humanize_figures : true,
div_graph : $("#host_mem_graph"),
div_legend : $("#host_mem_legend")
@@ -890,24 +890,30 @@ function updateHostInfo(request,host){
content:
'<div class="">\
<div class="six columns">\
<div class="row">\
<div class="ten columns" id="host_cpu_legend" style="width:60%;height: 100px;margin: 50px;">\
</div>\
<div class="row graph_legend">\
<h3 class="subheader"><small>'+tr("CPU")+'</small></h3>\
</div>\
<div class="row">\
<div class="ten columns centered graph" id="host_cpu_graph" style="height: 100px;">\
</div>\
<div class="row">\
<div class="ten columns" id="host_cpu_graph" style="width:60%;height: 200px;margin: 50px;">\
</div>\
</div>\
<div class="row graph_legend">\
<div class="ten columns centered" id="host_cpu_legend">\
</div>\
</div>\
</div>\
<div class="six columns">\
<div class="row">\
<div class="ten columns" id="host_mem_legend" style="width:60%;height: 100px;margin: 50px;">\
</div>\
<div class="row graph_legend">\
<h3 class="subheader"><small>'+tr("MEMORY")+'</small></h3>\
</div>\
<div class="row">\
<div class="ten columns centered graph" id="host_mem_graph" style="height: 100px;">\
</div>\
<div class="row">\
<div class="ten columns" id="host_mem_graph" style="width:60%;height: 200px;margin: 50px;">\
</div>\
</div>\
<div class="row graph_legend">\
<div class="ten columns centered" id="host_mem_legend">\
</div>\
</div>\
</div>\
</div>'
}
+65 -54
View File
@@ -402,29 +402,25 @@ var vm_actions = {
monitor_resources : "CPU",
labels : "Real CPU",
humanize_figures : false,
div_graph : $("#vm_cpu_graph"),
div_legend : $("#vm_cpu_legend")
div_graph : $("#vm_cpu_graph")
},
{
monitor_resources : "MEMORY",
labels : "Real MEM",
humanize_figures : true,
div_graph : $("#vm_memory_graph"),
div_legend : $("#vm_memory_legend")
div_graph : $("#vm_memory_graph")
},
{ labels : "Network reception",
monitor_resources : "NET_RX",
humanize_figures : true,
convert_from_bytes : true,
div_graph : $("#vm_net_rx_graph"),
div_legend : $("#vm_net_rx_legend")
div_graph : $("#vm_net_rx_graph")
},
{ labels : "Network transmission",
monitor_resources : "NET_TX",
humanize_figures : true,
convert_from_bytes : true,
div_graph : $("#vm_net_tx_graph"),
div_legend : $("#vm_net_tx_legend")
div_graph : $("#vm_net_tx_graph")
},
{ labels : "Network reception speed",
monitor_resources : "NET_RX",
@@ -432,8 +428,7 @@ var vm_actions = {
convert_from_bytes : true,
y_sufix : "B/s",
derivative : true,
div_graph : $("#vm_net_rx_speed_graph"),
div_legend : $("#vm_net_rx_speed_legend")
div_graph : $("#vm_net_rx_speed_graph")
},
{ labels : "Network transmission speed",
monitor_resources : "NET_TX",
@@ -441,8 +436,7 @@ var vm_actions = {
convert_from_bytes : true,
y_sufix : "B/s",
derivative : true,
div_graph : $("#vm_net_tx_speed_graph"),
div_legend : $("#vm_net_tx_speed_legend")
div_graph : $("#vm_net_tx_speed_graph")
}
];
@@ -471,8 +465,7 @@ var vm_actions = {
convert_from_bytes : true,
y_sufix : "B/s",
derivative : true,
div_graph : $("#dash_vm_net_tx_graph", $dashboard),
div_legend : $("#dash_vm_net_tx_legend", $dashboard)
div_graph : $("#dash_vm_net_tx_graph", $dashboard)
},
{ labels : "Network reception",
monitor_resources : "NET_RX",
@@ -480,8 +473,7 @@ var vm_actions = {
convert_from_bytes : true,
y_sufix : "B/s",
derivative : true,
div_graph : $("#dash_vm_net_rx_graph", $dashboard),
div_legend : $("#dash_vm_net_rx_legend", $dashboard)
div_graph : $("#dash_vm_net_rx_graph", $dashboard)
}
];
@@ -1222,67 +1214,86 @@ function updateVMInfo(request,vm){
var monitoring_tab = {
title: tr("Graphs"),
content:
'<div class="">\
content:
'\
<div class="">\
<div class="six columns">\
<div class="row">\
<div class="ten columns" id="vm_cpu_legend" style="width:60%;height: 100px;margin: 50px;">\
</div>\
<div class="row graph_legend">\
<h3 class="subheader"><small>'+tr("CPU")+'</small></h3>\
</div>\
<div class="row">\
<div class="ten columns centered graph" id="vm_cpu_graph" style="height: 100px;">\
</div>\
<div class="row">\
<div class="ten columns" id="vm_cpu_graph" style="width:60%;height: 200px;margin: 50px;">\
</div>\
</div>\
<div class="row graph_legend">\
<div class="ten columns centered" id="vm_cpu_legend">\
</div>\
</div>\
</div>\
<div class="six columns">\
<div class="row">\
<div class="ten columns" id="vm_memory_legend" style="width:60%;height: 100px;margin: 50px;">\
</div>\
<div class="row graph_legend">\
<h3 class="subheader"><small>'+tr("MEMORY")+'</small></h3>\
</div>\
<div class="row">\
<div class="ten columns centered graph" id="vm_memory_graph" style="height: 100px;">\
</div>\
<div class="row">\
<div class="ten columns" id="vm_memory_graph" style="width:60%;height: 200px;margin: 50px;">\
</div>\
</div>\
<div class="row graph_legend">\
<div class="ten columns centered" id="vm_memory_legend">\
</div>\
</div>\
</div>\
<div class="six columns">\
<div class="row">\
<div class="ten columns" id="vm_net_rx_legend" style="width:60%;height: 100px;margin: 50px;">\
</div>\
<div class="row graph_legend">\
<h3 class="subheader"><small>'+tr("NET RX")+'</small></h3>\
</div>\
<div class="row">\
<div class="ten columns centered graph" id="vm_net_rx_graph" style="height: 100px;">\
</div>\
<div class="row">\
<div class="ten columns" id="vm_net_rx_graph" style="width:60%;height: 200px;margin: 50px;">\
</div>\
</div>\
<div class="row graph_legend">\
<div class="ten columns centered" id="vm_net_rx_legend">\
</div>\
</div>\
</div>\
<div class="six columns">\
<div class="row">\
<div class="ten columns" id="vm_net_tx_legend" style="width:60%;height: 100px;margin: 50px;">\
</div>\
<div class="row graph_legend">\
<h3 class="subheader"><small>'+tr("NET TX")+'</small></h3>\
</div>\
<div class="row">\
<div class="ten columns centered graph" id="vm_net_tx_graph" style="height: 100px;">\
</div>\
<div class="row">\
<div class="ten columns" id="vm_net_tx_graph" style="width:60%;height: 200px;margin: 50px;">\
</div>\
</div>\
<div class="row graph_legend">\
<div class="ten columns centered" id="vm_net_tx_legend">\
</div>\
</div>\
</div>\
<div class="six columns">\
<div class="row">\
<div class="ten columns" id="vm_net_rx_speed_legend" style="width:60%;height: 100px;margin: 50px;">\
</div>\
<div class="row graph_legend">\
<h3 class="subheader"><small>'+tr("NET DOWNLOAD SPEED")+'</small></h3>\
</div>\
<div class="row">\
<div class="ten columns centered graph" id="vm_net_rx_speed_graph" style="height: 100px;">\
</div>\
<div class="row">\
<div class="ten columns" id="vm_net_rx_speed_graph" style="width:60%;height: 200px;margin: 50px;">\
</div>\
</div>\
<div class="row graph_legend">\
<div class="ten columns centered" id="vm_net_rx_speed_legend">\
</div>\
</div>\
</div>\
<div class="six columns">\
<div class="row">\
<div class="ten columns" id="vm_net_tx_speed_legend" style="width:60%;height: 100px;margin: 50px;">\
</div>\
<div class="row graph_legend">\
<h3 class="subheader"><small>'+tr("NET UPLOAD SPEED")+'</small></h3>\
</div>\
<div class="row">\
<div class="ten columns centered graph" id="vm_net_tx_speed_graph" style="height: 100px;">\
</div>\
<div class="row">\
<div class="ten columns" id="vm_net_tx_speed_graph" style="width:60%;height: 200px;margin: 50px;">\
</div>\
</div>\
<div class="row graph_legend">\
<div class="ten columns centered" id="vm_net_tx_speed_legend">\
</div>\
</div>\
</div>\
</div>'
};
+4 -3
View File
@@ -716,6 +716,7 @@ function plot_graph(response, info) {
var options = {
// colors: [ "#cdebf5", "#2ba6cb", "#6f6f6f" ]
colors: [ "#2ba6cb", "#707D85", "#AC5A62" ],
legend : { show : (info.div_legend != undefined),
noColumns: attributes.length+1,
container: info.div_legend
@@ -725,7 +726,7 @@ function plot_graph(response, info) {
return pretty_time_axis(val, info.show_date);
}
},
yaxis : { labelWidth: 40,
yaxis : { labelWidth: 50,
tickFormatter: function(val, axis) {
return humanize(val, info.convert_from_bytes, info.y_sufix);
},
@@ -826,7 +827,7 @@ function plot_totals(response, info) {
var options = {
//colors: [ "#2ba6cb", "#cdebf5", "#6f6f6f" ],
colors: [ "#8DDAE4", "#707D85", "#AC5A62" ],
colors: [ "#2ba6cb", "#707D85", "#AC5A62" ],
legend : { show : (info.div_legend != undefined),
noColumns: attributes.length,
backgroundColor: "black",
@@ -837,7 +838,7 @@ function plot_totals(response, info) {
return pretty_time_axis(val, info.show_date);
}
},
yaxis : { labelWidth: 40,
yaxis : { labelWidth: 50,
tickFormatter: function(val, axis) {
return humanize(val, info.convert_from_bytes, info.y_sufix);
},
+13 -1
View File
@@ -737,12 +737,20 @@ a.footer.button {
top: 34px !important;
}
.graph_legend{
text-align: center;
}
.graph_legend table {
background: #f2f2f2;
background: inherit;
border: 0px;
width: 100%;
}
.graph_legend h3 {
margin-top: 0px;
}
.graph_legend .subheader {
margin-bottom: 5px;
}
@@ -755,3 +763,7 @@ a.footer.button {
.graph {
margin-bottom: 15px !important;
}
.dashboard-panel {
height: 517px;
}