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

bugfix: fix proper type of setting maxConcurrentShardRequests (#47120)

Browse Source
This commit is contained in:
Aleksandr Stepanov 2022-04-11 11:29:49 +03:00 committed by GitHub
parent 2478785aaf
commit c0104db72d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/tsdb/elasticsearch/elasticsearch.go
View File

@ -5,6 +5,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"strconv"
"github.com/Masterminds/semver" "github.com/Masterminds/semver"
"github.com/grafana/grafana-plugin-sdk-go/backend" "github.com/grafana/grafana-plugin-sdk-go/backend"
@ -95,8 +96,17 @@ func newInstanceSettings() datasource.InstanceFactoryFunc {
timeInterval = "" timeInterval = ""
} }
maxConcurrentShardRequests, ok := jsonData["maxConcurrentShardRequests"].(float64) var maxConcurrentShardRequests float64
if !ok {
switch v := jsonData["maxConcurrentShardRequests"].(type) {
case float64:
maxConcurrentShardRequests = v
case string:
maxConcurrentShardRequests, err = strconv.ParseFloat(v, 64)
if err != nil {
maxConcurrentShardRequests = 256
}
default:
maxConcurrentShardRequests = 256 maxConcurrentShardRequests = 256
} }