IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
fix panic when reading concurrency count during influxql health check
This commit is contained in:
ismail simsek 2024-04-10 15:32:38 +02:00 committed by GitHub
parent 33b6f45a9e
commit 96f49bfaee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/tsdb/influxdb/healthcheck.go
View File

@ -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,