gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-03-17 11:14:44 +08:00
Code

feat(container): Align Container Memory Usage Display with Docker Stats (#7435)

Browse Source
This commit is contained in:
zhengkunwang 2024-12-19 14:24:29 +08:00 committed by GitHub
parent 07e4f34913
commit 7cb987434e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 69 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
agent/app/service/container.go
View File

@ -1052,6 +1052,9 @@ func calculateCPUPercentUnix(stats *container.StatsResponse) float64 {
func calculateMemPercentUnix(memStats container.MemoryStats) float64 { func calculateMemPercentUnix(memStats container.MemoryStats) float64 {
memPercent := 0.0 memPercent := 0.0
memUsage := float64(memStats.Usage) memUsage := float64(memStats.Usage)
if memStats.Stats["inactive_file"] > 0 {
memUsage = memUsage - float64(memStats.Stats["inactive_file"])
}
memLimit := float64(memStats.Limit) memLimit := float64(memStats.Limit)
if memUsage > 0.0 && memLimit > 0.0 { if memUsage > 0.0 && memLimit > 0.0 {
memPercent = (memUsage / memLimit) * 100.0 memPercent = (memUsage / memLimit) * 100.0
@ -1162,8 +1165,8 @@ func loadCpuAndMem(client *client.Client, containerItem string) dto.ContainerLis
data.CPUPercent = calculateCPUPercentUnix(stats) data.CPUPercent = calculateCPUPercentUnix(stats)
data.PercpuUsage = len(stats.CPUStats.CPUUsage.PercpuUsage) data.PercpuUsage = len(stats.CPUStats.CPUUsage.PercpuUsage)
data.MemoryCache = stats.MemoryStats.Stats["cache"] data.MemoryCache = stats.MemoryStats.Stats["inactive_file"]
data.MemoryUsage = stats.MemoryStats.Usage data.MemoryUsage = stats.MemoryStats.Usage - data.MemoryCache
data.MemoryLimit = stats.MemoryStats.Limit data.MemoryLimit = stats.MemoryStats.Limit
data.MemoryPercent = calculateMemPercentUnix(stats.MemoryStats) data.MemoryPercent = calculateMemPercentUnix(stats.MemoryStats)

2
frontend/src/components/back-button/index.vue
View File

@ -1,8 +1,6 @@
<template> <template>
<el-page-header :content="header" @back="jump"> <el-page-header :content="header" @back="jump">
<template v-if="slots.buttons" #content> <template v-if="slots.buttons" #content>
<!-- <span>{{ header }}</span> -->
<!-- <el-divider direction="vertical" /> -->
<slot name="buttons"></slot> <slot name="buttons"></slot>
</template> </template>
</el-page-header> </el-page-header>

17
frontend/src/components/group/index.vue
View File

@ -1,15 +1,6 @@
<template> <template>
<el-drawer <DrawerPro v-model="open" :header="$t('website.group')" size="large" :back="handleClose">
:close-on-click-modal="false" <template #content>
v-model="open"
size="50%"
:close-on-press-escape="false"
:before-close="handleClose"
>
<template #header>
<Header :header="$t('website.group')" :back="handleClose"></Header>
</template>
<ComplexTable :data="data" @search="search()"> <ComplexTable :data="data" @search="search()">
<template #leftToolBar> <template #leftToolBar>
<el-button type="primary" @click="openCreate">{{ $t('website.createGroup') }}</el-button> <el-button type="primary" @click="openCreate">{{ $t('website.createGroup') }}</el-button>
@ -71,13 +62,13 @@
</template> </template>
</el-table-column> </el-table-column>
</ComplexTable> </ComplexTable>
</el-drawer> </template>
</DrawerPro>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref } from 'vue'; import { ref } from 'vue';
import i18n from '@/lang'; import i18n from '@/lang';
import { CreateGroup, DeleteGroup, GetGroupList, UpdateGroup } from '@/api/modules/group'; import { CreateGroup, DeleteGroup, GetGroupList, UpdateGroup } from '@/api/modules/group';
import Header from '@/components/drawer-header/index.vue';
import { MsgSuccess } from '@/utils/message'; import { MsgSuccess } from '@/utils/message';
import { Group } from '@/api/interface/group'; import { Group } from '@/api/interface/group';
import { Rules } from '@/global/form-rules'; import { Rules } from '@/global/form-rules';