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

F #5162: Update Host and VMs datatables columns (#728)

Browse Source
This commit is contained in:
Frederick Borges 2021-01-29 14:46:54 +01:00 committed by GitHub
parent 92c77fb858
commit 9e6a6f8477
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 139 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/sunstone/etc/sunstone-views/kvm/admin.yaml
View File

@ -367,16 +367,14 @@ tabs:
- 3 # Owner - 3 # Owner
- 4 # Group - 4 # Group
- 5 # Status - 5 # Status
#- 6 # Used CPU - 6 # Host
#- 7 # Used Memory - 7 # IPs
- 8 # Host #- 8 # Start Time
- 9 # IPs - 9 # VNC
#- 10 # Start Time #- 10 # Hidden Template
- 11 # VNC #- 11 # Labels
#- 12 # Hidden Template #- 12 # Search data
#- 13 # Labels - 13 # Clock leases
- 14 # Search data
- 15 # Clock leases
actions: actions:
VM.refresh: true VM.refresh: true
VM.create_dialog: true VM.create_dialog: true
@ -560,16 +558,13 @@ tabs:
- 2 # Name - 2 # Name
- 3 # Cluster - 3 # Cluster
- 4 # RVMs - 4 # RVMs
#- 5 # Real CPU - 5 # Allocated CPU
- 6 # Allocated CPU - 6 # Allocated MEM
#- 7 # Real MEM - 7 # Status
- 8 # Allocated MEM #- 8 # IM MAD
- 9 # Status #- 9 # VM MAD
#- 10 # IM MAD #- 10 # Labels
#- 11 # VM MAD #- 11 # Search data
#- 12 # Last monitored on
#- 13 # Labels
#- 14 # Search data
actions: actions:
Host.refresh: true Host.refresh: true
Host.create_dialog: true Host.create_dialog: true

35
src/sunstone/etc/sunstone-views/kvm/groupadmin.yaml
View File

@ -366,16 +366,14 @@ tabs:
#- 3 # Owner #- 3 # Owner
- 4 # Group - 4 # Group
- 5 # Status - 5 # Status
#- 6 # Used CPU #- 6 # Host
#- 7 # Used Memory - 7 # IPs
#- 8 # Host #- 8 # Start Time
- 9 # IPs - 9 # VNC
#- 10 # Start Time #- 10 # Hidden Template
- 11 # VNC #- 11 # Labels
#- 12 # Hidden Template #- 12 # Search data
#- 13 # Labels #- 13 # Clock leases
- 14 # Search data
#- 15 # Clock leases
actions: actions:
VM.refresh: true VM.refresh: true
VM.create_dialog: true VM.create_dialog: true
@ -560,16 +558,13 @@ tabs:
- 2 # Name - 2 # Name
- 3 # Cluster - 3 # Cluster
- 4 # RVMs - 4 # RVMs
#- 5 # Real CPU - 5 # Allocated CPU
- 6 # Allocated CPU - 6 # Allocated MEM
#- 7 # Real MEM - 7 # Status
- 8 # Allocated MEM #- 8 # IM MAD
- 9 # Status #- 9 # VM MAD
#- 10 # IM MAD #- 10 # Labels
#- 11 # VM MAD #- 11 # Search data
#- 12 # Last monitored on
#- 13 # Labels
#- 14 # Search data
actions: actions:
Host.refresh: true Host.refresh: true
Host.create_dialog: true Host.create_dialog: true

35
src/sunstone/etc/sunstone-views/kvm/user.yaml
View File

@ -359,16 +359,14 @@ tabs:
- 3 # Group - 3 # Group
- 4 # Name - 4 # Name
- 5 # Status - 5 # Status
#- 6 # Used CPU - 6 # Host
#- 7 # Used Memory - 7 # IPs
- 8 # Host #- 8 # Start Time
- 9 # IPs - 9 # VNC
#- 10 # Start Time #- 10 # Hidden Template
- 11 # VNC #- 11 # Labels
#- 12 # Hidden Template #- 12 # Search data
#- 13 # Labels #- 13 # Clock leases
- 14 # Search data
#- 15 # Clock leases
actions: actions:
VM.refresh: true VM.refresh: true
VM.create_dialog: true VM.create_dialog: true
@ -553,16 +551,13 @@ tabs:
- 2 # Name - 2 # Name
- 3 # Cluster - 3 # Cluster
- 4 # RVMs - 4 # RVMs
#- 5 # Real CPU - 5 # Allocated CPU
- 6 # Allocated CPU - 6 # Allocated MEM
#- 7 # Real MEM - 7 # Status
- 8 # Allocated MEM #- 8 # IM MAD
- 9 # Status #- 9 # VM MAD
#- 10 # IM MAD #- 10 # Labels
#- 11 # VM MAD #- 11 # Search data
#- 12 # Last monitored on
#- 13 # Labels
#- 14 # Search data
actions: actions:
Host.refresh: true Host.refresh: true
Host.create_dialog: true Host.create_dialog: true

