From 8175b31e16ca8c279b8fa115c27d2952eea5d529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Farkas?= Date: Mon, 5 Feb 2024 08:08:35 +0100 Subject: [PATCH] sql: make sure queries do not have fill-params (#81576) --- pkg/tsdb/sqleng/sql_engine.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/tsdb/sqleng/sql_engine.go b/pkg/tsdb/sqleng/sql_engine.go index 58d50b91a3e..30863093299 100644 --- a/pkg/tsdb/sqleng/sql_engine.go +++ b/pkg/tsdb/sqleng/sql_engine.go @@ -175,6 +175,13 @@ func (e *DataSourceHandler) QueryData(ctx context.Context, req *backend.QueryDat if err != nil { return nil, fmt.Errorf("error unmarshal query json: %w", err) } + + // the fill-params are only stored inside this function, during query-interpolation. we do not support + // sending them in "from the outside" + if queryjson.Fill || queryjson.FillInterval != 0.0 || queryjson.FillMode != "" || queryjson.FillValue != 0.0 { + return nil, fmt.Errorf("query fill-parameters not supported") + } + if queryjson.RawSql == "" { continue }