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

fix API specification for #4194

Browse Source 
Signed-off-by: zhu733756 <talonzhu@yunify.com>
This commit is contained in:
zhu733756
2021-09-01 15:33:35 +08:00
parent 52c0cbbee8
commit ad02644674
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kapis/monitoring/v1alpha3/dashboard_template_test.sh
View File

@@ -1,3 +1,3 @@
#! /bin/bash #! /bin/bash
curl -d '{"grafanaDashboardName":"test2","grafanaDashboardUrl":"https://grafana.com/api/dashboards/7362/revisions/5/download"}' -H "Content-Type: application/json" localhost:9090/kapis/monitoring.kubesphere.io/v1alpha3/dashboard/template curl -d '{"grafanaDashboardUrl":"https://grafana.com/api/dashboards/7362/revisions/5/download"}' -H "Content-Type: application/json" localhost:9090/kapis/monitoring.kubesphere.io/v1alpha3/clusterdashboard/test1/template

8
pkg/kapis/monitoring/v1alpha3/handler.go
View File

@@ -328,7 +328,9 @@ func (h handler) handleGrafanaDashboardImport(req *restful.Request, resp *restfu
return return
} }
if entity.GrafanaDashboardName == "" { grafanaDashboardName := req.PathParameter("grafanaDashboardName")
if grafanaDashboardName == "" {
err := errors.New("the requested parameter grafanaDashboardName cannot be empty") err := errors.New("the requested parameter grafanaDashboardName cannot be empty")
api.HandleBadRequest(resp, nil, err) api.HandleBadRequest(resp, nil, err)
return return
@@ -375,7 +377,7 @@ func (h handler) handleGrafanaDashboardImport(req *restful.Request, resp *restfu
} }
c := converter.NewConverter() c := converter.NewConverter()
convertedDashboard, err := c.ConvertToDashboard(grafanaDashboardContent, true, "", entity.GrafanaDashboardName) convertedDashboard, err := c.ConvertToDashboard(grafanaDashboardContent, true, "", grafanaDashboardName)
if err != nil { if err != nil {
api.HandleBadRequest(resp, nil, err) api.HandleBadRequest(resp, nil, err)
return return
@@ -406,7 +408,7 @@ func (h handler) handleGrafanaDashboardImport(req *restful.Request, resp *restfu
DoRaw(ctx) DoRaw(ctx)
if err == nil { if err == nil {
api.HandleBadRequest(resp, nil, errors.New("a dashboard with the same name already exists!")) api.HandleBadRequest(resp, nil, errors.New("a dashboard with the same name already exists."))
return return
} }

5
pkg/kapis/monitoring/v1alpha3/register.go
View File

@@ -506,9 +506,10 @@ func AddToContainer(c *restful.Container, k8sClient kubernetes.Interface, monito
Returns(http.StatusOK, respOK, monitoring.Metric{})). Returns(http.StatusOK, respOK, monitoring.Metric{})).
Produces(restful.MIME_JSON) Produces(restful.MIME_JSON)
ws.Route(ws.POST("/dashboard/template"). ws.Route(ws.POST("/clusterdashboard/{grafanaDashboardName}/template").
To(h.handleGrafanaDashboardImport). To(h.handleGrafanaDashboardImport).
Doc("Convert Grafana templates to KubeSphere dashboards."). Doc("Convert Grafana templates to KubeSphere clusterdashboards.").
Param(ws.PathParameter("grafanaDashboardName", "The name of the Grafana template to be converted").DataType("string").Required(true)).
Metadata(restfulspec.KeyOpenAPITags, []string{constants.DashboardTag}). Metadata(restfulspec.KeyOpenAPITags, []string{constants.DashboardTag}).
Writes(monitoringdashboardv1alpha2.ClusterDashboard{}). Writes(monitoringdashboardv1alpha2.ClusterDashboard{}).
Returns(http.StatusOK, respOK, monitoringdashboardv1alpha2.ClusterDashboard{})). Returns(http.StatusOK, respOK, monitoringdashboardv1alpha2.ClusterDashboard{})).

1
pkg/simple/client/monitoring/types.go
View File

@@ -50,7 +50,6 @@ type MetricData struct {
} }
type DashboardEntity struct { type DashboardEntity struct {
GrafanaDashboardName string `json:"grafanaDashboardName"`
GrafanaDashboardUrl string `json:"grafanaDashboardUrl,omitempty"` GrafanaDashboardUrl string `json:"grafanaDashboardUrl,omitempty"`
GrafanaDashboardContent string `json:"grafanaDashboardContent,omitempty"` GrafanaDashboardContent string `json:"grafanaDashboardContent,omitempty"`
} }