35
src/sunstone/etc/sunstone-views/mixed/admin.yaml
View File

@ -367,16 +367,14 @@ tabs:
- 3 # Owner - 3 # Owner
- 4 # Group - 4 # Group
- 5 # Status - 5 # Status
#- 6 # Used CPU - 6 # Host
#- 7 # Used Memory - 7 # IPs
- 8 # Host #- 8 # Start Time
- 9 # IPs - 9 # VNC
#- 10 # Start Time #- 10 # Hidden Template
- 11 # VNC #- 11 # Labels
#- 12 # Hidden Template #- 12 # Search data
#- 13 # Labels - 13 # Clock leases
#- 14 # Search data
- 15 # Clock leases
actions: actions:
VM.refresh: true VM.refresh: true
VM.create_dialog: true VM.create_dialog: true
@ -562,16 +560,13 @@ tabs:
- 2 # Name - 2 # Name
- 3 # Cluster - 3 # Cluster
- 4 # RVMs - 4 # RVMs
#- 5 # Real CPU - 5 # Allocated CPU
- 6 # Allocated CPU - 6 # Allocated MEM
#- 7 # Real MEM - 7 # Status
- 8 # Allocated MEM #- 8 # IM MAD
- 9 # Status #- 9 # VM MAD
#- 10 # IM MAD #- 10 # Labels
#- 11 # VM MAD #- 11 # Search data
#- 12 # Last monitored on
#- 13 # Labels
#- 14 # Search data
actions: actions:
Host.refresh: true Host.refresh: true
Host.create_dialog: true Host.create_dialog: true

35
src/sunstone/etc/sunstone-views/mixed/groupadmin.yaml
View File

@ -366,16 +366,14 @@ tabs:
#- 3 # Owner #- 3 # Owner
- 4 # Group - 4 # Group
- 5 # Status - 5 # Status
#- 6 # Used CPU #- 6 # Host
#- 7 # Used Memory - 7 # IPs
#- 8 # Host #- 8 # Start Time
- 9 # IPs - 9 # VNC
#- 10 # Start Time #- 10 # Hidden Template
- 11 # VNC #- 11 # Labels
#- 12 # Hidden Template #- 12 # Search data
#- 13 # Labels #- 13 # Clock leases
#- 14 # Search data
#- 15 # Clock leases
actions: actions:
VM.refresh: true VM.refresh: true
VM.create_dialog: true VM.create_dialog: true
@ -561,16 +559,13 @@ tabs:
- 2 # Name - 2 # Name
- 3 # Cluster - 3 # Cluster
- 4 # RVMs - 4 # RVMs
#- 5 # Real CPU - 5 # Allocated CPU
- 6 # Allocated CPU - 6 # Allocated MEM
#- 7 # Real MEM - 7 # Status
- 8 # Allocated MEM #- 8 # IM MAD
- 9 # Status #- 9 # VM MAD
#- 10 # IM MAD #- 10 # Labels
#- 11 # VM MAD #- 11 # Search data
#- 12 # Last monitored on
#- 13 # Labels
#- 14 # Search data
actions: actions:
Host.refresh: true Host.refresh: true
Host.create_dialog: true Host.create_dialog: true

35
src/sunstone/etc/sunstone-views/mixed/user.yaml
View File

@ -359,16 +359,14 @@ tabs:
- 3 # Group - 3 # Group
- 4 # Name - 4 # Name
- 5 # Status - 5 # Status
#- 6 # Used CPU - 6 # Host
#- 7 # Used Memory - 7 # IPs
- 8 # Host #- 8 # Start Time
- 9 # IPs - 9 # VNC
#- 10 # Start Time #- 10 # Hidden Template
- 11 # VNC #- 11 # Labels
#- 12 # Hidden Template #- 12 # Search data
#- 13 # Labels #- 13 # Clock leases
#- 14 # Search data
#- 15 # Clock leases
actions: actions:
VM.refresh: true VM.refresh: true
VM.create_dialog: true VM.create_dialog: true
@ -554,16 +552,13 @@ tabs:
- 2 # Name - 2 # Name
- 3 # Cluster - 3 # Cluster
- 4 # RVMs - 4 # RVMs
#- 5 # Real CPU - 5 # Allocated CPU
- 6 # Allocated CPU - 6 # Allocated MEM
#- 7 # Real MEM - 7 # Status
- 8 # Allocated MEM #- 8 # IM MAD
- 9 # Status #- 9 # VM MAD
#- 10 # IM MAD #- 10 # Labels
#- 11 # VM MAD #- 11 # Search data
#- 12 # Last monitored on
#- 13 # Labels
#- 14 # Search data
actions: actions:
Host.refresh: true Host.refresh: true
Host.create_dialog: true Host.create_dialog: true

