Skip to content
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

feat(cloudwatch): add accountId property to support Cross-Account visibility for Logs and Metric Widgets #31512

Closed
wants to merge 12 commits into from
Closed

feat(cloudwatch): add accountId property to support Cross-Account visibility for Logs and Metric Widgets #31512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ccc8371
add accountId to LogQueryGroupProps and MetricWidgetProps; initialize…
sumupitchayan Sep 20, 2024
ef71d77
add accountId to LogQueryGroupProps and MetricWidgetProps; initialize…
sumupitchayan Sep 20, 2024
b33b32b
update unit tests, adding accountId property to 5 different snapshot …
sumupitchayan Sep 20, 2024
ae87c00
update README
sumupitchayan Sep 20, 2024
48e5acf
newline at end of README
sumupitchayan Sep 20, 2024
4c2a23a
update integ test and snapshots for: integ.math-alarm-and-dashboard.ts
sumupitchayan Sep 20, 2024
d05f5af
update integ test and snapshot with accountId in LogQueryWidget
sumupitchayan Sep 20, 2024
311acfd
undo FEATURE_FLAGS changes - accidentally committed
sumupitchayan Sep 20, 2024
71b3327
touchup README
sumupitchayan Sep 20, 2024
d5e5cc8
Merge branch 'main' into sumughan/account-id-on-widget
sumupitchayan Sep 20, 2024
9cc1e6d
Merge branch 'main' into sumughan/account-id-on-widget
sumupitchayan Sep 30, 2024
6698509
update doc comment for accountId prop
sumupitchayan Sep 30, 2024
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
6 changes: 3 additions & 3 deletions ...oudwatch/test/integ.alarm-and-dashboard.js.snapshot/aws-cdk-cloudwatch-alarms.assets.json
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions ...dwatch/test/integ.alarm-and-dashboard.js.snapshot/aws-cdk-cloudwatch-alarms.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"Type": "AWS::CloudWatch::Alarm",
"Properties": {
"ComparisonOperator": "GreaterThanOrEqualToThreshold",
"EvaluationPeriods": 3,
"DatapointsToAlarm": 2,
"Dimensions": [
{
Expand All @@ -20,6 +19,7 @@
}
}
],
"EvaluationPeriods": 3,
"MetricName": "ApproximateNumberOfMessagesVisible",
"Namespace": "AWS/SQS",
"Period": 300,
Expand Down Expand Up @@ -74,7 +74,7 @@
"QueueName"
]
},
"\"]]}},{\"type\":\"log\",\"width\":6,\"height\":6,\"x\":0,\"y\":20,\"properties\":{\"view\":\"table\",\"title\":\"Errors in my log group\",\"region\":\"",
"\"]]}},{\"type\":\"log\",\"width\":6,\"height\":6,\"x\":0,\"y\":20,\"properties\":{\"view\":\"table\",\"title\":\"Errors in my log group\",\"accountId\":\"123456789\",\"region\":\"",
{
"Ref": "AWS::Region"
},
Expand Down
2 changes: 1 addition & 1 deletion ...ng/framework-integ/test/aws-cloudwatch/test/integ.alarm-and-dashboard.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.

2 changes: 1 addition & 1 deletion ...board.js.snapshot/cdkcloudwatchalarmsintegtestDefaultTestDeployAssertD2D0B407.assets.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ...framework-integ/test/aws-cloudwatch/test/integ.alarm-and-dashboard.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.

6 changes: 4 additions & 2 deletions ...mework-integ/test/aws-cloudwatch/test/integ.alarm-and-dashboard.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.

36 changes: 18 additions & 18 deletions .../framework-integ/test/aws-cloudwatch/test/integ.alarm-and-dashboard.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.

