IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-01 11:47:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Search: handle a couple of corner cases when parsing dashboard data (#48521)

Browse Source
This commit is contained in:
Alexander Emelin 2022-04-29 18:49:38 +03:00 committed by GitHub
parent da035e823f
commit 87ae3e0644
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/services/searchV2/extract/dashboard.go
View File

@ -2,6 +2,7 @@ package extract
import (
"io"
"strconv"
jsoniter "github.com/json-iterator/go"
)
@ -38,8 +39,17 @@ func ReadDashboard(stream io.Reader, lookup DatasourceLookup) (*DashboardInfo, e
dash.Description = iter.ReadString()
case "schemaVersion":
dash.SchemaVersion = iter.ReadInt64()
switch iter.WhatIsNext() {
case jsoniter.NumberValue:
dash.SchemaVersion = iter.ReadInt64()
case jsoniter.StringValue:
val := iter.ReadString()
if v, err := strconv.ParseInt(val, 10, 64); err == nil {
dash.SchemaVersion = v
}
default:
iter.Skip()
}
case "timezone":
dash.TimeZone = iter.ReadString()
@ -176,8 +186,17 @@ func readPanelInfo(iter *jsoniter.Iterator, lookup DatasourceLookup) PanelInfo {
targets.addDatasource(iter)
case "targets":
for iter.ReadArray() {
targets.addTarget(iter)
switch iter.WhatIsNext() {
case jsoniter.ArrayValue:
for iter.ReadArray() {
targets.addTarget(iter)
}
case jsoniter.ObjectValue:
for f := iter.ReadObject(); f != ""; f = iter.ReadObject() {
targets.addTarget(iter)
}
default:
iter.Skip()
}
case "transformations":