diff --git a/src/ozones/Server/public/css/application.css b/src/ozones/Server/public/css/application.css index 764fa310de..0d441b2f98 100644 --- a/src/ozones/Server/public/css/application.css +++ b/src/ozones/Server/public/css/application.css @@ -568,7 +568,7 @@ ul.action_list li a:hover{ .dd_lists{ width:250px; display:inline-block; - height:200px; + height:100px; margin-left:2px; margin-bottom: 10px; } @@ -605,4 +605,18 @@ ul.dd_left{ .ui-layout-resizer-open-hover, /* hover-color to 'resize' */ .ui-layout-resizer-dragging { background: #EEE; +} + +.dataTables_length { + width: auto; +} + +.ColVis { + margin: 0 10px 0 10px; + float: left; +} + +.ColVis_Button { + padding: 5px; + font-size: 1em; } \ No newline at end of file diff --git a/src/ozones/Server/public/js/ozones-util.js b/src/ozones/Server/public/js/ozones-util.js index b8f8e16547..060292b799 100644 --- a/src/ozones/Server/public/js/ozones-util.js +++ b/src/ozones/Server/public/js/ozones-util.js @@ -178,12 +178,19 @@ function updateUsersList(req,list,tag, zone_id,zone_name){ $.each(list,function(){ var user = this.USER; - var name = ""; - var group_str = ""; - if (user.NAME && user.NAME != {}){ - name = user.NAME; + //var group_str = ""; + + var vms = "-"; + var memory = "-"; + var cpu = "-"; + + if (!$.isEmptyObject(user.VM_QUOTA)){ + vms = user.VM_QUOTA.VM.VMS_USED; + memory = user.VM_QUOTA.VM.MEMORY_USED+' MB'; + cpu = user.VM_QUOTA.VM.CPU_USED; } + // if (user.GROUPS.ID){ // $.each(user.GROUPS.ID,function() { // groups_str += this +", "; @@ -194,12 +201,24 @@ function updateUsersList(req,list,tag, zone_id,zone_name){ zone_id, zone_name, user.ID, - name + user.NAME, + user.GNAME, + user.AUTH_DRIVER, + vms, + memory, + cpu, + user.GID ]); } else { user_array.push([ user.ID, - name + user.NAME, + user.GNAME, + user.AUTH_DRIVER, + vms, + memory, + cpu, + user.GID ]); } @@ -223,11 +242,14 @@ function updateImagesList(req,list,tag,zone_id,zone_name){ image.UNAME, image.GNAME, image.NAME, + image.DATASTORE, + image.SIZE, oZones.Helper.image_type(image.TYPE), pretty_time(image.REGTIME), parseInt(image.PERSISTENT) ? "yes" : "no", oZones.Helper.resource_state("image",image.STATE), - image.RUNNING_VMS + image.RUNNING_VMS, + image.TEMPLATE.TARGET ? image.TEMPLATE.TARGET : '--' ]); } else { image_array.push([ @@ -235,11 +257,14 @@ function updateImagesList(req,list,tag,zone_id,zone_name){ image.UNAME, image.GNAME, image.NAME, + image.DATASTORE, + image.SIZE, oZones.Helper.image_type(image.TYPE), pretty_time(image.REGTIME), parseInt(image.PERSISTENT) ? "yes" : "no", oZones.Helper.resource_state("image",image.STATE), - image.RUNNING_VMS + image.RUNNING_VMS, + image.TEMPLATE.TARGET ? image.TEMPLATE.TARGET : '--' ]); }; }); @@ -300,7 +325,11 @@ function hostElementArray(host,zone_id,zone_name){ host.HOST_SHARE.RUNNING_VMS, //rvm pb_cpu, pb_mem, - oZones.Helper.resource_state("host_simple",host.STATE) ]; + oZones.Helper.resource_state("host_simple",host.STATE), + host.IM_MAD, + host.VM_MAD, + pretty_time(host.LAST_MON_TIME) + ]; }; return [ @@ -310,7 +339,11 @@ function hostElementArray(host,zone_id,zone_name){ host.HOST_SHARE.RUNNING_VMS, //rvm pb_cpu, pb_mem, - oZones.Helper.resource_state("host_simple",host.STATE) ]; + oZones.Helper.resource_state("host_simple",host.STATE), + host.IM_MAD, + host.VM_MAD, + pretty_time(host.LAST_MON_TIME) + ]; }; @@ -321,17 +354,41 @@ function updateClustersList(req,list,tag, zone_id,zone_name){ $.each(list,function(){ var cluster = this.CLUSTER; + var hosts = 0; + if ($.isArray(cluster.HOSTS.ID)) + hosts = cluster.HOSTS.ID.length; + else if (!$.isEmptyObject(cluster.HOSTS.ID)) + hosts = 1; + + var vnets = 0; + if ($.isArray(cluster.VNETS.ID)) + vnets = cluster.VNETS.ID.length; + else if (!$.isEmptyObject(cluster.VNETS.ID)) + vnets = 1; + + var dss = 0; + if ($.isArray(cluster.DATASTORES.ID)) + dss = cluster.DATASTORES.ID.length; + else if (!$.isEmptyObject(cluster.DATASTORES.ID)) + dss = 1; + if (zone_id){ array.push([ zone_id, zone_name, cluster.ID, - cluster.NAME + cluster.NAME, + hosts, + vnets, + dss ]); } else { array.push([ cluster.ID, - cluster.NAME + cluster.NAME, + hosts, + vnets, + dss ]); }; @@ -356,6 +413,10 @@ function updateDatastoresList(req,list,tag, zone_id,zone_name){ ds.GNAME, ds.NAME, ds.CLUSTER.length ? ds.CLUSTER : "-", + ds.BASE_PATH, + ds.TM_MAD, + ds.DS_MAD, + ds.SYSTEM == '1' ? 'Yes' : 'No' ]); } else { array.push([ @@ -364,6 +425,10 @@ function updateDatastoresList(req,list,tag, zone_id,zone_name){ ds.GNAME, ds.NAME, ds.CLUSTER.length ? ds.CLUSTER : "-", + ds.BASE_PATH, + ds.TM_MAD, + ds.DS_MAD, + ds.SYSTEM == '1' ? 'Yes' : 'No' ]); }; diff --git a/src/ozones/Server/public/js/plugins/aggregated-tab.js b/src/ozones/Server/public/js/plugins/aggregated-tab.js index 5cfa335e72..bc53615a57 100644 --- a/src/ozones/Server/public/js/plugins/aggregated-tab.js +++ b/src/ozones/Server/public/js/plugins/aggregated-tab.js @@ -30,6 +30,9 @@ var aggregated_hosts_tab_content =
| Owner | \Group | \Name | \ +Datastore | \ +Size | \Type | \Registration time | \Persistent | \State | \#VMS | \ +Target | \ \ \ \ @@ -110,6 +118,12 @@ var aggregated_users_tab_content =Zone Name | \ID | \Name | \ +Group | \ +Auth driver | \ +VMS | \ +Memory | \ +CPU | \ +GID | \ \ \ \ @@ -144,6 +158,9 @@ var aggregated_clusters_tab_content =Zone Name | \ID | \Name | \ +Hosts | \ +Virtual Networks | \ +Datastores | \ \ \ \ @@ -163,6 +180,10 @@ var aggregated_datastores_tab_content =Group | \Name | \Cluster | \ +Basepath | \ +TM MAD | \ +DS MAD | \ +System | \ \ \ \ @@ -725,12 +746,14 @@ $(document).ready(function(){ "bJQueryUI": true, "bSortClasses": false, "bAutoWidth":false, + "sDom" : '<"H"lfrC>t<"F"ip>', "sPaginationType": "full_numbers", "aoColumnDefs": [ { "sWidth": "60px", "aTargets": [5,8] }, { "sWidth": "35px", "aTargets": [0,2] }, { "sWidth": "160px", "aTargets": [6,7] }, - { "sWidth": "100px", "aTargets": [1,4] } + { "sWidth": "100px", "aTargets": [1,4,9,10,11] }, + { "bVisible" : false, "aTargets": [9,10,11] } ] }); @@ -739,10 +762,12 @@ $(document).ready(function(){ "bSortClasses": false, "sPaginationType": "full_numbers", "bAutoWidth":false, + "sDom" : '<"H"lfrC>t<"F"ip>', "aoColumnDefs": [ { "sWidth": "35px", "aTargets": [0,2] }, { "sWidth": "60px", "aTargets": [7,8] }, - { "sWidth": "100px", "aTargets": [1,3,4,6,10] } + { "sWidth": "100px", "aTargets": [1,3,4,6,10] }, + { "bVisible" : false, "aTargets": [7,8,11] } ] }); @@ -751,10 +776,12 @@ $(document).ready(function(){ "bSortClasses": false, "bAutoWidth":false, "sPaginationType": "full_numbers", + "sDom" : '<"H"lfrC>t<"F"ip>', "aoColumnDefs": [ { "sWidth": "60px", "aTargets": [7,8,9] }, { "sWidth": "35px", "aTargets": [0,2] }, - { "sWidth": "100px", "aTargets": [1,3,4,6] } + { "sWidth": "100px", "aTargets": [1,3,4,6] }, + { "bVisible" : false, "aTargets": [8] } ] }); @@ -762,11 +789,13 @@ $(document).ready(function(){ "bJQueryUI": true, "bSortClasses": false, "bAutoWidth":false, + "sDom" : '<"H"lfrC>t<"F"ip>', "sPaginationType": "full_numbers", "aoColumnDefs": [ - { "sWidth": "60px", "aTargets": [9] }, - { "sWidth": "35px", "aTargets": [0,2,8,10] }, - { "sWidth": "100px", "aTargets": [1,3,4,6,7] } + { "sWidth": "60px", "aTargets": [11] }, + { "sWidth": "35px", "aTargets": [0,2,7,10,12,13] }, + { "sWidth": "100px", "aTargets": [1,3,4,6,8,9] }, + { "bVisible" : false, "aTargets": [7,9,13] } ] }); @@ -774,6 +803,7 @@ $(document).ready(function(){ "bJQueryUI": true, "bSortClasses": false, "bAutoWidth":false, + "sDom" : '<"H"lfrC>t<"F"ip>', "sPaginationType": "full_numbers", "aoColumnDefs": [ { "sWidth": "35px", "aTargets": [0,2] }, @@ -786,9 +816,12 @@ $(document).ready(function(){ "bSortClasses": false, "sPaginationType": "full_numbers", "bAutoWidth":false, + "sDom" : '<"H"lfrC>t<"F"ip>', "aoColumnDefs": [ - { "sWidth": "35px", "aTargets": [0,2] }, - { "sWidth": "100px", "aTargets": [1] } + { "sWidth": "35px", "aTargets": [0,2,6,7,8,9] }, + { "sWidth": "100px", "aTargets": [1] }, + { "sWidth": "150px", "aTargets": [5] }, + { "bVisible" : false, "aTargets": [9] } ] }); @@ -797,8 +830,9 @@ $(document).ready(function(){ "bSortClasses": false, "sPaginationType": "full_numbers", "bAutoWidth":false, + "sDom" : '<"H"lfrC>t<"F"ip>', "aoColumnDefs": [ - { "sWidth": "35px", "aTargets": [0,2] }, + { "sWidth": "35px", "aTargets": [0,2,4,5,6] }, { "sWidth": "100px", "aTargets": [1] } ] }); @@ -808,9 +842,11 @@ $(document).ready(function(){ "bSortClasses": false, "sPaginationType": "full_numbers", "bAutoWidth":false, + "sDom" : '<"H"lfrC>t<"F"ip>', "aoColumnDefs": [ { "sWidth": "35px", "aTargets": [0,2] }, - { "sWidth": "100px", "aTargets": [1,3,4,6] } + { "sWidth": "100px", "aTargets": [1,3,4,6,8,9,10] }, + { "bVisible" : false, "aTargets": [7,8,9,10] } ] }); diff --git a/src/ozones/Server/public/js/plugins/vdcs-tab.js b/src/ozones/Server/public/js/plugins/vdcs-tab.js index e4c5ea9780..01eb9dc6dd 100644 --- a/src/ozones/Server/public/js/plugins/vdcs-tab.js +++ b/src/ozones/Server/public/js/plugins/vdcs-tab.js @@ -26,9 +26,9 @@ var vdcs_tab_content =Name | \Zone ID | \Cluster ID | \ -Hosts | \ -Virtual Networks | \ -Datastores | \ +Hosts IDs | \ +Virtual Networks IDs | \ +Datastores IDs | \ \ \ \ @@ -57,31 +57,31 @@ var create_vdc_tmpl = \
|---|