shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

feature #2798: Fix monitoring error

Browse Source
This commit is contained in:
Daniel Molina 2014-04-09 10:32:14 +02:00
parent 4973e5604d
commit 79c3ac8e52
1 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/sunstone/public/js/plugins/provision-tab.js
View File

@ -794,34 +794,34 @@ var povision_actions = {
humanize_figures : true,
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")
},
{ labels : "Network transmission",
monitor_resources : "NET_TX",
humanize_figures : true,
convert_from_bytes : true,
div_graph : $("#vm_net_tx_graph")
},
{ labels : "Network reception speed",
monitor_resources : "NET_RX",
humanize_figures : true,
convert_from_bytes : true,
y_sufix : "B/s",
derivative : true,
div_graph : $("#vm_net_rx_speed_graph")
},
{ labels : "Network transmission speed",
monitor_resources : "NET_TX",
humanize_figures : true,
convert_from_bytes : true,
y_sufix : "B/s",
derivative : true,
div_graph : $("#vm_net_tx_speed_graph")
}
//{ labels : "Network reception",
// monitor_resources : "NET_RX",
// humanize_figures : true,
// convert_from_bytes : true,
// 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")
//},
//{ labels : "Network reception speed",
// monitor_resources : "NET_RX",
// humanize_figures : true,
// convert_from_bytes : true,
// y_sufix : "B/s",
// derivative : true,
// div_graph : $("#vm_net_rx_speed_graph")
//},
//{ labels : "Network transmission speed",
// monitor_resources : "NET_TX",
// humanize_figures : true,
// convert_from_bytes : true,
// y_sufix : "B/s",
// derivative : true,
// div_graph : $("#vm_net_tx_speed_graph")
//}
];
// The network speed graphs require the derivative of the data,
@ -835,7 +835,7 @@ var povision_actions = {
);
}
},
error: vmMonitorError
//error: vmMonitorError
},
"Provision.reboot" : {
type: "single",
@ -1381,7 +1381,7 @@ function update_provision_vm_info(data) {
$("#provision_confirm_action").html("");
Sunstone.runAction("VM.monitor",data.ID, { monitor_resources : "CPU,MEMORY"});
Sunstone.runAction("Provision.monitor",data.ID, { monitor_resources : "CPU,MEMORY"});
}
function provision_show_vm_callback(request, response) {
@ -1727,7 +1727,6 @@ $(document).ready(function(){
},
"fnRowCallback": function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
var data = aData;
console.log(data);
$("#provision_instance_types_ul").append('<li>'+
'<ul class="provision-pricing-table hoverable only-one" data=\''+JSON.stringify(data)+'\'>'+
'<li class="provision-title" title="'+data.name+'">'+