public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SQL Expressions: Add setting to limit length of query (#110165)

Browse Source 
sql_expression_query_length_limit

Set the maximum length of a SQL query that can be used in a SQL expression. Default is 10000 characters. A setting of 0 means no limit.
This commit is contained in:
Kyle Brandt
2025-08-27 12:08:25 -04:00
committed by GitHub
parent 74cfe7b803
commit dd4ffc9918
11 changed files with 88 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/registry/apis/query/client/instance_provider.go
+6 -5
View File
@@ -47,11 +47,12 @@ func (s *singleTenantInstanceProvider) GetInstance(_ context.Context, _ map[stri
func (s *singleTenantInstance) GetSettings() clientapi.InstanceConfigurationSettings {
return clientapi.InstanceConfigurationSettings{
FeatureToggles: s.features,
SQLExpressionCellLimit: s.cfg.SQLExpressionCellLimit,
SQLExpressionOutputCellLimit: s.cfg.SQLExpressionOutputCellLimit,
SQLExpressionTimeout: s.cfg.SQLExpressionTimeout,
ExpressionsEnabled: s.cfg.ExpressionsEnabled,
FeatureToggles: s.features,
SQLExpressionCellLimit: s.cfg.SQLExpressionCellLimit,
SQLExpressionOutputCellLimit: s.cfg.SQLExpressionOutputCellLimit,
SQLExpressionQueryLengthLimit: s.cfg.SQLExpressionQueryLengthLimit,
SQLExpressionTimeout: s.cfg.SQLExpressionTimeout,
ExpressionsEnabled: s.cfg.ExpressionsEnabled,
}
}
pkg/registry/apis/query/clientapi/clientapi.go
+6 -5
View File
@@ -21,11 +21,12 @@ type QueryDataClient interface {
}
type InstanceConfigurationSettings struct {
FeatureToggles featuremgmt.FeatureToggles
SQLExpressionCellLimit int64
SQLExpressionOutputCellLimit int64
SQLExpressionTimeout time.Duration
ExpressionsEnabled bool
FeatureToggles featuremgmt.FeatureToggles
SQLExpressionCellLimit int64
SQLExpressionOutputCellLimit int64
SQLExpressionQueryLengthLimit int64
SQLExpressionTimeout time.Duration
ExpressionsEnabled bool
}
type Instance interface {
pkg/registry/apis/query/query.go
+5 -4
View File
@@ -286,10 +286,11 @@ func handleQuery(ctx context.Context, raw query.QueryDataRequest, b QueryAPIBuil
exprService := expr.ProvideService(
&setting.Cfg{
ExpressionsEnabled: instanceConfig.ExpressionsEnabled,
SQLExpressionCellLimit: instanceConfig.SQLExpressionCellLimit,
SQLExpressionOutputCellLimit: instanceConfig.SQLExpressionOutputCellLimit,
SQLExpressionTimeout: instanceConfig.SQLExpressionTimeout,
ExpressionsEnabled: instanceConfig.ExpressionsEnabled,
SQLExpressionCellLimit: instanceConfig.SQLExpressionCellLimit,
SQLExpressionOutputCellLimit: instanceConfig.SQLExpressionOutputCellLimit,
SQLExpressionTimeout: instanceConfig.SQLExpressionTimeout,
SQLExpressionQueryLengthLimit: instanceConfig.SQLExpressionQueryLengthLimit,
},
nil,
nil,