From 0b14c95dd86c404339726fca55daed4ebe2b4997 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 17:46:42 +0200 Subject: [PATCH] [v11.0.x] InfluxDB: Fix panic when reading concurrency count during influxql health check (#85877) 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 96f49bfaeeeab1ef9e8d3296946a3c69492c532a) Co-authored-by: ismail simsek --- pkg/tsdb/influxdb/healthcheck.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/tsdb/influxdb/healthcheck.go b/pkg/tsdb/influxdb/healthcheck.go index 39a08232420..b1080bf6f78 100644 --- a/pkg/tsdb/influxdb/healthcheck.go +++ b/pkg/tsdb/influxdb/healthcheck.go @@ -37,7 +37,7 @@ func (s *Service) CheckHealth(ctx context.Context, req *backend.CheckHealthReque case influxVersionFlux: return CheckFluxHealth(ctx, dsInfo, req) case influxVersionInfluxQL: - return CheckInfluxQLHealth(ctx, dsInfo, s.features) + return CheckInfluxQLHealth(ctx, dsInfo, req, s.features) case influxVersionSQL: return CheckSQLHealth(ctx, dsInfo, req) default: @@ -80,10 +80,12 @@ func CheckFluxHealth(ctx context.Context, dsInfo *models.DatasourceInfo, 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) tracer := tracing.DefaultTracer() resp, err := influxql.Query(ctx, tracer, dsInfo, &backend.QueryDataRequest{ + PluginContext: req.PluginContext, + Headers: req.Headers, Queries: []backend.DataQuery{ { RefID: refID,