diff --git a/pkg/tsdb/influxdb/flux/builder.go b/pkg/tsdb/influxdb/flux/builder.go index 17dacd6c0d1..c9cd1caa136 100644 --- a/pkg/tsdb/influxdb/flux/builder.go +++ b/pkg/tsdb/influxdb/flux/builder.go @@ -24,8 +24,10 @@ const ( ) type columnInfo struct { - name string - converter *data.FieldConverter + name string + converter *data.FieldConverter + shouldGetLabels bool + isTheSingleValue bool } // frameBuilder is an interface to help testing. @@ -34,19 +36,40 @@ type frameBuilder struct { groupKeyColumnNames []string active *data.Frame frames []*data.Frame - value *data.FieldConverter columns []columnInfo labels []string maxPoints int // max points in a series maxSeries int // max number of series totalSeries int - isTimeSeries bool - timeColumn string // sometimes it is not `_time` - timeDisplay string + hasUsualStartStop bool // has _start and _stop timestamp-labels } -func isTag(schk string) bool { - return (schk != "result" && schk != "table" && schk[0] != '_') +// some csv-columns contain metadata about the data, like what is part of a "table", +// we skip these +func isDataColumn(col *query.FluxColumn) bool { + index := col.Index() + name := col.Name() + dataType := col.DataType() + if index == 0 && name == "result" && dataType == stringDatatype { + return false + } + if index == 1 && name == "table" && dataType == longDatatype { + return false + } + + return true +} + +func getDataColumns(cols []*query.FluxColumn) []*query.FluxColumn { + var dataCols []*query.FluxColumn + + for _, col := range cols { + if isDataColumn(col) { + dataCols = append(dataCols, col) + } + } + + return dataCols } var timeToOptionalTime = data.FieldConverter{ @@ -90,96 +113,113 @@ func getConverter(t string) (*data.FieldConverter, error) { return nil, fmt.Errorf("no matching converter found for [%v]", t) } -// Init initializes the frame to be returned -// fields points at entries in the frame, and provides easier access -// names indexes the columns encountered -func (fb *frameBuilder) Init(metadata *query.FluxTableMetadata) error { - columns := metadata.Columns() - fb.frames = make([]*data.Frame, 0) - fb.currentGroupKey = nil - fb.value = nil - fb.columns = make([]columnInfo, 0) - fb.isTimeSeries = false - fb.timeColumn = "" - fb.groupKeyColumnNames = make([]string, 0) - - for _, col := range columns { +func getGroupColumnNames(cols []*query.FluxColumn) []string { + var colNames []string + for _, col := range cols { if col.IsGroup() { - fb.groupKeyColumnNames = append(fb.groupKeyColumnNames, col.Name()) + colNames = append(colNames, col.Name()) } } - for _, col := range columns { - switch { - case col.Name() == "_value": - if fb.value != nil { - return fmt.Errorf("multiple values found") + return colNames +} + +func isTimestampType(dataType string) bool { + return (dataType == timeDatatypeRFC) || (dataType == timeDatatypeRFCNano) +} + +func hasUsualStartStop(dataCols []*query.FluxColumn) bool { + starts := 0 + stops := 0 + + for _, col := range dataCols { + if col.IsGroup() && isTimestampType(col.DataType()) { + name := col.Name() + if name == "_start" { + starts += 1 } - converter, err := getConverter(col.DataType()) + if name == "_stop" { + stops += 1 + } + } + } + + return (starts == 1) && (stops == 1) +} + +func (fb *frameBuilder) Init(metadata *query.FluxTableMetadata) error { + columns := metadata.Columns() + // FIXME: the following line should very probably simply be + // `fb.frames = nil`, but in executor.go there is an explicit + // check to make sure it is not `nil`, so that check should be + // removed too, and double-checked if everything is ok. + fb.frames = make([]*data.Frame, 0) + fb.currentGroupKey = nil + fb.columns = nil + fb.labels = nil + fb.groupKeyColumnNames = getGroupColumnNames(columns) + fb.active = nil + fb.hasUsualStartStop = false + + var timestampCols []*columnInfo + var nonTimestampCols []*columnInfo + + dataColumns := getDataColumns(columns) + fb.hasUsualStartStop = hasUsualStartStop(dataColumns) + + // first we store the column-info structures as pointers, + // because we need to modify some items in the list + var columnInfos []*columnInfo + + for _, col := range dataColumns { + if col.IsGroup() { + fb.labels = append(fb.labels, col.Name()) + } else { + dataType := col.DataType() + name := col.Name() + isTimestamp := isTimestampType(dataType) + + converter, err := getConverter(dataType) if err != nil { return err } - fb.value = converter - fb.isTimeSeries = true - case isTag(col.Name()): - fb.labels = append(fb.labels, col.Name()) - } - } + info := &columnInfo{ + name: name, + converter: converter, + shouldGetLabels: true, // we default to get-labels + isTheSingleValue: false, + } - // Timeseries has a "_value" and a time - if fb.isTimeSeries { - col := getTimeSeriesTimeColumn(columns) - if col != nil { - fb.timeColumn = col.Name() - fb.timeDisplay = "Time" - if fb.timeColumn != "_time" { - fb.timeDisplay = col.Name() + columnInfos = append(columnInfos, info) + + if isTimestamp { + timestampCols = append(timestampCols, info) + } else { + nonTimestampCols = append(nonTimestampCols, info) } - return nil } } - // reset any timeseries properties - fb.value = nil - fb.isTimeSeries = false - 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 - } - - fb.columns = append(fb.columns, columnInfo{ - name: col.Name(), - converter: converter, - }) - } - return nil -} - -func getTimeSeriesTimeColumn(columns []*query.FluxColumn) *query.FluxColumn { - // First look for '_time' column - for _, col := range columns { - if col.Name() == "_time" && col.DataType() == timeDatatypeRFC || col.DataType() == timeDatatypeRFCNano { - return col - } + hasSimpleTimeCol := false + if (len(timestampCols) == 1) && (timestampCols[0].name == "_time") { + // there is only one timestamp-data-column, and has the correct name. + // based on this info, we decide that this is "the" timestamp-column. + // as such it gets no label + timestampCols[0].shouldGetLabels = false + hasSimpleTimeCol = true } - // Then any time column - for _, col := range columns { - if col.DataType() == timeDatatypeRFC || col.DataType() == timeDatatypeRFCNano { - return col - } + if hasSimpleTimeCol && (len(nonTimestampCols) == 1) && (nonTimestampCols[0].name == "_value") { + // there is a simple timestamp column, and there is a single non-timestamp value column + // named "_value". we decide that this is "the" value-column. + nonTimestampCols[0].isTheSingleValue = true } + + for _, colInfo := range columnInfos { + fb.columns = append(fb.columns, *colInfo) + } + return nil } @@ -229,11 +269,6 @@ func isTableIDEqual(id1 []interface{}, id2 []interface{}) bool { return true } -// Append appends a single entry from an influxdb2 record to a data frame -// Values are appended to _value -// Tags are appended as labels -// _measurement holds the dataframe name -// _field holds the field name. func (fb *frameBuilder) Append(record *query.FluxRecord) error { table := getTableID(record, fb.groupKeyColumnNames) if (fb.currentGroupKey == nil) || !isTableIDEqual(table, fb.currentGroupKey) { @@ -242,70 +277,69 @@ func (fb *frameBuilder) Append(record *query.FluxRecord) error { return fmt.Errorf("results are truncated, max series reached (%d)", fb.maxSeries) } - if fb.isTimeSeries { - frameName, ok := record.ValueByKey("_measurement").(string) - if !ok { - frameName = "" // empty frame name + // labels have the same value for every row in the same "table", + // so we collect them here + labels := make(map[string]string) + for _, name := range fb.labels { + val := record.ValueByKey(name) + str := fmt.Sprintf("%v", val) + if val != nil && str != "" { + labels[name] = str } + } - fb.active = data.NewFrame( - frameName, - data.NewFieldFromFieldType(data.FieldTypeTime, 0), - data.NewFieldFromFieldType(fb.value.OutputFieldType, 0), - ) + // we will try to use the _measurement label as the frame-name. + // if it works, we remove _measurement from the labels. + frameName := "" + measurementLabel := labels["_measurement"] + if measurementLabel != "" { + frameName = measurementLabel + delete(labels, "_measurement") + } - fb.active.Fields[0].Name = fb.timeDisplay - name, ok := record.ValueByKey("_field").(string) - if ok { - fb.active.Fields[1].Name = name - } + fields := make([]*data.Field, len(fb.columns)) + for idx, col := range fb.columns { + fields[idx] = data.NewFieldFromFieldType(col.converter.OutputFieldType, 0) + fields[idx].Name = col.name - // set the labels - labels := make(map[string]string) - for _, name := range fb.labels { - val := record.ValueByKey(name) - str := fmt.Sprintf("%v", val) - if val != nil && str != "" { - labels[name] = str + if col.isTheSingleValue { + fieldLabel := labels["_field"] + if fieldLabel != "" { + fields[idx].Name = fieldLabel + delete(labels, "_field") + } + + // when the data-structure is "simple" + // (meaning simple-time and simple-value), + // we remove the "_start" and "_stop" + // labels if they are the usual type, + // because they are usually not wanted, + // because they are the start and stop + // of the time-interval. + + if fb.hasUsualStartStop { + delete(labels, "_start") + delete(labels, "_stop") } } - fb.active.Fields[1].Labels = labels - } else { - fields := make([]*data.Field, len(fb.columns)) - for idx, col := range fb.columns { - fields[idx] = data.NewFieldFromFieldType(col.converter.OutputFieldType, 0) - fields[idx].Name = col.name + + if col.shouldGetLabels { + fields[idx].Labels = labels } - fb.active = data.NewFrame("", fields...) } + fb.active = data.NewFrame(frameName, fields...) fb.frames = append(fb.frames, fb.active) fb.currentGroupKey = table } - if fb.isTimeSeries { - time, ok := record.ValueByKey(fb.timeColumn).(time.Time) - if !ok { - return fmt.Errorf("unable to get time colum: %q", fb.timeColumn) - } - - val, err := fb.value.Converter(record.Value()) + for idx, col := range fb.columns { + val, err := col.converter.Converter(record.ValueByKey(col.name)) if err != nil { return err } - fb.active.Fields[0].Append(time) - fb.active.Fields[1].Append(val) - } else { - // Table view - for idx, col := range fb.columns { - val, err := col.converter.Converter(record.ValueByKey(col.name)) - if err != nil { - return err - } - - fb.active.Fields[idx].Append(val) - } + fb.active.Fields[idx].Append(val) } pointsCount := fb.active.Fields[0].Len() diff --git a/pkg/tsdb/influxdb/flux/builder_test.go b/pkg/tsdb/influxdb/flux/builder_test.go deleted file mode 100644 index 1b517db1fee..00000000000 --- a/pkg/tsdb/influxdb/flux/builder_test.go +++ /dev/null @@ -1,25 +0,0 @@ -package flux - -import ( - "testing" -) - -func TestColumnIdentification(t *testing.T) { - t.Run("Test Tag Identification", func(t *testing.T) { - tagNames := []string{"header", "value", "tag"} - for _, item := range tagNames { - if !isTag(item) { - t.Fatal("Tag", item, "Expected tag, but got false") - } - } - }) - - t.Run("Test Special Case Tag Identification", func(t *testing.T) { - notTagNames := []string{"table", "result"} - for _, item := range notTagNames { - if isTag(item) { - t.Fatal("Special tag", item, "Expected NOT a tag, but got true") - } - } - }) -} diff --git a/pkg/tsdb/influxdb/flux/executor_test.go b/pkg/tsdb/influxdb/flux/executor_test.go index 7cfc8bd20a2..332e5dc6143 100644 --- a/pkg/tsdb/influxdb/flux/executor_test.go +++ b/pkg/tsdb/influxdb/flux/executor_test.go @@ -83,7 +83,7 @@ func TestExecuteSimple(t *testing.T) { require.Len(t, dr.Frames, 1) require.Contains(t, dr.Frames[0].Name, "test") require.Len(t, dr.Frames[0].Fields[1].Labels, 2) - require.Equal(t, "Time", dr.Frames[0].Fields[0].Name) + require.Equal(t, "_time", dr.Frames[0].Fields[0].Name) st, err := dr.Frames[0].StringTable(-1, -1) require.NoError(t, err) @@ -101,7 +101,7 @@ func TestExecuteMultiple(t *testing.T) { require.Len(t, dr.Frames, 3) require.Contains(t, dr.Frames[0].Name, "test") require.Len(t, dr.Frames[0].Fields[1].Labels, 2) - require.Equal(t, "Time", dr.Frames[0].Fields[0].Name) + require.Equal(t, "_time", dr.Frames[0].Fields[0].Name) st, err := dr.Frames[0].StringTable(-1, -1) require.NoError(t, err) @@ -118,8 +118,8 @@ func TestExecuteGrouping(t *testing.T) { dr := verifyGoldenResponse(t, "grouping") require.Len(t, dr.Frames, 3) require.Contains(t, dr.Frames[0].Name, "system") - require.Len(t, dr.Frames[0].Fields[1].Labels, 1) - require.Equal(t, "Time", dr.Frames[0].Fields[0].Name) + require.Len(t, dr.Frames[0].Fields[0].Labels, 1) + require.Equal(t, "_time", dr.Frames[0].Fields[1].Name) st, err := dr.Frames[0].StringTable(-1, -1) require.NoError(t, err) @@ -138,9 +138,9 @@ func TestAggregateGrouping(t *testing.T) { // `Name: // Dimensions: 2 Fields by 3 Rows // +-------------------------------+--------------------------+ - // | Name: Time | Name: | + // | Name: _time | Name: _value | // | Labels: | Labels: host=hostname.ru | - // | Type: []time.Time | Type: []*float64 | + // | Type: []*time.Time | Type: []*float64 | // +-------------------------------+--------------------------+ // | 2020-06-05 12:06:00 +0000 UTC | 8.291 | // | 2020-06-05 12:07:00 +0000 UTC | 0.534 | @@ -148,13 +148,13 @@ func TestAggregateGrouping(t *testing.T) { // +-------------------------------+--------------------------+ // ` + t1 := time.Date(2020, 6, 5, 12, 6, 0, 0, time.UTC) + t2 := time.Date(2020, 6, 5, 12, 7, 0, 0, time.UTC) + t3 := time.Date(2020, 6, 5, 12, 8, 0, 0, time.UTC) + expectedFrame := data.NewFrame("", - data.NewField("Time", nil, []time.Time{ - time.Date(2020, 6, 5, 12, 6, 0, 0, time.UTC), - time.Date(2020, 6, 5, 12, 7, 0, 0, time.UTC), - time.Date(2020, 6, 5, 12, 8, 0, 0, time.UTC), - }), - data.NewField("", map[string]string{"host": "hostname.ru"}, []*float64{ + data.NewField("_time", nil, []*time.Time{&t1, &t2, &t3}), + data.NewField("_value", map[string]string{"host": "hostname.ru"}, []*float64{ pointer.Float64(8.291), pointer.Float64(0.534), pointer.Float64(0.667), @@ -174,20 +174,22 @@ func TestNonStandardTimeColumn(t *testing.T) { require.NoError(t, err) fmt.Println(str) - // Dimensions: 2 Fields by 1 Rows - // +-----------------------------------------+------------------+ - // | Name: _start_water | Name: | - // | Labels: | Labels: st=1 | - // | Type: []time.Time | Type: []*float64 | - // +-----------------------------------------+------------------+ - // | 2020-06-28 17:50:13.012584046 +0000 UTC | 156.304 | - // +-----------------------------------------+------------------+ + // Dimensions: 3 Fields by 1 Rows + // +-----------------------------------------+-----------------------------------------+------------------+ + // | Name: _start_water | Name: _stop_water | Name: _value | + // | Labels: st=1 | Labels: st=1 | Labels: st=1 | + // | Type: []*time.Time | Type: []*time.Time | Type: []*float64 | + // +-----------------------------------------+-----------------------------------------+------------------+ + // | 2020-06-28 17:50:13.012584046 +0000 UTC | 2020-06-29 17:50:13.012584046 +0000 UTC | 156.304 | + // +-----------------------------------------+-----------------------------------------+------------------+ + + t1 := time.Date(2020, 6, 28, 17, 50, 13, 12584046, time.UTC) + t2 := time.Date(2020, 6, 29, 17, 50, 13, 12584046, time.UTC) expectedFrame := data.NewFrame("", - data.NewField("_start_water", nil, []time.Time{ - time.Date(2020, 6, 28, 17, 50, 13, 12584046, time.UTC), - }), - data.NewField("", map[string]string{"st": "1"}, []*float64{ + data.NewField("_start_water", map[string]string{"st": "1"}, []*time.Time{&t1}), + data.NewField("_stop_water", map[string]string{"st": "1"}, []*time.Time{&t2}), + data.NewField("_value", map[string]string{"st": "1"}, []*float64{ pointer.Float64(156.304), }), ) @@ -265,3 +267,35 @@ func TestMaxDataPointsExceededWithAggregate(t *testing.T) { require.EqualError(t, dr.Error, "A query returned too many datapoints and the results have been truncated at 21 points to prevent memory issues. At the current graph size, Grafana can only draw 2.") assertDataResponseDimensions(t, dr, 2, 21) } + +func TestMultivalue(t *testing.T) { + // we await a non-labeled _time column + // and two value-columns named _value and _value2 + dr := verifyGoldenResponse(t, "multivalue") + require.Len(t, dr.Frames, 4) + frame := dr.Frames[0] + require.Len(t, frame.Fields, 3) + require.Equal(t, frame.Fields[0].Name, "_time") + require.Equal(t, frame.Fields[0].Len(), 2) + require.Len(t, frame.Fields[0].Labels, 0) + require.Equal(t, frame.Fields[1].Name, "_value") + require.Len(t, frame.Fields[1].Labels, 5) + require.Equal(t, frame.Fields[2].Name, "_value2") + require.Len(t, frame.Fields[2].Labels, 5) +} + +func TestMultiTime(t *testing.T) { + // we await three columns, _time, _time2, _value + // all have all labels + dr := verifyGoldenResponse(t, "multitime") + require.Len(t, dr.Frames, 4) + frame := dr.Frames[0] + require.Len(t, frame.Fields, 3) + require.Equal(t, frame.Fields[0].Name, "_time") + require.Equal(t, frame.Fields[0].Len(), 1) + require.Len(t, frame.Fields[0].Labels, 5) + require.Equal(t, frame.Fields[1].Name, "_time2") + require.Len(t, frame.Fields[1].Labels, 5) + require.Equal(t, frame.Fields[2].Name, "_value") + require.Len(t, frame.Fields[2].Labels, 5) +} diff --git a/pkg/tsdb/influxdb/flux/testdata/aggregate.golden.txt b/pkg/tsdb/influxdb/flux/testdata/aggregate.golden.txt index 04233b39796..1309036719a 100644 --- a/pkg/tsdb/influxdb/flux/testdata/aggregate.golden.txt +++ b/pkg/tsdb/influxdb/flux/testdata/aggregate.golden.txt @@ -4,9 +4,9 @@ Frame[0] {} Name: Dimensions: 2 Fields by 3 Rows +-------------------------------+--------------------------+ -| Name: Time | Name: | +| Name: _time | Name: _value | | Labels: | Labels: host=hostname.ru | -| Type: []time.Time | Type: []*float64 | +| Type: []*time.Time | Type: []*float64 | +-------------------------------+--------------------------+ | 2020-06-05 12:06:00 +0000 UTC | 8.291 | | 2020-06-05 12:07:00 +0000 UTC | 0.534 | @@ -15,4 +15,4 @@ Dimensions: 2 Fields by 3 Rows ====== TEST DATA RESPONSE (arrow base64) ====== -FRAME=QVJST1cxAAD/////0AEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHQAAAADAAAATAAAACgAAAAEAAAAxP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADk/v//CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAAT///8IAAAADAAAAAIAAAB7fQAABAAAAG1ldGEAAAAAAgAAALgAAAAYAAAAAAASABgAFAATABIADAAAAAgABAASAAAAFAAAAHAAAABwAAAAAAADAXAAAAACAAAAKAAAAAQAAABo////CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAIj///8IAAAAIAAAABYAAAB7Imhvc3QiOiJob3N0bmFtZS5ydSJ9AAAGAAAAbGFiZWxzAAAAAAAAjv///wAAAgAAAAAAAAASABgAFAAAABMADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAACkwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABAAAAFRpbWUAAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAEAAAAVGltZQAAAAAAAAAA/////7gAAAAUAAAAAAAAAAwAFgAUABMADAAEAAwAAAAwAAAAAAAAABQAAAAAAAADAwAKABgADAAIAAQACgAAABQAAABYAAAAAwAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAGAAAAAAAAAAAAAAAAgAAAAMAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAJABYFykFRYA6EhYaqQVFgBAkFB4pBUWokW28/2UIEBKDAIrhxbhP/LSTWIQWOU/EAAAAAwAFAASAAwACAAEAAwAAAAQAAAALAAAADgAAAAAAAMAAQAAAOABAAAAAAAAwAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAKAAwAAAAIAAQACgAAAAgAAAB0AAAAAwAAAEwAAAAoAAAABAAAAMT+//8IAAAADAAAAAAAAAAAAAAABQAAAHJlZklkAAAA5P7//wgAAAAMAAAAAAAAAAAAAAAEAAAAbmFtZQAAAAAE////CAAAAAwAAAACAAAAe30AAAQAAABtZXRhAAAAAAIAAAC4AAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAABwAAAAcAAAAAAAAwFwAAAAAgAAACgAAAAEAAAAaP///wgAAAAMAAAAAAAAAAAAAAAEAAAAbmFtZQAAAACI////CAAAACAAAAAWAAAAeyJob3N0IjoiaG9zdG5hbWUucnUifQAABgAAAGxhYmVscwAAAAAAAI7///8AAAIAAAAAAAAAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAABEAAAATAAAAAAAAApMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAQAAABUaW1lAAAAAAQAAABuYW1lAAAAAAAAAAAAAAYACAAGAAYAAAAAAAMABAAAAFRpbWUAAAAA+AEAAEFSUk9XMQ== +FRAME=QVJST1cxAAD/////yAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHQAAAADAAAATAAAACgAAAAEAAAAzP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADs/v//CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAAz///8IAAAADAAAAAIAAAB7fQAABAAAAG1ldGEAAAAAAgAAALAAAAAEAAAAav///xQAAAB0AAAAdAAAAAAAAwF0AAAAAgAAACwAAAAEAAAAXP///wgAAAAQAAAABgAAAF92YWx1ZQAABAAAAG5hbWUAAAAAgP///wgAAAAgAAAAFgAAAHsiaG9zdCI6Imhvc3RuYW1lLnJ1In0AAAYAAABsYWJlbHMAAAAAAACG////AAACAAYAAABfdmFsdWUAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAABEAAAATAAAAAAACgFMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAUAAABfdGltZQAAAAQAAABuYW1lAAAAAAAAAAAAAAYACAAGAAYAAAAAAAMABQAAAF90aW1lAAAAAAAAAP////+4AAAAFAAAAAAAAAAMABYAFAATAAwABAAMAAAAMAAAAAAAAAAUAAAAAAAAAwMACgAYAAwACAAEAAoAAAAUAAAAWAAAAAMAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAABgAAAAAAAAAAAAAAAIAAAADAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAACQAWBcpBUWAOhIWGqkFRYAQJBQeKQVFqJFtvP9lCBASgwCK4cW4T/y0k1iEFjlPxAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA4AAAAAAADAAEAAADYAQAAAAAAAMAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAACgAMAAAACAAEAAoAAAAIAAAAdAAAAAMAAABMAAAAKAAAAAQAAADM/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAOz+//8IAAAADAAAAAAAAAAAAAAABAAAAG5hbWUAAAAADP///wgAAAAMAAAAAgAAAHt9AAAEAAAAbWV0YQAAAAACAAAAsAAAAAQAAABq////FAAAAHQAAAB0AAAAAAADAXQAAAACAAAALAAAAAQAAABc////CAAAABAAAAAGAAAAX3ZhbHVlAAAEAAAAbmFtZQAAAACA////CAAAACAAAAAWAAAAeyJob3N0IjoiaG9zdG5hbWUucnUifQAABgAAAGxhYmVscwAAAAAAAIb///8AAAIABgAAAF92YWx1ZQAAAAASABgAFAATABIADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAKAUwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABQAAAF90aW1lAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAFAAAAX3RpbWUAAADwAQAAQVJST1cx diff --git a/pkg/tsdb/influxdb/flux/testdata/boolean.csv b/pkg/tsdb/influxdb/flux/testdata/boolean.csv index f56618a28a6..e37eb22955e 100644 --- a/pkg/tsdb/influxdb/flux/testdata/boolean.csv +++ b/pkg/tsdb/influxdb/flux/testdata/boolean.csv @@ -1,4 +1,4 @@ -#group,false,false,false,false,true,true,false,false,false,true +#group,false,false,true,true,true,true,false,false,true,true #datatype,string,long,string,string,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,long,boolean,string #default,_result,,,,,,,,, ,result,table,_field,_measurement,_start,_stop,_time,_value,dead,train diff --git a/pkg/tsdb/influxdb/flux/testdata/boolean.golden.txt b/pkg/tsdb/influxdb/flux/testdata/boolean.golden.txt index be042b4802f..8cee3a1de40 100644 --- a/pkg/tsdb/influxdb/flux/testdata/boolean.golden.txt +++ b/pkg/tsdb/influxdb/flux/testdata/boolean.golden.txt @@ -4,9 +4,9 @@ Frame[0] {} Name: ingress Dimensions: 2 Fields by 1 Rows +-------------------------------+---------------------------------+ -| Name: Time | Name: file_size | +| Name: _time | Name: file_size | | Labels: | Labels: dead=true, train=350117 | -| Type: []time.Time | Type: []*int64 | +| Type: []*time.Time | Type: []*int64 | +-------------------------------+---------------------------------+ | 2020-11-09 17:27:00 +0000 UTC | 3339 | +-------------------------------+---------------------------------+ @@ -17,9 +17,9 @@ Frame[1] Name: ingress Dimensions: 2 Fields by 1 Rows +-------------------------------+---------------------------------+ -| Name: Time | Name: file_size | +| Name: _time | Name: file_size | | Labels: | Labels: dead=true, train=350125 | -| Type: []time.Time | Type: []*int64 | +| Type: []*time.Time | Type: []*int64 | +-------------------------------+---------------------------------+ | 2020-11-10 12:29:00 +0000 UTC | 3666 | +-------------------------------+---------------------------------+ @@ -30,9 +30,9 @@ Frame[2] Name: ingress Dimensions: 2 Fields by 1 Rows +-------------------------------+---------------------------------+ -| Name: Time | Name: file_size | +| Name: _time | Name: file_size | | Labels: | Labels: dead=true, train=350236 | -| Type: []time.Time | Type: []*int64 | +| Type: []*time.Time | Type: []*int64 | +-------------------------------+---------------------------------+ | 2020-11-09 19:01:00 +0000 UTC | 3570 | +-------------------------------+---------------------------------+ @@ -43,16 +43,16 @@ Frame[3] Name: ingress Dimensions: 2 Fields by 1 Rows +-------------------------------+---------------------------------+ -| Name: Time | Name: file_size | +| Name: _time | Name: file_size | | Labels: | Labels: dead=true, train=350410 | -| Type: []time.Time | Type: []*int64 | +| Type: []*time.Time | Type: []*int64 | +-------------------------------+---------------------------------+ | 2020-11-09 07:13:00 +0000 UTC | 2772 | +-------------------------------+---------------------------------+ ====== TEST DATA RESPONSE (arrow base64) ====== -FRAME=QVJST1cxAAD/////+AEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHgAAAADAAAAUAAAACgAAAAEAAAAmP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAAC4/v//CAAAABAAAAAHAAAAaW5ncmVzcwAEAAAAbmFtZQAAAADc/v//CAAAAAwAAAACAAAAe30AAAQAAABtZXRhAAAAAAIAAADgAAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAACEAAAAjAAAAAAAAgGQAAAAAgAAADAAAAAEAAAAQP///wgAAAAUAAAACQAAAGZpbGVfc2l6ZQAAAAQAAABuYW1lAAAAAGj///8IAAAALAAAACAAAAB7ImRlYWQiOiJ0cnVlIiwidHJhaW4iOiIzNTAxMTcifQAAAAAGAAAAbGFiZWxzAAAAAAAACAAMAAgABwAIAAAAAAAAAUAAAAAJAAAAZmlsZV9zaXplABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAEAAAAVGltZQAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAABUaW1lAAAAAP////+4AAAAFAAAAAAAAAAMABYAFAATAAwABAAMAAAAEAAAAAAAAAAUAAAAAAAAAwMACgAYAAwACAAEAAoAAAAUAAAAWAAAAAEAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAAAAAAAAIAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAADo6c795kUWCw0AAAAAAAAQAAAADAAUABIADAAIAAQADAAAABAAAAAsAAAAPAAAAAAAAwABAAAACAIAAAAAAADAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAwAAAAIAAQACgAAAAgAAAB4AAAAAwAAAFAAAAAoAAAABAAAAJj+//8IAAAADAAAAAAAAAAAAAAABQAAAHJlZklkAAAAuP7//wgAAAAQAAAABwAAAGluZ3Jlc3MABAAAAG5hbWUAAAAA3P7//wgAAAAMAAAAAgAAAHt9AAAEAAAAbWV0YQAAAAACAAAA4AAAABgAAAAAABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAAhAAAAIwAAAAAAAIBkAAAAAIAAAAwAAAABAAAAED///8IAAAAFAAAAAkAAABmaWxlX3NpemUAAAAEAAAAbmFtZQAAAABo////CAAAACwAAAAgAAAAeyJkZWFkIjoidHJ1ZSIsInRyYWluIjoiMzUwMTE3In0AAAAABgAAAGxhYmVscwAAAAAAAAgADAAIAAcACAAAAAAAAAFAAAAACQAAAGZpbGVfc2l6ZQASABgAFAAAABMADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAACkwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABAAAAFRpbWUAAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAEAAAAVGltZQAAAAAoAgAAQVJST1cx -FRAME=QVJST1cxAAD/////2AEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAAC4/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAANj+//8IAAAAEAAAAAcAAABpbmdyZXNzAAQAAABuYW1lAAAAAAIAAADgAAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAACEAAAAjAAAAAAAAgGQAAAAAgAAADAAAAAEAAAAQP///wgAAAAUAAAACQAAAGZpbGVfc2l6ZQAAAAQAAABuYW1lAAAAAGj///8IAAAALAAAACAAAAB7ImRlYWQiOiJ0cnVlIiwidHJhaW4iOiIzNTAxMjUifQAAAAAGAAAAbGFiZWxzAAAAAAAACAAMAAgABwAIAAAAAAAAAUAAAAAJAAAAZmlsZV9zaXplABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAEAAAAVGltZQAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAABUaW1lAAAAAAAAAAD/////uAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAABAAAAAAAAAAFAAAAAAAAAMDAAoAGAAMAAgABAAKAAAAFAAAAFgAAAABAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAAAAAACAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAeCxdTyVGFlIOAAAAAAAAEAAAAAwAFAASAAwACAAEAAwAAAAQAAAALAAAADgAAAAAAAMAAQAAAOgBAAAAAAAAwAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAKAAwAAAAIAAQACgAAAAgAAABUAAAAAgAAACgAAAAEAAAAuP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADY/v//CAAAABAAAAAHAAAAaW5ncmVzcwAEAAAAbmFtZQAAAAACAAAA4AAAABgAAAAAABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAAhAAAAIwAAAAAAAIBkAAAAAIAAAAwAAAABAAAAED///8IAAAAFAAAAAkAAABmaWxlX3NpemUAAAAEAAAAbmFtZQAAAABo////CAAAACwAAAAgAAAAeyJkZWFkIjoidHJ1ZSIsInRyYWluIjoiMzUwMTI1In0AAAAABgAAAGxhYmVscwAAAAAAAAgADAAIAAcACAAAAAAAAAFAAAAACQAAAGZpbGVfc2l6ZQASABgAFAAAABMADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAACkwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABAAAAFRpbWUAAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAEAAAAVGltZQAAAAAAAgAAQVJST1cx -FRAME=QVJST1cxAAD/////2AEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAAC4/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAANj+//8IAAAAEAAAAAcAAABpbmdyZXNzAAQAAABuYW1lAAAAAAIAAADgAAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAACEAAAAjAAAAAAAAgGQAAAAAgAAADAAAAAEAAAAQP///wgAAAAUAAAACQAAAGZpbGVfc2l6ZQAAAAQAAABuYW1lAAAAAGj///8IAAAALAAAACAAAAB7ImRlYWQiOiJ0cnVlIiwidHJhaW4iOiIzNTAyMzYifQAAAAAGAAAAbGFiZWxzAAAAAAAACAAMAAgABwAIAAAAAAAAAUAAAAAJAAAAZmlsZV9zaXplABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAEAAAAVGltZQAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAABUaW1lAAAAAAAAAAD/////uAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAABAAAAAAAAAAFAAAAAAAAAMDAAoAGAAMAAgABAAKAAAAFAAAAFgAAAABAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAAAAAACAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAOBz5HuxFFvINAAAAAAAAEAAAAAwAFAASAAwACAAEAAwAAAAQAAAALAAAADgAAAAAAAMAAQAAAOgBAAAAAAAAwAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAKAAwAAAAIAAQACgAAAAgAAABUAAAAAgAAACgAAAAEAAAAuP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADY/v//CAAAABAAAAAHAAAAaW5ncmVzcwAEAAAAbmFtZQAAAAACAAAA4AAAABgAAAAAABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAAhAAAAIwAAAAAAAIBkAAAAAIAAAAwAAAABAAAAED///8IAAAAFAAAAAkAAABmaWxlX3NpemUAAAAEAAAAbmFtZQAAAABo////CAAAACwAAAAgAAAAeyJkZWFkIjoidHJ1ZSIsInRyYWluIjoiMzUwMjM2In0AAAAABgAAAGxhYmVscwAAAAAAAAgADAAIAAcACAAAAAAAAAFAAAAACQAAAGZpbGVfc2l6ZQASABgAFAAAABMADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAACkwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABAAAAFRpbWUAAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAEAAAAVGltZQAAAAAAAgAAQVJST1cx -FRAME=QVJST1cxAAD/////2AEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAAC4/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAANj+//8IAAAAEAAAAAcAAABpbmdyZXNzAAQAAABuYW1lAAAAAAIAAADgAAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAACEAAAAjAAAAAAAAgGQAAAAAgAAADAAAAAEAAAAQP///wgAAAAUAAAACQAAAGZpbGVfc2l6ZQAAAAQAAABuYW1lAAAAAGj///8IAAAALAAAACAAAAB7ImRlYWQiOiJ0cnVlIiwidHJhaW4iOiIzNTA0MTAifQAAAAAGAAAAbGFiZWxzAAAAAAAACAAMAAgABwAIAAAAAAAAAUAAAAAJAAAAZmlsZV9zaXplABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAEAAAAVGltZQAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAABUaW1lAAAAAAAAAAD/////uAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAABAAAAAAAAAAFAAAAAAAAAMDAAoAGAAMAAgABAAKAAAAFAAAAFgAAAABAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAAAAAACAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAA2MxTfMVFFtQKAAAAAAAAEAAAAAwAFAASAAwACAAEAAwAAAAQAAAALAAAADgAAAAAAAMAAQAAAOgBAAAAAAAAwAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAKAAwAAAAIAAQACgAAAAgAAABUAAAAAgAAACgAAAAEAAAAuP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADY/v//CAAAABAAAAAHAAAAaW5ncmVzcwAEAAAAbmFtZQAAAAACAAAA4AAAABgAAAAAABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAAhAAAAIwAAAAAAAIBkAAAAAIAAAAwAAAABAAAAED///8IAAAAFAAAAAkAAABmaWxlX3NpemUAAAAEAAAAbmFtZQAAAABo////CAAAACwAAAAgAAAAeyJkZWFkIjoidHJ1ZSIsInRyYWluIjoiMzUwNDEwIn0AAAAABgAAAGxhYmVscwAAAAAAAAgADAAIAAcACAAAAAAAAAFAAAAACQAAAGZpbGVfc2l6ZQASABgAFAAAABMADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAACkwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABAAAAFRpbWUAAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAEAAAAVGltZQAAAAAAAgAAQVJST1cx +FRAME=QVJST1cxAAD/////6AEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHgAAAADAAAAUAAAACgAAAAEAAAArP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADM/v//CAAAABAAAAAHAAAAaW5ncmVzcwAEAAAAbmFtZQAAAADw/v//CAAAAAwAAAACAAAAe30AAAQAAABtZXRhAAAAAAIAAADMAAAABAAAAE7///8UAAAAhAAAAIwAAAAAAAIBkAAAAAIAAAAwAAAABAAAAED///8IAAAAFAAAAAkAAABmaWxlX3NpemUAAAAEAAAAbmFtZQAAAABo////CAAAACwAAAAgAAAAeyJkZWFkIjoidHJ1ZSIsInRyYWluIjoiMzUwMTE3In0AAAAABgAAAGxhYmVscwAAAAAAAAgADAAIAAcACAAAAAAAAAFAAAAACQAAAGZpbGVfc2l6ZQASABgAFAATABIADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAKAUwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABQAAAF90aW1lAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAFAAAAX3RpbWUAAAAAAAAA/////7gAAAAUAAAAAAAAAAwAFgAUABMADAAEAAwAAAAQAAAAAAAAABQAAAAAAAADAwAKABgADAAIAAQACgAAABQAAABYAAAAAQAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAAAAAAAgAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAOjpzv3mRRYLDQAAAAAAABAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA4AAAAAAADAAEAAAD4AQAAAAAAAMAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAACgAMAAAACAAEAAoAAAAIAAAAeAAAAAMAAABQAAAAKAAAAAQAAACs/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAMz+//8IAAAAEAAAAAcAAABpbmdyZXNzAAQAAABuYW1lAAAAAPD+//8IAAAADAAAAAIAAAB7fQAABAAAAG1ldGEAAAAAAgAAAMwAAAAEAAAATv///xQAAACEAAAAjAAAAAAAAgGQAAAAAgAAADAAAAAEAAAAQP///wgAAAAUAAAACQAAAGZpbGVfc2l6ZQAAAAQAAABuYW1lAAAAAGj///8IAAAALAAAACAAAAB7ImRlYWQiOiJ0cnVlIiwidHJhaW4iOiIzNTAxMTcifQAAAAAGAAAAbGFiZWxzAAAAAAAACAAMAAgABwAIAAAAAAAAAUAAAAAJAAAAZmlsZV9zaXplABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAoBTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAFAAAAX3RpbWUAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAUAAABfdGltZQAAABACAABBUlJPVzE= +FRAME=QVJST1cxAAD/////wAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAADM/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAOz+//8IAAAAEAAAAAcAAABpbmdyZXNzAAQAAABuYW1lAAAAAAIAAADMAAAABAAAAE7///8UAAAAhAAAAIwAAAAAAAIBkAAAAAIAAAAwAAAABAAAAED///8IAAAAFAAAAAkAAABmaWxlX3NpemUAAAAEAAAAbmFtZQAAAABo////CAAAACwAAAAgAAAAeyJkZWFkIjoidHJ1ZSIsInRyYWluIjoiMzUwMTI1In0AAAAABgAAAGxhYmVscwAAAAAAAAgADAAIAAcACAAAAAAAAAFAAAAACQAAAGZpbGVfc2l6ZQASABgAFAATABIADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAKAUwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABQAAAF90aW1lAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAFAAAAX3RpbWUAAAD/////uAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAABAAAAAAAAAAFAAAAAAAAAMDAAoAGAAMAAgABAAKAAAAFAAAAFgAAAABAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAAAAAACAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAeCxdTyVGFlIOAAAAAAAAEAAAAAwAFAASAAwACAAEAAwAAAAQAAAALAAAADwAAAAAAAMAAQAAANABAAAAAAAAwAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAMAAAACAAEAAoAAAAIAAAAVAAAAAIAAAAoAAAABAAAAMz+//8IAAAADAAAAAAAAAAAAAAABQAAAHJlZklkAAAA7P7//wgAAAAQAAAABwAAAGluZ3Jlc3MABAAAAG5hbWUAAAAAAgAAAMwAAAAEAAAATv///xQAAACEAAAAjAAAAAAAAgGQAAAAAgAAADAAAAAEAAAAQP///wgAAAAUAAAACQAAAGZpbGVfc2l6ZQAAAAQAAABuYW1lAAAAAGj///8IAAAALAAAACAAAAB7ImRlYWQiOiJ0cnVlIiwidHJhaW4iOiIzNTAxMjUifQAAAAAGAAAAbGFiZWxzAAAAAAAACAAMAAgABwAIAAAAAAAAAUAAAAAJAAAAZmlsZV9zaXplABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAoBTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAFAAAAX3RpbWUAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAUAAABfdGltZQAAAPABAABBUlJPVzE= +FRAME=QVJST1cxAAD/////wAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAADM/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAOz+//8IAAAAEAAAAAcAAABpbmdyZXNzAAQAAABuYW1lAAAAAAIAAADMAAAABAAAAE7///8UAAAAhAAAAIwAAAAAAAIBkAAAAAIAAAAwAAAABAAAAED///8IAAAAFAAAAAkAAABmaWxlX3NpemUAAAAEAAAAbmFtZQAAAABo////CAAAACwAAAAgAAAAeyJkZWFkIjoidHJ1ZSIsInRyYWluIjoiMzUwMjM2In0AAAAABgAAAGxhYmVscwAAAAAAAAgADAAIAAcACAAAAAAAAAFAAAAACQAAAGZpbGVfc2l6ZQASABgAFAATABIADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAKAUwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABQAAAF90aW1lAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAFAAAAX3RpbWUAAAD/////uAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAABAAAAAAAAAAFAAAAAAAAAMDAAoAGAAMAAgABAAKAAAAFAAAAFgAAAABAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAAAAAACAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAOBz5HuxFFvINAAAAAAAAEAAAAAwAFAASAAwACAAEAAwAAAAQAAAALAAAADwAAAAAAAMAAQAAANABAAAAAAAAwAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAMAAAACAAEAAoAAAAIAAAAVAAAAAIAAAAoAAAABAAAAMz+//8IAAAADAAAAAAAAAAAAAAABQAAAHJlZklkAAAA7P7//wgAAAAQAAAABwAAAGluZ3Jlc3MABAAAAG5hbWUAAAAAAgAAAMwAAAAEAAAATv///xQAAACEAAAAjAAAAAAAAgGQAAAAAgAAADAAAAAEAAAAQP///wgAAAAUAAAACQAAAGZpbGVfc2l6ZQAAAAQAAABuYW1lAAAAAGj///8IAAAALAAAACAAAAB7ImRlYWQiOiJ0cnVlIiwidHJhaW4iOiIzNTAyMzYifQAAAAAGAAAAbGFiZWxzAAAAAAAACAAMAAgABwAIAAAAAAAAAUAAAAAJAAAAZmlsZV9zaXplABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAoBTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAFAAAAX3RpbWUAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAUAAABfdGltZQAAAPABAABBUlJPVzE= +FRAME=QVJST1cxAAD/////wAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAADM/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAOz+//8IAAAAEAAAAAcAAABpbmdyZXNzAAQAAABuYW1lAAAAAAIAAADMAAAABAAAAE7///8UAAAAhAAAAIwAAAAAAAIBkAAAAAIAAAAwAAAABAAAAED///8IAAAAFAAAAAkAAABmaWxlX3NpemUAAAAEAAAAbmFtZQAAAABo////CAAAACwAAAAgAAAAeyJkZWFkIjoidHJ1ZSIsInRyYWluIjoiMzUwNDEwIn0AAAAABgAAAGxhYmVscwAAAAAAAAgADAAIAAcACAAAAAAAAAFAAAAACQAAAGZpbGVfc2l6ZQASABgAFAATABIADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAKAUwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABQAAAF90aW1lAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAFAAAAX3RpbWUAAAD/////uAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAABAAAAAAAAAAFAAAAAAAAAMDAAoAGAAMAAgABAAKAAAAFAAAAFgAAAABAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAAAAAACAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAA2MxTfMVFFtQKAAAAAAAAEAAAAAwAFAASAAwACAAEAAwAAAAQAAAALAAAADwAAAAAAAMAAQAAANABAAAAAAAAwAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAMAAAACAAEAAoAAAAIAAAAVAAAAAIAAAAoAAAABAAAAMz+//8IAAAADAAAAAAAAAAAAAAABQAAAHJlZklkAAAA7P7//wgAAAAQAAAABwAAAGluZ3Jlc3MABAAAAG5hbWUAAAAAAgAAAMwAAAAEAAAATv///xQAAACEAAAAjAAAAAAAAgGQAAAAAgAAADAAAAAEAAAAQP///wgAAAAUAAAACQAAAGZpbGVfc2l6ZQAAAAQAAABuYW1lAAAAAGj///8IAAAALAAAACAAAAB7ImRlYWQiOiJ0cnVlIiwidHJhaW4iOiIzNTA0MTAifQAAAAAGAAAAbGFiZWxzAAAAAAAACAAMAAgABwAIAAAAAAAAAUAAAAAJAAAAZmlsZV9zaXplABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAoBTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAFAAAAX3RpbWUAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAUAAABfdGltZQAAAPABAABBUlJPVzE= diff --git a/pkg/tsdb/influxdb/flux/testdata/buckets.golden.txt b/pkg/tsdb/influxdb/flux/testdata/buckets.golden.txt index 9dead6a4bf5..02061814e10 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: 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 | -+-----------------+------------------+----------------------+-----------------------+-----------------------+ +Dimensions: 4 Fields by 3 Rows ++-----------------------------------------+-----------------------------------------+-----------------------------------------+-----------------------------------------+ +| Name: name | Name: id | Name: retentionPolicy | Name: retentionPeriod | +| Labels: organizationID=059b46a59abab000 | Labels: organizationID=059b46a59abab000 | Labels: organizationID=059b46a59abab000 | Labels: organizationID=059b46a59abab000 | +| Type: []*string | Type: []*string | Type: []*string | Type: []*int64 | ++-----------------------------------------+-----------------------------------------+-----------------------------------------+-----------------------------------------+ +| grafana | 059b46a59abab001 | null | 604800000000000 | +| _tasks | 059b46a59abab002 | null | 259200000000000 | +| _monitoring | 059b46a59abab003 | null | 604800000000000 | ++-----------------------------------------+-----------------------------------------+-----------------------------------------+-----------------------------------------+ ====== TEST DATA RESPONSE (arrow base64) ====== -FRAME=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 +FRAME=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 diff --git a/pkg/tsdb/influxdb/flux/testdata/grouping.golden.txt b/pkg/tsdb/influxdb/flux/testdata/grouping.golden.txt index 55656dc8b2e..c6acab0f7dd 100644 --- a/pkg/tsdb/influxdb/flux/testdata/grouping.golden.txt +++ b/pkg/tsdb/influxdb/flux/testdata/grouping.golden.txt @@ -3,56 +3,56 @@ Frame[0] {} Name: system Dimensions: 2 Fields by 3 Rows -+-----------------------------------------+-----------------------+ -| Name: Time | Name: load1 | -| Labels: | Labels: host=hostname | -| Type: []time.Time | Type: []*float64 | -+-----------------------------------------+-----------------------+ -| 2020-05-05 18:38:50 +0000 UTC | null | -| 2020-05-05 18:39:00 +0000 UTC | 3.56 | -| 2020-05-05 19:38:47.207881833 +0000 UTC | null | -+-----------------------------------------+-----------------------+ ++-----------------------+-----------------------------------------+ +| Name: load1 | Name: _time | +| Labels: host=hostname | Labels: | +| Type: []*float64 | Type: []*time.Time | ++-----------------------+-----------------------------------------+ +| null | 2020-05-05 18:38:50 +0000 UTC | +| 3.56 | 2020-05-05 18:39:00 +0000 UTC | +| null | 2020-05-05 19:38:47.207881833 +0000 UTC | ++-----------------------+-----------------------------------------+ Frame[1] Name: system Dimensions: 2 Fields by 4 Rows -+-----------------------------------------+-----------------------+ -| Name: Time | Name: load15 | -| Labels: | Labels: host=hostname | -| Type: []time.Time | Type: []*float64 | -+-----------------------------------------+-----------------------+ -| 2020-05-05 18:38:50 +0000 UTC | null | -| 2020-05-05 18:39:00 +0000 UTC | 2.51 | -| 2020-05-05 19:38:40 +0000 UTC | 1.74 | -| 2020-05-05 19:38:47.207881833 +0000 UTC | null | -+-----------------------------------------+-----------------------+ ++-----------------------+-----------------------------------------+ +| Name: load15 | Name: _time | +| Labels: host=hostname | Labels: | +| Type: []*float64 | Type: []*time.Time | ++-----------------------+-----------------------------------------+ +| null | 2020-05-05 18:38:50 +0000 UTC | +| 2.51 | 2020-05-05 18:39:00 +0000 UTC | +| 1.74 | 2020-05-05 19:38:40 +0000 UTC | +| null | 2020-05-05 19:38:47.207881833 +0000 UTC | ++-----------------------+-----------------------------------------+ Frame[2] Name: system Dimensions: 2 Fields by 10 Rows -+-----------------------------------------+-----------------------+ -| Name: Time | Name: load5 | -| Labels: | Labels: host=hostname | -| Type: []time.Time | Type: []*float64 | -+-----------------------------------------+-----------------------+ -| 2020-05-05 18:38:50 +0000 UTC | null | -| 2020-05-05 18:39:00 +0000 UTC | 3.14 | -| 2020-05-05 18:39:10 +0000 UTC | 3.04 | -| 2020-05-05 19:37:50 +0000 UTC | 1.8 | -| 2020-05-05 19:38:00 +0000 UTC | 1.76 | -| 2020-05-05 19:38:10 +0000 UTC | 1.75 | -| 2020-05-05 19:38:20 +0000 UTC | 1.71 | -| 2020-05-05 19:38:30 +0000 UTC | 1.77 | -| 2020-05-05 19:38:40 +0000 UTC | 1.71 | -| 2020-05-05 19:38:47.207881833 +0000 UTC | null | -+-----------------------------------------+-----------------------+ ++-----------------------+-----------------------------------------+ +| Name: load5 | Name: _time | +| Labels: host=hostname | Labels: | +| Type: []*float64 | Type: []*time.Time | ++-----------------------+-----------------------------------------+ +| null | 2020-05-05 18:38:50 +0000 UTC | +| 3.14 | 2020-05-05 18:39:00 +0000 UTC | +| 3.04 | 2020-05-05 18:39:10 +0000 UTC | +| 1.8 | 2020-05-05 19:37:50 +0000 UTC | +| 1.76 | 2020-05-05 19:38:00 +0000 UTC | +| 1.75 | 2020-05-05 19:38:10 +0000 UTC | +| 1.71 | 2020-05-05 19:38:20 +0000 UTC | +| 1.77 | 2020-05-05 19:38:30 +0000 UTC | +| 1.71 | 2020-05-05 19:38:40 +0000 UTC | +| null | 2020-05-05 19:38:47.207881833 +0000 UTC | ++-----------------------+-----------------------------------------+ ====== 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/////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= +FRAME=QVJST1cxAAD/////wAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHgAAAADAAAAUAAAACgAAAAEAAAA3P7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAAD8/v//CAAAABAAAAAGAAAAc3lzdGVtAAAEAAAAbmFtZQAAAAAg////CAAAAAwAAAACAAAAe30AAAQAAABtZXRhAAAAAAIAAAB0AAAABAAAAKb///8UAAAAPAAAADwAAAAAAAoBPAAAAAEAAAAEAAAAbP///wgAAAAQAAAABQAAAF90aW1lAAAABAAAAG5hbWUAAAAAAAAAAFb///8AAAMABQAAAF90aW1lABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAAeAAAAIAAAAAAAAMBgAAAAAIAAAA0AAAABAAAANz///8IAAAAEAAAAAUAAABsb2FkMQAAAAQAAABuYW1lAAAAAAgADAAIAAQACAAAAAgAAAAcAAAAEwAAAHsiaG9zdCI6Imhvc3RuYW1lIn0ABgAAAGxhYmVscwAAAAAAAAAABgAIAAYABgAAAAAAAgAFAAAAbG9hZDEAAAD/////uAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAADgAAAAAAAAAFAAAAAAAAAMDAAoAGAAMAAgABAAKAAAAFAAAAFgAAAADAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAAGAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAYAAAAAAAAAAAAAAACAAAAAwAAAAAAAAACAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAexSuR+F6DEAAAAAAAAAAAADE6pjONQwWAKj27NA1DBZpDDcjFDkMFhAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA8AAAAAAADAAEAAADQAQAAAAAAAMAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoADAAAAAgABAAKAAAACAAAAHgAAAADAAAAUAAAACgAAAAEAAAA3P7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAAD8/v//CAAAABAAAAAGAAAAc3lzdGVtAAAEAAAAbmFtZQAAAAAg////CAAAAAwAAAACAAAAe30AAAQAAABtZXRhAAAAAAIAAAB0AAAABAAAAKb///8UAAAAPAAAADwAAAAAAAoBPAAAAAEAAAAEAAAAbP///wgAAAAQAAAABQAAAF90aW1lAAAABAAAAG5hbWUAAAAAAAAAAFb///8AAAMABQAAAF90aW1lABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAAeAAAAIAAAAAAAAMBgAAAAAIAAAA0AAAABAAAANz///8IAAAAEAAAAAUAAABsb2FkMQAAAAQAAABuYW1lAAAAAAgADAAIAAQACAAAAAgAAAAcAAAAEwAAAHsiaG9zdCI6Imhvc3RuYW1lIn0ABgAAAGxhYmVscwAAAAAAAAAABgAIAAYABgAAAAAAAgAFAAAAbG9hZDEAAADwAQAAQVJST1cx +FRAME=QVJST1cxAAD/////oAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAAD8/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAABz///8IAAAAEAAAAAYAAABzeXN0ZW0AAAQAAABuYW1lAAAAAAIAAAB0AAAABAAAAKb///8UAAAAPAAAADwAAAAAAAoBPAAAAAEAAAAEAAAAbP///wgAAAAQAAAABQAAAF90aW1lAAAABAAAAG5hbWUAAAAAAAAAAFb///8AAAMABQAAAF90aW1lABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAAeAAAAIAAAAAAAAMBgAAAAAIAAAA0AAAABAAAANz///8IAAAAEAAAAAYAAABsb2FkMTUAAAQAAABuYW1lAAAAAAgADAAIAAQACAAAAAgAAAAcAAAAEwAAAHsiaG9zdCI6Imhvc3RuYW1lIn0ABgAAAGxhYmVscwAAAAAAAAAABgAIAAYABgAAAAAAAgAGAAAAbG9hZDE1AAAAAAAA/////7gAAAAUAAAAAAAAAAwAFgAUABMADAAEAAwAAABIAAAAAAAAABQAAAAAAAADAwAKABgADAAIAAQACgAAABQAAABYAAAABAAAAAAAAAAAAAAABAAAAAAAAAAAAAAACAAAAAAAAAAIAAAAAAAAACAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAACgAAAAAAAAAIAAAAAAAAAAAAAAAAgAAAAQAAAAAAAAAAgAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAABSuR+F6FARA16NwPQrX+z8AAAAAAAAAAADE6pjONQwWAKj27NA1DBYAgJd1EjkMFmkMNyMUOQwWEAAAAAwAFAASAAwACAAEAAwAAAAQAAAALAAAADgAAAAAAAMAAQAAALABAAAAAAAAwAAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAKAAwAAAAIAAQACgAAAAgAAABUAAAAAgAAACgAAAAEAAAA/P7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAAAc////CAAAABAAAAAGAAAAc3lzdGVtAAAEAAAAbmFtZQAAAAACAAAAdAAAAAQAAACm////FAAAADwAAAA8AAAAAAAKATwAAAABAAAABAAAAGz///8IAAAAEAAAAAUAAABfdGltZQAAAAQAAABuYW1lAAAAAAAAAABW////AAADAAUAAABfdGltZQASABgAFAATABIADAAAAAgABAASAAAAFAAAAHgAAACAAAAAAAADAYAAAAACAAAANAAAAAQAAADc////CAAAABAAAAAGAAAAbG9hZDE1AAAEAAAAbmFtZQAAAAAIAAwACAAEAAgAAAAIAAAAHAAAABMAAAB7Imhvc3QiOiJob3N0bmFtZSJ9AAYAAABsYWJlbHMAAAAAAAAAAAYACAAGAAYAAAAAAAIABgAAAGxvYWQxNQAAyAEAAEFSUk9XMQ== +FRAME=QVJST1cxAAD/////oAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAAD8/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAABz///8IAAAAEAAAAAYAAABzeXN0ZW0AAAQAAABuYW1lAAAAAAIAAAB0AAAABAAAAKb///8UAAAAPAAAADwAAAAAAAoBPAAAAAEAAAAEAAAAbP///wgAAAAQAAAABQAAAF90aW1lAAAABAAAAG5hbWUAAAAAAAAAAFb///8AAAMABQAAAF90aW1lABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAAeAAAAIAAAAAAAAMBgAAAAAIAAAA0AAAABAAAANz///8IAAAAEAAAAAUAAABsb2FkNQAAAAQAAABuYW1lAAAAAAgADAAIAAQACAAAAAgAAAAcAAAAEwAAAHsiaG9zdCI6Imhvc3RuYW1lIn0ABgAAAGxhYmVscwAAAAAAAAAABgAIAAYABgAAAAAAAgAFAAAAbG9hZDUAAAAAAAAA/////7gAAAAUAAAAAAAAAAwAFgAUABMADAAEAAwAAACoAAAAAAAAABQAAAAAAAADAwAKABgADAAIAAQACgAAABQAAABYAAAACgAAAAAAAAAAAAAABAAAAAAAAAAAAAAACAAAAAAAAAAIAAAAAAAAAFAAAAAAAAAAWAAAAAAAAAAAAAAAAAAAAFgAAAAAAAAAUAAAAAAAAAAAAAAAAgAAAAoAAAAAAAAAAgAAAAAAAAAKAAAAAAAAAAAAAAAAAAAA/gEAAAAAAAAAAAAAAAAAAB+F61G4HglAUrgehetRCEDNzMzMzMz8Pylcj8L1KPw/AAAAAAAA/D9cj8L1KFz7P1K4HoXrUfw/XI/C9Shc+z8AAAAAAAAAAADE6pjONQwWAKj27NA1DBYAjAJB0zUMFgAMXNEGOQwWAPBnJQk5DBYA1HN5CzkMFgC4f80NOQwWAJyLIRA5DBYAgJd1EjkMFmkMNyMUOQwWEAAAAAwAFAASAAwACAAEAAwAAAAQAAAALAAAADgAAAAAAAMAAQAAALABAAAAAAAAwAAAAAAAAACoAAAAAAAAAAAAAAAAAAAAAAAKAAwAAAAIAAQACgAAAAgAAABUAAAAAgAAACgAAAAEAAAA/P7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAAAc////CAAAABAAAAAGAAAAc3lzdGVtAAAEAAAAbmFtZQAAAAACAAAAdAAAAAQAAACm////FAAAADwAAAA8AAAAAAAKATwAAAABAAAABAAAAGz///8IAAAAEAAAAAUAAABfdGltZQAAAAQAAABuYW1lAAAAAAAAAABW////AAADAAUAAABfdGltZQASABgAFAATABIADAAAAAgABAASAAAAFAAAAHgAAACAAAAAAAADAYAAAAACAAAANAAAAAQAAADc////CAAAABAAAAAFAAAAbG9hZDUAAAAEAAAAbmFtZQAAAAAIAAwACAAEAAgAAAAIAAAAHAAAABMAAAB7Imhvc3QiOiJob3N0bmFtZSJ9AAYAAABsYWJlbHMAAAAAAAAAAAYACAAGAAYAAAAAAAIABQAAAGxvYWQ1AAAAyAEAAEFSUk9XMQ== diff --git a/pkg/tsdb/influxdb/flux/testdata/multiple.golden.txt b/pkg/tsdb/influxdb/flux/testdata/multiple.golden.txt index e04aaf1e863..719193df560 100644 --- a/pkg/tsdb/influxdb/flux/testdata/multiple.golden.txt +++ b/pkg/tsdb/influxdb/flux/testdata/multiple.golden.txt @@ -4,9 +4,9 @@ Frame[0] {} Name: test Dimensions: 2 Fields by 2 Rows +-----------------------------------------+-------------------------+ -| Name: Time | Name: f | +| Name: _time | Name: f | | Labels: | Labels: a=1, b=adsfasdf | -| Type: []time.Time | Type: []*float64 | +| Type: []*time.Time | Type: []*float64 | +-----------------------------------------+-------------------------+ | 2020-02-18 10:34:08.135814545 +0000 UTC | 1.4 | | 2020-02-18 22:08:44.850214724 +0000 UTC | 6.6 | @@ -18,9 +18,9 @@ Frame[1] Name: test Dimensions: 2 Fields by 2 Rows +-----------------------------------------+-------------------------+ -| Name: Time | Name: i | +| Name: _time | Name: i | | Labels: | Labels: a=1, b=adsfasdf | -| Type: []time.Time | Type: []*int64 | +| Type: []*time.Time | Type: []*int64 | +-----------------------------------------+-------------------------+ | 2020-02-18 10:34:08.135814545 +0000 UTC | 4 | | 2020-02-18 22:08:44.850214724 +0000 UTC | -1 | @@ -32,16 +32,16 @@ Frame[2] Name: test Dimensions: 2 Fields by 2 Rows +-----------------------------------------+-------------------------+ -| Name: _start | Name: i | +| Name: _time | Name: i | | Labels: | Labels: a=0, b=adsfasdf | -| Type: []time.Time | Type: []*uint64 | +| Type: []*time.Time | Type: []*uint64 | +-----------------------------------------+-------------------------+ -| 2020-02-17 22:19:49.747562847 +0000 UTC | 0 | -| 2020-02-17 22:19:49.747562847 +0000 UTC | 2 | +| 2020-02-18 22:08:44.62797864 +0000 UTC | 0 | +| 2020-02-18 22:08:44.969100374 +0000 UTC | 2 | +-----------------------------------------+-------------------------+ ====== 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/////wAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAADQ/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAPD+//8IAAAAEAAAAAQAAAB0ZXN0AAAAAAQAAABuYW1lAAAAAAIAAADIAAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAAB0AAAAfAAAAAAAAgGAAAAAAgAAACgAAAAEAAAAWP///wgAAAAMAAAAAQAAAGkAAAAEAAAAbmFtZQAAAAB4////CAAAACQAAAAYAAAAeyJhIjoiMSIsImIiOiJhZHNmYXNkZiJ9AAAAAAYAAABsYWJlbHMAAAAAAAAIAAwACAAHAAgAAAAAAAABQAAAAAEAAABpABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAEAAAAVGltZQAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAQAAABUaW1lAAAAAAAAAAD/////uAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAACAAAAAAAAAAFAAAAAAAAAMDAAoAGAAMAAgABAAKAAAAFAAAAFgAAAACAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAAAAAACAAAAAgAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAACRnfi9q3j0FUR3uluTnvQVBAAAAAAAAAD//////////xAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA4AAAAAAADAAEAAADQAQAAAAAAAMAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAACgAMAAAACAAEAAoAAAAIAAAAVAAAAAIAAAAoAAAABAAAAND+//8IAAAADAAAAAAAAAAAAAAABQAAAHJlZklkAAAA8P7//wgAAAAQAAAABAAAAHRlc3QAAAAABAAAAG5hbWUAAAAAAgAAAMgAAAAYAAAAAAASABgAFAATABIADAAAAAgABAASAAAAFAAAAHQAAAB8AAAAAAACAYAAAAACAAAAKAAAAAQAAABY////CAAAAAwAAAABAAAAaQAAAAQAAABuYW1lAAAAAHj///8IAAAAJAAAABgAAAB7ImEiOiIxIiwiYiI6ImFkc2Zhc2RmIn0AAAAABgAAAGxhYmVscwAAAAAAAAgADAAIAAcACAAAAAAAAAFAAAAAAQAAAGkAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAABEAAAATAAAAAAAAApMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAQAAABUaW1lAAAAAAQAAABuYW1lAAAAAAAAAAAAAAYACAAGAAYAAAAAAAMABAAAAFRpbWUAAAAA6AEAAEFSUk9XMQ== -FRAME=QVJST1cxAAD/////uAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAADU/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAPT+//8IAAAAEAAAAAQAAAB0ZXN0AAAAAAQAAABuYW1lAAAAAAIAAADEAAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAAB0AAAAfAAAAAAAAgF8AAAAAgAAACgAAAAEAAAAXP///wgAAAAMAAAAAQAAAGkAAAAEAAAAbmFtZQAAAAB8////CAAAACQAAAAYAAAAeyJhIjoiMCIsImIiOiJhZHNmYXNkZiJ9AAAAAAYAAABsYWJlbHMAAAAAAAAAAAYACAAEAAYAAABAAAAAAQAAAGkAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAABEAAAATAAAAAAAAApMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAYAAABfc3RhcnQAAAQAAABuYW1lAAAAAAAAAAAAAAYACAAGAAYAAAAAAAMABgAAAF9zdGFydAAA/////7gAAAAUAAAAAAAAAAwAFgAUABMADAAEAAwAAAAgAAAAAAAAABQAAAAAAAADAwAKABgADAAIAAQACgAAABQAAABYAAAAAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAAAAAAAgAAAAIAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAX9ljmZlQ9BVf2WOZmVD0FQAAAAAAAAAAAgAAAAAAAAAQAAAADAAUABIADAAIAAQADAAAABAAAAAsAAAAPAAAAAAAAwABAAAAyAEAAAAAAADAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAwAAAAIAAQACgAAAAgAAABUAAAAAgAAACgAAAAEAAAA1P7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAAD0/v//CAAAABAAAAAEAAAAdGVzdAAAAAAEAAAAbmFtZQAAAAACAAAAxAAAABgAAAAAABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAAdAAAAHwAAAAAAAIBfAAAAAIAAAAoAAAABAAAAFz///8IAAAADAAAAAEAAABpAAAABAAAAG5hbWUAAAAAfP///wgAAAAkAAAAGAAAAHsiYSI6IjAiLCJiIjoiYWRzZmFzZGYifQAAAAAGAAAAbGFiZWxzAAAAAAAAAAAGAAgABAAGAAAAQAAAAAEAAABpABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAAKTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAGAAAAX3N0YXJ0AAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAYAAABfc3RhcnQAAOgBAABBUlJPVzE= +FRAME=QVJST1cxAAD/////wAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHgAAAADAAAAUAAAACgAAAAEAAAA0P7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADw/v//CAAAABAAAAAEAAAAdGVzdAAAAAAEAAAAbmFtZQAAAAAU////CAAAAAwAAAACAAAAe30AAAQAAABtZXRhAAAAAAIAAACoAAAABAAAAHL///8UAAAAdAAAAHQAAAAAAAMBdAAAAAIAAAAoAAAABAAAAGT///8IAAAADAAAAAEAAABmAAAABAAAAG5hbWUAAAAAhP///wgAAAAkAAAAGAAAAHsiYSI6IjEiLCJiIjoiYWRzZmFzZGYifQAAAAAGAAAAbGFiZWxzAAAAAAAAjv///wAAAgABAAAAZgASABgAFAATABIADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAKAUwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABQAAAF90aW1lAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAFAAAAX3RpbWUAAAD/////uAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAACAAAAAAAAAAFAAAAAAAAAMDAAoAGAAMAAgABAAKAAAAFAAAAFgAAAACAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAAAAAACAAAAAgAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAACRnfi9q3j0FUR3uluTnvQVZmZmZmZm9j9mZmZmZmYaQBAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA8AAAAAAADAAEAAADQAQAAAAAAAMAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoADAAAAAgABAAKAAAACAAAAHgAAAADAAAAUAAAACgAAAAEAAAA0P7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADw/v//CAAAABAAAAAEAAAAdGVzdAAAAAAEAAAAbmFtZQAAAAAU////CAAAAAwAAAACAAAAe30AAAQAAABtZXRhAAAAAAIAAACoAAAABAAAAHL///8UAAAAdAAAAHQAAAAAAAMBdAAAAAIAAAAoAAAABAAAAGT///8IAAAADAAAAAEAAABmAAAABAAAAG5hbWUAAAAAhP///wgAAAAkAAAAGAAAAHsiYSI6IjEiLCJiIjoiYWRzZmFzZGYifQAAAAAGAAAAbGFiZWxzAAAAAAAAjv///wAAAgABAAAAZgASABgAFAATABIADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAKAUwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABQAAAF90aW1lAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAFAAAAX3RpbWUAAADwAQAAQVJST1cx +FRAME=QVJST1cxAAD/////qAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAADk/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAAT///8IAAAAEAAAAAQAAAB0ZXN0AAAAAAQAAABuYW1lAAAAAAIAAAC0AAAABAAAAGb///8UAAAAdAAAAHwAAAAAAAIBgAAAAAIAAAAoAAAABAAAAFj///8IAAAADAAAAAEAAABpAAAABAAAAG5hbWUAAAAAeP///wgAAAAkAAAAGAAAAHsiYSI6IjEiLCJiIjoiYWRzZmFzZGYifQAAAAAGAAAAbGFiZWxzAAAAAAAACAAMAAgABwAIAAAAAAAAAUAAAAABAAAAaQASABgAFAATABIADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAKAUwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABQAAAF90aW1lAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAFAAAAX3RpbWUAAAD/////uAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAACAAAAAAAAAAFAAAAAAAAAMDAAoAGAAMAAgABAAKAAAAFAAAAFgAAAACAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAAAAAACAAAAAgAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAACRnfi9q3j0FUR3uluTnvQVBAAAAAAAAAD//////////xAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA8AAAAAAADAAEAAAC4AQAAAAAAAMAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAADk/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAAT///8IAAAAEAAAAAQAAAB0ZXN0AAAAAAQAAABuYW1lAAAAAAIAAAC0AAAABAAAAGb///8UAAAAdAAAAHwAAAAAAAIBgAAAAAIAAAAoAAAABAAAAFj///8IAAAADAAAAAEAAABpAAAABAAAAG5hbWUAAAAAeP///wgAAAAkAAAAGAAAAHsiYSI6IjEiLCJiIjoiYWRzZmFzZGYifQAAAAAGAAAAbGFiZWxzAAAAAAAACAAMAAgABwAIAAAAAAAAAUAAAAABAAAAaQASABgAFAATABIADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAKAUwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABQAAAF90aW1lAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAFAAAAX3RpbWUAAADYAQAAQVJST1cx +FRAME=QVJST1cxAAD/////qAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAFQAAAACAAAAKAAAAAQAAADo/v//CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAAj///8IAAAAEAAAAAQAAAB0ZXN0AAAAAAQAAABuYW1lAAAAAAIAAACwAAAABAAAAGr///8UAAAAdAAAAHwAAAAAAAIBfAAAAAIAAAAoAAAABAAAAFz///8IAAAADAAAAAEAAABpAAAABAAAAG5hbWUAAAAAfP///wgAAAAkAAAAGAAAAHsiYSI6IjAiLCJiIjoiYWRzZmFzZGYifQAAAAAGAAAAbGFiZWxzAAAAAAAAAAAGAAgABAAGAAAAQAAAAAEAAABpABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAARAAAAEwAAAAAAAoBTAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAFAAAAX3RpbWUAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAUAAABfdGltZQAAAAAAAAD/////uAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAACAAAAAAAAAAFAAAAAAAAAMDAAoAGAAMAAgABAAKAAAAFAAAAFgAAAACAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAAAAAACAAAAAgAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAACQaXtOk570FVaE0GKTnvQVAAAAAAAAAAACAAAAAAAAABAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA4AAAAAAADAAEAAAC4AQAAAAAAAMAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAACgAMAAAACAAEAAoAAAAIAAAAVAAAAAIAAAAoAAAABAAAAOj+//8IAAAADAAAAAAAAAAAAAAABQAAAHJlZklkAAAACP///wgAAAAQAAAABAAAAHRlc3QAAAAABAAAAG5hbWUAAAAAAgAAALAAAAAEAAAAav///xQAAAB0AAAAfAAAAAAAAgF8AAAAAgAAACgAAAAEAAAAXP///wgAAAAMAAAAAQAAAGkAAAAEAAAAbmFtZQAAAAB8////CAAAACQAAAAYAAAAeyJhIjoiMCIsImIiOiJhZHNmYXNkZiJ9AAAAAAYAAABsYWJlbHMAAAAAAAAAAAYACAAEAAYAAABAAAAAAQAAAGkAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAABEAAAATAAAAAAACgFMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAUAAABfdGltZQAAAAQAAABuYW1lAAAAAAAAAAAAAAYACAAGAAYAAAAAAAMABQAAAF90aW1lAAAA0AEAAEFSUk9XMQ== diff --git a/pkg/tsdb/influxdb/flux/testdata/multitime.csv b/pkg/tsdb/influxdb/flux/testdata/multitime.csv new file mode 100644 index 00000000000..68ace4efe3e --- /dev/null +++ b/pkg/tsdb/influxdb/flux/testdata/multitime.csv @@ -0,0 +1,8 @@ +#group,false,false,true,true,true,true,false,false,false,true,true +#datatype,string,long,string,string,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string,string +#default,_result,,,,,,,,,, +,result,table,_field,_measurement,_start,_stop,_time,_time2,_value,cpu,host +,,0,usage_guest,cpu,2021-05-08T14:59:57Z,2021-05-08T15:00:57Z,2021-05-08T15:00:00Z,2021-05-08T15:10:00Z,0,cpu1,hst +,,1,usage_guest,cpu,2021-05-08T14:59:57Z,2021-05-08T15:00:57Z,2021-05-08T15:00:00Z,2021-05-08T15:10:00Z,0,cpu2,hst +,,2,usage_idle,cpu,2021-05-08T14:59:57Z,2021-05-08T15:00:57Z,2021-05-08T15:00:00Z,2021-05-08T15:10:00Z,98,cpu1,hst +,,3,usage_idle,cpu,2021-05-08T14:59:57Z,2021-05-08T15:00:57Z,2021-05-08T15:00:00Z,2021-05-08T15:10:00Z,99,cpu2,hst \ No newline at end of file diff --git a/pkg/tsdb/influxdb/flux/testdata/multitime.golden.txt b/pkg/tsdb/influxdb/flux/testdata/multitime.golden.txt new file mode 100644 index 00000000000..fb0819a7e45 --- /dev/null +++ b/pkg/tsdb/influxdb/flux/testdata/multitime.golden.txt @@ -0,0 +1,58 @@ +🌟 This was machine generated. Do not edit. 🌟 + +Frame[0] {} +Name: cpu +Dimensions: 3 Fields by 1 Rows ++---------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+ +| Name: _time | Name: _time2 | Name: _value | +| Labels: _field=usage_guest, _start=2021-05-08 14:59:57 +0000 UTC, _stop=2021-05-08 15:00:57 +0000 UTC, cpu=cpu1, host=hst | Labels: _field=usage_guest, _start=2021-05-08 14:59:57 +0000 UTC, _stop=2021-05-08 15:00:57 +0000 UTC, cpu=cpu1, host=hst | Labels: _field=usage_guest, _start=2021-05-08 14:59:57 +0000 UTC, _stop=2021-05-08 15:00:57 +0000 UTC, cpu=cpu1, host=hst | +| Type: []*time.Time | Type: []*time.Time | Type: []*float64 | ++---------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+ +| 2021-05-08 15:00:00 +0000 UTC | 2021-05-08 15:10:00 +0000 UTC | 0 | ++---------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+ + + + +Frame[1] +Name: cpu +Dimensions: 3 Fields by 1 Rows ++---------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+ +| Name: _time | Name: _time2 | Name: _value | +| Labels: _field=usage_guest, _start=2021-05-08 14:59:57 +0000 UTC, _stop=2021-05-08 15:00:57 +0000 UTC, cpu=cpu2, host=hst | Labels: _field=usage_guest, _start=2021-05-08 14:59:57 +0000 UTC, _stop=2021-05-08 15:00:57 +0000 UTC, cpu=cpu2, host=hst | Labels: _field=usage_guest, _start=2021-05-08 14:59:57 +0000 UTC, _stop=2021-05-08 15:00:57 +0000 UTC, cpu=cpu2, host=hst | +| Type: []*time.Time | Type: []*time.Time | Type: []*float64 | ++---------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+ +| 2021-05-08 15:00:00 +0000 UTC | 2021-05-08 15:10:00 +0000 UTC | 0 | ++---------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+ + + + +Frame[2] +Name: cpu +Dimensions: 3 Fields by 1 Rows ++--------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------+ +| Name: _time | Name: _time2 | Name: _value | +| Labels: _field=usage_idle, _start=2021-05-08 14:59:57 +0000 UTC, _stop=2021-05-08 15:00:57 +0000 UTC, cpu=cpu1, host=hst | Labels: _field=usage_idle, _start=2021-05-08 14:59:57 +0000 UTC, _stop=2021-05-08 15:00:57 +0000 UTC, cpu=cpu1, host=hst | Labels: _field=usage_idle, _start=2021-05-08 14:59:57 +0000 UTC, _stop=2021-05-08 15:00:57 +0000 UTC, cpu=cpu1, host=hst | +| Type: []*time.Time | Type: []*time.Time | Type: []*float64 | ++--------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------+ +| 2021-05-08 15:00:00 +0000 UTC | 2021-05-08 15:10:00 +0000 UTC | 98 | ++--------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------+ + + + +Frame[3] +Name: cpu +Dimensions: 3 Fields by 1 Rows ++--------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------+ +| Name: _time | Name: _time2 | Name: _value | +| Labels: _field=usage_idle, _start=2021-05-08 14:59:57 +0000 UTC, _stop=2021-05-08 15:00:57 +0000 UTC, cpu=cpu2, host=hst | Labels: _field=usage_idle, _start=2021-05-08 14:59:57 +0000 UTC, _stop=2021-05-08 15:00:57 +0000 UTC, cpu=cpu2, host=hst | Labels: _field=usage_idle, _start=2021-05-08 14:59:57 +0000 UTC, _stop=2021-05-08 15:00:57 +0000 UTC, cpu=cpu2, host=hst | +| Type: []*time.Time | Type: []*time.Time | Type: []*float64 | ++--------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------+ +| 2021-05-08 15:00:00 +0000 UTC | 2021-05-08 15:10:00 +0000 UTC | 99 | ++--------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------+ + + +====== TEST DATA RESPONSE (arrow base64) ====== +FRAME=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 +FRAME=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 +FRAME=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 +FRAME=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 diff --git a/pkg/tsdb/influxdb/flux/testdata/multivalue.csv b/pkg/tsdb/influxdb/flux/testdata/multivalue.csv new file mode 100644 index 00000000000..8d957c4d0ac --- /dev/null +++ b/pkg/tsdb/influxdb/flux/testdata/multivalue.csv @@ -0,0 +1,12 @@ +#group,false,false,true,true,false,false,false,true,true,true,true +#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,double,string,string,string,string +#default,mean,,,,,,,,,, +,result,table,_start,_stop,_time,_value,_value2,_field,_measurement,cpu,host +,,0,2021-05-08T08:03:17Z,2021-05-08T08:04:17Z,2021-05-08T08:03:18Z,0,100,usage_guest,cpu,cpu1,hst +,,0,2021-05-08T08:03:17Z,2021-05-08T08:04:17Z,2021-05-08T08:03:28Z,0,100,usage_guest,cpu,cpu1,hst +,,1,2021-05-08T08:03:17Z,2021-05-08T08:04:17Z,2021-05-08T08:03:18Z,99,1,usage_idle,cpu,cpu1,hst +,,1,2021-05-08T08:03:17Z,2021-05-08T08:04:17Z,2021-05-08T08:03:28Z,98,2,usage_idle,cpu,cpu1,hst +,,2,2021-05-08T08:03:17Z,2021-05-08T08:04:17Z,2021-05-08T08:03:18Z,0,100,usage_guest,cpu,cpu2,hst +,,2,2021-05-08T08:03:17Z,2021-05-08T08:04:17Z,2021-05-08T08:03:28Z,0,100,usage_guest,cpu,cpu2,hst +,,3,2021-05-08T08:03:17Z,2021-05-08T08:04:17Z,2021-05-08T08:03:18Z,59,41,usage_idle,cpu,cpu2,hst +,,3,2021-05-08T08:03:17Z,2021-05-08T08:04:17Z,2021-05-08T08:03:28Z,58,42,usage_idle,cpu,cpu2,hst \ No newline at end of file diff --git a/pkg/tsdb/influxdb/flux/testdata/multivalue.golden.txt b/pkg/tsdb/influxdb/flux/testdata/multivalue.golden.txt new file mode 100644 index 00000000000..c6c20b423cb --- /dev/null +++ b/pkg/tsdb/influxdb/flux/testdata/multivalue.golden.txt @@ -0,0 +1,62 @@ +🌟 This was machine generated. Do not edit. 🌟 + +Frame[0] {} +Name: cpu +Dimensions: 3 Fields by 2 Rows ++-------------------------------+---------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+ +| Name: _time | Name: _value | Name: _value2 | +| Labels: | Labels: _field=usage_guest, _start=2021-05-08 08:03:17 +0000 UTC, _stop=2021-05-08 08:04:17 +0000 UTC, cpu=cpu1, host=hst | Labels: _field=usage_guest, _start=2021-05-08 08:03:17 +0000 UTC, _stop=2021-05-08 08:04:17 +0000 UTC, cpu=cpu1, host=hst | +| Type: []*time.Time | Type: []*float64 | Type: []*float64 | ++-------------------------------+---------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+ +| 2021-05-08 08:03:18 +0000 UTC | 0 | 100 | +| 2021-05-08 08:03:28 +0000 UTC | 0 | 100 | ++-------------------------------+---------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+ + + + +Frame[1] +Name: cpu +Dimensions: 3 Fields by 2 Rows ++-------------------------------+--------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------+ +| Name: _time | Name: _value | Name: _value2 | +| Labels: | Labels: _field=usage_idle, _start=2021-05-08 08:03:17 +0000 UTC, _stop=2021-05-08 08:04:17 +0000 UTC, cpu=cpu1, host=hst | Labels: _field=usage_idle, _start=2021-05-08 08:03:17 +0000 UTC, _stop=2021-05-08 08:04:17 +0000 UTC, cpu=cpu1, host=hst | +| Type: []*time.Time | Type: []*float64 | Type: []*float64 | ++-------------------------------+--------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------+ +| 2021-05-08 08:03:18 +0000 UTC | 99 | 1 | +| 2021-05-08 08:03:28 +0000 UTC | 98 | 2 | ++-------------------------------+--------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------+ + + + +Frame[2] +Name: cpu +Dimensions: 3 Fields by 2 Rows ++-------------------------------+---------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+ +| Name: _time | Name: _value | Name: _value2 | +| Labels: | Labels: _field=usage_guest, _start=2021-05-08 08:03:17 +0000 UTC, _stop=2021-05-08 08:04:17 +0000 UTC, cpu=cpu2, host=hst | Labels: _field=usage_guest, _start=2021-05-08 08:03:17 +0000 UTC, _stop=2021-05-08 08:04:17 +0000 UTC, cpu=cpu2, host=hst | +| Type: []*time.Time | Type: []*float64 | Type: []*float64 | ++-------------------------------+---------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+ +| 2021-05-08 08:03:18 +0000 UTC | 0 | 100 | +| 2021-05-08 08:03:28 +0000 UTC | 0 | 100 | ++-------------------------------+---------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+ + + + +Frame[3] +Name: cpu +Dimensions: 3 Fields by 2 Rows ++-------------------------------+--------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------+ +| Name: _time | Name: _value | Name: _value2 | +| Labels: | Labels: _field=usage_idle, _start=2021-05-08 08:03:17 +0000 UTC, _stop=2021-05-08 08:04:17 +0000 UTC, cpu=cpu2, host=hst | Labels: _field=usage_idle, _start=2021-05-08 08:03:17 +0000 UTC, _stop=2021-05-08 08:04:17 +0000 UTC, cpu=cpu2, host=hst | +| Type: []*time.Time | Type: []*float64 | Type: []*float64 | ++-------------------------------+--------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------+ +| 2021-05-08 08:03:18 +0000 UTC | 59 | 41 | +| 2021-05-08 08:03:28 +0000 UTC | 58 | 42 | ++-------------------------------+--------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------+ + + +====== TEST DATA RESPONSE (arrow base64) ====== +FRAME=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 +FRAME=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 +FRAME=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 +FRAME=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 diff --git a/pkg/tsdb/influxdb/flux/testdata/non_standard_time_column.csv b/pkg/tsdb/influxdb/flux/testdata/non_standard_time_column.csv index 9b6d522644d..5c3061e5e55 100644 --- a/pkg/tsdb/influxdb/flux/testdata/non_standard_time_column.csv +++ b/pkg/tsdb/influxdb/flux/testdata/non_standard_time_column.csv @@ -1,4 +1,4 @@ -#group,false,false,true,true,false,true +#group,false,false,false,false,false,true #datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,double,string #default,_result,,,,, ,result,table,_start_water,_stop_water,_value,st diff --git a/pkg/tsdb/influxdb/flux/testdata/non_standard_time_column.golden.txt b/pkg/tsdb/influxdb/flux/testdata/non_standard_time_column.golden.txt index 6171779863f..acaee779c85 100644 --- a/pkg/tsdb/influxdb/flux/testdata/non_standard_time_column.golden.txt +++ b/pkg/tsdb/influxdb/flux/testdata/non_standard_time_column.golden.txt @@ -2,15 +2,15 @@ Frame[0] {} Name: -Dimensions: 2 Fields by 1 Rows -+-----------------------------------------+------------------+ -| Name: _start_water | Name: | -| Labels: | Labels: st=1 | -| Type: []time.Time | Type: []*float64 | -+-----------------------------------------+------------------+ -| 2020-06-28 17:50:13.012584046 +0000 UTC | 156.304 | -+-----------------------------------------+------------------+ +Dimensions: 3 Fields by 1 Rows ++-----------------------------------------+-----------------------------------------+------------------+ +| Name: _start_water | Name: _stop_water | Name: _value | +| Labels: st=1 | Labels: st=1 | Labels: st=1 | +| Type: []*time.Time | Type: []*time.Time | Type: []*float64 | ++-----------------------------------------+-----------------------------------------+------------------+ +| 2020-06-28 17:50:13.012584046 +0000 UTC | 2020-06-29 17:50:13.012584046 +0000 UTC | 156.304 | ++-----------------------------------------+-----------------------------------------+------------------+ ====== TEST DATA RESPONSE (arrow base64) ====== -FRAME=QVJST1cxAAD/////0AEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHQAAAADAAAATAAAACgAAAAEAAAA0P7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADw/v//CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAABD///8IAAAADAAAAAIAAAB7fQAABAAAAG1ldGEAAAAAAgAAAKwAAAAYAAAAAAASABgAFAATABIADAAAAAgABAASAAAAFAAAAGQAAABkAAAAAAADAWQAAAACAAAAKAAAAAQAAAB0////CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAJT///8IAAAAFAAAAAoAAAB7InN0IjoiMSJ9AAAGAAAAbGFiZWxzAAAAAAAAhv///wAAAgAAAAAAAAASABgAFAAAABMADAAAAAgABAASAAAAFAAAAEwAAABUAAAAAAAAClQAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAYAAAADAAAAF9zdGFydF93YXRlcgAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAwAAABfc3RhcnRfd2F0ZXIAAAAA/////7gAAAAUAAAAAAAAAAwAFgAUABMADAAEAAwAAAAQAAAAAAAAABQAAAAAAAADAwAKABgADAAIAAQACgAAABQAAABYAAAAAQAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAAAAAAAgAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAbhaVFX7GHBZ9PzVeuoljQBAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA8AAAAAAADAAEAAADgAQAAAAAAAMAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoADAAAAAgABAAKAAAACAAAAHQAAAADAAAATAAAACgAAAAEAAAA0P7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADw/v//CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAABD///8IAAAADAAAAAIAAAB7fQAABAAAAG1ldGEAAAAAAgAAAKwAAAAYAAAAAAASABgAFAATABIADAAAAAgABAASAAAAFAAAAGQAAABkAAAAAAADAWQAAAACAAAAKAAAAAQAAAB0////CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAJT///8IAAAAFAAAAAoAAAB7InN0IjoiMSJ9AAAGAAAAbGFiZWxzAAAAAAAAhv///wAAAgAAAAAAAAASABgAFAAAABMADAAAAAgABAASAAAAFAAAAEwAAABUAAAAAAAAClQAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAYAAAADAAAAF9zdGFydF93YXRlcgAAAAAEAAAAbmFtZQAAAAAAAAAAAAAGAAgABgAGAAAAAAADAAwAAABfc3RhcnRfd2F0ZXIAAAAAAAIAAEFSUk9XMQ== +FRAME=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 diff --git a/pkg/tsdb/influxdb/flux/testdata/simple.golden.txt b/pkg/tsdb/influxdb/flux/testdata/simple.golden.txt index d5a8f8ca58a..cc99c53e948 100644 --- a/pkg/tsdb/influxdb/flux/testdata/simple.golden.txt +++ b/pkg/tsdb/influxdb/flux/testdata/simple.golden.txt @@ -4,9 +4,9 @@ Frame[0] {} Name: test Dimensions: 2 Fields by 2 Rows +-----------------------------------------+-------------------------+ -| Name: Time | Name: f | +| Name: _time | Name: f | | Labels: | Labels: a=1, b=adsfasdf | -| Type: []time.Time | Type: []*float64 | +| Type: []*time.Time | Type: []*float64 | +-----------------------------------------+-------------------------+ | 2020-02-18 10:34:08.135814545 +0000 UTC | 1.4 | | 2020-02-18 22:08:44.850214724 +0000 UTC | 6.6 | @@ -14,4 +14,4 @@ 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/////wAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHgAAAADAAAAUAAAACgAAAAEAAAA0P7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADw/v//CAAAABAAAAAEAAAAdGVzdAAAAAAEAAAAbmFtZQAAAAAU////CAAAAAwAAAACAAAAe30AAAQAAABtZXRhAAAAAAIAAACoAAAABAAAAHL///8UAAAAdAAAAHQAAAAAAAMBdAAAAAIAAAAoAAAABAAAAGT///8IAAAADAAAAAEAAABmAAAABAAAAG5hbWUAAAAAhP///wgAAAAkAAAAGAAAAHsiYSI6IjEiLCJiIjoiYWRzZmFzZGYifQAAAAAGAAAAbGFiZWxzAAAAAAAAjv///wAAAgABAAAAZgASABgAFAATABIADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAKAUwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABQAAAF90aW1lAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAFAAAAX3RpbWUAAAD/////uAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAACAAAAAAAAAAFAAAAAAAAAMDAAoAGAAMAAgABAAKAAAAFAAAAFgAAAACAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAAAAAACAAAAAgAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAACRnfi9q3j0FUR3uluTnvQVZmZmZmZm9j9mZmZmZmYaQBAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA8AAAAAAADAAEAAADQAQAAAAAAAMAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoADAAAAAgABAAKAAAACAAAAHgAAAADAAAAUAAAACgAAAAEAAAA0P7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADw/v//CAAAABAAAAAEAAAAdGVzdAAAAAAEAAAAbmFtZQAAAAAU////CAAAAAwAAAACAAAAe30AAAQAAABtZXRhAAAAAAIAAACoAAAABAAAAHL///8UAAAAdAAAAHQAAAAAAAMBdAAAAAIAAAAoAAAABAAAAGT///8IAAAADAAAAAEAAABmAAAABAAAAG5hbWUAAAAAhP///wgAAAAkAAAAGAAAAHsiYSI6IjEiLCJiIjoiYWRzZmFzZGYifQAAAAAGAAAAbGFiZWxzAAAAAAAAjv///wAAAgABAAAAZgASABgAFAATABIADAAAAAgABAASAAAAFAAAAEQAAABMAAAAAAAKAUwAAAABAAAADAAAAAgADAAIAAQACAAAAAgAAAAQAAAABQAAAF90aW1lAAAABAAAAG5hbWUAAAAAAAAAAAAABgAIAAYABgAAAAAAAwAFAAAAX3RpbWUAAADwAQAAQVJST1cx diff --git a/pkg/tsdb/influxdb/flux/testdata/single.golden.txt b/pkg/tsdb/influxdb/flux/testdata/single.golden.txt index 9434692bd87..37800c7251d 100644 --- a/pkg/tsdb/influxdb/flux/testdata/single.golden.txt +++ b/pkg/tsdb/influxdb/flux/testdata/single.golden.txt @@ -2,15 +2,15 @@ Frame[0] {} Name: -Dimensions: 2 Fields by 1 Rows -+-----------------------+----------------+ -| Name: _field | Name: _value | -| Labels: | Labels: | -| Type: []*string | Type: []*int64 | -+-----------------------+----------------+ -| summary_serial_number | 6 | -+-----------------------+----------------+ +Dimensions: 1 Fields by 1 Rows ++--------------------------------------+ +| Name: _value | +| Labels: _field=summary_serial_number | +| Type: []*int64 | ++--------------------------------------+ +| 6 | ++--------------------------------------+ ====== TEST DATA RESPONSE (arrow base64) ====== -FRAME=QVJST1cxAAD/////kAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHQAAAADAAAATAAAACgAAAAEAAAA+P7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAAAY////CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAADj///8IAAAADAAAAAIAAAB7fQAABAAAAG1ldGEAAAAAAgAAAIQAAAAEAAAAlv///xQAAAA8AAAARAAAAAAAAgFIAAAAAQAAAAQAAACE////CAAAABAAAAAGAAAAX3ZhbHVlAAAEAAAAbmFtZQAAAAAAAAAACAAMAAgABwAIAAAAAAAAAUAAAAAGAAAAX3ZhbHVlAAAAABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAARAAAAEgAAAAAAAUBRAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAGAAAAX2ZpZWxkAAAEAAAAbmFtZQAAAAAAAAAABAAEAAQAAAAGAAAAX2ZpZWxkAAD/////yAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAACgAAAAAAAAAFAAAAAAAAAMDAAoAGAAMAAgABAAKAAAAFAAAAGgAAAABAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAIAAAAAAAAABgAAAAAAAAAIAAAAAAAAAAAAAAAAAAAACAAAAAAAAAACAAAAAAAAAAAAAAAAgAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAABUAAABzdW1tYXJ5X3NlcmlhbF9udW1iZXIAAAAGAAAAAAAAABAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA8AAAAAAADAAEAAACgAQAAAAAAANAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoADAAAAAgABAAKAAAACAAAAHQAAAADAAAATAAAACgAAAAEAAAA+P7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAAAY////CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAADj///8IAAAADAAAAAIAAAB7fQAABAAAAG1ldGEAAAAAAgAAAIQAAAAEAAAAlv///xQAAAA8AAAARAAAAAAAAgFIAAAAAQAAAAQAAACE////CAAAABAAAAAGAAAAX3ZhbHVlAAAEAAAAbmFtZQAAAAAAAAAACAAMAAgABwAIAAAAAAAAAUAAAAAGAAAAX3ZhbHVlAAAAABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAARAAAAEgAAAAAAAUBRAAAAAEAAAAMAAAACAAMAAgABAAIAAAACAAAABAAAAAGAAAAX2ZpZWxkAAAEAAAAbmFtZQAAAAAAAAAABAAEAAQAAAAGAAAAX2ZpZWxkAADAAQAAQVJST1cx +FRAME=QVJST1cxAAD/////eAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHQAAAADAAAATAAAACgAAAAEAAAAPP///wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAABc////CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAHz///8IAAAADAAAAAIAAAB7fQAABAAAAG1ldGEAAAAAAQAAABgAAAAAABIAGAAUABMAEgAMAAAACAAEABIAAAAUAAAAiAAAAJAAAAAAAAIBlAAAAAIAAAA0AAAABAAAANz///8IAAAAEAAAAAYAAABfdmFsdWUAAAQAAABuYW1lAAAAAAgADAAIAAQACAAAAAgAAAAsAAAAIgAAAHsiX2ZpZWxkIjoic3VtbWFyeV9zZXJpYWxfbnVtYmVyIn0AAAYAAABsYWJlbHMAAAAAAAAIAAwACAAHAAgAAAAAAAABQAAAAAYAAABfdmFsdWUAAAAAAAD/////iAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAAAgAAAAAAAAAFAAAAAAAAAMDAAoAGAAMAAgABAAKAAAAFAAAADgAAAABAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAAGAAAAAAAAABAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA4AAAAAAADAAEAAACIAQAAAAAAAJAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAACgAMAAAACAAEAAoAAAAIAAAAdAAAAAMAAABMAAAAKAAAAAQAAAA8////CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAFz///8IAAAADAAAAAAAAAAAAAAABAAAAG5hbWUAAAAAfP///wgAAAAMAAAAAgAAAHt9AAAEAAAAbWV0YQAAAAABAAAAGAAAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAACIAAAAkAAAAAAAAgGUAAAAAgAAADQAAAAEAAAA3P///wgAAAAQAAAABgAAAF92YWx1ZQAABAAAAG5hbWUAAAAACAAMAAgABAAIAAAACAAAACwAAAAiAAAAeyJfZmllbGQiOiJzdW1tYXJ5X3NlcmlhbF9udW1iZXIifQAABgAAAGxhYmVscwAAAAAAAAgADAAIAAcACAAAAAAAAAFAAAAABgAAAF92YWx1ZQAAoAEAAEFSUk9XMQ== diff --git a/pkg/tsdb/influxdb/flux/testdata/table.golden.txt b/pkg/tsdb/influxdb/flux/testdata/table.golden.txt index 82bf6e4a7db..76c4a28ad1f 100644 --- a/pkg/tsdb/influxdb/flux/testdata/table.golden.txt +++ b/pkg/tsdb/influxdb/flux/testdata/table.golden.txt @@ -3,14 +3,14 @@ Frame[0] {} Name: Dimensions: 2 Fields by 1 Rows -+---------------------------------------+----------------+ -| Name: Time | Name: | -| Labels: | Labels: | -| Type: []time.Time | Type: []*int64 | -+---------------------------------------+----------------+ -| 2021-02-05 14:03:04.7009051 +0000 UTC | 42 | -+---------------------------------------+----------------+ ++---------------------------------------+-------------------------+ +| Name: _time | Name: _value | +| Labels: | Labels: table=something | +| Type: []*time.Time | Type: []*int64 | ++---------------------------------------+-------------------------+ +| 2021-02-05 14:03:04.7009051 +0000 UTC | 42 | ++---------------------------------------+-------------------------+ ====== TEST DATA RESPONSE (arrow base64) ====== -FRAME=QVJST1cxAAD/////yAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHQAAAADAAAATAAAACgAAAAEAAAAzP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADs/v//CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAAz///8IAAAADAAAAAIAAAB7fQAABAAAAG1ldGEAAAAAAgAAALAAAAAYAAAAAAASABgAFAATABIADAAAAAgABAASAAAAFAAAAFwAAABkAAAAAAACAWgAAAACAAAAKAAAAAQAAABw////CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAJD///8IAAAADAAAAAIAAAB7fQAABgAAAGxhYmVscwAAAAAAAAgADAAIAAcACAAAAAAAAAFAAAAAAAAAAAAAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAABEAAAATAAAAAAAAApMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAQAAABUaW1lAAAAAAQAAABuYW1lAAAAAAAAAAAAAAYACAAGAAYAAAAAAAMABAAAAFRpbWUAAAAAAAAAAP////+4AAAAFAAAAAAAAAAMABYAFAATAAwABAAMAAAAEAAAAAAAAAAUAAAAAAAAAwMACgAYAAwACAAEAAoAAAAUAAAAWAAAAAEAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAAAAAAAAIAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAIzmaQHv3mAWKgAAAAAAAAAQAAAADAAUABIADAAIAAQADAAAABAAAAAsAAAAOAAAAAAAAwABAAAA2AEAAAAAAADAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAoADAAAAAgABAAKAAAACAAAAHQAAAADAAAATAAAACgAAAAEAAAAzP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADs/v//CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAAz///8IAAAADAAAAAIAAAB7fQAABAAAAG1ldGEAAAAAAgAAALAAAAAYAAAAAAASABgAFAATABIADAAAAAgABAASAAAAFAAAAFwAAABkAAAAAAACAWgAAAACAAAAKAAAAAQAAABw////CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAJD///8IAAAADAAAAAIAAAB7fQAABgAAAGxhYmVscwAAAAAAAAgADAAIAAcACAAAAAAAAAFAAAAAAAAAAAAAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAABEAAAATAAAAAAAAApMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAQAAABUaW1lAAAAAAQAAABuYW1lAAAAAAAAAAAAAAYACAAGAAYAAAAAAAMABAAAAFRpbWUAAAAA8AEAAEFSUk9XMQ== +FRAME=QVJST1cxAAD/////0AEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAHQAAAADAAAATAAAACgAAAAEAAAAwP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADg/v//CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAAD///8IAAAADAAAAAIAAAB7fQAABAAAAG1ldGEAAAAAAgAAALwAAAAEAAAAXv///xQAAAB0AAAAfAAAAAAAAgGAAAAAAgAAACwAAAAEAAAAUP///wgAAAAQAAAABgAAAF92YWx1ZQAABAAAAG5hbWUAAAAAdP///wgAAAAgAAAAFQAAAHsidGFibGUiOiJzb21ldGhpbmcifQAAAAYAAABsYWJlbHMAAAAAAAAIAAwACAAHAAgAAAAAAAABQAAAAAYAAABfdmFsdWUAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAABEAAAATAAAAAAACgFMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAUAAABfdGltZQAAAAQAAABuYW1lAAAAAAAAAAAAAAYACAAGAAYAAAAAAAMABQAAAF90aW1lAAAA/////7gAAAAUAAAAAAAAAAwAFgAUABMADAAEAAwAAAAQAAAAAAAAABQAAAAAAAADAwAKABgADAAIAAQACgAAABQAAABYAAAAAQAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAAAAAAAgAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAjOZpAe/eYBYqAAAAAAAAABAAAAAMABQAEgAMAAgABAAMAAAAEAAAACwAAAA8AAAAAAADAAEAAADgAQAAAAAAAMAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoADAAAAAgABAAKAAAACAAAAHQAAAADAAAATAAAACgAAAAEAAAAwP7//wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAADg/v//CAAAAAwAAAAAAAAAAAAAAAQAAABuYW1lAAAAAAD///8IAAAADAAAAAIAAAB7fQAABAAAAG1ldGEAAAAAAgAAALwAAAAEAAAAXv///xQAAAB0AAAAfAAAAAAAAgGAAAAAAgAAACwAAAAEAAAAUP///wgAAAAQAAAABgAAAF92YWx1ZQAABAAAAG5hbWUAAAAAdP///wgAAAAgAAAAFQAAAHsidGFibGUiOiJzb21ldGhpbmcifQAAAAYAAABsYWJlbHMAAAAAAAAIAAwACAAHAAgAAAAAAAABQAAAAAYAAABfdmFsdWUAAAAAEgAYABQAEwASAAwAAAAIAAQAEgAAABQAAABEAAAATAAAAAAACgFMAAAAAQAAAAwAAAAIAAwACAAEAAgAAAAIAAAAEAAAAAUAAABfdGltZQAAAAQAAABuYW1lAAAAAAAAAAAAAAYACAAGAAYAAAAAAAMABQAAAF90aW1lAAAAAAIAAEFSUk9XMQ==