diff --git a/install.sh b/install.sh index e8a792d764..5d63e9133a 100755 --- a/install.sh +++ b/install.sh @@ -1498,6 +1498,9 @@ src/sunstone/public/vendor/flot/jquery.flot.navigate.min.js \ src/sunstone/public/vendor/flot/jquery.flot.pie.min.js \ src/sunstone/public/vendor/flot/jquery.flot.resize.min.js \ src/sunstone/public/vendor/flot/jquery.flot.stack.min.js \ +src/sunstone/public/vendor/flot/jquery.flot.tooltip.min.js \ +src/sunstone/public/vendor/flot/jquery.flot.JUMlib.min.js \ +src/sunstone/public/vendor/flot/jquery.flot.gantt.min.js \ src/sunstone/public/vendor/flot/LICENSE.txt \ src/sunstone/public/vendor/flot/NOTICE" diff --git a/src/sunstone/models/SunstoneServer.rb b/src/sunstone/models/SunstoneServer.rb index 35f2fb58d1..7f58338377 100644 --- a/src/sunstone/models/SunstoneServer.rb +++ b/src/sunstone/models/SunstoneServer.rb @@ -368,6 +368,30 @@ class SunstoneServer < CloudServer return [200, {:monitoring => result}.to_json] end + def get_vm_accounting(options) + pool = VirtualMachinePool.new(@client) + + filter_flag = options[:userfilter] ? options[:userfilter].to_i : VirtualMachinePool::INFO_ALL + start_time = options[:start_time] ? options[:start_time].to_i : -1 + end_time = options[:end_time] ? options[:end_time].to_i : -1 + + acct_options = { + :start_time => start_time, + :end_time => end_time, + :group => options[:group] + } + + rc = pool.accounting(filter_flag, acct_options) + + if OpenNebula.is_error?(rc) + error = Error.new(rc.message) + return [500, error.to_json] + end + + return [200, rc.to_json] + end + + private ############################################################################ diff --git a/src/sunstone/public/js/opennebula.js b/src/sunstone/public/js/opennebula.js index 1bbacca82d..b23ea72645 100644 --- a/src/sunstone/public/js/opennebula.js +++ b/src/sunstone/public/js/opennebula.js @@ -595,7 +595,32 @@ var OpenNebula = { callback_error(request, OpenNebula.Error(response)) : null; } }); - } + }, + + "accounting": function(params, resource, path){ + var callback = params.success; + var callback_error = params.error; + var data = params.data; + + var method = "accounting"; + var request = OpenNebula.Helper.request(resource,method, data); + + var url = path ? path : resource.toLowerCase() + "/accounting"; + + $.ajax({ + url: url, + type: "GET", + data: data, + dataType: "json", + success: function(response){ + return callback ? callback(request, response) : null; + }, + error: function(response){ + return callback_error ? + callback_error(request, OpenNebula.Error(response)) : null; + } + }); + }, }, "Auth": { @@ -984,7 +1009,10 @@ var OpenNebula = { "recover" : function(params){ var action_obj = {"with": params.data.extra_param}; OpenNebula.Action.simple_action(params,OpenNebula.VM.resource,"recover",action_obj); - } + }, + "accounting": function(params){ + OpenNebula.Action.accounting(params,OpenNebula.VM.resource); + }, }, "Group": { diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js index 9c35733922..b35598601f 100644 --- a/src/sunstone/public/js/plugins/groups-tab.js +++ b/src/sunstone/public/js/plugins/groups-tab.js @@ -703,9 +703,16 @@ function updateGroupInfo(request,group){ ' }; + var accounting_tab = { + title: tr("Accounting"), + icon: "fa-bar-chart-o", + content: '
' + }; + Sunstone.updateInfoPanelTab("group_info_panel","group_info_tab",info_tab); Sunstone.updateInfoPanelTab("group_info_panel","group_quotas_tab",quotas_tab); Sunstone.updateInfoPanelTab("group_info_panel","group_providers_tab",providers_tab); + Sunstone.updateInfoPanelTab("group_info_panel","group_accouning_tab",accounting_tab); Sunstone.popUpInfoPanel("group_info_panel", 'groups-tab'); $("#add_rp_button", $("#group_info_panel")).click(function(){ @@ -715,6 +722,11 @@ function updateGroupInfo(request,group){ return false; }); + + accountingGraphs( + $("#group_accounting","#group_info_panel"), + { fixed_group: info.ID, + init_group_by: "user" }); } function setup_group_resource_tab_content(zone_id, zone_section, str_zone_tab_id, str_datatable_id, selected_group_clusters, group) { diff --git a/src/sunstone/public/js/plugins/provision-tab.js b/src/sunstone/public/js/plugins/provision-tab.js index 18d4dfee95..c0a9a0fae4 100644 --- a/src/sunstone/public/js/plugins/provision-tab.js +++ b/src/sunstone/public/js/plugins/provision-tab.js @@ -343,9 +343,10 @@ var provision_user_info = '