35
src/sunstone/etc/sunstone-views/vcenter/admin.yaml
View File

@ -365,16 +365,14 @@ tabs:
- 3 # Owner - 3 # Owner
- 4 # Group - 4 # Group
- 5 # Status - 5 # Status
#- 6 # Used CPU - 6 # Host
#- 7 # Used Memory - 7 # IPs
- 8 # Host #- 8 # Start Time
- 9 # IPs - 9 # VNC
#- 10 # Start Time #- 10 # Hidden Template
- 11 # VNC #- 11 # Labels
#- 12 # Hidden Template #- 12 # Search data
#- 13 # Labels #- 13 # Clock leases
#- 14 # Search data
#- 15 # Clock leases
actions: actions:
VM.refresh: true VM.refresh: true
VM.create_dialog: true VM.create_dialog: true
@ -560,16 +558,13 @@ tabs:
- 2 # Name - 2 # Name
- 3 # Cluster - 3 # Cluster
- 4 # RVMs - 4 # RVMs
#- 5 # Real CPU - 5 # Allocated CPU
- 6 # Allocated CPU - 6 # Allocated MEM
#- 7 # Real MEM - 7 # Status
- 8 # Allocated MEM #- 8 # IM MAD
- 9 # Status #- 9 # VM MAD
#- 10 # IM MAD #- 10 # Labels
#- 11 # VM MAD #- 11 # Search data
#- 12 # Last monitored on
#- 13 # Labels
#- 14 # Search data
actions: actions:
Host.refresh: true Host.refresh: true
Host.create_dialog: true Host.create_dialog: true

35
src/sunstone/etc/sunstone-views/vcenter/groupadmin.yaml
View File

@ -366,16 +366,14 @@ tabs:
#- 3 # Owner #- 3 # Owner
- 4 # Group - 4 # Group
- 5 # Status - 5 # Status
#- 6 # Used CPU #- 6 # Host
#- 7 # Used Memory - 7 # IPs
#- 8 # Host #- 8 # Start Time
- 9 # IPs - 9 # VNC
#- 10 # Start Time #- 10 # Hidden Template
- 11 # VNC #- 11 # Labels
#- 12 # Hidden Template #- 12 # Search data
#- 13 # Labels #- 13 # Clock leases
#- 14 # Search data
#- 15 # Clock leases
actions: actions:
VM.refresh: true VM.refresh: true
VM.create_dialog: true VM.create_dialog: true
@ -561,16 +559,13 @@ tabs:
- 2 # Name - 2 # Name
- 3 # Cluster - 3 # Cluster
- 4 # RVMs - 4 # RVMs
#- 5 # Real CPU - 5 # Allocated CPU
- 6 # Allocated CPU - 6 # Allocated MEM
#- 7 # Real MEM - 7 # Status
- 8 # Allocated MEM #- 8 # IM MAD
- 9 # Status #- 9 # VM MAD
#- 10 # IM MAD #- 10 # Labels
#- 11 # VM MAD #- 11 # Search data
#- 12 # Last monitored on
#- 13 # Labels
#- 14 # Search data
actions: actions:
Host.refresh: true Host.refresh: true
Host.create_dialog: true Host.create_dialog: true

35
src/sunstone/etc/sunstone-views/vcenter/user.yaml
View File

@ -359,16 +359,14 @@ tabs:
- 3 # Group - 3 # Group
- 4 # Name - 4 # Name
- 5 # Status - 5 # Status
#- 6 # Used CPU - 6 # Host
#- 7 # Used Memory - 7 # IPs
- 8 # Host #- 8 # Start Time
- 9 # IPs - 9 # VNC
#- 10 # Start Time #- 10 # Hidden Template
- 11 # VNC #- 11 # Labels
#- 12 # Hidden Template #- 12 # Search data
#- 13 # Labels #- 13 # Clock leases
#- 14 # Search data
#- 15 # Clock leases
actions: actions:
VM.refresh: true VM.refresh: true
VM.create_dialog: true VM.create_dialog: true
@ -554,16 +552,13 @@ tabs:
- 2 # Name - 2 # Name
- 3 # Cluster - 3 # Cluster
- 4 # RVMs - 4 # RVMs
#- 5 # Real CPU - 5 # Allocated CPU
- 6 # Allocated CPU - 6 # Allocated MEM
#- 7 # Real MEM - 7 # Status
- 8 # Allocated MEM #- 8 # IM MAD
- 9 # Status #- 9 # VM MAD
#- 10 # IM MAD #- 10 # Labels
#- 11 # VM MAD #- 11 # Search data
#- 12 # Last monitored on
#- 13 # Labels
#- 14 # Search data
actions: actions:
Host.refresh: true Host.refresh: true
Host.create_dialog: true Host.create_dialog: true

