cloudwatch: Consolidate client logic (#25555)
* cloudwatch: Consolidate client logic Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Patrik Karlström
co-authored by
Arve Knudsen
Arve Knudsen
parent
80edbbe314
commit
43ef052d57
@@ -7,7 +7,9 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/aws/aws-sdk-go/aws"
|
||||
"github.com/aws/aws-sdk-go/aws/session"
|
||||
"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
|
||||
"github.com/aws/aws-sdk-go/service/cloudwatchlogs/cloudwatchlogsiface"
|
||||
"github.com/grafana/grafana-plugin-sdk-go/data"
|
||||
"github.com/grafana/grafana/pkg/components/simplejson"
|
||||
"github.com/grafana/grafana/pkg/tsdb"
|
||||
@@ -16,84 +18,351 @@ import (
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
//***
|
||||
// LogActions Tests
|
||||
//***
|
||||
func TestQuery_DescribeLogGroups(t *testing.T) {
|
||||
origNewCWLogsClient := newCWLogsClient
|
||||
t.Cleanup(func() {
|
||||
newCWLogsClient = origNewCWLogsClient
|
||||
})
|
||||
|
||||
func TestHandleDescribeLogGroups_WhenLogGroupNamePrefixIsEmpty(t *testing.T) {
|
||||
executor := &cloudWatchExecutor{}
|
||||
var cli fakeCWLogsClient
|
||||
|
||||
logsClient := &FakeLogsClient{
|
||||
Config: aws.Config{
|
||||
Region: aws.String("default"),
|
||||
newCWLogsClient = func(sess *session.Session) cloudwatchlogsiface.CloudWatchLogsAPI {
|
||||
return cli
|
||||
}
|
||||
|
||||
t.Run("Empty log group name prefix", func(t *testing.T) {
|
||||
cli = fakeCWLogsClient{
|
||||
logGroups: cloudwatchlogs.DescribeLogGroupsOutput{
|
||||
LogGroups: []*cloudwatchlogs.LogGroup{
|
||||
{
|
||||
LogGroupName: aws.String("group_a"),
|
||||
},
|
||||
{
|
||||
LogGroupName: aws.String("group_b"),
|
||||
},
|
||||
{
|
||||
LogGroupName: aws.String("group_c"),
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
executor := newExecutor()
|
||||
resp, err := executor.Query(context.Background(), fakeDataSource(), &tsdb.TsdbQuery{
|
||||
Queries: []*tsdb.Query{
|
||||
{
|
||||
Model: simplejson.NewFromAny(map[string]interface{}{
|
||||
"type": "logAction",
|
||||
"subtype": "DescribeLogGroups",
|
||||
"limit": 50,
|
||||
}),
|
||||
},
|
||||
},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, resp)
|
||||
|
||||
assert.Equal(t, &tsdb.Response{
|
||||
Results: map[string]*tsdb.QueryResult{
|
||||
"": {
|
||||
Dataframes: tsdb.NewDecodedDataFrames(data.Frames{
|
||||
&data.Frame{
|
||||
Name: "logGroups",
|
||||
Fields: []*data.Field{
|
||||
data.NewField("logGroupName", nil, []*string{
|
||||
aws.String("group_a"), aws.String("group_b"), aws.String("group_c"),
|
||||
}),
|
||||
},
|
||||
Meta: &data.FrameMeta{
|
||||
PreferredVisualization: "logs",
|
||||
},
|
||||
},
|
||||
}),
|
||||
},
|
||||
},
|
||||
}, resp)
|
||||
})
|
||||
|
||||
t.Run("Non-empty log group name prefix", func(t *testing.T) {
|
||||
cli = fakeCWLogsClient{
|
||||
logGroups: cloudwatchlogs.DescribeLogGroupsOutput{
|
||||
LogGroups: []*cloudwatchlogs.LogGroup{
|
||||
{
|
||||
LogGroupName: aws.String("group_a"),
|
||||
},
|
||||
{
|
||||
LogGroupName: aws.String("group_b"),
|
||||
},
|
||||
{
|
||||
LogGroupName: aws.String("group_c"),
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
executor := newExecutor()
|
||||
resp, err := executor.Query(context.Background(), fakeDataSource(), &tsdb.TsdbQuery{
|
||||
Queries: []*tsdb.Query{
|
||||
{
|
||||
Model: simplejson.NewFromAny(map[string]interface{}{
|
||||
"type": "logAction",
|
||||
"subtype": "DescribeLogGroups",
|
||||
"logGroupNamePrefix": "g",
|
||||
}),
|
||||
},
|
||||
},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, resp)
|
||||
|
||||
assert.Equal(t, &tsdb.Response{
|
||||
Results: map[string]*tsdb.QueryResult{
|
||||
"": {
|
||||
Dataframes: tsdb.NewDecodedDataFrames(data.Frames{
|
||||
&data.Frame{
|
||||
Name: "logGroups",
|
||||
Fields: []*data.Field{
|
||||
data.NewField("logGroupName", nil, []*string{
|
||||
aws.String("group_a"), aws.String("group_b"), aws.String("group_c"),
|
||||
}),
|
||||
},
|
||||
Meta: &data.FrameMeta{
|
||||
PreferredVisualization: "logs",
|
||||
},
|
||||
},
|
||||
}),
|
||||
},
|
||||
},
|
||||
}, resp)
|
||||
})
|
||||
}
|
||||
|
||||
func TestQuery_GetLogGroupFields(t *testing.T) {
|
||||
origNewCWLogsClient := newCWLogsClient
|
||||
t.Cleanup(func() {
|
||||
newCWLogsClient = origNewCWLogsClient
|
||||
})
|
||||
|
||||
var cli fakeCWLogsClient
|
||||
|
||||
newCWLogsClient = func(sess *session.Session) cloudwatchlogsiface.CloudWatchLogsAPI {
|
||||
return cli
|
||||
}
|
||||
|
||||
cli = fakeCWLogsClient{
|
||||
logGroupFields: cloudwatchlogs.GetLogGroupFieldsOutput{
|
||||
LogGroupFields: []*cloudwatchlogs.LogGroupField{
|
||||
{
|
||||
Name: aws.String("field_a"),
|
||||
Percent: aws.Int64(100),
|
||||
},
|
||||
{
|
||||
Name: aws.String("field_b"),
|
||||
Percent: aws.Int64(30),
|
||||
},
|
||||
{
|
||||
Name: aws.String("field_c"),
|
||||
Percent: aws.Int64(55),
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
params := simplejson.NewFromAny(map[string]interface{}{
|
||||
"limit": 50,
|
||||
const refID = "A"
|
||||
|
||||
executor := newExecutor()
|
||||
resp, err := executor.Query(context.Background(), fakeDataSource(), &tsdb.TsdbQuery{
|
||||
Queries: []*tsdb.Query{
|
||||
{
|
||||
RefId: refID,
|
||||
Model: simplejson.NewFromAny(map[string]interface{}{
|
||||
"type": "logAction",
|
||||
"subtype": "GetLogGroupFields",
|
||||
"logGroupName": "group_a",
|
||||
"limit": 50,
|
||||
}),
|
||||
},
|
||||
},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, resp)
|
||||
|
||||
frame, err := executor.handleDescribeLogGroups(context.Background(), logsClient, params)
|
||||
|
||||
expectedField := data.NewField("logGroupName", nil, []*string{aws.String("group_a"), aws.String("group_b"), aws.String("group_c")})
|
||||
expectedFrame := data.NewFrame("logGroups", expectedField)
|
||||
|
||||
assert.Equal(t, nil, err)
|
||||
assert.Equal(t, expectedFrame, frame)
|
||||
}
|
||||
|
||||
func TestHandleDescribeLogGroups_WhenLogGroupNamePrefixIsNotEmpty(t *testing.T) {
|
||||
executor := &cloudWatchExecutor{}
|
||||
|
||||
logsClient := &FakeLogsClient{
|
||||
Config: aws.Config{
|
||||
Region: aws.String("default"),
|
||||
expFrame := &data.Frame{
|
||||
Name: refID,
|
||||
Fields: []*data.Field{
|
||||
data.NewField("name", nil, []*string{
|
||||
aws.String("field_a"), aws.String("field_b"), aws.String("field_c"),
|
||||
}),
|
||||
data.NewField("percent", nil, []*int64{
|
||||
aws.Int64(100), aws.Int64(30), aws.Int64(55),
|
||||
}),
|
||||
},
|
||||
Meta: &data.FrameMeta{
|
||||
PreferredVisualization: "logs",
|
||||
},
|
||||
}
|
||||
|
||||
params := simplejson.NewFromAny(map[string]interface{}{
|
||||
"logGroupNamePrefix": "g",
|
||||
})
|
||||
|
||||
frame, err := executor.handleDescribeLogGroups(context.Background(), logsClient, params)
|
||||
|
||||
expectedField := data.NewField("logGroupName", nil, []*string{aws.String("group_a"), aws.String("group_b"), aws.String("group_c")})
|
||||
expectedFrame := data.NewFrame("logGroups", expectedField)
|
||||
assert.Equal(t, nil, err)
|
||||
assert.Equal(t, expectedFrame, frame)
|
||||
expFrame.RefID = refID
|
||||
assert.Equal(t, &tsdb.Response{
|
||||
Results: map[string]*tsdb.QueryResult{
|
||||
refID: {
|
||||
Dataframes: tsdb.NewDecodedDataFrames(data.Frames{expFrame}),
|
||||
RefId: refID,
|
||||
},
|
||||
},
|
||||
}, resp)
|
||||
}
|
||||
|
||||
func TestHandleGetLogGroupFields_WhenLogGroupNamePrefixIsNotEmpty(t *testing.T) {
|
||||
executor := &cloudWatchExecutor{}
|
||||
func TestQuery_StartQuery(t *testing.T) {
|
||||
origNewCWLogsClient := newCWLogsClient
|
||||
t.Cleanup(func() {
|
||||
newCWLogsClient = origNewCWLogsClient
|
||||
})
|
||||
|
||||
logsClient := &FakeLogsClient{
|
||||
Config: aws.Config{
|
||||
Region: aws.String("default"),
|
||||
},
|
||||
var cli fakeCWLogsClient
|
||||
|
||||
newCWLogsClient = func(sess *session.Session) cloudwatchlogsiface.CloudWatchLogsAPI {
|
||||
return cli
|
||||
}
|
||||
|
||||
params := simplejson.NewFromAny(map[string]interface{}{
|
||||
"logGroupName": "group_a",
|
||||
"limit": 50,
|
||||
t.Run("invalid time range", func(t *testing.T) {
|
||||
cli = fakeCWLogsClient{
|
||||
logGroupFields: cloudwatchlogs.GetLogGroupFieldsOutput{
|
||||
LogGroupFields: []*cloudwatchlogs.LogGroupField{
|
||||
{
|
||||
Name: aws.String("field_a"),
|
||||
Percent: aws.Int64(100),
|
||||
},
|
||||
{
|
||||
Name: aws.String("field_b"),
|
||||
Percent: aws.Int64(30),
|
||||
},
|
||||
{
|
||||
Name: aws.String("field_c"),
|
||||
Percent: aws.Int64(55),
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
timeRange := &tsdb.TimeRange{
|
||||
From: "1584873443000",
|
||||
To: "1584700643000",
|
||||
}
|
||||
|
||||
executor := newExecutor()
|
||||
_, err := executor.Query(context.Background(), fakeDataSource(), &tsdb.TsdbQuery{
|
||||
TimeRange: timeRange,
|
||||
Queries: []*tsdb.Query{
|
||||
{
|
||||
Model: simplejson.NewFromAny(map[string]interface{}{
|
||||
"type": "logAction",
|
||||
"subtype": "StartQuery",
|
||||
"limit": 50,
|
||||
"region": "default",
|
||||
"queryString": "fields @message",
|
||||
}),
|
||||
},
|
||||
},
|
||||
})
|
||||
require.Error(t, err)
|
||||
|
||||
assert.Equal(t, fmt.Errorf("invalid time range: start time must be before end time"), err)
|
||||
})
|
||||
|
||||
frame, err := executor.handleGetLogGroupFields(context.Background(), logsClient, params, "A")
|
||||
t.Run("valid time range", func(t *testing.T) {
|
||||
const refID = "A"
|
||||
cli = fakeCWLogsClient{
|
||||
logGroupFields: cloudwatchlogs.GetLogGroupFieldsOutput{
|
||||
LogGroupFields: []*cloudwatchlogs.LogGroupField{
|
||||
{
|
||||
Name: aws.String("field_a"),
|
||||
Percent: aws.Int64(100),
|
||||
},
|
||||
{
|
||||
Name: aws.String("field_b"),
|
||||
Percent: aws.Int64(30),
|
||||
},
|
||||
{
|
||||
Name: aws.String("field_c"),
|
||||
Percent: aws.Int64(55),
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
expectedNameField := data.NewField("name", nil, []*string{aws.String("field_a"), aws.String("field_b"), aws.String("field_c")})
|
||||
expectedPercentField := data.NewField("percent", nil, []*int64{aws.Int64(100), aws.Int64(30), aws.Int64(55)})
|
||||
expectedFrame := data.NewFrame("A", expectedNameField, expectedPercentField)
|
||||
expectedFrame.RefID = "A"
|
||||
timeRange := &tsdb.TimeRange{
|
||||
From: "1584700643000",
|
||||
To: "1584873443000",
|
||||
}
|
||||
|
||||
assert.Equal(t, nil, err)
|
||||
assert.Equal(t, expectedFrame, frame)
|
||||
executor := newExecutor()
|
||||
resp, err := executor.Query(context.Background(), fakeDataSource(), &tsdb.TsdbQuery{
|
||||
TimeRange: timeRange,
|
||||
Queries: []*tsdb.Query{
|
||||
{
|
||||
RefId: refID,
|
||||
Model: simplejson.NewFromAny(map[string]interface{}{
|
||||
"type": "logAction",
|
||||
"subtype": "StartQuery",
|
||||
"limit": 50,
|
||||
"region": "default",
|
||||
"queryString": "fields @message",
|
||||
}),
|
||||
},
|
||||
},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
expFrame := data.NewFrame(
|
||||
refID,
|
||||
data.NewField("queryId", nil, []string{"abcd-efgh-ijkl-mnop"}),
|
||||
)
|
||||
expFrame.RefID = refID
|
||||
expFrame.Meta = &data.FrameMeta{
|
||||
Custom: map[string]interface{}{
|
||||
"Region": "default",
|
||||
},
|
||||
PreferredVisualization: "logs",
|
||||
}
|
||||
assert.Equal(t, &tsdb.Response{
|
||||
Results: map[string]*tsdb.QueryResult{
|
||||
refID: {
|
||||
Dataframes: tsdb.NewDecodedDataFrames(data.Frames{expFrame}),
|
||||
RefId: refID,
|
||||
},
|
||||
},
|
||||
}, resp)
|
||||
})
|
||||
}
|
||||
|
||||
func TestExecuteStartQuery(t *testing.T) {
|
||||
executor := &cloudWatchExecutor{}
|
||||
func TestQuery_StopQuery(t *testing.T) {
|
||||
origNewCWLogsClient := newCWLogsClient
|
||||
t.Cleanup(func() {
|
||||
newCWLogsClient = origNewCWLogsClient
|
||||
})
|
||||
|
||||
logsClient := &FakeLogsClient{
|
||||
Config: aws.Config{
|
||||
Region: aws.String("default"),
|
||||
var cli fakeCWLogsClient
|
||||
|
||||
newCWLogsClient = func(sess *session.Session) cloudwatchlogsiface.CloudWatchLogsAPI {
|
||||
return cli
|
||||
}
|
||||
|
||||
cli = fakeCWLogsClient{
|
||||
logGroupFields: cloudwatchlogs.GetLogGroupFieldsOutput{
|
||||
LogGroupFields: []*cloudwatchlogs.LogGroupField{
|
||||
{
|
||||
Name: aws.String("field_a"),
|
||||
Percent: aws.Int64(100),
|
||||
},
|
||||
{
|
||||
Name: aws.String("field_b"),
|
||||
Percent: aws.Int64(30),
|
||||
},
|
||||
{
|
||||
Name: aws.String("field_c"),
|
||||
Percent: aws.Int64(55),
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
@@ -102,109 +371,122 @@ func TestExecuteStartQuery(t *testing.T) {
|
||||
To: "1584700643000",
|
||||
}
|
||||
|
||||
params := simplejson.NewFromAny(map[string]interface{}{
|
||||
"region": "default",
|
||||
"limit": 50,
|
||||
"queryString": "fields @message",
|
||||
executor := newExecutor()
|
||||
resp, err := executor.Query(context.Background(), fakeDataSource(), &tsdb.TsdbQuery{
|
||||
TimeRange: timeRange,
|
||||
Queries: []*tsdb.Query{
|
||||
{
|
||||
Model: simplejson.NewFromAny(map[string]interface{}{
|
||||
"type": "logAction",
|
||||
"subtype": "StopQuery",
|
||||
"queryId": "abcd-efgh-ijkl-mnop",
|
||||
}),
|
||||
},
|
||||
},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
response, err := executor.executeStartQuery(context.Background(), logsClient, params, timeRange)
|
||||
|
||||
var expectedResponse *cloudwatchlogs.StartQueryOutput = nil
|
||||
|
||||
assert.Equal(t, expectedResponse, response)
|
||||
assert.Equal(t, fmt.Errorf("invalid time range: start time must be before end time"), err)
|
||||
expFrame := &data.Frame{
|
||||
Name: "StopQueryResponse",
|
||||
Fields: []*data.Field{
|
||||
data.NewField("success", nil, []bool{true}),
|
||||
},
|
||||
Meta: &data.FrameMeta{
|
||||
PreferredVisualization: "logs",
|
||||
},
|
||||
}
|
||||
assert.Equal(t, &tsdb.Response{
|
||||
Results: map[string]*tsdb.QueryResult{
|
||||
"": {
|
||||
Dataframes: tsdb.NewDecodedDataFrames(data.Frames{expFrame}),
|
||||
},
|
||||
},
|
||||
}, resp)
|
||||
}
|
||||
|
||||
func TestHandleStartQuery(t *testing.T) {
|
||||
executor := &cloudWatchExecutor{}
|
||||
|
||||
logsClient := &FakeLogsClient{
|
||||
Config: aws.Config{
|
||||
Region: aws.String("default"),
|
||||
},
|
||||
}
|
||||
|
||||
timeRange := &tsdb.TimeRange{
|
||||
From: "1584700643000",
|
||||
To: "1584873443000",
|
||||
}
|
||||
|
||||
params := simplejson.NewFromAny(map[string]interface{}{
|
||||
"region": "default",
|
||||
"limit": 50,
|
||||
"queryString": "fields @message",
|
||||
func TestQuery_GetQueryResults(t *testing.T) {
|
||||
origNewCWLogsClient := newCWLogsClient
|
||||
t.Cleanup(func() {
|
||||
newCWLogsClient = origNewCWLogsClient
|
||||
})
|
||||
|
||||
frame, err := executor.handleStartQuery(context.Background(), logsClient, params, timeRange, "A")
|
||||
var cli fakeCWLogsClient
|
||||
|
||||
expectedField := data.NewField("queryId", nil, []string{"abcd-efgh-ijkl-mnop"})
|
||||
expectedFrame := data.NewFrame("A", expectedField)
|
||||
expectedFrame.RefID = "A"
|
||||
expectedFrame.Meta = &data.FrameMeta{
|
||||
Custom: map[string]interface{}{
|
||||
"Region": "default",
|
||||
newCWLogsClient = func(sess *session.Session) cloudwatchlogsiface.CloudWatchLogsAPI {
|
||||
return cli
|
||||
}
|
||||
|
||||
const refID = "A"
|
||||
cli = fakeCWLogsClient{
|
||||
queryResults: cloudwatchlogs.GetQueryResultsOutput{
|
||||
Results: [][]*cloudwatchlogs.ResultField{
|
||||
{
|
||||
{
|
||||
Field: aws.String("@timestamp"),
|
||||
Value: aws.String("2020-03-20 10:37:23.000"),
|
||||
},
|
||||
{
|
||||
Field: aws.String("field_b"),
|
||||
Value: aws.String("b_1"),
|
||||
},
|
||||
{
|
||||
Field: aws.String("@ptr"),
|
||||
Value: aws.String("abcdefg"),
|
||||
},
|
||||
},
|
||||
{
|
||||
{
|
||||
Field: aws.String("@timestamp"),
|
||||
Value: aws.String("2020-03-20 10:40:43.000"),
|
||||
},
|
||||
{
|
||||
Field: aws.String("field_b"),
|
||||
Value: aws.String("b_2"),
|
||||
},
|
||||
{
|
||||
Field: aws.String("@ptr"),
|
||||
Value: aws.String("hijklmnop"),
|
||||
},
|
||||
},
|
||||
},
|
||||
Statistics: &cloudwatchlogs.QueryStatistics{
|
||||
BytesScanned: aws.Float64(512),
|
||||
RecordsMatched: aws.Float64(256),
|
||||
RecordsScanned: aws.Float64(1024),
|
||||
},
|
||||
Status: aws.String("Complete"),
|
||||
},
|
||||
}
|
||||
|
||||
assert.Equal(t, nil, err)
|
||||
assert.Equal(t, expectedFrame, frame)
|
||||
}
|
||||
|
||||
func TestHandleStopQuery(t *testing.T) {
|
||||
executor := &cloudWatchExecutor{}
|
||||
|
||||
logsClient := &FakeLogsClient{
|
||||
Config: aws.Config{
|
||||
Region: aws.String("default"),
|
||||
executor := newExecutor()
|
||||
resp, err := executor.Query(context.Background(), fakeDataSource(), &tsdb.TsdbQuery{
|
||||
Queries: []*tsdb.Query{
|
||||
{
|
||||
RefId: refID,
|
||||
Model: simplejson.NewFromAny(map[string]interface{}{
|
||||
"type": "logAction",
|
||||
"subtype": "GetQueryResults",
|
||||
"queryId": "abcd-efgh-ijkl-mnop",
|
||||
}),
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
params := simplejson.NewFromAny(map[string]interface{}{
|
||||
"queryId": "abcd-efgh-ijkl-mnop",
|
||||
})
|
||||
|
||||
frame, err := executor.handleStopQuery(context.Background(), logsClient, params)
|
||||
|
||||
expectedField := data.NewField("success", nil, []bool{true})
|
||||
expectedFrame := data.NewFrame("StopQueryResponse", expectedField)
|
||||
|
||||
assert.Equal(t, nil, err)
|
||||
assert.Equal(t, expectedFrame, frame)
|
||||
}
|
||||
|
||||
func TestHandleGetQueryResults(t *testing.T) {
|
||||
executor := &cloudWatchExecutor{}
|
||||
|
||||
logsClient := &FakeLogsClient{
|
||||
Config: aws.Config{
|
||||
Region: aws.String("default"),
|
||||
},
|
||||
}
|
||||
|
||||
params := simplejson.NewFromAny(map[string]interface{}{
|
||||
"queryId": "abcd-efgh-ijkl-mnop",
|
||||
})
|
||||
|
||||
frame, err := executor.handleGetQueryResults(context.Background(), logsClient, params, "A")
|
||||
require.NoError(t, err)
|
||||
timeA, err := time.Parse("2006-01-02 15:04:05.000", "2020-03-20 10:37:23.000")
|
||||
require.NoError(t, err)
|
||||
timeB, err := time.Parse("2006-01-02 15:04:05.000", "2020-03-20 10:40:43.000")
|
||||
require.NoError(t, err)
|
||||
expectedTimeField := data.NewField("@timestamp", nil, []*time.Time{
|
||||
aws.Time(timeA), aws.Time(timeB),
|
||||
})
|
||||
expectedTimeField.SetConfig(&data.FieldConfig{DisplayName: "Time"})
|
||||
|
||||
expectedFieldB := data.NewField("field_b", nil, []*string{
|
||||
time1, err := time.Parse("2006-01-02 15:04:05.000", "2020-03-20 10:37:23.000")
|
||||
require.NoError(t, err)
|
||||
time2, err := time.Parse("2006-01-02 15:04:05.000", "2020-03-20 10:40:43.000")
|
||||
require.NoError(t, err)
|
||||
expField1 := data.NewField("@timestamp", nil, []*time.Time{
|
||||
aws.Time(time1), aws.Time(time2),
|
||||
})
|
||||
expField1.SetConfig(&data.FieldConfig{DisplayName: "Time"})
|
||||
expField2 := data.NewField("field_b", nil, []*string{
|
||||
aws.String("b_1"), aws.String("b_2"),
|
||||
})
|
||||
|
||||
expectedFrame := data.NewFrame("A", expectedTimeField, expectedFieldB)
|
||||
expectedFrame.RefID = "A"
|
||||
|
||||
expectedFrame.Meta = &data.FrameMeta{
|
||||
expFrame := data.NewFrame(refID, expField1, expField2)
|
||||
expFrame.RefID = refID
|
||||
expFrame.Meta = &data.FrameMeta{
|
||||
Custom: map[string]interface{}{
|
||||
"Status": "Complete",
|
||||
"Statistics": cloudwatchlogs.QueryStatistics{
|
||||
@@ -213,9 +495,15 @@ func TestHandleGetQueryResults(t *testing.T) {
|
||||
RecordsScanned: aws.Float64(1024),
|
||||
},
|
||||
},
|
||||
PreferredVisualization: "logs",
|
||||
}
|
||||
|
||||
assert.Equal(t, nil, err)
|
||||
assert.ElementsMatch(t, expectedFrame.Fields, frame.Fields)
|
||||
assert.Equal(t, expectedFrame.Meta, frame.Meta)
|
||||
assert.Equal(t, &tsdb.Response{
|
||||
Results: map[string]*tsdb.QueryResult{
|
||||
refID: {
|
||||
RefId: refID,
|
||||
Dataframes: tsdb.NewDecodedDataFrames(data.Frames{expFrame}),
|
||||
},
|
||||
},
|
||||
}, resp)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user