diff --git a/go.mod b/go.mod index 3b5d207aa78..6a2c76eaef1 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/gorilla/websocket v1.4.1 github.com/gosimple/slug v1.4.2 github.com/grafana/grafana-plugin-model v0.0.0-20190930120109-1fc953a61fb4 - github.com/grafana/grafana-plugin-sdk-go v0.60.0 + github.com/grafana/grafana-plugin-sdk-go v0.66.0 github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd github.com/hashicorp/go-plugin v1.2.2 github.com/hashicorp/go-version v1.1.0 @@ -56,7 +56,7 @@ require ( github.com/robfig/cron/v3 v3.0.0 github.com/sergi/go-diff v1.0.0 // indirect github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 - github.com/stretchr/testify v1.4.0 + github.com/stretchr/testify v1.5.1 github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf github.com/timberio/go-datemath v0.1.1-0.20200323150745-74ddef604fff github.com/ua-parser/uap-go v0.0.0-20190826212731-daf92ba38329 diff --git a/go.sum b/go.sum index 686e0169afa..97c6964a4ef 100644 --- a/go.sum +++ b/go.sum @@ -135,8 +135,8 @@ github.com/gosimple/slug v1.4.2 h1:jDmprx3q/9Lfk4FkGZtvzDQ9Cj9eAmsjzeQGp24PeiQ= github.com/gosimple/slug v1.4.2/go.mod h1:ER78kgg1Mv0NQGlXiDe57DpCyfbNywXXZ9mIorhxAf0= github.com/grafana/grafana-plugin-model v0.0.0-20190930120109-1fc953a61fb4 h1:SPdxCL9BChFTlyi0Khv64vdCW4TMna8+sxL7+Chx+Ag= github.com/grafana/grafana-plugin-model v0.0.0-20190930120109-1fc953a61fb4/go.mod h1:nc0XxBzjeGcrMltCDw269LoWF9S8ibhgxolCdA1R8To= -github.com/grafana/grafana-plugin-sdk-go v0.60.0 h1:9IhNRdoaRi2RQflmNQHv2VuqXRGigpLacoYHHXZ+XBU= -github.com/grafana/grafana-plugin-sdk-go v0.60.0/go.mod h1:V3mq3GjPrIOc4K9jOm3mP5scJQgx9NJaYQ3cUlxm8vE= +github.com/grafana/grafana-plugin-sdk-go v0.66.0 h1:Tx8pchA74QUtxtN8moavf0FJoAZbnbW3Fe8RVfSKUoY= +github.com/grafana/grafana-plugin-sdk-go v0.66.0/go.mod h1:w855JyiC5PDP3naWUJP0h/vY8RlzlE4+4fodyoXph+4= github.com/grpc-ecosystem/go-grpc-middleware v1.2.0 h1:0IKlLyQ3Hs9nDaiK5cSHAGmcQEIC8l2Ts1u6x5Dfrqg= github.com/grpc-ecosystem/go-grpc-middleware v1.2.0/go.mod h1:mJzapYve32yjrKlk9GbyCZHuPgZsrbyIbyKhSzOpg6s= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= @@ -304,6 +304,8 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf h1:Z2X3Os7oRzpdJ75iPqWZc0HeJWFYNCvKsfpQwFpRNTA= github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf/go.mod h1:M8agBzgqHIhgj7wEn9/0hJUZcrvt9VY+Ln+S1I5Mha0= diff --git a/pkg/tsdb/cloudwatch/log_actions.go b/pkg/tsdb/cloudwatch/log_actions.go index 4ffbec611cc..34380a3de20 100644 --- a/pkg/tsdb/cloudwatch/log_actions.go +++ b/pkg/tsdb/cloudwatch/log_actions.go @@ -158,7 +158,7 @@ func (e *CloudWatchExecutor) handleGetLogEvents(ctx context.Context, logsClient } timestampField := data.NewField("ts", nil, timestamps) - timestampField.SetConfig(&data.FieldConfig{Title: "Time"}) + timestampField.SetConfig(&data.FieldConfig{DisplayName: "Time"}) messageField := data.NewField("line", nil, messages) diff --git a/pkg/tsdb/cloudwatch/log_actions_test.go b/pkg/tsdb/cloudwatch/log_actions_test.go index fab556de460..929327d0aee 100644 --- a/pkg/tsdb/cloudwatch/log_actions_test.go +++ b/pkg/tsdb/cloudwatch/log_actions_test.go @@ -196,7 +196,7 @@ func TestHandleGetQueryResults(t *testing.T) { expectedTimeField := data.NewField("@timestamp", nil, []*time.Time{ aws.Time(timeA), aws.Time(timeB), }) - expectedTimeField.SetConfig(&data.FieldConfig{Title: "Time"}) + expectedTimeField.SetConfig(&data.FieldConfig{DisplayName: "Time"}) expectedFieldB := data.NewField("field_b", nil, []*string{ aws.String("b_1"), aws.String("b_2"), diff --git a/pkg/tsdb/cloudwatch/log_query.go b/pkg/tsdb/cloudwatch/log_query.go index 5de732bb4bb..0c36172f4d8 100644 --- a/pkg/tsdb/cloudwatch/log_query.go +++ b/pkg/tsdb/cloudwatch/log_query.go @@ -80,7 +80,7 @@ func logsResultsToDataframes(response *cloudwatchlogs.GetQueryResultsOutput) (*d newFields = append(newFields, data.NewField(fieldName, nil, fieldValues[fieldName])) if fieldName == "@timestamp" { - newFields[len(newFields)-1].SetConfig(&data.FieldConfig{Title: "Time"}) + newFields[len(newFields)-1].SetConfig(&data.FieldConfig{DisplayName: "Time"}) } else if fieldName == logStreamIdentifierInternal || fieldName == logIdentifierInternal { newFields[len(newFields)-1].SetConfig( &data.FieldConfig{ diff --git a/pkg/tsdb/cloudwatch/log_query_test.go b/pkg/tsdb/cloudwatch/log_query_test.go index 05086c62c9c..861ae629dea 100644 --- a/pkg/tsdb/cloudwatch/log_query_test.go +++ b/pkg/tsdb/cloudwatch/log_query_test.go @@ -139,7 +139,7 @@ func TestLogsResultsToDataframes(t *testing.T) { &timeA, &timeB, &timeC, } timeField := data.NewField("@timestamp", nil, timeVals) - timeField.SetConfig(&data.FieldConfig{Title: "Time"}) + timeField.SetConfig(&data.FieldConfig{DisplayName: "Time"}) lineField := data.NewField("line", nil, []*string{ aws.String("test message 1"),