opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-30 00:52:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Chore: remove expressions flag and allow (#22764)

Browse Source
This commit is contained in:
Ryan McKinley
2020-03-13 07:43:25 -07:00
committed by GitHub
parent 317894660f
commit c65db9bf25
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/metrics.go
View File

@ -19,10 +19,6 @@ import (
// QueryMetricsV2 returns query metrics // QueryMetricsV2 returns query metrics
// POST /api/ds/query DataSource query w/ expressions // POST /api/ds/query DataSource query w/ expressions
func (hs *HTTPServer) QueryMetricsV2(c *models.ReqContext, reqDto dtos.MetricRequest) Response { func (hs *HTTPServer) QueryMetricsV2(c *models.ReqContext, reqDto dtos.MetricRequest) Response {
if !setting.IsExpressionsEnabled() {
return Error(404, "Expressions feature toggle is not enabled", nil)
}
if len(reqDto.Queries) == 0 { if len(reqDto.Queries) == 0 {
return Error(500, "No queries found in query", nil) return Error(500, "No queries found in query", nil)
} }
@ -76,6 +72,10 @@ func (hs *HTTPServer) QueryMetricsV2(c *models.ReqContext, reqDto dtos.MetricReq
return Error(500, "Metric request error", err) return Error(500, "Metric request error", err)
} }
} else { } else {
if !setting.IsExpressionsEnabled() {
return Error(404, "Expressions feature toggle is not enabled", nil)
}
resp, err = plugins.Transform.Transform(c.Req.Context(), request) resp, err = plugins.Transform.Transform(c.Req.Context(), request)
if err != nil { if err != nil {
return Error(500, "Transform request error", err) return Error(500, "Transform request error", err)