');
+
+ for (var i = 0; i< labels_arr.length; i++) {
+ serie = {
+ label: labels_arr[i],
+ data: data[i]
+ };
+ series.push(serie);
+ };
+
+ var options = {
+ legend : { show : true,
+ noColumns: labels_arr.length,
+ container: $('#'+id+'_legend')},
+ xaxis : { mode: "time",
+ timeformat: "%h:%M"
+ },
+ yaxis : { labelWidth: 40 }
+ }
+
+ switch (id){
+ case "graph3":
+ case "graph5":
+ options["yaxis"]["tickFormatter"] = function(val,axis) { return humanize_size(val); }
+ }
+
+
+
+ $.plot($('#'+id+'_graph'),series,options);
+}
+
+function quickstart_setup(){
+
+ $('#quickstart').button("disable");
+
+ $('#quickstart_form input').click(function(){
+ $('#quickstart').val($(this).val());
+ $('#quickstart').button("enable");
+ });
+
+ $('#quickstart').click(function(){
+ Sunstone.runAction($(this).val());
+ return false;
+ });
+}
+
+function graph_autorefresh(){
+ setInterval(function(){
+ refresh_graphs();
+ },GRAPH_AUTOREFRESH_INTERVAL);
+
+}
+
+function refresh_graphs(){
+ Sunstone.runAction("Host.monitor_all", graph1);
+ Sunstone.runAction("Host.monitor_all", graph2);
+ Sunstone.runAction("Host.monitor_all", graph3);
+ Sunstone.runAction("VM.monitor_all", graph4);
+ Sunstone.runAction("VM.monitor_all", graph5);
+}
+
$(document).ready(function(){
//Dashboard link listener
$("#dashboard_table h3 a").live("click", function (){
@@ -164,13 +241,17 @@ $(document).ready(function(){
showTab(tab);
return false;
});
-
+
emptyDashboard();
if (uid!=0) {
$("td.oneadmin").hide();
}
-
-
+
+ quickstart_setup();
+
+ refresh_graphs();
+ graph_autorefresh();
+
});
//puts the dashboard values into "retrieving"
@@ -180,62 +261,73 @@ function emptyDashboard(){
function updateDashboard(what,json_info){
- db = $('#dashboard_tab');
- switch (what){
- case "hosts":
- total_hosts=json_info.length;
- active_hosts=0;
- $.each(json_info,function(){
- if (parseInt(this.HOST.STATE) < 3){
- active_hosts++;}
- });
- $('#total_hosts',db).html(total_hosts);
- $('#active_hosts',db).html(active_hosts);
- break;
- case "clusters":
- total_clusters=json_info.length;
- $('#total_clusters',db).html(total_clusters);
- break;
- case "vms":
- total_vms=json_info.length;
- running_vms=0;
+ var db = $('#dashboard_tab');
+ switch (what){
+ case "hosts":
+ var total_hosts=json_info.length;
+ var active_hosts=0;
+ $.each(json_info,function(){
+ if (parseInt(this.HOST.STATE) < 3){
+ active_hosts++;}
+ });
+ $('#total_hosts',db).html(total_hosts+' / ');
+ $('#active_hosts',db).html(active_hosts);
+ break;
+ case "clusters":
+ var total_clusters=json_info.length;
+ $('#total_clusters',db).html(total_clusters);
+ break;
+ case "vms":
+ var total_vms=json_info.length;
+ var running_vms=0;
failed_vms=0;
- $.each(json_info,function(){
- vm_state = parseInt(this.VM.STATE);
- if (vm_state == 3){
- running_vms++;
- }
- else if (vm_state == 7) {
- failed_vms++;
- }
- });
- $('#total_vms',db).html(total_vms);
- $('#running_vms',db).html(running_vms);
- $('#failed_vms',db).html(failed_vms);
- break;
- case "vnets":
- public_vnets=0;
- total_vnets=json_info.length;
- $.each(json_info,function(){
- if (parseInt(this.VNET.PUBLIC)){
- public_vnets++;}
- });
- $('#total_vnets',db).html(total_vnets);
- $('#public_vnets',db).html(public_vnets);
- break;
- case "users":
- total_users=json_info.length;
- $('#total_users',db).html(total_users);
- break;
- case "images":
- total_images=json_info.length;
- public_images=0;
- $.each(json_info,function(){
- if (parseInt(this.IMAGE.PUBLIC)){
- public_images++;}
- });
- $('#total_images',db).html(total_images);
- $('#public_images',db).html(public_images);
- break;
- }
-}
+ $.each(json_info,function(){
+ vm_state = parseInt(this.VM.STATE);
+ if (vm_state == 3){
+ running_vms++;
+ }
+ else if (vm_state == 7) {
+ failed_vms++;
+ }
+ });
+ $('#total_vms',db).html(total_vms+' / ');
+ $('#running_vms',db).html(running_vms+' / ');
+ $('#failed_vms',db).html(failed_vms);
+ break;
+ case "vnets":
+ var public_vnets=0;
+ var total_vnets=json_info.length;
+ $.each(json_info,function(){
+ if (parseInt(this.VNET.PUBLIC)){
+ public_vnets++;}
+ });
+ $('#total_vnets',db).html(total_vnets+' / ');
+ $('#public_vnets',db).html(public_vnets);
+ break;
+ case "users":
+ var total_users=json_info.length;
+ $('#total_users',db).html(total_users);
+ break;
+ case "images":
+ var total_images=json_info.length;
+ var public_images=0;
+ $.each(json_info,function(){
+ if (parseInt(this.IMAGE.PUBLIC)){
+ public_images++;}
+ });
+ $('#total_images',db).html(total_images+' / ');
+ $('#public_images',db).html(public_images);
+ break;
+ case "templates":
+ var total_templates=json_info.length;
+ var public_templates=0;
+ $.each(json_info,function(){
+ if (parseInt(this.VMTEMPLATE.PUBLIC)){
+ public_templates++;
+ }
+ });
+ $('#total_templates',db).html(total_templates+' / ');
+ $('#public_templates',db).html(public_templates);
+ break;
+ }
+}
\ No newline at end of file
diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js
index b29eb412e3..7673b61885 100644
--- a/src/sunstone/public/js/plugins/hosts-tab.js
+++ b/src/sunstone/public/js/plugins/hosts-tab.js
@@ -231,6 +231,10 @@ var host_actions = {
"Host.monitor_all" : {
type: "monitor_global",
call: OpenNebula.Host.monitor_all,
+ callback: function(req,response) {
+ var info = req.request.data[0].monitor;
+ plot_global_graph(response,info);
+ },
error: onError
},
diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js
index c8e4276f04..c0cfcf95b2 100644
--- a/src/sunstone/public/js/plugins/images-tab.js
+++ b/src/sunstone/public/js/plugins/images-tab.js
@@ -663,13 +663,16 @@ function setupCreateImageDialog(){
//Insert HTML in place
$('#create_image_dialog').html(create_image_tmpl);
+ var height = Math.floor($(window).height()*0.8); //set height to a percentage of the window
+
//Prepare jquery dialog
$('#create_image_dialog').dialog({
- autoOpen: false,
- modal:true,
- width: 520
- });
-
+ autoOpen: false,
+ modal:true,
+ width: 520,
+ height: height
+ });
+
$('#img_tabs').tabs();
$('#create_image_dialog button').button();
$('#img_type option').first().attr("selected","selected");
diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js
index c58dfc76eb..2511b7af2c 100644
--- a/src/sunstone/public/js/plugins/templates-tab.js
+++ b/src/sunstone/public/js/plugins/templates-tab.js
@@ -803,6 +803,7 @@ function updateTemplateSelect(){
//update static selectors:
$('#create_vm_dialog #template_id').html(templates_select);
+ $('#speed_virt').html(templates_select);
}
// Callback to update an element in the dataTable
diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js
index 1e3c594248..65b29f663f 100644
--- a/src/sunstone/public/js/plugins/vms-tab.js
+++ b/src/sunstone/public/js/plugins/vms-tab.js
@@ -44,9 +44,8 @@ var vm_graphs = [
monitor_resources : "net_rx",
humanize_figures : true,
history_length : VM_HISTORY_LENGTH
- },
-
-]
+ }
+];
var vms_tab_content =
'