Skip to content

Commit 57ae6f9

Browse files
authored
fix(logs): query strings can have multiple stats commands (#34590)
### Issue #34578 Closes #34578 ### Checklist - [ ] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent e8a1962 commit 57ae6f9

File tree

12 files changed

+169
-216
lines changed

12 files changed

+169
-216
lines changed

packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/LogsInsightsQueryDefinitionIntegTestDefaultTestDeployAssert902BAAD5.assets.json

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/aws-cdk-logs-insights-querydefinition-integ.assets.json

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/aws-cdk-logs-insights-querydefinition-integ.template.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,25 @@
1111
"QueryDefinition4190BC36": {
1212
"Type": "AWS::Logs::QueryDefinition",
1313
"Properties": {
14-
"Name": "QueryDefinition",
15-
"QueryString": "fields @timestamp, @message\n| parse @message \"[*] *\" as loggingType, loggingMessage\n| filter loggingType = \"ERROR\"\n| sort @timestamp desc\n| limit 20\n| display loggingMessage",
1614
"LogGroupNames": [
1715
{
1816
"Ref": "LogGroupF5B46931"
1917
}
20-
]
18+
],
19+
"Name": "QueryDefinition",
20+
"QueryString": "fields @timestamp, @message\n| parse @message \"[*] *\" as loggingType, loggingMessage\n| filter loggingType = \"ERROR\"\n| stats count(loggingMessage) as loggingErrors\n| sort @timestamp desc\n| limit 20\n| display loggingMessage"
2121
}
2222
},
2323
"QueryDefinitionWithMultipleStatements58A3EF74": {
2424
"Type": "AWS::Logs::QueryDefinition",
2525
"Properties": {
26-
"Name": "QueryDefinitionWithMultipleStatements",
27-
"QueryString": "fields @timestamp, @message\n| parse @message \"[*] *\" as loggingType, loggingMessage\n| parse @message \"<*>: *\" as differentLoggingType, differentLoggingMessage\n| filter loggingType = \"ERROR\"\n| filter loggingMessage = \"A very strange error occurred!\"\n| sort @timestamp desc\n| limit 20\n| display loggingMessage",
2826
"LogGroupNames": [
2927
{
3028
"Ref": "LogGroupF5B46931"
3129
}
32-
]
30+
],
31+
"Name": "QueryDefinitionWithMultipleStatements",
32+
"QueryString": "fields @timestamp, @message\n| parse @message \"[*] *\" as loggingType, loggingMessage\n| parse @message \"<*>: *\" as differentLoggingType, differentLoggingMessage\n| filter loggingType = \"ERROR\"\n| filter loggingMessage = \"A very strange error occurred!\"\n| stats count(loggingMessage) as loggingErrors\n| stats count(differentLoggingMessage) as differentLoggingErrors\n| sort @timestamp desc\n| limit 20\n| display loggingMessage"
3333
}
3434
}
3535
},

packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/cdk.out

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/integ.json

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/manifest.json

Lines changed: 24 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/tree.json

Lines changed: 1 addition & 185 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.save-logs-insights-query-definition.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,22 @@ class LogsInsightsQueryDefinitionIntegStack extends Stack {
1111
removalPolicy: RemovalPolicy.DESTROY,
1212
});
1313

14-
// Test query creation with single parse and filter statements
14+
// Test query creation with single parse, filter, and sort statements
1515
new QueryDefinition(this, 'QueryDefinition', {
1616
queryDefinitionName: 'QueryDefinition',
1717
queryString: new QueryString({
1818
fields: ['@timestamp', '@message'],
1919
parse: '@message "[*] *" as loggingType, loggingMessage',
2020
filter: 'loggingType = "ERROR"',
21+
stats: 'count(loggingMessage) as loggingErrors',
2122
sort: '@timestamp desc',
2223
limit: 20,
2324
display: 'loggingMessage',
2425
}),
2526
logGroups: [logGroup],
2627
});
2728

28-
// Test query creation with multiple parse and filter statements
29+
// Test query creation with multiple parse, filter, and stats statements
2930
new QueryDefinition(this, 'QueryDefinitionWithMultipleStatements', {
3031
queryDefinitionName: 'QueryDefinitionWithMultipleStatements',
3132
queryString: new QueryString({
@@ -38,6 +39,10 @@ class LogsInsightsQueryDefinitionIntegStack extends Stack {
3839
'loggingType = "ERROR"',
3940
'loggingMessage = "A very strange error occurred!"',
4041
],
42+
statsStatements: [
43+
'count(loggingMessage) as loggingErrors',
44+
'count(differentLoggingMessage) as differentLoggingErrors',
45+
],
4146
sort: '@timestamp desc',
4247
limit: 20,
4348
display: 'loggingMessage',

0 commit comments

Comments
 (0)