diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js index ec879c74f66..7a4274651cf 100644 --- a/ui/src/config/section/compute.js +++ b/ui/src/config/section/compute.js @@ -10,7 +10,7 @@ export default { permission: [ 'listVirtualMachinesMetrics', 'listVirtualMachines' ], component: () => import('@/components/CloudMonkey/Resource.vue'), columns: [ - 'displayname', 'state', { 'ipaddress': (record) => { return record.nic[0].ipaddress } }, 'instancename', 'account', 'zonename', + 'displayname', 'state', 'instancename', { 'ipaddress': (record) => { return record.nic[0].ipaddress } }, 'account', 'zonename', 'cpunumber', 'cpuused', 'cputotal', 'memoryintfreekbs', 'memorytotal', 'networkread', 'networkwrite', 'diskkbsread', 'diskkbswrite', 'diskiopstotal' ], diff --git a/ui/src/config/section/config.js b/ui/src/config/section/config.js index 2ed35037201..dbba69bf2b5 100644 --- a/ui/src/config/section/config.js +++ b/ui/src/config/section/config.js @@ -9,21 +9,24 @@ export default { title: 'Global Settings', icon: 'global', permission: [ 'listConfigurations' ], - component: () => import('@/components/CloudMonkey/Resource.vue') + component: () => import('@/components/CloudMonkey/Resource.vue'), + columns: [ 'name', 'description', 'category', 'value' ] }, { name: 'ldapsetting', title: 'LDAP Settings', icon: 'team', permission: [ 'listLdapConfigurations' ], - component: () => import('@/components/CloudMonkey/Resource.vue') + component: () => import('@/components/CloudMonkey/Resource.vue'), + columns: [ 'hostname', 'port' ] }, { name: 'hypervisorcapability', title: 'Hypervisor Capabilities', icon: 'database', permission: [ 'listHypervisorCapabilities' ], - component: () => import('@/components/CloudMonkey/Resource.vue') + component: () => import('@/components/CloudMonkey/Resource.vue'), + columns: [ 'hypervisor', 'hypervisorversion', 'maxguestlimit', 'maxdatavolumeslimit', 'maxhostspercluster' ] } ] } diff --git a/ui/src/config/section/infra.js b/ui/src/config/section/infra.js index 951d18fcd28..06448d505a3 100644 --- a/ui/src/config/section/infra.js +++ b/ui/src/config/section/infra.js @@ -42,42 +42,49 @@ export default { title: 'Primary Storages', icon: 'database', permission: [ 'listStoragePools', 'listStoragePoolsMetrics' ], - component: () => import('@/components/CloudMonkey/Resource.vue') + component: () => import('@/components/CloudMonkey/Resource.vue'), + columns: [ 'name', 'state', 'ipaddress', 'type', 'path', 'scope', 'clustername', 'zonename' ] }, { name: 'imagestore', title: 'Secondary Storages', icon: 'picture', permission: [ 'listImageStores' ], - component: () => import('@/components/CloudMonkey/Resource.vue') + component: () => import('@/components/CloudMonkey/Resource.vue'), + columns: [ 'name', 'url', 'protocol', 'scope', 'zonename' ] }, { name: 'systemvm', title: 'System VMs', icon: 'thunderbolt', permission: [ 'listSystemVms' ], - component: () => import('@/components/CloudMonkey/Resource.vue') + component: () => import('@/components/CloudMonkey/Resource.vue'), + columns: [ 'name', 'state', 'agentstate', 'systemvmtype', 'publicip', 'privateip', 'hostname', 'zonename' ] }, { name: 'router', title: 'Virtual Routers', icon: 'fork', permission: [ 'listRouters' ], - component: () => import('@/components/CloudMonkey/Resource.vue') + component: () => import('@/components/CloudMonkey/Resource.vue'), + columns: [ 'name', 'state', 'publicip', 'guestnetworkname', 'vpcname', 'redundantstate', 'version', 'hostname', 'account', 'zonename', 'requiresupgrade' ] }, { - name: 'cpusockets', + name: 'cpusocket', title: 'CPU Sockets', icon: 'api', permission: [ 'listHosts' ], - component: () => import('@/components/CloudMonkey/Resource.vue') + params: { 'type': 'routing' }, + component: () => import('@/components/CloudMonkey/Resource.vue'), + columns: [ 'hypervisor', 'hosts', 'cpusockets' ] }, { - name: 'ms', + name: 'managementserver', title: 'Management Servers', icon: 'rocket', permission: [ 'listManagementServers' ], - component: () => import('@/components/CloudMonkey/Resource.vue') + component: () => import('@/components/CloudMonkey/Resource.vue'), + columns: [ 'name', 'state', 'version' ] } ] } diff --git a/ui/src/config/section/offering.js b/ui/src/config/section/offering.js index 0b96de1cfe9..50bf1f46162 100644 --- a/ui/src/config/section/offering.js +++ b/ui/src/config/section/offering.js @@ -9,28 +9,32 @@ export default { title: 'Compute Offerings', icon: 'cloud', permission: [ 'listServiceOfferings' ], - component: () => import('@/components/CloudMonkey/Resource.vue') + component: () => import('@/components/CloudMonkey/Resource.vue'), + columns: [ 'name', 'displaytext', 'cpunumber', 'cpuspeed', 'memory', 'tags', 'domain', 'zone' ] }, { name: 'diskoffering', title: 'Disk Offerings', icon: 'hdd', permission: [ 'listDiskOfferings' ], - component: () => import('@/components/CloudMonkey/Resource.vue') + component: () => import('@/components/CloudMonkey/Resource.vue'), + columns: [ 'name', 'displaytext', 'disksize', 'tags', 'domain', 'zone' ] }, { name: 'networkoffering', title: 'Network Offerings', icon: 'wifi', permission: [ 'listNetworkOfferings' ], - component: () => import('@/components/CloudMonkey/Resource.vue') + component: () => import('@/components/CloudMonkey/Resource.vue'), + columns: [ 'name', 'state', 'guestiptype', 'traffictype', 'networkrate', 'tags', 'domain', 'zone' ] }, { name: 'vpcoffering', title: 'VPC Offerings', icon: 'deployment-unit', permission: [ 'listVPCOfferings' ], - component: () => import('@/components/CloudMonkey/Resource.vue') + component: () => import('@/components/CloudMonkey/Resource.vue'), + columns: [ 'name', 'state', 'displaytext', 'domain', 'zone' ] }, { name: 'systemoffering', @@ -38,7 +42,8 @@ export default { icon: 'setting', permission: [ 'listServiceOfferings' ], params: { 'issystem': 'true' }, - component: () => import('@/components/CloudMonkey/Resource.vue') + component: () => import('@/components/CloudMonkey/Resource.vue'), + columns: [ 'name', 'systemvmtype', 'cpunumber', 'cpuspeed', 'memory', 'storagetype', 'tags' ] } ] } diff --git a/ui/src/config/section/storage.js b/ui/src/config/section/storage.js index 9d33e5cef84..a4ad845acc1 100644 --- a/ui/src/config/section/storage.js +++ b/ui/src/config/section/storage.js @@ -9,7 +9,7 @@ export default { icon: 'hdd', permission: [ 'listVolumesMetrics', 'listVolumes' ], component: () => import('@/components/CloudMonkey/Resource.vue'), - columns: ['name', 'state', 'type', 'vmname', 'size', 'physicalsize', 'utilization', 'storage', 'hypervisor', 'account', 'zonename'], + columns: ['name', 'state', 'type', 'vmname', 'size', 'physicalsize', 'utilization', 'diskkbsread', 'diskkbswrite', 'diskiopstotal', 'storage', 'account', 'zonename'], hidden: ['storage', 'utilization'], actions: [ {