innov
/
nightingale1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

modify prometheus query batch response format (#1068)

This commit is contained in:
ulricqin 2022-07-23 17:50:16 +08:00 committed by GitHub
parent 0bd7ba9549
commit ba7ff133e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/webapi/router/router.go
View File

@ -101,11 +101,9 @@ func configRoute(r *gin.Engine, version string) {
if config.C.AnonymousAccess.PromQuerier {
pages.Any("/prometheus/*url", prometheusProxy)
pages.POST("/query-range-batch", promBatchQueryRange)
} else {
pages.Any("/prometheus/*url", auth(), prometheusProxy)
pages.POST("/query-range-batch", auth(), promBatchQueryRange)
}

19
src/webapi/router/router_prometheus.go
View File

@ -32,21 +32,15 @@ type batchQueryForm struct {
func promBatchQueryRange(c *gin.Context) {
xcluster := c.GetHeader("X-Cluster")
if xcluster == "" {
c.String(500, "X-Cluster is blank")
return
ginx.Bomb(http.StatusBadRequest, "header(X-Cluster) is blank")
}
var f batchQueryForm
err := c.BindJSON(&f)
if err != nil {
c.String(500, err.Error())
return
}
ginx.Dangerous(c.BindJSON(&f))
cluster, exist := prom.Clusters.Get(xcluster)
if !exist {
c.String(http.StatusBadRequest, "cluster(%s) not found", xcluster)
return
ginx.Bomb(http.StatusBadRequest, "cluster(%s) not found", xcluster)
}
var lst []model.Value
@ -59,15 +53,12 @@ func promBatchQueryRange(c *gin.Context) {
}
resp, _, err := cluster.PromClient.QueryRange(context.Background(), item.Query, r)
if err != nil {
c.String(500, err.Error())
return
}
ginx.Dangerous(err)
lst = append(lst, resp)
}
c.JSON(200, lst)
ginx.NewRender(c).Data(lst, nil)
}
func prometheusProxy(c *gin.Context) {