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

remove buggy if statements

Browse Source 
Signed-off-by: huanggze <loganhuang@yunify.com>
This commit is contained in:
huanggze
2019-06-30 19:46:50 +08:00
parent cbec574fa3
commit 7b81d24e13
1 changed files with 16 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/apiserver/monitoring/monitoring.go
View File

@@ -18,6 +18,7 @@
package monitoring package monitoring
import ( import (
"fmt"
"github.com/emicklei/go-restful" "github.com/emicklei/go-restful"
"kubesphere.io/kubesphere/pkg/models/metrics" "kubesphere.io/kubesphere/pkg/models/metrics"
"kubesphere.io/kubesphere/pkg/simple/client/prometheus" "kubesphere.io/kubesphere/pkg/simple/client/prometheus"
@@ -42,19 +43,10 @@ func MonitorSpecificPodOnSpecificNode(request *restful.Request, response *restfu
func MonitorPod(request *restful.Request, response *restful.Response) { func MonitorPod(request *restful.Request, response *restful.Response) {
requestParams := prometheus.ParseMonitoringRequestParams(request) requestParams := prometheus.ParseMonitoringRequestParams(request)
podName := requestParams.PodName podName := requestParams.PodName
metricName := requestParams.MetricsName
if podName != "" { if podName != "" {
// single pod single metric requestParams.ResourcesFilter = fmt.Sprintf("^%s$", requestParams.PodName)
queryType, params, nullRule := metrics.AssemblePodMetricRequestInfo(requestParams, metricName)
var res *metrics.FormatedMetric
if !nullRule {
metricsStr := prometheus.SendMonitoringRequest(prometheus.PrometheusEndpoint, queryType, params)
res = metrics.ReformatJson(metricsStr, metricName, map[string]string{metrics.MetricLevelPodName: ""})
} }
response.WriteAsJson(res)
} else {
// multiple
rawMetrics := metrics.GetPodLevelMetrics(requestParams) rawMetrics := metrics.GetPodLevelMetrics(requestParams)
// sorting // sorting
sortedMetrics, maxMetricCount := metrics.Sort(requestParams.SortMetricName, requestParams.SortType, rawMetrics) sortedMetrics, maxMetricCount := metrics.Sort(requestParams.SortMetricName, requestParams.SortType, rawMetrics)
@@ -62,7 +54,6 @@ func MonitorPod(request *restful.Request, response *restful.Response) {
pagedMetrics := metrics.Page(requestParams.PageNum, requestParams.LimitNum, sortedMetrics, maxMetricCount) pagedMetrics := metrics.Page(requestParams.PageNum, requestParams.LimitNum, sortedMetrics, maxMetricCount)
response.WriteAsJson(pagedMetrics) response.WriteAsJson(pagedMetrics)
} }
}
func MonitorAllContainersOnSpecificNode(request *restful.Request, response *restful.Response) { func MonitorAllContainersOnSpecificNode(request *restful.Request, response *restful.Response) {
MonitorContainer(request, response) MonitorContainer(request, response)
@@ -78,8 +69,6 @@ func MonitorSpecificContainerOfSpecificNamespace(request *restful.Request, respo
func MonitorContainer(request *restful.Request, response *restful.Response) { func MonitorContainer(request *restful.Request, response *restful.Response) {
requestParams := prometheus.ParseMonitoringRequestParams(request) requestParams := prometheus.ParseMonitoringRequestParams(request)
metricName := requestParams.MetricsName
if requestParams.MetricsFilter != "" {
rawMetrics := metrics.GetContainerLevelMetrics(requestParams) rawMetrics := metrics.GetContainerLevelMetrics(requestParams)
// sorting // sorting
sortedMetrics, maxMetricCount := metrics.Sort(requestParams.SortMetricName, requestParams.SortType, rawMetrics) sortedMetrics, maxMetricCount := metrics.Sort(requestParams.SortMetricName, requestParams.SortType, rawMetrics)
@@ -87,12 +76,6 @@ func MonitorContainer(request *restful.Request, response *restful.Response) {
pagedMetrics := metrics.Page(requestParams.PageNum, requestParams.LimitNum, sortedMetrics, maxMetricCount) pagedMetrics := metrics.Page(requestParams.PageNum, requestParams.LimitNum, sortedMetrics, maxMetricCount)
response.WriteAsJson(pagedMetrics) response.WriteAsJson(pagedMetrics)
} else {
res := metrics.MonitorContainer(requestParams, metricName)
response.WriteAsJson(res)
}
} }
func MonitorSpecificWorkload(request *restful.Request, response *restful.Response) { func MonitorSpecificWorkload(request *restful.Request, response *restful.Response) {
@@ -132,7 +115,7 @@ func MonitorAllWorkspaces(request *restful.Request, response *restful.Response)
res := metrics.GetAllWorkspacesStatistics() res := metrics.GetAllWorkspacesStatistics()
response.WriteAsJson(res) response.WriteAsJson(res)
} else if tp == "rank" { } else {
rawMetrics := metrics.MonitorAllWorkspaces(requestParams) rawMetrics := metrics.MonitorAllWorkspaces(requestParams)
// sorting // sorting
@@ -142,9 +125,6 @@ func MonitorAllWorkspaces(request *restful.Request, response *restful.Response)
pagedMetrics := metrics.Page(requestParams.PageNum, requestParams.LimitNum, sortedMetrics, maxMetricCount) pagedMetrics := metrics.Page(requestParams.PageNum, requestParams.LimitNum, sortedMetrics, maxMetricCount)
response.WriteAsJson(pagedMetrics) response.WriteAsJson(pagedMetrics)
} else {
rawMetrics := metrics.MonitorAllWorkspaces(requestParams)
response.WriteAsJson(rawMetrics)
} }
} }