admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix metrics memory error

Browse Source
This commit is contained in:
jeff
2018-07-04 00:22:30 +08:00
parent 6359bb5459
commit 9084fdee97
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/models/metrics/containers.go
View File

@@ -101,6 +101,7 @@ func FormatContainerMetrics(namespace, podName, containerName string) ContainerM
memoryRequstMetrics, err := memoryRequst.GetObjectArray("metrics") memoryRequstMetrics, err := memoryRequst.GetObjectArray("metrics")
if err == nil && len(memoryRequstMetrics) != 0 { if err == nil && len(memoryRequstMetrics) != 0 {
requestMemory, _ := memoryRequstMetrics[0].GetFloat64("value") requestMemory, _ := memoryRequstMetrics[0].GetFloat64("value")
requestMemory = requestMemory / 1024 / 1024
resultContainer.MemoryRequest = FormatResourceLimit(requestMemory) resultContainer.MemoryRequest = FormatResourceLimit(requestMemory)
} else { } else {
resultContainer.MemoryRequest = Inf resultContainer.MemoryRequest = Inf
@@ -110,6 +111,7 @@ func FormatContainerMetrics(namespace, podName, containerName string) ContainerM
memoryLimitMetrics, err := memoryLimit.GetObjectArray("metrics") memoryLimitMetrics, err := memoryLimit.GetObjectArray("metrics")
if err == nil && len(memoryLimitMetrics) != 0 { if err == nil && len(memoryLimitMetrics) != 0 {
limitMemory, _ := memoryLimitMetrics[0].GetFloat64("value") limitMemory, _ := memoryLimitMetrics[0].GetFloat64("value")
limitMemory = limitMemory / 1024 / 1024
resultContainer.MemoryLimit = FormatResourceLimit(limitMemory) resultContainer.MemoryLimit = FormatResourceLimit(limitMemory)
} else { } else {
resultContainer.MemoryLimit = Inf resultContainer.MemoryLimit = Inf