From a2a6b9448ff0516a50738ac53fea28a3365d016f Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Thu, 20 Aug 2020 10:52:46 -0700 Subject: [PATCH] InfluxDB: exclude result and table column from Flux table results (#27081) --- pkg/tsdb/influxdb/flux/builder.go | 10 +++++- pkg/tsdb/influxdb/flux/executor.go | 26 ++++++-------- pkg/tsdb/influxdb/flux/executor_test.go | 35 +++++++++++++++--- pkg/tsdb/influxdb/flux/flux.go | 2 +- pkg/tsdb/influxdb/flux/macros.go | 5 --- .../influxdb/flux/testdata/buckets.golden.txt | 22 ++++++------ .../flux/testdata/grouping.golden.txt | 8 ++--- .../flux/testdata/multiple.golden.txt | 12 +++---- .../influxdb/flux/testdata/renamed.golden.txt | 36 +++++++++---------- 9 files changed, 91 insertions(+), 65 deletions(-) diff --git a/pkg/tsdb/influxdb/flux/builder.go b/pkg/tsdb/influxdb/flux/builder.go index 2285e52408b..0b052a00c0e 100644 --- a/pkg/tsdb/influxdb/flux/builder.go +++ b/pkg/tsdb/influxdb/flux/builder.go @@ -116,6 +116,14 @@ func (fb *frameBuilder) Init(metadata *query.FluxTableMetadata) error { } else { fb.labels = make([]string, 0) for _, col := range columns { + // Skip the result column + if col.Index() == 0 && col.Name() == "result" && col.DataType() == stringDatatype { + continue + } + if col.Index() == 1 && col.Name() == "table" && col.DataType() == longDatatype { + continue + } + converter, err := getConverter(col.DataType()) if err != nil { return err @@ -158,7 +166,7 @@ func (fb *frameBuilder) Append(record *query.FluxRecord) error { if ok && table != fb.tableID { fb.totalSeries++ if fb.totalSeries > fb.maxSeries { - return fmt.Errorf("reached max series limit (%d)", fb.maxSeries) + return fmt.Errorf("results are truncated, max series reached (%d)", fb.maxSeries) } if fb.isTimeSeries { diff --git a/pkg/tsdb/influxdb/flux/executor.go b/pkg/tsdb/influxdb/flux/executor.go index a655d795065..18e54865536 100644 --- a/pkg/tsdb/influxdb/flux/executor.go +++ b/pkg/tsdb/influxdb/flux/executor.go @@ -20,29 +20,25 @@ func executeQuery(ctx context.Context, query queryModel, runner queryRunner, max return } - glog.Debug("Executing Flux query", "interpolated query", flux) + glog.Debug("Executing Flux query", "flux", flux) tables, err := runner.runQuery(ctx, flux) if err != nil { glog.Warn("Flux query failed", "err", err, "query", flux) dr.Error = err - metaFrame := data.NewFrame("meta for error") - metaFrame.Meta = &data.FrameMeta{ - ExecutedQueryString: flux, - } - dr.Frames = append(dr.Frames, metaFrame) - return + } else { + dr = readDataFrames(tables, int(float64(query.MaxDataPoints)*1.5), maxSeries) } - dr = readDataFrames(tables, int(float64(query.MaxDataPoints)*1.5), maxSeries) - - for _, frame := range dr.Frames { - if frame.Meta == nil { - frame.Meta = &data.FrameMeta{} - } - frame.Meta.ExecutedQueryString = flux + // Make sure there is at least one frame + if len(dr.Frames) == 0 { + dr.Frames = append(dr.Frames, data.NewFrame("")) } - + firstFrame := dr.Frames[0] + if firstFrame.Meta == nil { + firstFrame.SetMeta(&data.FrameMeta{}) + } + firstFrame.Meta.ExecutedQueryString = flux return dr } diff --git a/pkg/tsdb/influxdb/flux/executor_test.go b/pkg/tsdb/influxdb/flux/executor_test.go index 826b6ae08ed..808fd53a1ea 100644 --- a/pkg/tsdb/influxdb/flux/executor_test.go +++ b/pkg/tsdb/influxdb/flux/executor_test.go @@ -14,6 +14,10 @@ import ( "github.com/grafana/grafana-plugin-sdk-go/backend" "github.com/grafana/grafana-plugin-sdk-go/data" "github.com/grafana/grafana-plugin-sdk-go/experimental" + "github.com/grafana/grafana/pkg/components/securejsondata" + "github.com/grafana/grafana/pkg/components/simplejson" + "github.com/grafana/grafana/pkg/models" + "github.com/stretchr/testify/require" "github.com/xorcare/pointer" influxdb2 "github.com/influxdata/influxdb-client-go/v2" @@ -255,10 +259,6 @@ func TestBuckets(t *testing.T) { if dr.Error != nil { t.Fatal(dr.Error) } - - st, _ := dr.Frames[0].StringTable(-1, -1) - fmt.Println(st) - fmt.Println("----------------------") }) } @@ -270,3 +270,30 @@ func TestGoldenFiles(t *testing.T) { } }) } + +func TestRealQuery(t *testing.T) { + t.Skip() // this is used for local testing + + t.Run("Check buckets() query on localhost", func(t *testing.T) { + json := simplejson.New() + json.Set("organization", "test-org") + + dsInfo := &models.DataSource{ + Url: "http://localhost:9999", // NOTE! no api/v2 + JsonData: json, + SecureJsonData: securejsondata.GetEncryptedJsonData(map[string]string{ + "token": "PjSEcM5oWhqg2eI6IXcqYJFe5UbMM_xt-UNlAL0BRYJqLeVpcdMWidiPfWxGhu4Xrh6wioRR-CiadCg-ady68Q==", + }), + } + + runner, err := runnerFromDataSource(dsInfo) + require.NoError(t, err) + + dr := executeQuery(context.Background(), queryModel{ + MaxDataPoints: 100, + RawQuery: "buckets()", + }, runner, 50) + err = experimental.CheckGoldenDataResponse("./testdata/buckets-real.golden.txt", &dr, true) + require.NoError(t, err) + }) +} diff --git a/pkg/tsdb/influxdb/flux/flux.go b/pkg/tsdb/influxdb/flux/flux.go index 3cb1c4985a1..7e747f93fbf 100644 --- a/pkg/tsdb/influxdb/flux/flux.go +++ b/pkg/tsdb/influxdb/flux/flux.go @@ -39,7 +39,7 @@ func Query(ctx context.Context, dsInfo *models.DataSource, tsdbQuery *tsdb.TsdbQ continue } - res := executeQuery(context.Background(), *qm, r, 50) + res := executeQuery(ctx, *qm, r, 50) tRes.Results[query.RefId] = backendDataResponseToTSDBResponse(&res, query.RefId) } diff --git a/pkg/tsdb/influxdb/flux/macros.go b/pkg/tsdb/influxdb/flux/macros.go index dd224fe7729..2db350c99fc 100644 --- a/pkg/tsdb/influxdb/flux/macros.go +++ b/pkg/tsdb/influxdb/flux/macros.go @@ -1,12 +1,9 @@ package flux import ( - "fmt" "regexp" "strings" "time" - - "github.com/grafana/grafana-plugin-sdk-go/backend" ) const variableFilter = `(?m)([a-zA-Z]+)\.([a-zA-Z]+)` @@ -38,7 +35,5 @@ func interpolate(query queryModel) (string, error) { } } } - - backend.Logger.Info(fmt.Sprintf("%s => %v", flux, query.Options)) return flux, err } diff --git a/pkg/tsdb/influxdb/flux/testdata/buckets.golden.txt b/pkg/tsdb/influxdb/flux/testdata/buckets.golden.txt index 889a275dced..9dead6a4bf5 100644 --- a/pkg/tsdb/influxdb/flux/testdata/buckets.golden.txt +++ b/pkg/tsdb/influxdb/flux/testdata/buckets.golden.txt @@ -2,17 +2,17 @@ Frame[0] {} Name: -Dimensions: 7 Fields by 3 Rows -+-----------------+----------------+-----------------+------------------+----------------------+-----------------------+-----------------------+ -| Name: result | Name: table | Name: name | Name: id | Name: organizationID | Name: retentionPolicy | Name: retentionPeriod | -| Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | Labels: | -| Type: []*string | Type: []*int64 | Type: []*string | Type: []*string | Type: []*string | Type: []*string | Type: []*int64 | -+-----------------+----------------+-----------------+------------------+----------------------+-----------------------+-----------------------+ -| _result | 0 | grafana | 059b46a59abab001 | 059b46a59abab000 | null | 604800000000000 | -| _result | 0 | _tasks | 059b46a59abab002 | 059b46a59abab000 | null | 259200000000000 | -| _result | 0 | _monitoring | 059b46a59abab003 | 059b46a59abab000 | null | 604800000000000 | -+-----------------+----------------+-----------------+------------------+----------------------+-----------------------+-----------------------+ +Dimensions: 5 Fields by 3 Rows ++-----------------+------------------+----------------------+-----------------------+-----------------------+ +| Name: name | Name: id | Name: organizationID | Name: retentionPolicy | Name: retentionPeriod | +| Labels: | Labels: | Labels: | Labels: | Labels: | +| Type: []*string | Type: []*string | Type: []*string | Type: []*string | Type: []*int64 | ++-----------------+------------------+----------------------+-----------------------+-----------------------+ +| grafana | 059b46a59abab001 | 059b46a59abab000 | null | 604800000000000 | +| _tasks | 059b46a59abab002 | 059b46a59abab000 | null | 259200000000000 | +| _monitoring | 059b46a59abab003 | 059b46a59abab000 | null | 604800000000000 | ++-----------------+------------------+----------------------+-----------------------+-----------------------+ ====== TEST DATA RESPONSE (arrow base64) ====== -FRAME=QVJST1cxAAD/////iAMAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHQAAAADAAAATAAAACgAAAAEAAAAAP3//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAAAg/f//CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAED9//8IAAAADAAAAAIAAAB7fQAABAAAAG1ldGEAAAAABwAAAHwCAAAAAgAApAEAAFABAADkAAAAeAAAAAQAAACy/f//FAAAAEQAAABEAAAAAAACAUgAAAABAAAABAAAAKD9//8IAAAAGAAAAA8AAAByZXRlbnRpb25QZXJpb2QABAAAAG5hbWUAAAAAAAAAACD+//8AAAABQAAAAA8AAAByZXRlbnRpb25QZXJpb2QAIv7//xQAAABEAAAARAAAAAAABQFAAAAAAQAAAAQAAAAQ/v//CAAAABgAAAAPAAAAcmV0ZW50aW9uUG9saWN5AAQAAABuYW1lAAAAAAAAAAAQ/v//DwAAAHJldGVudGlvblBvbGljeQCK/v//FAAAAEQAAABEAAAAAAAFAUAAAAABAAAABAAAAHj+//8IAAAAGAAAAA4AAABvcmdhbml6YXRpb25JRAAABAAAAG5hbWUAAAAAAAAAAHj+//8OAAAAb3JnYW5pemF0aW9uSUQAAPL+//8UAAAAOAAAADgAAAAAAAUBNAAAAAEAAAAEAAAA4P7//wgAAAAMAAAAAgAAAGlkAAAEAAAAbmFtZQAAAAAAAAAA1P7//wIAAABpZAAAQv///xQAAAA8AAAAPAAAAAAABQE4AAAAAQAAAAQAAAAw////CAAAABAAAAAEAAAAbmFtZQAAAAAEAAAAbmFtZQAAAAAAAAAAKP///wQAAABuYW1lAAAAAJr///8UAAAAPAAAAEQAAAAAAAIBSAAAAAEAAAAEAAAAiP///wgAAAAQAAAABQAAAHRhYmxlAAAABAAAAG5hbWUAAAAAAAAAAAgADAAIAAcACAAAAAAAAAFAAAAABQAAAHRhYmxlABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAARAAAAEgAAAAAAAUBRAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAGAAAAcmVzdWx0AAAEAAAAbmFtZQAAAAAAAAAABAAEAAQAAAAGAAAAcmVzdWx0AAD/////+AEAABQAAAAAAAAADAAWABQAEwAMAAQADAAAABgBAAAAAAAAFAAAAAAAAAMDAAoAGAAMAAgABAAKAAAAFAAAAEgBAAADAAAAAAAAAAAAAAATAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAABgAAAAAAAAAKAAAAAAAAAAAAAAAAAAAACgAAAAAAAAAGAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAQAAAAAAAAAFAAAAAAAAAAGAAAAAAAAABoAAAAAAAAAAAAAAAAAAAAaAAAAAAAAAAQAAAAAAAAAHgAAAAAAAAAMAAAAAAAAACoAAAAAAAAAAAAAAAAAAAAqAAAAAAAAAAQAAAAAAAAALgAAAAAAAAAMAAAAAAAAADoAAAAAAAAAAgAAAAAAAAA8AAAAAAAAAAQAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAYAAAAAAAAAAAAAAAHAAAAAwAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAHAAAADgAAABUAAABfcmVzdWx0X3Jlc3VsdF9yZXN1bHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAA0AAAAYAAAAZ3JhZmFuYV90YXNrc19tb25pdG9yaW5nAAAAABAAAAAgAAAAMAAAADA1OWI0NmE1OWFiYWIwMDEwNTliNDZhNTlhYmFiMDAyMDU5YjQ2YTU5YWJhYjAwMwAAAAAQAAAAIAAAADAAAAAwNTliNDZhNTlhYmFiMDAwMDU5YjQ2YTU5YWJhYjAwMDA1OWI0NmE1OWFiYWIwMDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACn5DyYCAAAA7bO96wAAAAAp+Q8mAgAQAAAADAAUABIADAAIAAQADAAAABAAAAAsAAAAPAAAAAAAAwABAAAAmAMAAAAAAAAAAgAAAAAAABgBAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAwAAAAIAAQACgAAAAgAAAB0AAAAAwAAAEwAAAAoAAAABAAAAAD9//8IAAAADAAAAAAAAAAAAAAABQAAAHJlZklkAAAAIP3//wgAAAAMAAAAAAAAAAAAAAAEAAAAbmFtZQAAAABA/f//CAAAAAwAAAACAAAAe30AAAQAAABtZXRhAAAAAAcAAAB8AgAAAAIAAKQBAABQAQAA5AAAAHgAAAAEAAAAsv3//xQAAABEAAAARAAAAAAAAgFIAAAAAQAAAAQAAACg/f//CAAAABgAAAAPAAAAcmV0ZW50aW9uUGVyaW9kAAQAAABuYW1lAAAAAAAAAAAg/v//AAAAAUAAAAAPAAAAcmV0ZW50aW9uUGVyaW9kACL+//8UAAAARAAAAEQAAAAAAAUBQAAAAAEAAAAEAAAAEP7//wgAAAAYAAAADwAAAHJldGVudGlvblBvbGljeQAEAAAAbmFtZQAAAAAAAAAAEP7//w8AAAByZXRlbnRpb25Qb2xpY3kAiv7//xQAAABEAAAARAAAAAAABQFAAAAAAQAAAAQAAAB4/v//CAAAABgAAAAOAAAAb3JnYW5pemF0aW9uSUQAAAQAAABuYW1lAAAAAAAAAAB4/v//DgAAAG9yZ2FuaXphdGlvbklEAADy/v//FAAAADgAAAA4AAAAAAAFATQAAAABAAAABAAAAOD+//8IAAAADAAAAAIAAABpZAAABAAAAG5hbWUAAAAAAAAAANT+//8CAAAAaWQAAEL///8UAAAAPAAAADwAAAAAAAUBOAAAAAEAAAAEAAAAMP///wgAAAAQAAAABAAAAG5hbWUAAAAABAAAAG5hbWUAAAAAAAAAACj///8EAAAAbmFtZQAAAACa////FAAAADwAAABEAAAAAAACAUgAAAABAAAABAAAAIj///8IAAAAEAAAAAUAAAB0YWJsZQAAAAQAAABuYW1lAAAAAAAAAAAIAAwACAAHAAgAAAAAAAABQAAAAAUAAAB0YWJsZQASABgAFAATABIADAAAAAgABAASAAAAFAAAAEQAAABIAAAAAAAFAUQAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABgAAAHJlc3VsdAAABAAAAG5hbWUAAAAAAAAAAAQABAAEAAAABgAAAHJlc3VsdAAAuAMAAEFSUk9XMQ== +FRAME=QVJST1cxAAD/////0AIAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHQAAAADAAAATAAAACgAAAAEAAAAvP3//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADc/f//CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAPz9//8IAAAADAAAAAIAAAB7fQAABAAAAG1ldGEAAAAABQAAAMABAABYAQAA7AAAAIAAAAAEAAAAZv7//xQAAABEAAAATAAAAAAAAgFQAAAAAQAAAAQAAABU/v//CAAAABgAAAAPAAAAcmV0ZW50aW9uUGVyaW9kAAQAAABuYW1lAAAAAAAAAAAIAAwACAAHAAgAAAAAAAABQAAAAA8AAAByZXRlbnRpb25QZXJpb2QA3v7//xQAAABEAAAARAAAAAAABQFAAAAAAQAAAAQAAADM/v//CAAAABgAAAAPAAAAcmV0ZW50aW9uUG9saWN5AAQAAABuYW1lAAAAAAAAAADM/v//DwAAAHJldGVudGlvblBvbGljeQBG////FAAAAEQAAABEAAAAAAAFAUAAAAABAAAABAAAADT///8IAAAAGAAAAA4AAABvcmdhbml6YXRpb25JRAAABAAAAG5hbWUAAAAAAAAAADT///8OAAAAb3JnYW5pemF0aW9uSUQAAK7///8UAAAAOAAAADgAAAAAAAUBNAAAAAEAAAAEAAAAnP///wgAAAAMAAAAAgAAAGlkAAAEAAAAbmFtZQAAAAAAAAAAkP///wIAAABpZAAAAAASABgAFAATABIADAAAAAgABAASAAAAFAAAAEQAAABIAAAAAAAFAUQAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABAAAAG5hbWUAAAAABAAAAG5hbWUAAAAAAAAAAAQABAAEAAAABAAAAG5hbWUAAAAAAAAAAP////+IAQAAFAAAAAAAAAAMABYAFAATAAwABAAMAAAA2AAAAAAAAAAUAAAAAAAAAwMACgAYAAwACAAEAAoAAAAUAAAA+AAAAAMAAAAAAAAAAAAAAA4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAGAAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAQAAAAAAAAADgAAAAAAAAAMAAAAAAAAABoAAAAAAAAAAAAAAAAAAAAaAAAAAAAAAAQAAAAAAAAAHgAAAAAAAAAMAAAAAAAAACoAAAAAAAAAAgAAAAAAAAAsAAAAAAAAAAQAAAAAAAAAMAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAYAAAAAAAAAAAAAAAFAAAAAwAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAABwAAAA0AAAAYAAAAZ3JhZmFuYV90YXNrc19tb25pdG9yaW5nAAAAABAAAAAgAAAAMAAAADA1OWI0NmE1OWFiYWIwMDEwNTliNDZhNTlhYmFiMDAyMDU5YjQ2YTU5YWJhYjAwMwAAAAAQAAAAIAAAADAAAAAwNTliNDZhNTlhYmFiMDAwMDU5YjQ2YTU5YWJhYjAwMDA1OWI0NmE1OWFiYWIwMDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACn5DyYCAAAA7bO96wAAAAAp+Q8mAgAQAAAADAAUABIADAAIAAQADAAAABAAAAAsAAAAOAAAAAAAAwABAAAA4AIAAAAAAACQAQAAAAAAANgAAAAAAAAAAAAAAAAAAAAAAAoADAAAAAgABAAKAAAACAAAAHQAAAADAAAATAAAACgAAAAEAAAAvP3//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADc/f//CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAPz9//8IAAAADAAAAAIAAAB7fQAABAAAAG1ldGEAAAAABQAAAMABAABYAQAA7AAAAIAAAAAEAAAAZv7//xQAAABEAAAATAAAAAAAAgFQAAAAAQAAAAQAAABU/v//CAAAABgAAAAPAAAAcmV0ZW50aW9uUGVyaW9kAAQAAABuYW1lAAAAAAAAAAAIAAwACAAHAAgAAAAAAAABQAAAAA8AAAByZXRlbnRpb25QZXJpb2QA3v7//xQAAABEAAAARAAAAAAABQFAAAAAAQAAAAQAAADM/v//CAAAABgAAAAPAAAAcmV0ZW50aW9uUG9saWN5AAQAAABuYW1lAAAAAAAAAADM/v//DwAAAHJldGVudGlvblBvbGljeQBG////FAAAAEQAAABEAAAAAAAFAUAAAAABAAAABAAAADT///8IAAAAGAAAAA4AAABvcmdhbml6YXRpb25JRAAABAAAAG5hbWUAAAAAAAAAADT///8OAAAAb3JnYW5pemF0aW9uSUQAAK7///8UAAAAOAAAADgAAAAAAAUBNAAAAAEAAAAEAAAAnP///wgAAAAMAAAAAgAAAGlkAAAEAAAAbmFtZQAAAAAAAAAAkP///wIAAABpZAAAAAASABgAFAATABIADAAAAAgABAASAAAAFAAAAEQAAABIAAAAAAAFAUQAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABAAAAG5hbWUAAAAABAAAAG5hbWUAAAAAAAAAAAQABAAEAAAABAAAAG5hbWUAAAAA+AIAAEFSUk9XMQ== diff --git a/pkg/tsdb/influxdb/flux/testdata/grouping.golden.txt b/pkg/tsdb/influxdb/flux/testdata/grouping.golden.txt index ba3838c59cb..55656dc8b2e 100644 --- a/pkg/tsdb/influxdb/flux/testdata/grouping.golden.txt +++ b/pkg/tsdb/influxdb/flux/testdata/grouping.golden.txt @@ -15,7 +15,7 @@ Dimensions: 2 Fields by 3 Rows -Frame[1] {} +Frame[1] Name: system Dimensions: 2 Fields by 4 Rows +-----------------------------------------+-----------------------+ @@ -31,7 +31,7 @@ Dimensions: 2 Fields by 4 Rows -Frame[2] {} +Frame[2] Name: system Dimensions: 2 Fields by 10 Rows +-----------------------------------------+-----------------------+ @@ -54,5 +54,5 @@ Dimensions: 2 Fields by 10 Rows ====== TEST DATA RESPONSE (arrow base64) ====== FRAME=QVJST1cxAAD/////2AEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHgAAAADAAAAUAAAACgAAAAEAAAAvP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADc/v//CAAAABAAAAAGAAAAc3lzdGVtAAAEAAAAbmFtZQAAAAAA////CAAAAAwAAAACAAAAe30AAAQAAABtZXRhAAAAAAIAAAC8AAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAABwAAAAcAAAAAAAAwFwAAAAAgAAACwAAAAEAAAAZP///wgAAAAQAAAABQAAAGxvYWQxAAAABAAAAG5hbWUAAAAAiP///wgAAAAcAAAAEwAAAHsiaG9zdCI6Imhvc3RuYW1lIn0ABgAAAGxhYmVscwAAAAAAAIr///8AAAIABQAAAGxvYWQxABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAEAAAAVGltZQAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAABUaW1lAAAAAAAAAAD/////uAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAADgAAAAAAAAAFAAAAAAAAAMDAAoAGAAMAAgABAAKAAAAFAAAAFgAAAADAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAYAAAAAAAAAAgAAAAAAAAAIAAAAAAAAAAYAAAAAAAAAAAAAAACAAAAAwAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAgAAAAAAAAAAxOqYzjUMFgCo9uzQNQwWaQw3IxQ5DBYCAAAAAAAAAAAAAAAAAAAAexSuR+F6DEAAAAAAAAAAABAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA4AAAAAAADAAEAAADoAQAAAAAAAMAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAAAAACgAMAAAACAAEAAoAAAAIAAAAeAAAAAMAAABQAAAAKAAAAAQAAAC8/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAANz+//8IAAAAEAAAAAYAAABzeXN0ZW0AAAQAAABuYW1lAAAAAAD///8IAAAADAAAAAIAAAB7fQAABAAAAG1ldGEAAAAAAgAAALwAAAAYAAAAAAASABgAFAATABIADAAAAAgABAASAAAAFAAAAHAAAABwAAAAAAADAXAAAAACAAAALAAAAAQAAABk////CAAAABAAAAAFAAAAbG9hZDEAAAAEAAAAbmFtZQAAAACI////CAAAABwAAAATAAAAeyJob3N0IjoiaG9zdG5hbWUifQAGAAAAbGFiZWxzAAAAAAAAiv///wAAAgAFAAAAbG9hZDEAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAABEAAAATAAAAAAAAApMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAQAAABUaW1lAAAAAAQAAABuYW1lAAAAAAAAAAAAAAYACAAGAAYAAAAAAAMABAAAAFRpbWUAAAAAAAIAAEFSUk9XMQ== -FRAME=QVJST1cxAAD/////2AEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHgAAAADAAAAUAAAACgAAAAEAAAAuP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADY/v//CAAAABAAAAAGAAAAc3lzdGVtAAAEAAAAbmFtZQAAAAD8/v//CAAAAAwAAAACAAAAe30AAAQAAABtZXRhAAAAAAIAAADAAAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAABwAAAAcAAAAAAAAwFwAAAAAgAAACwAAAAEAAAAYP///wgAAAAQAAAABgAAAGxvYWQxNQAABAAAAG5hbWUAAAAAhP///wgAAAAcAAAAEwAAAHsiaG9zdCI6Imhvc3RuYW1lIn0ABgAAAGxhYmVscwAAAAAAAIb///8AAAIABgAAAGxvYWQxNQAAAAASABgAFAAAABMADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAACkwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABAAAAFRpbWUAAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAEAAAAVGltZQAAAAD/////uAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAAEgAAAAAAAAAFAAAAAAAAAMDAAoAGAAMAAgABAAKAAAAFAAAAFgAAAAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAAAgAAAAAAAAAKAAAAAAAAAAgAAAAAAAAAAAAAAACAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAgAAAAAAAAAAxOqYzjUMFgCo9uzQNQwWAICXdRI5DBZpDDcjFDkMFgYAAAAAAAAAAAAAAAAAAAAUrkfhehQEQNejcD0K1/s/AAAAAAAAAAAQAAAADAAUABIADAAIAAQADAAAABAAAAAsAAAAPAAAAAAAAwABAAAA6AEAAAAAAADAAAAAAAAAAEgAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAwAAAAIAAQACgAAAAgAAAB4AAAAAwAAAFAAAAAoAAAABAAAALj+//8IAAAADAAAAAAAAAAAAAAABQAAAHJlZklkAAAA2P7//wgAAAAQAAAABgAAAHN5c3RlbQAABAAAAG5hbWUAAAAA/P7//wgAAAAMAAAAAgAAAHt9AAAEAAAAbWV0YQAAAAACAAAAwAAAABgAAAAAABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAAcAAAAHAAAAAAAAMBcAAAAAIAAAAsAAAABAAAAGD///8IAAAAEAAAAAYAAABsb2FkMTUAAAQAAABuYW1lAAAAAIT///8IAAAAHAAAABMAAAB7Imhvc3QiOiJob3N0bmFtZSJ9AAYAAABsYWJlbHMAAAAAAACG////AAACAAYAAABsb2FkMTUAAAAAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAABEAAAATAAAAAAAAApMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAQAAABUaW1lAAAAAAQAAABuYW1lAAAAAAAAAAAAAAYACAAGAAYAAAAAAAMABAAAAFRpbWUAAAAACAIAAEFSUk9XMQ== -FRAME=QVJST1cxAAD/////2AEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHgAAAADAAAAUAAAACgAAAAEAAAAvP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADc/v//CAAAABAAAAAGAAAAc3lzdGVtAAAEAAAAbmFtZQAAAAAA////CAAAAAwAAAACAAAAe30AAAQAAABtZXRhAAAAAAIAAAC8AAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAABwAAAAcAAAAAAAAwFwAAAAAgAAACwAAAAEAAAAZP///wgAAAAQAAAABQAAAGxvYWQ1AAAABAAAAG5hbWUAAAAAiP///wgAAAAcAAAAEwAAAHsiaG9zdCI6Imhvc3RuYW1lIn0ABgAAAGxhYmVscwAAAAAAAIr///8AAAIABQAAAGxvYWQ1ABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAEAAAAVGltZQAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAABUaW1lAAAAAAAAAAD/////uAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAAKgAAAAAAAAAFAAAAAAAAAMDAAoAGAAMAAgABAAKAAAAFAAAAFgAAAAKAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAABQAAAAAAAAAAgAAAAAAAAAWAAAAAAAAABQAAAAAAAAAAAAAAACAAAACgAAAAAAAAAAAAAAAAAAAAoAAAAAAAAAAgAAAAAAAAAAxOqYzjUMFgCo9uzQNQwWAIwCQdM1DBYADFzRBjkMFgDwZyUJOQwWANRzeQs5DBYAuH/NDTkMFgCciyEQOQwWAICXdRI5DBZpDDcjFDkMFv4BAAAAAAAAAAAAAAAAAAAfhetRuB4JQFK4HoXrUQhAzczMzMzM/D8pXI/C9Sj8PwAAAAAAAPw/XI/C9Shc+z9SuB6F61H8P1yPwvUoXPs/AAAAAAAAAAAQAAAADAAUABIADAAIAAQADAAAABAAAAAsAAAAOAAAAAAAAwABAAAA6AEAAAAAAADAAAAAAAAAAKgAAAAAAAAAAAAAAAAAAAAAAAoADAAAAAgABAAKAAAACAAAAHgAAAADAAAAUAAAACgAAAAEAAAAvP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADc/v//CAAAABAAAAAGAAAAc3lzdGVtAAAEAAAAbmFtZQAAAAAA////CAAAAAwAAAACAAAAe30AAAQAAABtZXRhAAAAAAIAAAC8AAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAABwAAAAcAAAAAAAAwFwAAAAAgAAACwAAAAEAAAAZP///wgAAAAQAAAABQAAAGxvYWQ1AAAABAAAAG5hbWUAAAAAiP///wgAAAAcAAAAEwAAAHsiaG9zdCI6Imhvc3RuYW1lIn0ABgAAAGxhYmVscwAAAAAAAIr///8AAAIABQAAAGxvYWQ1ABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAEAAAAVGltZQAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAABUaW1lAAAAAAACAABBUlJPVzE= +FRAME=QVJST1cxAAD/////uAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAADY/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAPj+//8IAAAAEAAAAAYAAABzeXN0ZW0AAAQAAABuYW1lAAAAAAIAAADAAAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAABwAAAAcAAAAAAAAwFwAAAAAgAAACwAAAAEAAAAYP///wgAAAAQAAAABgAAAGxvYWQxNQAABAAAAG5hbWUAAAAAhP///wgAAAAcAAAAEwAAAHsiaG9zdCI6Imhvc3RuYW1lIn0ABgAAAGxhYmVscwAAAAAAAIb///8AAAIABgAAAGxvYWQxNQAAAAASABgAFAAAABMADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAACkwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABAAAAFRpbWUAAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAEAAAAVGltZQAAAAAAAAAA/////7gAAAAUAAAAAAAAAAwAFgAUABMADAAEAAwAAABIAAAAAAAAABQAAAAAAAADAwAKABgADAAIAAQACgAAABQAAABYAAAABAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAIAAAAAAAAACgAAAAAAAAAIAAAAAAAAAAAAAAAAgAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAIAAAAAAAAAAMTqmM41DBYAqPbs0DUMFgCAl3USOQwWaQw3IxQ5DBYGAAAAAAAAAAAAAAAAAAAAFK5H4XoUBEDXo3A9Ctf7PwAAAAAAAAAAEAAAAAwAFAASAAwACAAEAAwAAAAQAAAALAAAADgAAAAAAAMAAQAAAMgBAAAAAAAAwAAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAKAAwAAAAIAAQACgAAAAgAAABUAAAAAgAAACgAAAAEAAAA2P7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAAD4/v//CAAAABAAAAAGAAAAc3lzdGVtAAAEAAAAbmFtZQAAAAACAAAAwAAAABgAAAAAABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAAcAAAAHAAAAAAAAMBcAAAAAIAAAAsAAAABAAAAGD///8IAAAAEAAAAAYAAABsb2FkMTUAAAQAAABuYW1lAAAAAIT///8IAAAAHAAAABMAAAB7Imhvc3QiOiJob3N0bmFtZSJ9AAYAAABsYWJlbHMAAAAAAACG////AAACAAYAAABsb2FkMTUAAAAAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAABEAAAATAAAAAAAAApMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAQAAABUaW1lAAAAAAQAAABuYW1lAAAAAAAAAAAAAAYACAAGAAYAAAAAAAMABAAAAFRpbWUAAAAA4AEAAEFSUk9XMQ== +FRAME=QVJST1cxAAD/////sAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAADc/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAPz+//8IAAAAEAAAAAYAAABzeXN0ZW0AAAQAAABuYW1lAAAAAAIAAAC8AAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAABwAAAAcAAAAAAAAwFwAAAAAgAAACwAAAAEAAAAZP///wgAAAAQAAAABQAAAGxvYWQ1AAAABAAAAG5hbWUAAAAAiP///wgAAAAcAAAAEwAAAHsiaG9zdCI6Imhvc3RuYW1lIn0ABgAAAGxhYmVscwAAAAAAAIr///8AAAIABQAAAGxvYWQ1ABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAEAAAAVGltZQAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAABUaW1lAAAAAP////+4AAAAFAAAAAAAAAAMABYAFAATAAwABAAMAAAAqAAAAAAAAAAUAAAAAAAAAwMACgAYAAwACAAEAAoAAAAUAAAAWAAAAAoAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAAFAAAAAAAAAACAAAAAAAAABYAAAAAAAAAFAAAAAAAAAAAAAAAAIAAAAKAAAAAAAAAAAAAAAAAAAACgAAAAAAAAACAAAAAAAAAADE6pjONQwWAKj27NA1DBYAjAJB0zUMFgAMXNEGOQwWAPBnJQk5DBYA1HN5CzkMFgC4f80NOQwWAJyLIRA5DBYAgJd1EjkMFmkMNyMUOQwW/gEAAAAAAAAAAAAAAAAAAB+F61G4HglAUrgehetRCEDNzMzMzMz8Pylcj8L1KPw/AAAAAAAA/D9cj8L1KFz7P1K4HoXrUfw/XI/C9Shc+z8AAAAAAAAAABAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA8AAAAAAADAAEAAADAAQAAAAAAAMAAAAAAAAAAqAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAADc/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAPz+//8IAAAAEAAAAAYAAABzeXN0ZW0AAAQAAABuYW1lAAAAAAIAAAC8AAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAABwAAAAcAAAAAAAAwFwAAAAAgAAACwAAAAEAAAAZP///wgAAAAQAAAABQAAAGxvYWQ1AAAABAAAAG5hbWUAAAAAiP///wgAAAAcAAAAEwAAAHsiaG9zdCI6Imhvc3RuYW1lIn0ABgAAAGxhYmVscwAAAAAAAIr///8AAAIABQAAAGxvYWQ1ABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAEAAAAVGltZQAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAABUaW1lAAAAAOABAABBUlJPVzE= diff --git a/pkg/tsdb/influxdb/flux/testdata/multiple.golden.txt b/pkg/tsdb/influxdb/flux/testdata/multiple.golden.txt index 05cd952b755..cbd3ff4bd20 100644 --- a/pkg/tsdb/influxdb/flux/testdata/multiple.golden.txt +++ b/pkg/tsdb/influxdb/flux/testdata/multiple.golden.txt @@ -14,7 +14,7 @@ Dimensions: 2 Fields by 2 Rows -Frame[1] {} +Frame[1] Name: test Dimensions: 2 Fields by 2 Rows +-----------------------------------------+-------------------------+ @@ -28,7 +28,7 @@ Dimensions: 2 Fields by 2 Rows -Frame[2] {} +Frame[2] Name: test Dimensions: 2 Fields by 2 Rows +-----------------------------------------+-------------------------+ @@ -42,7 +42,7 @@ Dimensions: 2 Fields by 2 Rows -Frame[3] {} +Frame[3] Name: test Dimensions: 2 Fields by 2 Rows +-----------------------------------------+-------------------------+ @@ -57,6 +57,6 @@ Dimensions: 2 Fields by 2 Rows ====== TEST DATA RESPONSE (arrow base64) ====== FRAME=QVJST1cxAAD/////2AEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHgAAAADAAAAUAAAACgAAAAEAAAAvP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADc/v//CAAAABAAAAAEAAAAdGVzdAAAAAAEAAAAbmFtZQAAAAAA////CAAAAAwAAAACAAAAe30AAAQAAABtZXRhAAAAAAIAAAC8AAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAAB0AAAAdAAAAAAAAwF0AAAAAgAAACgAAAAEAAAAZP///wgAAAAMAAAAAQAAAGYAAAAEAAAAbmFtZQAAAACE////CAAAACQAAAAYAAAAeyJhIjoiMSIsImIiOiJhZHNmYXNkZiJ9AAAAAAYAAABsYWJlbHMAAAAAAACO////AAACAAEAAABmABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAEAAAAVGltZQAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAABUaW1lAAAAAAAAAAD/////uAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAACAAAAAAAAAAFAAAAAAAAAMDAAoAGAAMAAgABAAKAAAAFAAAAFgAAAACAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAAAAAACAAAAAgAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAACRnfi9q3j0FUR3uluTnvQVZmZmZmZm9j9mZmZmZmYaQBAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA4AAAAAAADAAEAAADoAQAAAAAAAMAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAACgAMAAAACAAEAAoAAAAIAAAAeAAAAAMAAABQAAAAKAAAAAQAAAC8/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAANz+//8IAAAAEAAAAAQAAAB0ZXN0AAAAAAQAAABuYW1lAAAAAAD///8IAAAADAAAAAIAAAB7fQAABAAAAG1ldGEAAAAAAgAAALwAAAAYAAAAAAASABgAFAATABIADAAAAAgABAASAAAAFAAAAHQAAAB0AAAAAAADAXQAAAACAAAAKAAAAAQAAABk////CAAAAAwAAAABAAAAZgAAAAQAAABuYW1lAAAAAIT///8IAAAAJAAAABgAAAB7ImEiOiIxIiwiYiI6ImFkc2Zhc2RmIn0AAAAABgAAAGxhYmVscwAAAAAAAI7///8AAAIAAQAAAGYAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAABEAAAATAAAAAAAAApMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAQAAABUaW1lAAAAAAQAAABuYW1lAAAAAAAAAAAAAAYACAAGAAYAAAAAAAMABAAAAFRpbWUAAAAAAAIAAEFSUk9XMQ== -FRAME=QVJST1cxAAD/////4AEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHgAAAADAAAAUAAAACgAAAAEAAAAsP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADQ/v//CAAAABAAAAAEAAAAdGVzdAAAAAAEAAAAbmFtZQAAAAD0/v//CAAAAAwAAAACAAAAe30AAAQAAABtZXRhAAAAAAIAAADIAAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAAB0AAAAfAAAAAAAAgGAAAAAAgAAACgAAAAEAAAAWP///wgAAAAMAAAAAQAAAGkAAAAEAAAAbmFtZQAAAAB4////CAAAACQAAAAYAAAAeyJhIjoiMSIsImIiOiJhZHNmYXNkZiJ9AAAAAAYAAABsYWJlbHMAAAAAAAAIAAwACAAHAAgAAAAAAAABQAAAAAEAAABpABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAEAAAAVGltZQAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAABUaW1lAAAAAP////+4AAAAFAAAAAAAAAAMABYAFAATAAwABAAMAAAAIAAAAAAAAAAUAAAAAAAAAwMACgAYAAwACAAEAAoAAAAUAAAAWAAAAAIAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAAAAAAAIAAAACAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAJGd+L2rePQVRHe6W5Oe9BUEAAAAAAAAAP//////////EAAAAAwAFAASAAwACAAEAAwAAAAQAAAALAAAADwAAAAAAAMAAQAAAPABAAAAAAAAwAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAMAAAACAAEAAoAAAAIAAAAeAAAAAMAAABQAAAAKAAAAAQAAACw/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAND+//8IAAAAEAAAAAQAAAB0ZXN0AAAAAAQAAABuYW1lAAAAAPT+//8IAAAADAAAAAIAAAB7fQAABAAAAG1ldGEAAAAAAgAAAMgAAAAYAAAAAAASABgAFAATABIADAAAAAgABAASAAAAFAAAAHQAAAB8AAAAAAACAYAAAAACAAAAKAAAAAQAAABY////CAAAAAwAAAABAAAAaQAAAAQAAABuYW1lAAAAAHj///8IAAAAJAAAABgAAAB7ImEiOiIxIiwiYiI6ImFkc2Zhc2RmIn0AAAAABgAAAGxhYmVscwAAAAAAAAgADAAIAAcACAAAAAAAAAFAAAAAAQAAAGkAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAABEAAAATAAAAAAAAApMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAQAAABUaW1lAAAAAAQAAABuYW1lAAAAAAAAAAAAAAYACAAGAAYAAAAAAAMABAAAAFRpbWUAAAAAEAIAAEFSUk9XMQ== -FRAME=QVJST1cxAAD/////2AEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHgAAAADAAAAUAAAACgAAAAEAAAAvP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADc/v//CAAAABAAAAAEAAAAdGVzdAAAAAAEAAAAbmFtZQAAAAAA////CAAAAAwAAAACAAAAe30AAAQAAABtZXRhAAAAAAIAAAC8AAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAAB0AAAAeAAAAAAABgF0AAAAAgAAACgAAAAEAAAAZP///wgAAAAMAAAAAQAAAGYAAAAEAAAAbmFtZQAAAACE////CAAAACQAAAAYAAAAeyJhIjoiMCIsImIiOiJhZHNmYXNkZiJ9AAAAAAYAAABsYWJlbHMAAAAAAAAEAAQABAAAAAEAAABmABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAEAAAAVGltZQAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAABUaW1lAAAAAAAAAAD/////uAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAABgAAAAAAAAAFAAAAAAAAAMDAAoAGAAMAAgABAAKAAAAFAAAAFgAAAACAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAIAAAAAAAAAAAAAAACAAAAAgAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAACQaXtOk570FVaE0GKTnvQVAgAAAAAAAAAQAAAADAAUABIADAAIAAQADAAAABAAAAAsAAAAOAAAAAAAAwABAAAA6AEAAAAAAADAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAoADAAAAAgABAAKAAAACAAAAHgAAAADAAAAUAAAACgAAAAEAAAAvP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADc/v//CAAAABAAAAAEAAAAdGVzdAAAAAAEAAAAbmFtZQAAAAAA////CAAAAAwAAAACAAAAe30AAAQAAABtZXRhAAAAAAIAAAC8AAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAAB0AAAAeAAAAAAABgF0AAAAAgAAACgAAAAEAAAAZP///wgAAAAMAAAAAQAAAGYAAAAEAAAAbmFtZQAAAACE////CAAAACQAAAAYAAAAeyJhIjoiMCIsImIiOiJhZHNmYXNkZiJ9AAAAAAYAAABsYWJlbHMAAAAAAAAEAAQABAAAAAEAAABmABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAEAAAAVGltZQAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAABUaW1lAAAAAAACAABBUlJPVzE= -FRAME=QVJST1cxAAD/////4AEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHgAAAADAAAAUAAAACgAAAAEAAAAtP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADU/v//CAAAABAAAAAEAAAAdGVzdAAAAAAEAAAAbmFtZQAAAAD4/v//CAAAAAwAAAACAAAAe30AAAQAAABtZXRhAAAAAAIAAADEAAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAAB0AAAAfAAAAAAAAgF8AAAAAgAAACgAAAAEAAAAXP///wgAAAAMAAAAAQAAAGkAAAAEAAAAbmFtZQAAAAB8////CAAAACQAAAAYAAAAeyJhIjoiMCIsImIiOiJhZHNmYXNkZiJ9AAAAAAYAAABsYWJlbHMAAAAAAAAAAAYACAAEAAYAAABAAAAAAQAAAGkAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAABEAAAATAAAAAAAAApMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAYAAABfc3RhcnQAAAQAAABuYW1lAAAAAAAAAAAAAAYACAAGAAYAAAAAAAMABgAAAF9zdGFydAAAAAAAAP////+4AAAAFAAAAAAAAAAMABYAFAATAAwABAAMAAAAIAAAAAAAAAAUAAAAAAAAAwMACgAYAAwACAAEAAoAAAAUAAAAWAAAAAIAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAAAAAAAIAAAACAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAF/ZY5mZUPQVX9ljmZlQ9BUAAAAAAAAAAAIAAAAAAAAAEAAAAAwAFAASAAwACAAEAAwAAAAQAAAALAAAADgAAAAAAAMAAQAAAPABAAAAAAAAwAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAKAAwAAAAIAAQACgAAAAgAAAB4AAAAAwAAAFAAAAAoAAAABAAAALT+//8IAAAADAAAAAAAAAAAAAAABQAAAHJlZklkAAAA1P7//wgAAAAQAAAABAAAAHRlc3QAAAAABAAAAG5hbWUAAAAA+P7//wgAAAAMAAAAAgAAAHt9AAAEAAAAbWV0YQAAAAACAAAAxAAAABgAAAAAABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAAdAAAAHwAAAAAAAIBfAAAAAIAAAAoAAAABAAAAFz///8IAAAADAAAAAEAAABpAAAABAAAAG5hbWUAAAAAfP///wgAAAAkAAAAGAAAAHsiYSI6IjAiLCJiIjoiYWRzZmFzZGYifQAAAAAGAAAAbGFiZWxzAAAAAAAAAAAGAAgABAAGAAAAQAAAAAEAAABpABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAGAAAAX3N0YXJ0AAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAYAAABfc3RhcnQAAAgCAABBUlJPVzE= +FRAME=QVJST1cxAAD/////wAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAADQ/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAPD+//8IAAAAEAAAAAQAAAB0ZXN0AAAAAAQAAABuYW1lAAAAAAIAAADIAAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAAB0AAAAfAAAAAAAAgGAAAAAAgAAACgAAAAEAAAAWP///wgAAAAMAAAAAQAAAGkAAAAEAAAAbmFtZQAAAAB4////CAAAACQAAAAYAAAAeyJhIjoiMSIsImIiOiJhZHNmYXNkZiJ9AAAAAAYAAABsYWJlbHMAAAAAAAAIAAwACAAHAAgAAAAAAAABQAAAAAEAAABpABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAEAAAAVGltZQAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAABUaW1lAAAAAAAAAAD/////uAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAACAAAAAAAAAAFAAAAAAAAAMDAAoAGAAMAAgABAAKAAAAFAAAAFgAAAACAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAAAAAACAAAAAgAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAACRnfi9q3j0FUR3uluTnvQVBAAAAAAAAAD//////////xAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA4AAAAAAADAAEAAADQAQAAAAAAAMAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAACgAMAAAACAAEAAoAAAAIAAAAVAAAAAIAAAAoAAAABAAAAND+//8IAAAADAAAAAAAAAAAAAAABQAAAHJlZklkAAAA8P7//wgAAAAQAAAABAAAAHRlc3QAAAAABAAAAG5hbWUAAAAAAgAAAMgAAAAYAAAAAAASABgAFAATABIADAAAAAgABAASAAAAFAAAAHQAAAB8AAAAAAACAYAAAAACAAAAKAAAAAQAAABY////CAAAAAwAAAABAAAAaQAAAAQAAABuYW1lAAAAAHj///8IAAAAJAAAABgAAAB7ImEiOiIxIiwiYiI6ImFkc2Zhc2RmIn0AAAAABgAAAGxhYmVscwAAAAAAAAgADAAIAAcACAAAAAAAAAFAAAAAAQAAAGkAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAABEAAAATAAAAAAAAApMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAQAAABUaW1lAAAAAAQAAABuYW1lAAAAAAAAAAAAAAYACAAGAAYAAAAAAAMABAAAAFRpbWUAAAAA6AEAAEFSUk9XMQ== +FRAME=QVJST1cxAAD/////sAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAADc/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAPz+//8IAAAAEAAAAAQAAAB0ZXN0AAAAAAQAAABuYW1lAAAAAAIAAAC8AAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAAB0AAAAeAAAAAAABgF0AAAAAgAAACgAAAAEAAAAZP///wgAAAAMAAAAAQAAAGYAAAAEAAAAbmFtZQAAAACE////CAAAACQAAAAYAAAAeyJhIjoiMCIsImIiOiJhZHNmYXNkZiJ9AAAAAAYAAABsYWJlbHMAAAAAAAAEAAQABAAAAAEAAABmABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAEAAAAVGltZQAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAABUaW1lAAAAAP////+4AAAAFAAAAAAAAAAMABYAFAATAAwABAAMAAAAGAAAAAAAAAAUAAAAAAAAAwMACgAYAAwACAAEAAoAAAAUAAAAWAAAAAIAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAgAAAAAAAAAAAAAAAIAAAACAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAJBpe06TnvQVVoTQYpOe9BUCAAAAAAAAABAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA8AAAAAAADAAEAAADAAQAAAAAAAMAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAADc/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAPz+//8IAAAAEAAAAAQAAAB0ZXN0AAAAAAQAAABuYW1lAAAAAAIAAAC8AAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAAB0AAAAeAAAAAAABgF0AAAAAgAAACgAAAAEAAAAZP///wgAAAAMAAAAAQAAAGYAAAAEAAAAbmFtZQAAAACE////CAAAACQAAAAYAAAAeyJhIjoiMCIsImIiOiJhZHNmYXNkZiJ9AAAAAAYAAABsYWJlbHMAAAAAAAAEAAQABAAAAAEAAABmABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAEAAAAVGltZQAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAABUaW1lAAAAAOABAABBUlJPVzE= +FRAME=QVJST1cxAAD/////uAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAADU/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAPT+//8IAAAAEAAAAAQAAAB0ZXN0AAAAAAQAAABuYW1lAAAAAAIAAADEAAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAAB0AAAAfAAAAAAAAgF8AAAAAgAAACgAAAAEAAAAXP///wgAAAAMAAAAAQAAAGkAAAAEAAAAbmFtZQAAAAB8////CAAAACQAAAAYAAAAeyJhIjoiMCIsImIiOiJhZHNmYXNkZiJ9AAAAAAYAAABsYWJlbHMAAAAAAAAAAAYACAAEAAYAAABAAAAAAQAAAGkAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAABEAAAATAAAAAAAAApMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAYAAABfc3RhcnQAAAQAAABuYW1lAAAAAAAAAAAAAAYACAAGAAYAAAAAAAMABgAAAF9zdGFydAAA/////7gAAAAUAAAAAAAAAAwAFgAUABMADAAEAAwAAAAgAAAAAAAAABQAAAAAAAADAwAKABgADAAIAAQACgAAABQAAABYAAAAAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAAAAAAAgAAAAIAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAX9ljmZlQ9BVf2WOZmVD0FQAAAAAAAAAAAgAAAAAAAAAQAAAADAAUABIADAAIAAQADAAAABAAAAAsAAAAPAAAAAAAAwABAAAAyAEAAAAAAADAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAwAAAAIAAQACgAAAAgAAABUAAAAAgAAACgAAAAEAAAA1P7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAAD0/v//CAAAABAAAAAEAAAAdGVzdAAAAAAEAAAAbmFtZQAAAAACAAAAxAAAABgAAAAAABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAAdAAAAHwAAAAAAAIBfAAAAAIAAAAoAAAABAAAAFz///8IAAAADAAAAAEAAABpAAAABAAAAG5hbWUAAAAAfP///wgAAAAkAAAAGAAAAHsiYSI6IjAiLCJiIjoiYWRzZmFzZGYifQAAAAAGAAAAbGFiZWxzAAAAAAAAAAAGAAgABAAGAAAAQAAAAAEAAABpABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAGAAAAX3N0YXJ0AAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAYAAABfc3RhcnQAAOgBAABBUlJPVzE= diff --git a/pkg/tsdb/influxdb/flux/testdata/renamed.golden.txt b/pkg/tsdb/influxdb/flux/testdata/renamed.golden.txt index 90767b675c3..dc73b1d22be 100644 --- a/pkg/tsdb/influxdb/flux/testdata/renamed.golden.txt +++ b/pkg/tsdb/influxdb/flux/testdata/renamed.golden.txt @@ -2,24 +2,24 @@ Frame[0] {} Name: -Dimensions: 4 Fields by 20 Rows -+-----------------+----------------+---------------------+-------------------------------+ -| Name: result | Name: table | Name: MeanAggregate | Name: time | -| Labels: | Labels: | Labels: | Labels: | -| Type: []*string | Type: []*int64 | Type: []*float64 | Type: []*time.Time | -+-----------------+----------------+---------------------+-------------------------------+ -| _result | 0 | 0 | 2020-07-14 03:26:31 +0000 UTC | -| _result | 0 | 0 | 2020-07-14 03:26:32 +0000 UTC | -| _result | 0 | 0 | 2020-07-14 03:26:35 +0000 UTC | -| _result | 0 | 0 | 2020-07-14 03:29:33 +0000 UTC | -| _result | 0 | 29.38586956521739 | 2020-07-14 04:59:41 +0000 UTC | -| _result | 0 | 0 | 2020-07-14 05:04:24 +0000 UTC | -| _result | 0 | 7.306756756756757 | 2020-07-14 05:04:25 +0000 UTC | -| _result | 0 | 3.633736559139785 | 2020-07-14 05:04:26 +0000 UTC | -| _result | 0 | 3.6143048128342246 | 2020-07-14 05:04:27 +0000 UTC | -| ... | ... | ... | ... | -+-----------------+----------------+---------------------+-------------------------------+ +Dimensions: 2 Fields by 20 Rows ++---------------------+-------------------------------+ +| Name: MeanAggregate | Name: time | +| Labels: | Labels: | +| Type: []*float64 | Type: []*time.Time | ++---------------------+-------------------------------+ +| 0 | 2020-07-14 03:26:31 +0000 UTC | +| 0 | 2020-07-14 03:26:32 +0000 UTC | +| 0 | 2020-07-14 03:26:35 +0000 UTC | +| 0 | 2020-07-14 03:29:33 +0000 UTC | +| 29.38586956521739 | 2020-07-14 04:59:41 +0000 UTC | +| 0 | 2020-07-14 05:04:24 +0000 UTC | +| 7.306756756756757 | 2020-07-14 05:04:25 +0000 UTC | +| 3.633736559139785 | 2020-07-14 05:04:26 +0000 UTC | +| 3.6143048128342246 | 2020-07-14 05:04:27 +0000 UTC | +| ... | ... | ++---------------------+-------------------------------+ ====== TEST DATA RESPONSE (arrow base64) ====== -FRAME=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 +FRAME=QVJST1cxAAD/////mAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHQAAAADAAAATAAAACgAAAAEAAAACP///wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAAAo////CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAEj///8IAAAADAAAAAIAAAB7fQAABAAAAG1ldGEAAAAAAgAAAHQAAAAEAAAApv///xQAAAA8AAAAPAAAAAAACgE8AAAAAQAAAAQAAACU////CAAAABAAAAAEAAAAdGltZQAAAAAEAAAAbmFtZQAAAAAAAAAAgv///wAAAwAEAAAAdGltZQAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAABMAAAAVAAAAAAAAwFUAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAGAAAAA0AAABNZWFuQWdncmVnYXRlAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAgANAAAATWVhbkFnZ3JlZ2F0ZQAAAP////+4AAAAFAAAAAAAAAAMABYAFAATAAwABAAMAAAAQAEAAAAAAAAUAAAAAAAAAwMACgAYAAwACAAEAAoAAAAUAAAAWAAAABQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAAAAKAAAAAAAAAAAAAAAAAAAACgAAAAAAAAAKAAAAAAAAAAAAAAAAIAAAAUAAAAAAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZCELWchiPUAAAAAAAAAAAKJjeHEeOh1AkkceeeQRDUDqL0ekGOoMQGJyBTG5wgxAo45I0zgcAEDE63zmvjsiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADXjY+JHhX4P2V5GaRjLQBANIHOXb0oAEAARt5ppYAhFgAQeaWlgCEWAG5JWKaAIRYA4unJz4AhFgAi1e+6hSEWAHDy0/yFIRYAOo0P/YUhFgAEKEv9hSEWAM7Chv2FIRYAmF3C/YUhFgDabh/iliEWANh9PsqbIRYA9r4Y/5shFgDAWVT/myEWAIr0j/+bIRYAVI/L/5shFgAeKgcAnCEWAOjEQgCcIRYAsl9+AJwhFgB8+rkAnCEWEAAAAAwAFAASAAwACAAEAAwAAAAQAAAALAAAADwAAAAAAAMAAQAAAKgBAAAAAAAAwAAAAAAAAABAAQAAAAAAAAAAAAAAAAAAAAAAAAAACgAMAAAACAAEAAoAAAAIAAAAdAAAAAMAAABMAAAAKAAAAAQAAAAI////CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAACj///8IAAAADAAAAAAAAAAAAAAABAAAAG5hbWUAAAAASP///wgAAAAMAAAAAgAAAHt9AAAEAAAAbWV0YQAAAAACAAAAdAAAAAQAAACm////FAAAADwAAAA8AAAAAAAKATwAAAABAAAABAAAAJT///8IAAAAEAAAAAQAAAB0aW1lAAAAAAQAAABuYW1lAAAAAAAAAACC////AAADAAQAAAB0aW1lAAASABgAFAATABIADAAAAAgABAASAAAAFAAAAEwAAABUAAAAAAADAVQAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAYAAAADQAAAE1lYW5BZ2dyZWdhdGUAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAACAA0AAABNZWFuQWdncmVnYXRlAAAAyAEAAEFSUk9XMQ==