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

Fix minor metrics bugs and refactor route implementation

Browse Source
This commit is contained in:
jeff
2018-06-16 16:55:39 +08:00
committed by jeff
parent 28dbcc797b
commit 18932ed1d8
429 changed files with 32117 additions and 3988 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/apis/v1alpha/nodes/nodes_handler.go
View File

@@ -23,7 +23,7 @@ import (
"kubesphere.io/kubesphere/pkg/constants"
"kubesphere.io/kubesphere/pkg/filter/route"
"kubesphere.io/kubesphere/pkg/models"
"kubesphere.io/kubesphere/pkg/models/metrics"
)
func Register(ws *restful.WebService, subPath string) {
@@ -44,29 +44,35 @@ func Register(ws *restful.WebService, subPath string) {
Produces(restful.MIME_JSON)
}
func MakeRequest(node string, ch chan<- metrics.NodeMetrics) {
resultNode := metrics.FormatNodeMetrics(node)
ch <- resultNode
}
func handleNodes(request *restful.Request, response *restful.Response) {
var result constants.PageableResponse
var resultNode models.ResultNode
nodes := models.GetNodes()
nodes := metrics.GetNodes()
var total_count int
for i, node := range nodes {
resultNode = models.FormatNodeMetrics(node)
result.Items = append(result.Items, resultNode)
total_count = i
ch := make(chan metrics.NodeMetrics)
for _, node := range nodes {
go MakeRequest(node, ch)
}
total_count = total_count + 1
result.TotalCount = total_count
for _, _ = range nodes {
result.Items = append(result.Items, <-ch)
}
result.TotalCount = len(result.Items)
response.WriteAsJson(result)
}
func handleSingleNode(request *restful.Request, response *restful.Response) {
nodeName := request.PathParameter("nodename")
var resultNode models.ResultNode
var resultNode metrics.NodeMetrics
resultNode = models.FormatNodeMetrics(nodeName)
resultNode = metrics.FormatNodeMetrics(nodeName)
response.WriteAsJson(resultNode)
}
@@ -75,7 +81,7 @@ func handleDrainNode(request *restful.Request, response *restful.Response) {
nodeName := request.PathParameter("nodename")
result, err := models.DrainNode(nodeName)
result, err := metrics.DrainNode(nodeName)
if err != nil {
@@ -93,7 +99,7 @@ func handleDrainStatus(request *restful.Request, response *restful.Response) {
nodeName := request.PathParameter("nodename")
result, err := models.DrainStatus(nodeName)
result, err := metrics.DrainStatus(nodeName)
if err != nil {