public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cloudwatch Logs: Ignore non-time grouping fields in expressions and alerts (#67608)

Browse Source
This commit is contained in:
Isabella Siu
2023-05-16 08:58:04 -04:00
committed by GitHub
parent 82114cb316
commit 0612f1f87a
4 changed files with 115 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/cloudwatch/log_query_test.go
+67 -2
View File
@@ -417,7 +417,7 @@ func TestGroupingResults(t *testing.T) {
},
}
groupedResults, err := groupResults(fakeDataFrame, []string{"@log"})
groupedResults, err := groupResults(fakeDataFrame, []string{"@log"}, false)
require.NoError(t, err)
assert.ElementsMatch(t, expectedGroupedFrames, groupedResults)
}
@@ -538,7 +538,72 @@ func TestGroupingResultsWithNumericField(t *testing.T) {
},
}
groupedResults, err := groupResults(fakeDataFrame, []string{"httpresponse"})
groupedResults, err := groupResults(fakeDataFrame, []string{"httpresponse"}, false)
require.NoError(t, err)
assert.ElementsMatch(t, expectedGroupedFrames, groupedResults)
}
func TestGroupingResultsWithRemoveNonTimeTrue(t *testing.T) {
logField := data.NewField("@log", data.Labels{}, []*string{
aws.String("fakelog-a"),
aws.String("fakelog-b"),
aws.String("fakelog-a"),
aws.String("fakelog-b"),
})
streamField := data.NewField("stream", data.Labels{}, []*int32{
aws.Int32(1),
aws.Int32(1),
aws.Int32(1),
aws.Int32(1),
})
countField := data.NewField("count", data.Labels{}, []*string{
aws.String("100"),
aws.String("150"),
aws.String("57"),
aws.String("62"),
})
timeA := time.Time{}
timeB := time.Time{}.Add(1 * time.Minute)
fakeDataFrame := &data.Frame{
Name: "CloudWatchLogsResponse",
Fields: []*data.Field{
data.NewField("@timestamp", data.Labels{}, []*time.Time{&timeA, &timeA, &timeB, &timeB}),
logField,
streamField,
countField,
},
RefID: "",
}
expectedGroupedFrames := []*data.Frame{
{
Name: "fakelog-a1",
Fields: []*data.Field{
data.NewField("@timestamp", data.Labels{}, []*time.Time{&timeA, &timeB}),
data.NewField("count", data.Labels{}, []*string{
aws.String("100"),
aws.String("57"),
}),
},
RefID: "",
},
{
Name: "fakelog-b1",
Fields: []*data.Field{
data.NewField("@timestamp", data.Labels{}, []*time.Time{&timeA, &timeB}),
data.NewField("count", data.Labels{}, []*string{
aws.String("150"),
aws.String("62"),
}),
},
RefID: "",
},
}
groupedResults, err := groupResults(fakeDataFrame, []string{"@log", "stream"}, true)
require.NoError(t, err)
assert.ElementsMatch(t, expectedGroupedFrames, groupedResults)
}