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

fix resource limit

Browse Source
This commit is contained in:
jeff
2018-06-29 21:10:14 +08:00
parent 8b61c25f69
commit 859305b517
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/models/metrics/pods.go
View File

@@ -228,6 +228,14 @@ func GetAllPodMetrics() constants.PageableResponse {
return podMetrics
}
func FormatResourceLimit(limit float64) string {
if limit <= 0 {
return Inf
} else {
return fmt.Sprintf("%.1f", limit)
}
}
func FormatPodMetrics(namespace string, pod string) PodMetrics {
var resultPod PodMetrics
@@ -260,8 +268,8 @@ func FormatPodMetrics(namespace string, pod string) PodMetrics {
if len(cpuLimitMetrics) == 0 {
resultPod.CPULimit = Inf
} else {
data, _ := cpuLimitMetrics[0].GetNumber("value")
resultPod.CPULimit = data.String()
data, _ := cpuLimitMetrics[0].GetFloat64("value")
resultPod.CPULimit = FormatResourceLimit(data)
}
memoryRequest := client.GetHeapsterMetricsJson("/namespaces/" + namespace + "/pods/" + pod + "/metrics/memory/request")
@@ -276,7 +284,7 @@ func FormatPodMetrics(namespace string, pod string) PodMetrics {
data, _ := memoryRequestMetrics[0].GetNumber("value")
memoryReq, _ := data.Float64()
memoryReq = memoryReq / 1024 / 1024
resultPod.MemoryRequest = fmt.Sprintf("%.1f", memoryReq)
resultPod.MemoryRequest = FormatResourceLimit(memoryReq)
}
memoryLimit := client.GetHeapsterMetricsJson("/namespaces/" + namespace + "/pods/" + pod + "/metrics/memory/limit")
@@ -288,7 +296,7 @@ func FormatPodMetrics(namespace string, pod string) PodMetrics {
data, _ := memoryLimitMetrics[0].GetNumber("value")
memoryLim, _ := data.Float64()
memoryLim = memoryLim / 1024 / 1024
resultPod.MemoryLimit = fmt.Sprintf("%.1f", memoryLim)
resultPod.MemoryLimit = FormatResourceLimit(memoryLim)
}
cpuUsageRate := client.GetHeapsterMetricsJson("/namespaces/" + namespace + "/pods/" + pod + "/metrics/cpu/usage_rate")