diff --git a/pkg/tsdb/mysql/mysql_test.go b/pkg/tsdb/mysql/mysql_test.go index 3386eb71c2e..2ffccddfece 100644 --- a/pkg/tsdb/mysql/mysql_test.go +++ b/pkg/tsdb/mysql/mysql_test.go @@ -373,6 +373,7 @@ func TestMySQL(t *testing.T) { frames, _ := queryResult.Dataframes.Decoded() require.Len(t, frames, 1) + require.Equal(t, data.TimeSeriesTimeFieldName, frames[0].Fields[0].Name) require.Equal(t, 7, frames[0].Fields[0].Len()) require.Equal(t, 1.5, *frames[0].Fields[1].At(3).(*float64)) }) @@ -505,6 +506,7 @@ func TestMySQL(t *testing.T) { frames, err := queryResult.Dataframes.Decoded() require.NoError(t, err) require.Len(t, frames, 1) + require.Equal(t, data.TimeSeriesTimeFieldName, frames[0].Fields[0].Name) require.True(t, tInitial.Equal(*frames[0].Fields[0].At(0).(*time.Time))) }) diff --git a/pkg/tsdb/sqleng/sql_engine.go b/pkg/tsdb/sqleng/sql_engine.go index 20a23c55034..1aee1b548da 100644 --- a/pkg/tsdb/sqleng/sql_engine.go +++ b/pkg/tsdb/sqleng/sql_engine.go @@ -283,6 +283,10 @@ func (e *dataPlugin) executeQuery(query plugins.DataSubQuery, wg *sync.WaitGroup errAppendDebug("db has no time column", errors.New("no time column found"), interpolatedQuery) return } + + // Make sure to name the time field 'Time' to be backward compatible with Grafana pre-v8. + frame.Fields[qm.timeIndex].Name = data.TimeSeriesTimeFieldName + for i := range qm.columnNames { if i == qm.timeIndex || i == qm.metricIndex { continue