From c65db9bf25bff74efacf6e018f9fcbb4926e3ea7 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Fri, 13 Mar 2020 07:43:25 -0700 Subject: [PATCH] Chore: remove expressions flag and allow (#22764) --- pkg/api/metrics.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/api/metrics.go b/pkg/api/metrics.go index 804faea1956..6e0e5d8997a 100644 --- a/pkg/api/metrics.go +++ b/pkg/api/metrics.go @@ -19,10 +19,6 @@ import ( // QueryMetricsV2 returns query metrics // POST /api/ds/query DataSource query w/ expressions 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 { 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) } } else { + if !setting.IsExpressionsEnabled() { + return Error(404, "Expressions feature toggle is not enabled", nil) + } + resp, err = plugins.Transform.Transform(c.Req.Context(), request) if err != nil { return Error(500, "Transform request error", err)