Skip to content

ui: improve metrics api use in list views #9825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 3 commits into from
May 9, 2025
Merged

ui: improve metrics api use in list views #9825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
204f1ce
ui: use *metrics apis only when metrics enabled for list
shwstppr Oct 18, 2024
c64aa4b
move metricsresponse fields to metricsFields
shwstppr Jan 29, 2025
f80f08b
Merge branch '4.20' into ui-improve-metricsapiuse
shwstppr May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ui/src/config/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ function generateRouterMap (section) {
icon: child.icon,
docHelp: vueProps.$applyDocHelpMappings(child.docHelp),
permission: child.permission,
getApiToCall: child.getApiToCall,
resourceType: child.resourceType,
filters: child.filters,
params: child.params ? child.params : {},
Expand Down
3 changes: 1 addition & 2 deletions ui/src/config/section/compute.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ export default {
title: 'label.instances',
icon: 'cloud-server-outlined',
docHelp: 'adminguide/virtual_machines.html',
permission: ['listVirtualMachines', 'listVirtualMachinesMetrics'],
getApiToCall: () => store.getters.metrics ? 'listVirtualMachinesMetrics' : 'listVirtualMachines',
permission: ['listVirtualMachinesMetrics'],
resourceType: 'UserVm',
params: () => {
var params = { details: 'group,nics,secgrp,tmpl,servoff,diskoff,iso,volume,affgrp,backoff' }
Expand Down
4 changes: 2 additions & 2 deletions ui/src/config/section/infra/clusters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ export default {
permission: ['listClustersMetrics'],
searchFilters: ['name', 'zoneid', 'podid', 'arch', 'hypervisor'],
columns: () => {
const fields = ['name', 'state', 'allocationstate', 'clustertype', 'arch', 'hypervisortype', 'hosts']
const metricsFields = ['cpuused', 'cpumaxdeviation', 'cpuallocated', 'cputotal', 'memoryused', 'memorymaxdeviation', 'memoryallocated', 'memorytotal', 'drsimbalance']
const fields = ['name', 'allocationstate', 'clustertype', 'arch', 'hypervisortype']
const metricsFields = ['state', 'hosts', 'cpuused', 'cpumaxdeviation', 'cpuallocated', 'cputotal', 'memoryused', 'memorymaxdeviation', 'memoryallocated', 'memorytotal', 'drsimbalance']
if (store.getters.metrics) {
fields.push(...metricsFields)
}
Expand Down
8 changes: 3 additions & 5 deletions ui/src/config/section/infra/hosts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,10 @@ export default {
params: { type: 'routing' },
columns: () => {
const fields = [
'name', 'state', 'resourcestate', 'ipaddress',
'arch', 'hypervisor', 'instances',
{ field: 'systeminstances', customTitle: 'system.vms' },
'powerstate', 'version'
'name', 'state', 'resourcestate', 'ipaddress', 'arch', 'hypervisor',
{ field: 'systeminstances', customTitle: 'system.vms' }, 'version'
]
const metricsFields = ['cpunumber', 'cputotalghz', 'cpuusedghz', 'cpuallocatedghz', 'memorytotalgb', 'memoryusedgb', 'memoryallocatedgb', 'networkread', 'networkwrite']
const metricsFields = ['instances', 'powerstate', 'cpunumber', 'cputotalghz', 'cpuusedghz', 'cpuallocatedghz', 'memorytotalgb', 'memoryusedgb', 'memoryallocatedgb', 'networkread', 'networkwrite']
if (store.getters.metrics) {
fields.push(...metricsFields)
}
Expand Down
4 changes: 2 additions & 2 deletions ui/src/config/section/infra/zones.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ export default {
permission: ['listZonesMetrics'],
searchFilters: ['name', 'domainid', 'tags'],
columns: () => {
const fields = ['name', 'allocationstate', 'type', 'networktype', 'clusters']
const metricsFields = ['cpuused', 'cpumaxdeviation', 'cpuallocated', 'cputotal', 'memoryused', 'memorymaxdeviation', 'memoryallocated', 'memorytotal']
const fields = ['name', 'allocationstate', 'type', 'networktype']
const metricsFields = ['clusters', 'cpuused', 'cpumaxdeviation', 'cpuallocated', 'cputotal', 'memoryused', 'memorymaxdeviation', 'memoryallocated', 'memorytotal']
if (store.getters.metrics) {
fields.push(...metricsFields)
}
Expand Down
7 changes: 6 additions & 1 deletion ui/src/views/AutogenView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,12 @@ export default {
}

if (this.$route && this.$route.meta && this.$route.meta.permission) {
this.apiName = (this.$route.meta.getApiToCall && this.$route.meta.getApiToCall()) || this.$route.meta.permission[0]
this.apiName = this.$route.meta.permission[0]
if (!store.getters.metrics && !this.dataView &&
this.apiName && this.apiName.endsWith('Metrics') &&
store.getters.apis[this.apiName.replace(/Metrics$/, '')]) {
this.apiName = this.apiName.replace(/Metrics$/, '')
}
if (this.$route.meta.columns) {
const columns = this.$route.meta.columns
if (columns && typeof columns === 'function') {
Expand Down
Loading