openstack/skyline-console
Code Issues Proposed changes

Merge "fix: fix the stats api request for zun container"

Browse Source
This commit is contained in:
Zuul 2022-08-05 16:07:47 +00:00 committed by Gerrit Code Review
commit b2939b0021
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pages/container-service/containers/Containers/Detail/BaseDetail.jsx
View File

@ -20,7 +20,11 @@ import { isEmpty } from 'lodash';
export class BaseDetail extends Base {
get leftCards() {
const cards = [this.baseInfoCard, this.statsCard, this.miscellaneousCard];
const cards = [this.baseInfoCard, this.miscellaneousCard];
const { stats } = this.detailData;
if (!isEmpty(stats)) {
cards.push(this.statsCard);
}
return cards;
}
@ -175,29 +179,29 @@ export class BaseDetail extends Base {
const options = [
{
label: t('BLOCK I/O(B)'),
dataIndex: 'BLOCK I/O(B)',
dataIndex: 'stats[BLOCK I/O(B)]',
},
{
label: t('NET I/O(B)'),
dataIndex: 'NET I/O(B)',
dataIndex: 'stats[NET I/O(B)]',
},
{
label: t('CPU %'),
dataIndex: 'CPU %',
dataIndex: 'stats[CPU %]',
render: (value = 0) => value.toFixed(4),
},
{
label: t('MEM LIMIT(MiB)'),
dataIndex: 'MEM LIMIT(MiB)',
dataIndex: 'stats[MEM LIMIT(MiB)]',
},
{
label: t('MEM USAGE(MiB)'),
dataIndex: 'MEM USAGE(MiB)',
dataIndex: 'stats[MEM USAGE(MiB)]',
render: (value = 0) => value.toFixed(4),
},
{
label: t('MEM %'),
dataIndex: 'MEM %',
dataIndex: 'stats[MEM %]',
render: (value = 0) => value.toFixed(4),
},
];

9
src/stores/zun/containers.js
View File

@ -77,9 +77,12 @@ export class ContainersStore extends Base {
}
async detailDidFetch(item) {
const { uuid } = item;
const stats = (await this.client.stats.list(uuid)) || {};
return { ...item, ...stats };
const { uuid, status } = item;
let stats = {};
if (status === 'Running') {
stats = (await this.client.stats.list(uuid)) || {};
}
return { ...item, stats };
}
async fetchLogs(id) {