Resolved merge conflict

Signed-off-by: hongming <talonwan@yunify.com>
2019-04-08 22:54:51 +08:00
parent 93ad572e19 d01cdf3b3c
commit c4c021b5a2
327 changed files with 64018 additions and 406 deletions
--- a/pkg/apiserver/git/git.go
+++ b/pkg/apiserver/git/git.go
@@ -0,0 +1,30 @@
+package git
+
+import (
+	"net/http"
+
+	"github.com/emicklei/go-restful"
+	"kubesphere.io/kubesphere/pkg/errors"
+	"kubesphere.io/kubesphere/pkg/models/git"
+)
+
+func GitReadVerify(request *restful.Request, response *restful.Response) {
+
+	authInfo := git.AuthInfo{}
+
+	err := request.ReadEntity(&authInfo)
+	ns := request.PathParameter("namespace")
+	if err != nil {
+		response.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	err = git.GitReadVerify(ns, authInfo)
+
+	if err != nil {
+		response.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
+		return
+	}
+
+	response.WriteAsJson(errors.None)
+}
--- a/pkg/apiserver/monitoring/monitoring.go
+++ b/pkg/apiserver/monitoring/monitoring.go
@@ -20,11 +20,11 @@ package monitoring
 import (
 	"github.com/emicklei/go-restful"
 	"kubesphere.io/kubesphere/pkg/models/metrics"
-	prom "kubesphere.io/kubesphere/pkg/simple/client/prometheus"
+	"kubesphere.io/kubesphere/pkg/simple/client/prometheus"
 )

 func MonitorPod(request *restful.Request, response *restful.Response) {
-	requestParams := prom.ParseMonitoringRequestParams(request)
+	requestParams := prometheus.ParseMonitoringRequestParams(request)
 	podName := requestParams.PodName
 	metricName := requestParams.MetricsName
 	if podName != "" {
@@ -32,7 +32,7 @@ func MonitorPod(request *restful.Request, response *restful.Response) {
 		queryType, params, nullRule := metrics.AssemblePodMetricRequestInfo(requestParams, metricName)
 		var res *metrics.FormatedMetric
 		if !nullRule {
-			metricsStr := prom.SendMonitoringRequest(queryType, params)
+			metricsStr := prometheus.SendMonitoringRequest(queryType, params)
 			res = metrics.ReformatJson(metricsStr, metricName, map[string]string{"pod_name": ""})
 		}
 		response.WriteAsJson(res)
@@ -49,7 +49,7 @@ func MonitorPod(request *restful.Request, response *restful.Response) {
 }

 func MonitorContainer(request *restful.Request, response *restful.Response) {
-	requestParams := prom.ParseMonitoringRequestParams(request)
+	requestParams := prometheus.ParseMonitoringRequestParams(request)
 	metricName := requestParams.MetricsName
 	if requestParams.MetricsFilter != "" {
 		rawMetrics := metrics.MonitorAllMetrics(requestParams, metrics.MetricLevelContainer)
@@ -68,23 +68,12 @@ func MonitorContainer(request *restful.Request, response *restful.Response) {
 }

 func MonitorWorkload(request *restful.Request, response *restful.Response) {
-	requestParams := prom.ParseMonitoringRequestParams(request)
+	requestParams := prometheus.ParseMonitoringRequestParams(request)

 	rawMetrics := metrics.MonitorAllMetrics(requestParams, metrics.MetricLevelWorkload)

-	var sortedMetrics *metrics.FormatedLevelMetric
-	var maxMetricCount int
-
-	wlKind := requestParams.WorkloadKind
-
 	// sorting
-	if wlKind == "" {
-
-		sortedMetrics, maxMetricCount = metrics.Sort(requestParams.SortMetricName, requestParams.SortType, rawMetrics)
-	} else {
-
-		sortedMetrics, maxMetricCount = metrics.Sort(requestParams.SortMetricName, requestParams.SortType, rawMetrics)
-	}
+	sortedMetrics, maxMetricCount := metrics.Sort(requestParams.SortMetricName, requestParams.SortType, rawMetrics)

 	// paging
 	pagedMetrics := metrics.Page(requestParams.PageNum, requestParams.LimitNum, sortedMetrics, maxMetricCount)
@@ -95,7 +84,7 @@ func MonitorWorkload(request *restful.Request, response *restful.Response) {

 func MonitorAllWorkspaces(request *restful.Request, response *restful.Response) {

-	requestParams := prom.ParseMonitoringRequestParams(request)
+	requestParams := prometheus.ParseMonitoringRequestParams(request)

 	tp := requestParams.Tp
 	if tp == "statistics" {
@@ -105,27 +94,31 @@ func MonitorAllWorkspaces(request *restful.Request, response *restful.Response)

 	} else if tp == "rank" {
 		rawMetrics := metrics.MonitorAllWorkspaces(requestParams)
+
 		// sorting
 		sortedMetrics, maxMetricCount := metrics.Sort(requestParams.SortMetricName, requestParams.SortType, rawMetrics)
+
 		// paging
 		pagedMetrics := metrics.Page(requestParams.PageNum, requestParams.LimitNum, sortedMetrics, maxMetricCount)

 		response.WriteAsJson(pagedMetrics)
 	} else {
-		res := metrics.MonitorAllMetrics(requestParams, metrics.MetricLevelWorkspace)
-		response.WriteAsJson(res)
+		rawMetrics := metrics.MonitorAllWorkspaces(requestParams)
+		response.WriteAsJson(rawMetrics)
 	}
 }

 func MonitorOneWorkspace(request *restful.Request, response *restful.Response) {
-	requestParams := prom.ParseMonitoringRequestParams(request)
+	requestParams := prometheus.ParseMonitoringRequestParams(request)

 	tp := requestParams.Tp
 	if tp == "rank" {
 		// multiple
 		rawMetrics := metrics.MonitorAllMetrics(requestParams, metrics.MetricLevelWorkspace)
+
 		// sorting
 		sortedMetrics, maxMetricCount := metrics.Sort(requestParams.SortMetricName, requestParams.SortType, rawMetrics)
+
 		// paging
 		pagedMetrics := metrics.Page(requestParams.PageNum, requestParams.LimitNum, sortedMetrics, maxMetricCount)
 		response.WriteAsJson(pagedMetrics)
@@ -143,34 +136,25 @@ func MonitorOneWorkspace(request *restful.Request, response *restful.Response) {
 }

 func MonitorNamespace(request *restful.Request, response *restful.Response) {
-	requestParams := prom.ParseMonitoringRequestParams(request)
-	metricName := requestParams.MetricsName
-	nsName := requestParams.NsName
-	if nsName != "" {
-		// single
-		queryType, params := metrics.AssembleNamespaceMetricRequestInfo(requestParams, metricName)
-		metricsStr := prom.SendMonitoringRequest(queryType, params)
-		res := metrics.ReformatJson(metricsStr, metricName, map[string]string{"namespace": ""})
-		response.WriteAsJson(res)
-	} else {
-		// multiple
-		rawMetrics := metrics.MonitorAllMetrics(requestParams, metrics.MetricLevelNamespace)
-		// sorting
-		sortedMetrics, maxMetricCount := metrics.Sort(requestParams.SortMetricName, requestParams.SortType, rawMetrics)
-		// paging
-		pagedMetrics := metrics.Page(requestParams.PageNum, requestParams.LimitNum, sortedMetrics, maxMetricCount)
-		response.WriteAsJson(pagedMetrics)
-	}
+	requestParams := prometheus.ParseMonitoringRequestParams(request)
+	// multiple
+	rawMetrics := metrics.MonitorAllMetrics(requestParams, metrics.MetricLevelNamespace)
+
+	// sorting
+	sortedMetrics, maxMetricCount := metrics.Sort(requestParams.SortMetricName, requestParams.SortType, rawMetrics)
+	// paging
+	pagedMetrics := metrics.Page(requestParams.PageNum, requestParams.LimitNum, sortedMetrics, maxMetricCount)
+	response.WriteAsJson(pagedMetrics)
 }

 func MonitorCluster(request *restful.Request, response *restful.Response) {
-	requestParams := prom.ParseMonitoringRequestParams(request)
+	requestParams := prometheus.ParseMonitoringRequestParams(request)

 	metricName := requestParams.MetricsName
 	if metricName != "" {
 		// single
 		queryType, params := metrics.AssembleClusterMetricRequestInfo(requestParams, metricName)
-		metricsStr := prom.SendMonitoringRequest(queryType, params)
+		metricsStr := prometheus.SendMonitoringRequest(queryType, params)
 		res := metrics.ReformatJson(metricsStr, metricName, map[string]string{"cluster": "local"})

 		response.WriteAsJson(res)
@@ -182,14 +166,17 @@ func MonitorCluster(request *restful.Request, response *restful.Response) {
 }

 func MonitorNode(request *restful.Request, response *restful.Response) {
-	requestParams := prom.ParseMonitoringRequestParams(request)
+	requestParams := prometheus.ParseMonitoringRequestParams(request)

 	metricName := requestParams.MetricsName
 	if metricName != "" {
 		// single
 		queryType, params := metrics.AssembleNodeMetricRequestInfo(requestParams, metricName)
-		metricsStr := prom.SendMonitoringRequest(queryType, params)
+		metricsStr := prometheus.SendMonitoringRequest(queryType, params)
 		res := metrics.ReformatJson(metricsStr, metricName, map[string]string{"node": ""})
+		// The raw node-exporter result doesn't include ip address information
+		// Thereby, append node ip address to .data.result[].metric
+
 		nodeAddress := metrics.GetNodeAddressInfo()
 		metrics.AddNodeAddressMetric(res, nodeAddress)