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

[v11.0.x] InfluxDB: Fix panic when reading concurrency count during influxql health check (#85877)

Browse Source 
InfluxDB: Fix panic when reading concurrency count during influxql health check (#85771)

fix panic when reading concurrency count during influxql health check

(cherry picked from commit 96f49bfaee)

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
This commit is contained in:
grafana-delivery-bot[bot]
2024-04-10 17:46:42 +02:00
committed by GitHub
co-authored by ismail simsek
parent f8f908ead8
commit 0b14c95dd8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/influxdb/healthcheck.go
+4 -2
View File
@@ -37,7 +37,7 @@ func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthReque
case influxVersionFlux: case influxVersionFlux:
return CheckFluxHealth(ctx, dsInfo, req) return CheckFluxHealth(ctx, dsInfo, req)
case influxVersionInfluxQL: case influxVersionInfluxQL:
return CheckInfluxQLHealth(ctx, dsInfo, s.features) return CheckInfluxQLHealth(ctx, dsInfo, req, s.features)
case influxVersionSQL: case influxVersionSQL:
return CheckSQLHealth(ctx, dsInfo, req) return CheckSQLHealth(ctx, dsInfo, req)
default: default:
@@ -80,10 +80,12 @@ func CheckFluxHealth(ctx context.Context, dsInfo *models.DatasourceInfo,
return getHealthCheckMessage(logger, "", errors.New("error getting flux query buckets")) return getHealthCheckMessage(logger, "", errors.New("error getting flux query buckets"))
} }
func CheckInfluxQLHealth(ctx context.Context, dsInfo *models.DatasourceInfo, features featuremgmt.FeatureToggles) (*backend.CheckHealthResult, error) { func CheckInfluxQLHealth(ctx context.Context, dsInfo *models.DatasourceInfo, req *backend.CheckHealthRequest, features featuremgmt.FeatureToggles) (*backend.CheckHealthResult, error) {
logger := logger.FromContext(ctx) logger := logger.FromContext(ctx)
tracer := tracing.DefaultTracer() tracer := tracing.DefaultTracer()
resp, err := influxql.Query(ctx, tracer, dsInfo, &backend.QueryDataRequest{ resp, err := influxql.Query(ctx, tracer, dsInfo, &backend.QueryDataRequest{
PluginContext: req.PluginContext,
Headers: req.Headers,
Queries: []backend.DataQuery{ Queries: []backend.DataQuery{
{ {
RefID: refID, RefID: refID,