Skip to content

revert "fix(logs): query strings can have multiple stats commands" #35067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ozelalisen wants to merge 1 commit into from
Closed

revert "fix(logs): query strings can have multiple stats commands" #35067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ....snapshot/LogsInsightsQueryDefinitionIntegTestDefaultTestDeployAssert902BAAD5.assets.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions ...ghts-query-definition.js.snapshot/aws-cdk-logs-insights-querydefinition-integ.assets.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions ...ts-query-definition.js.snapshot/aws-cdk-logs-insights-querydefinition-integ.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,25 @@
"QueryDefinition4190BC36": {
"Type": "AWS::Logs::QueryDefinition",
"Properties": {
"Name": "QueryDefinition",
"QueryString": "fields @timestamp, @message\n| parse @message \"[*] *\" as loggingType, loggingMessage\n| filter loggingType = \"ERROR\"\n| sort @timestamp desc\n| limit 20\n| display loggingMessage",
"LogGroupNames": [
{
"Ref": "LogGroupF5B46931"
}
],
"Name": "QueryDefinition",
"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"
]
}
},
"QueryDefinitionWithMultipleStatements58A3EF74": {
"Type": "AWS::Logs::QueryDefinition",
"Properties": {
"Name": "QueryDefinitionWithMultipleStatements",
"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",
"LogGroupNames": [
{
"Ref": "LogGroupF5B46931"
}
],
"Name": "QueryDefinitionWithMultipleStatements",
"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"
]
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion ...rk-integ/test/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/cdk.out
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions ...integ/test/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/integ.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 3 additions & 24 deletions ...eg/test/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/manifest.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

186 changes: 185 additions & 1 deletion ...-integ/test/aws-logs/test/integ.save-logs-insights-query-definition.js.snapshot/tree.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 2 additions & 7 deletions ...k-testing/framework-integ/test/aws-logs/test/integ.save-logs-insights-query-definition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,21 @@ class LogsInsightsQueryDefinitionIntegStack extends Stack {
removalPolicy: RemovalPolicy.DESTROY,
});

// Test query creation with single parse, filter, and sort statements
// Test query creation with single parse and filter statements
new QueryDefinition(this, 'QueryDefinition', {
queryDefinitionName: 'QueryDefinition',
queryString: new QueryString({
fields: ['@timestamp', '@message'],
parse: '@message "[*] *" as loggingType, loggingMessage',
filter: 'loggingType = "ERROR"',
stats: 'count(loggingMessage) as loggingErrors',
sort: '@timestamp desc',
limit: 20,
display: 'loggingMessage',
}),
logGroups: [logGroup],
});

// Test query creation with multiple parse, filter, and stats statements
// Test query creation with multiple parse and filter statements
new QueryDefinition(this, 'QueryDefinitionWithMultipleStatements', {
queryDefinitionName: 'QueryDefinitionWithMultipleStatements',
queryString: new QueryString({
Expand All @@ -39,10 +38,6 @@ class LogsInsightsQueryDefinitionIntegStack extends Stack {
'loggingType = "ERROR"',
'loggingMessage = "A very strange error occurred!"',
],
statsStatements: [
'count(loggingMessage) as loggingErrors',
'count(differentLoggingMessage) as differentLoggingErrors',
],
sort: '@timestamp desc',
limit: 20,
display: 'loggingMessage',
Expand Down
Loading
Loading