10
src/sunstone/public/app/tabs/hosts-tab/datatable.js
View File

@ -42,8 +42,8 @@ define(function(require) {
var RESOURCE = "Host"; var RESOURCE = "Host";
var XML_ROOT = "HOST"; var XML_ROOT = "HOST";
var TAB_NAME = require("./tabId"); var TAB_NAME = require("./tabId");
var LABELS_COLUMN = 13; var LABELS_COLUMN = 10;
var SEARCH_COLUMN = 14; var SEARCH_COLUMN = 11;
var TEMPLATE_ATTR = "TEMPLATE"; var TEMPLATE_ATTR = "TEMPLATE";
/* /*
@ -77,14 +77,11 @@ define(function(require) {
Locale.tr("Name") , Locale.tr("Name") ,
Locale.tr("Cluster"), Locale.tr("Cluster"),
Locale.tr("RVMs"), Locale.tr("RVMs"),
Locale.tr("Real CPU"),
Locale.tr("Allocated CPU"), Locale.tr("Allocated CPU"),
Locale.tr("Real MEM"),
Locale.tr("Allocated MEM"), Locale.tr("Allocated MEM"),
Locale.tr("Status"), Locale.tr("Status"),
Locale.tr("IM MAD"), Locale.tr("IM MAD"),
Locale.tr("VM MAD"), Locale.tr("VM MAD"),
Locale.tr("Last monitored on"),
Locale.tr("Labels"), Locale.tr("Labels"),
"search_data" "search_data"
]; ];
@ -184,14 +181,11 @@ define(function(require) {
element.NAME, element.NAME,
element.CLUSTER_ID.length ? element.CLUSTER_ID : "-", element.CLUSTER_ID.length ? element.CLUSTER_ID : "-",
element.HOST_SHARE.RUNNING_VMS, //rvm element.HOST_SHARE.RUNNING_VMS, //rvm
cpuBars.real||"",
cpuBars.allocated||"", cpuBars.allocated||"",
memoryBars.real||"",
memoryBars.allocated||"", memoryBars.allocated||"",
state, state,
element.IM_MAD, element.IM_MAD,
element.VM_MAD, element.VM_MAD,
Humanize.prettyTime(element.LAST_MON_TIME),
(LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||""), (LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||""),
btoa(unescape(encodeURIComponent(JSON.stringify(search)))) btoa(unescape(encodeURIComponent(JSON.stringify(search))))
]; ];

4
src/sunstone/public/app/tabs/vms-tab/datatable.js
View File

@ -43,8 +43,8 @@ define(function(require) {
var RESOURCE = "VM"; var RESOURCE = "VM";
var XML_ROOT = "VM"; var XML_ROOT = "VM";
var TAB_NAME = require('./tabId'); var TAB_NAME = require('./tabId');
var LABELS_COLUMN = 13; var LABELS_COLUMN = 11;
var SEARCH_COLUMN = 14; var SEARCH_COLUMN = 12;
/* /*

4
src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
View File

@ -34,8 +34,6 @@ define(function(require) {
Locale.tr("Owner"), Locale.tr("Owner"),
Locale.tr("Group"), Locale.tr("Group"),
Locale.tr("Status"), Locale.tr("Status"),
Locale.tr("Used CPU"),
Locale.tr("Used Memory"),
Locale.tr("Host"), Locale.tr("Host"),
Locale.tr("IPs"), Locale.tr("IPs"),
Locale.tr("Start Time"), Locale.tr("Start Time"),
@ -275,8 +273,6 @@ define(function(require) {
element.UNAME, element.UNAME,
element.GNAME, element.GNAME,
state, state,
cpuMonitoring,
Humanize.size(memoryMonitoring),
hostname, hostname,
OpenNebulaVM.ipsDropdown(element), OpenNebulaVM.ipsDropdown(element),
Humanize.prettyTimeDatatable(element.STIME), Humanize.prettyTimeDatatable(element.STIME),