2 changes: 2 additions & 0 deletions ...es/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.alarm-and-dashboard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ dashboard.addWidgets(new cloudwatch.SingleValueWidget({
}));
dashboard.addWidgets(new cloudwatch.LogQueryWidget({
title: 'Errors in my log group',
// Setting an account ID just for this LogQueryWidget
accountId: '123456789',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we have specific accountIds that won't get flagged by security. is this one of them? also, account ids are 12 numbers long

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh that's good to know - I just put in a random number here, will update it 👍

logGroupNames: ['my-log-group'],
queryString: `fields @message
| filter @message like /Error/`,
Expand Down
6 changes: 3 additions & 3 deletions ...cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/aws-cdk-cloudwatch.assets.json
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions ...oudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/aws-cdk-cloudwatch.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"Fn::Join": [
"",
[
"{\"widgets\":[{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":0,\"properties\":{\"view\":\"timeSeries\",\"title\":\"Total messages in queue\",\"region\":\"",
"{\"widgets\":[{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":0,\"properties\":{\"view\":\"timeSeries\",\"accountId\":\"123456789\",\"title\":\"Total messages in queue\",\"region\":\"",
{
"Ref": "AWS::Region"
},
Expand All @@ -84,7 +84,7 @@
"Arn"
]
},
"\"]},\"yAxis\":{}}},{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":6,\"properties\":{\"view\":\"timeSeries\",\"title\":\"More total messages in queue with alarm annotation\",\"region\":\"",
"\"]},\"yAxis\":{}}},{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":6,\"properties\":{\"view\":\"timeSeries\",\"title\":\"More total messages in queue with alarm annotation\",\"accountId\":\"123456789\",\"region\":\"",
{
"Ref": "AWS::Region"
},
Expand Down Expand Up @@ -116,7 +116,7 @@
"QueueName"
]
},
"\",{\"label\":\"NotVisible Messages\",\"period\":30,\"yAxis\":\"right\"}]],\"annotations\":{\"horizontal\":[{\"label\":\"Total Messages >= 100 for 3 datapoints within 3 minutes\",\"value\":100,\"yAxis\":\"left\"}]},\"yAxis\":{}}},{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":12,\"properties\":{\"view\":\"pie\",\"title\":\"Percentage of messages in each queue as pie chart\",\"region\":\"",
"\",{\"label\":\"NotVisible Messages\",\"period\":30,\"yAxis\":\"right\"}]],\"annotations\":{\"horizontal\":[{\"label\":\"Total Messages >= 100 for 3 datapoints within 3 minutes\",\"value\":100,\"yAxis\":\"left\"}]},\"yAxis\":{}}},{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":12,\"properties\":{\"view\":\"pie\",\"title\":\"Percentage of messages in each queue as pie chart\",\"accountId\":\"123456789\",\"region\":\"",
{
"Ref": "AWS::Region"
},
Expand All @@ -134,7 +134,7 @@
"QueueName"
]
},
"\",{\"label\":\"NotVisible Messages\",\"period\":30}]],\"yAxis\":{},\"setPeriodToTimeRange\":true}},{\"type\":\"metric\",\"width\":6,\"height\":3,\"x\":0,\"y\":18,\"properties\":{\"view\":\"singleValue\",\"title\":\"Current total messages in queue\",\"region\":\"",
"\",{\"label\":\"NotVisible Messages\",\"period\":30}]],\"yAxis\":{},\"setPeriodToTimeRange\":true}},{\"type\":\"metric\",\"width\":6,\"height\":3,\"x\":0,\"y\":18,\"properties\":{\"view\":\"singleValue\",\"title\":\"Current total messages in queue\",\"accountId\":\"123456789\",\"region\":\"",
{
"Ref": "AWS::Region"
},
Expand Down
2 changes: 1 addition & 1 deletion ...amework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.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.

2 changes: 1 addition & 1 deletion ...oard.js.snapshot/cdkintegmathalarmanddashboardDefaultTestDeployAssertE31ECF03.assets.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ...work-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.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.

6 changes: 4 additions & 2 deletions ...k-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.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.

Loading