diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/aws-cdk-cloudwatch.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/aws-cdk-cloudwatch.assets.json index 5d7d4d8fb1a4f..f39fbec734768 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/aws-cdk-cloudwatch.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/aws-cdk-cloudwatch.assets.json @@ -1,16 +1,16 @@ { - "version": "44.0.0", + "version": "48.0.0", "files": { - "fca62d2c6e2c9cb0235b47c9a312c26d3fa862d8dfc9161ed811df0e7dc70675": { + "53bf965ca0063d089926fd189c5c79281a934e943e532e571c1250f95efbde3d": { "displayName": "aws-cdk-cloudwatch Template", "source": { "path": "aws-cdk-cloudwatch.template.json", "packaging": "file" }, "destinations": { - "current_account-current_region": { + "current_account-current_region-6ae4fe15": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "fca62d2c6e2c9cb0235b47c9a312c26d3fa862d8dfc9161ed811df0e7dc70675.json", + "objectKey": "53bf965ca0063d089926fd189c5c79281a934e943e532e571c1250f95efbde3d.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/aws-cdk-cloudwatch.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/aws-cdk-cloudwatch.template.json index 8ce0f39e9a71f..5f89514700856 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/aws-cdk-cloudwatch.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/aws-cdk-cloudwatch.template.json @@ -96,28 +96,28 @@ "QueueName" ] }, - "\",{\"label\":\"Visible Messages\",\"id\":\"m1\",\"visible\":false,\"period\":60}],[\"AWS/SQS\",\"ApproximateNumberOfMessagesNotVisible\",\"QueueName\",\"", + "\",{\"label\":\"Visible Messages\",\"period\":10,\"yAxis\":\"right\"}],[\"AWS/SQS\",\"ApproximateNumberOfMessagesNotVisible\",\"QueueName\",\"", { "Fn::GetAtt": [ "queue", "QueueName" ] }, - "\",{\"label\":\"NotVisible Messages\",\"id\":\"m2\",\"visible\":false,\"period\":60}],[\"AWS/SQS\",\"ApproximateNumberOfMessagesVisible\",\"QueueName\",\"", + "\",{\"label\":\"NotVisible Messages\",\"period\":30,\"yAxis\":\"right\"}],[\"AWS/SQS\",\"ApproximateNumberOfMessagesVisible\",\"QueueName\",\"", { "Fn::GetAtt": [ "queue", "QueueName" ] }, - "\",{\"label\":\"Visible Messages\",\"period\":10,\"yAxis\":\"right\"}],[\"AWS/SQS\",\"ApproximateNumberOfMessagesNotVisible\",\"QueueName\",\"", + "\",{\"label\":\"Visible Messages\",\"id\":\"m1\",\"visible\":false,\"period\":60}],[\"AWS/SQS\",\"ApproximateNumberOfMessagesNotVisible\",\"QueueName\",\"", { "Fn::GetAtt": [ "queue", "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\":{},\"accountId\":\"123456789012\"}},{\"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\",\"id\":\"m2\",\"visible\":false,\"period\":60}]],\"annotations\":{\"horizontal\":[{\"label\":\"Total Messages >= 100 for 3 datapoints within 3 minutes\",\"value\":100,\"yAxis\":\"left\"}]},\"yAxis\":{},\"accountId\":\"123456789012\"}},{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":12,\"properties\":{\"view\":\"pie\",\"title\":\"Percentage of messages in each queue as pie chart\",\"region\":\"", { "Ref": "AWS::Region" }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/cdk.out index b3a26d44a5f73..523a9aac37cbf 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/cdk.out +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"44.0.0"} \ No newline at end of file +{"version":"48.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/cdkintegmathalarmanddashboardDefaultTestDeployAssertE31ECF03.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/cdkintegmathalarmanddashboardDefaultTestDeployAssertE31ECF03.assets.json index d1ee886139576..c2317f992a5cf 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/cdkintegmathalarmanddashboardDefaultTestDeployAssertE31ECF03.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/cdkintegmathalarmanddashboardDefaultTestDeployAssertE31ECF03.assets.json @@ -1,5 +1,5 @@ { - "version": "44.0.0", + "version": "48.0.0", "files": { "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { "displayName": "cdkintegmathalarmanddashboardDefaultTestDeployAssertE31ECF03 Template", @@ -8,7 +8,7 @@ "packaging": "file" }, "destinations": { - "current_account-current_region": { + "current_account-current_region-d8d86b35": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/integ.json index 70b17d21b7617..35c7c70fd2bd5 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/integ.json @@ -1,5 +1,5 @@ { - "version": "44.0.0", + "version": "48.0.0", "testCases": { "cdk-integ-math-alarm-and-dashboard/DefaultTest": { "stacks": [ @@ -9,5 +9,5 @@ "assertionStackName": "cdkintegmathalarmanddashboardDefaultTestDeployAssertE31ECF03" } }, - "minimumCliVersion": "2.1019.2" + "minimumCliVersion": "2.1027.0" } \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/manifest.json index 070bfa15e3f87..af65480da384e 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "44.0.0", + "version": "48.0.0", "artifacts": { "aws-cdk-cloudwatch.assets": { "type": "cdk:asset-manifest", @@ -18,7 +18,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/fca62d2c6e2c9cb0235b47c9a312c26d3fa862d8dfc9161ed811df0e7dc70675.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/53bf965ca0063d089926fd189c5c79281a934e943e532e571c1250f95efbde3d.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -88,10 +88,10 @@ "data": { "addWidgets": [ { - "warnings": "*", - "warningsV2": "*", "width": "*", - "height": "*" + "height": "*", + "warnings": "*", + "warningsV2": "*" } ] } @@ -101,10 +101,10 @@ "data": { "addWidgets": [ { - "warnings": "*", - "warningsV2": "*", "width": "*", - "height": "*" + "height": "*", + "warnings": "*", + "warningsV2": "*" } ] } @@ -118,10 +118,10 @@ "data": { "addWidgets": [ { - "warnings": "*", - "warningsV2": "*", "width": "*", - "height": "*" + "height": "*", + "warnings": "*", + "warningsV2": "*" } ] } @@ -131,10 +131,10 @@ "data": { "addWidgets": [ { - "warnings": "*", - "warningsV2": "*", "width": "*", - "height": "*" + "height": "*", + "warnings": "*", + "warningsV2": "*" } ] } @@ -220,74 +220,69 @@ "properties": { "module": "aws-cdk-lib", "flags": { - "@aws-cdk/core:enableStackNameDuplicates": { - "recommendedValue": true, - "explanation": "Allow multiple stacks with the same name" - }, - "aws-cdk:enableDiffNoFail": { + "@aws-cdk/aws-signer:signingProfileNamePassedToCfn": { + "userValue": true, "recommendedValue": true, - "explanation": "Make `cdk diff` not fail when there are differences" + "explanation": "Pass signingProfileName to CfnSigningProfile" }, "@aws-cdk/core:newStyleStackSynthesis": { "recommendedValue": true, - "explanation": "Switch to new stack synthesis method which enables CI/CD" + "explanation": "Switch to new stack synthesis method which enables CI/CD", + "unconfiguredBehavesLike": { + "v2": true + } }, "@aws-cdk/core:stackRelativeExports": { "recommendedValue": true, - "explanation": "Name exports based on the construct paths relative to the stack, rather than the global construct path" - }, - "@aws-cdk/aws-ecr-assets:dockerIgnoreSupport": { - "recommendedValue": true, - "explanation": "DockerImageAsset properly supports `.dockerignore` files by default" - }, - "@aws-cdk/aws-secretsmanager:parseOwnedSecretName": { - "recommendedValue": true, - "explanation": "Fix the referencing of SecretsManager names from ARNs" - }, - "@aws-cdk/aws-kms:defaultKeyPolicies": { - "recommendedValue": true, - "explanation": "Tighten default KMS key policies" - }, - "@aws-cdk/aws-s3:grantWriteWithoutAcl": { - "recommendedValue": true, - "explanation": "Remove `PutObjectAcl` from Bucket.grantWrite" + "explanation": "Name exports based on the construct paths relative to the stack, rather than the global construct path", + "unconfiguredBehavesLike": { + "v2": true + } }, - "@aws-cdk/aws-ecs-patterns:removeDefaultDesiredCount": { + "@aws-cdk/aws-ecs-patterns:secGroupsDisablesImplicitOpenListener": { + "userValue": true, "recommendedValue": true, - "explanation": "Do not specify a default DesiredCount for ECS services" + "explanation": "Disable implicit openListener when custom security groups are provided" }, "@aws-cdk/aws-rds:lowercaseDbIdentifier": { "recommendedValue": true, - "explanation": "Force lowercasing of RDS Cluster names in CDK" + "explanation": "Force lowercasing of RDS Cluster names in CDK", + "unconfiguredBehavesLike": { + "v2": true + } }, "@aws-cdk/aws-apigateway:usagePlanKeyOrderInsensitiveId": { "recommendedValue": true, - "explanation": "Allow adding/removing multiple UsagePlanKeys independently" - }, - "@aws-cdk/aws-efs:defaultEncryptionAtRest": { - "recommendedValue": true, - "explanation": "Enable this feature flag to have elastic file systems encrypted at rest by default." + "explanation": "Allow adding/removing multiple UsagePlanKeys independently", + "unconfiguredBehavesLike": { + "v2": true + } }, "@aws-cdk/aws-lambda:recognizeVersionProps": { "recommendedValue": true, - "explanation": "Enable this feature flag to opt in to the updated logical id calculation for Lambda Version created using the `fn.currentVersion`." + "explanation": "Enable this feature flag to opt in to the updated logical id calculation for Lambda Version created using the `fn.currentVersion`.", + "unconfiguredBehavesLike": { + "v2": true + } }, "@aws-cdk/aws-lambda:recognizeLayerVersion": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Enable this feature flag to opt in to the updated logical id calculation for Lambda Version created using the `fn.currentVersion`." }, "@aws-cdk/aws-cloudfront:defaultSecurityPolicyTLSv1.2_2021": { "recommendedValue": true, - "explanation": "Enable this feature flag to have cloudfront distributions use the security policy TLSv1.2_2021 by default." + "explanation": "Enable this feature flag to have cloudfront distributions use the security policy TLSv1.2_2021 by default.", + "unconfiguredBehavesLike": { + "v2": true + } }, "@aws-cdk/core:checkSecretUsage": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Enable this flag to make it impossible to accidentally use SecretValues in unsafe locations" }, "@aws-cdk/core:target-partitions": { - "userValue": "undefined", "recommendedValue": [ "aws", "aws-cn" @@ -295,347 +290,365 @@ "explanation": "What regions to include in lookup tables of environment agnostic stacks" }, "@aws-cdk-containers/ecs-service-extensions:enableDefaultLogDriver": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "ECS extensions will automatically add an `awslogs` driver if no logging is specified" }, "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Enable this feature flag to have Launch Templates generated by the `InstanceRequireImdsv2Aspect` use unique names." }, "@aws-cdk/aws-ecs:arnFormatIncludesClusterName": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "ARN format used by ECS. In the new ARN format, the cluster name is part of the resource ID." }, "@aws-cdk/aws-iam:minimizePolicies": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Minimize IAM policies by combining Statements" }, "@aws-cdk/core:validateSnapshotRemovalPolicy": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Error on snapshot removal policies on resources that do not support it." }, "@aws-cdk/aws-codepipeline:crossAccountKeyAliasStackSafeResourceName": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Generate key aliases that include the stack name" }, "@aws-cdk/aws-s3:createDefaultLoggingPolicy": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Enable this feature flag to create an S3 bucket policy by default in cases where an AWS service would automatically create the Policy if one does not exist." }, "@aws-cdk/aws-sns-subscriptions:restrictSqsDescryption": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Restrict KMS key policy for encrypted Queues a bit more" }, "@aws-cdk/aws-apigateway:disableCloudWatchRole": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Make default CloudWatch Role behavior safe for multiple API Gateways in one environment" }, "@aws-cdk/core:enablePartitionLiterals": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Make ARNs concrete if AWS partition is known" }, "@aws-cdk/aws-events:eventsTargetQueueSameAccount": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Event Rules may only push to encrypted SQS queues in the same account" }, "@aws-cdk/aws-ecs:disableExplicitDeploymentControllerForCircuitBreaker": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Avoid setting the \"ECS\" deployment controller when adding a circuit breaker" }, "@aws-cdk/aws-iam:importedRoleStackSafeDefaultPolicyName": { - "userValue": "true", + "userValue": true, "recommendedValue": true, - "explanation": "Enable this feature to by default create default policy names for imported roles that depend on the stack the role is in." + "explanation": "Enable this feature to create default policy names for imported roles that depend on the stack the role is in." }, "@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Use S3 Bucket Policy instead of ACLs for Server Access Logging" }, "@aws-cdk/aws-route53-patters:useCertificate": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Use the official `Certificate` resource instead of `DnsValidatedCertificate`" }, "@aws-cdk/customresources:installLatestAwsSdkDefault": { - "userValue": "false", + "userValue": false, "recommendedValue": false, "explanation": "Whether to install the latest SDK by default in AwsCustomResource" }, "@aws-cdk/aws-rds:databaseProxyUniqueResourceName": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Use unique resource name for Database Proxy" }, "@aws-cdk/aws-codedeploy:removeAlarmsFromDeploymentGroup": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Remove CloudWatch alarms from deployment group" }, "@aws-cdk/aws-apigateway:authorizerChangeDeploymentLogicalId": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Include authorizer configuration in the calculation of the API deployment logical ID." }, "@aws-cdk/aws-ec2:launchTemplateDefaultUserData": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Define user data for a launch template by default when a machine image is provided." }, "@aws-cdk/aws-secretsmanager:useAttachedSecretResourcePolicyForSecretTargetAttachments": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "SecretTargetAttachments uses the ResourcePolicy of the attached Secret." }, "@aws-cdk/aws-redshift:columnId": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Whether to use an ID to track Redshift column changes" }, "@aws-cdk/aws-stepfunctions-tasks:enableEmrServicePolicyV2": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Enable AmazonEMRServicePolicy_v2 managed policies" }, "@aws-cdk/aws-ec2:restrictDefaultSecurityGroup": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Restrict access to the VPC default security group" }, "@aws-cdk/aws-apigateway:requestValidatorUniqueId": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Generate a unique id for each RequestValidator added to a method" }, "@aws-cdk/aws-kms:aliasNameRef": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "KMS Alias name and keyArn will have implicit reference to KMS Key" }, "@aws-cdk/aws-kms:applyImportedAliasPermissionsToPrincipal": { + "userValue": true, "recommendedValue": true, "explanation": "Enable grant methods on Aliases imported by name to use kms:ResourceAliases condition" }, "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Generate a launch template when creating an AutoScalingGroup" }, "@aws-cdk/core:includePrefixInUniqueNameGeneration": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Include the stack prefix in the stack name generation process" }, "@aws-cdk/aws-efs:denyAnonymousAccess": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "EFS denies anonymous clients accesses" }, "@aws-cdk/aws-opensearchservice:enableOpensearchMultiAzWithStandby": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Enables support for Multi-AZ with Standby deployment for opensearch domains" }, "@aws-cdk/aws-lambda-nodejs:useLatestRuntimeVersion": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Enables aws-lambda-nodejs.Function to use the latest available NodeJs runtime as the default" }, "@aws-cdk/aws-efs:mountTargetOrderInsensitiveLogicalId": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, mount targets will have a stable logicalId that is linked to the associated subnet." }, "@aws-cdk/aws-rds:auroraClusterChangeScopeOfInstanceParameterGroupWithEachParameters": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, a scope of InstanceParameterGroup for AuroraClusterInstance with each parameters will change." }, "@aws-cdk/aws-appsync:useArnForSourceApiAssociationIdentifier": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, will always use the arn for identifiers for CfnSourceApiAssociation in the GraphqlApi construct rather than id." }, "@aws-cdk/aws-rds:preventRenderingDeprecatedCredentials": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, creating an RDS database cluster from a snapshot will only render credentials for snapshot credentials." }, "@aws-cdk/aws-codepipeline-actions:useNewDefaultBranchForCodeCommitSource": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, the CodeCommit source action is using the default branch name 'main'." }, "@aws-cdk/aws-cloudwatch-actions:changeLambdaPermissionLogicalIdForLambdaAction": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, the logical ID of a Lambda permission for a Lambda action includes an alarm ID." }, "@aws-cdk/aws-codepipeline:crossAccountKeysDefaultValueToFalse": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Enables Pipeline to set the default value for crossAccountKeys to false." }, "@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Enables Pipeline to set the default pipeline type to V2." }, "@aws-cdk/aws-kms:reduceCrossAccountRegionPolicyScope": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, IAM Policy created from KMS key grant will reduce the resource scope to this key only." }, "@aws-cdk/pipelines:reduceAssetRoleTrustScope": { "recommendedValue": true, - "explanation": "Remove the root account principal from PipelineAssetsFileRole trust policy" + "explanation": "Remove the root account principal from PipelineAssetsFileRole trust policy", + "unconfiguredBehavesLike": { + "v2": true + } }, "@aws-cdk/aws-eks:nodegroupNameAttribute": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, nodegroupName attribute of the provisioned EKS NodeGroup will not have the cluster name prefix." }, "@aws-cdk/aws-ec2:ebsDefaultGp3Volume": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, the default volume type of the EBS volume will be GP3" }, "@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, remove default deployment alarm settings" }, "@aws-cdk/custom-resources:logApiResponseDataPropertyTrueDefault": { - "userValue": "false", + "userValue": false, "recommendedValue": false, "explanation": "When enabled, the custom resource used for `AwsCustomResource` will configure the `logApiResponseData` property as true by default" }, "@aws-cdk/aws-s3:keepNotificationInImportedBucket": { - "userValue": "false", + "userValue": false, "recommendedValue": false, "explanation": "When enabled, Adding notifications to a bucket in the current stack will not remove notification from imported stack." }, "@aws-cdk/aws-stepfunctions-tasks:useNewS3UriParametersForBedrockInvokeModelTask": { "recommendedValue": true, - "explanation": "When enabled, use new props for S3 URI field in task definition of state machine for bedrock invoke model." + "explanation": "When enabled, use new props for S3 URI field in task definition of state machine for bedrock invoke model.", + "unconfiguredBehavesLike": { + "v2": true + } + }, + "@aws-cdk/core:explicitStackTags": { + "userValue": true, + "recommendedValue": true, + "explanation": "When enabled, stack tags need to be assigned explicitly on a Stack." }, "@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature": { - "userValue": "false", + "userValue": false, "recommendedValue": false, "explanation": "When set to true along with canContainersAccessInstanceRole=false in ECS cluster, new updated commands will be added to UserData to block container accessing IMDS. **Applicable to Linux only. IMPORTANT: See [details.](#aws-cdkaws-ecsenableImdsBlockingDeprecatedFeature)**" }, "@aws-cdk/aws-ecs:disableEcsImdsBlocking": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When set to true, CDK synth will throw exception if canContainersAccessInstanceRole is false. **IMPORTANT: See [details.](#aws-cdkaws-ecsdisableEcsImdsBlocking)**" }, "@aws-cdk/aws-ecs:reduceEc2FargateCloudWatchPermissions": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, we will only grant the necessary permissions when users specify cloudwatch log group through logConfiguration" }, "@aws-cdk/aws-dynamodb:resourcePolicyPerReplica": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled will allow you to specify a resource policy per replica, and not copy the source table policy to all replicas" }, "@aws-cdk/aws-ec2:ec2SumTImeoutEnabled": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, initOptions.timeout and resourceSignalTimeout values will be summed together." }, "@aws-cdk/aws-appsync:appSyncGraphQLAPIScopeLambdaPermission": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, a Lambda authorizer Permission created when using GraphqlApi will be properly scoped with a SourceArn." }, "@aws-cdk/aws-rds:setCorrectValueForDatabaseInstanceReadReplicaInstanceResourceId": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, the value of property `instanceResourceId` in construct `DatabaseInstanceReadReplica` will be set to the correct value which is `DbiResourceId` instead of currently `DbInstanceArn`" }, "@aws-cdk/core:cfnIncludeRejectComplexResourceUpdateCreatePolicyIntrinsics": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, CFN templates added with `cfn-include` will error if the template contains Resource Update or Create policies with CFN Intrinsics that include non-primitive values." }, "@aws-cdk/aws-lambda-nodejs:sdkV3ExcludeSmithyPackages": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, both `@aws-sdk` and `@smithy` packages will be excluded from the Lambda Node.js 18.x runtime to prevent version mismatches in bundled applications." }, "@aws-cdk/aws-stepfunctions-tasks:fixRunEcsTaskPolicy": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, the resource of IAM Run Ecs policy generated by SFN EcsRunTask will reference the definition, instead of constructing ARN." }, "@aws-cdk/aws-ec2:bastionHostUseAmazonLinux2023ByDefault": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, the BastionHost construct will use the latest Amazon Linux 2023 AMI, instead of Amazon Linux 2." }, "@aws-cdk/core:aspectStabilization": { "recommendedValue": true, - "explanation": "When enabled, a stabilization loop will be run when invoking Aspects during synthesis." + "explanation": "When enabled, a stabilization loop will be run when invoking Aspects during synthesis.", + "unconfiguredBehavesLike": { + "v2": true + } }, "@aws-cdk/aws-route53-targets:userPoolDomainNameMethodWithoutCustomResource": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, use a new method for DNS Name of user pool domain target without creating a custom resource." }, "@aws-cdk/aws-elasticloadbalancingV2:albDualstackWithoutPublicIpv4SecurityGroupRulesDefault": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, the default security group ingress rules will allow IPv6 ingress from anywhere" }, "@aws-cdk/aws-iam:oidcRejectUnauthorizedConnections": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, the default behaviour of OIDC provider will reject unauthorized connections" }, "@aws-cdk/core:enableAdditionalMetadataCollection": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, CDK will expand the scope of usage data collected to better inform CDK development and improve communication for security concerns and emerging issues." }, "@aws-cdk/aws-lambda:createNewPoliciesWithAddToRolePolicy": { - "userValue": "false", + "userValue": false, "recommendedValue": false, "explanation": "[Deprecated] When enabled, Lambda will create new inline policies with AddToRolePolicy instead of adding to the Default Policy Statement" }, "@aws-cdk/aws-s3:setUniqueReplicationRoleName": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, CDK will automatically generate a unique role name that is used for s3 object replication." }, "@aws-cdk/pipelines:reduceStageRoleTrustScope": { "recommendedValue": true, - "explanation": "Remove the root account principal from Stage addActions trust policy" + "explanation": "Remove the root account principal from Stage addActions trust policy", + "unconfiguredBehavesLike": { + "v2": true + } }, "@aws-cdk/aws-events:requireEventBusPolicySid": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, grantPutEventsTo() will use resource policies with Statement IDs for service principals." }, "@aws-cdk/core:aspectPrioritiesMutating": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When set to true, Aspects added by the construct library on your behalf will be given a priority of MUTATING." }, "@aws-cdk/aws-dynamodb:retainTableReplica": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, table replica will be default to the removal policy of source table unless specified otherwise." }, @@ -645,20 +658,23 @@ }, "@aws-cdk/pipelines:reduceCrossAccountActionRoleTrustScope": { "recommendedValue": true, - "explanation": "When enabled, scopes down the trust policy for the cross-account action role" + "explanation": "When enabled, scopes down the trust policy for the cross-account action role", + "unconfiguredBehavesLike": { + "v2": true + } }, "@aws-cdk/aws-stepfunctions:useDistributedMapResultWriterV2": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, the resultWriterV2 property of DistributedMap will be used insted of resultWriter" }, "@aws-cdk/s3-notifications:addS3TrustKeyPolicyForSnsSubscriptions": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "Add an S3 trust policy to a KMS key resource policy for SNS subscriptions." }, "@aws-cdk/aws-ec2:requirePrivateSubnetsForEgressOnlyInternetGateway": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, the EgressOnlyGateway resource is only created if private subnets are defined in the dual-stack VPC." }, @@ -667,18 +683,33 @@ "explanation": "When enabled, use resource IDs for VPC V2 migration" }, "@aws-cdk/aws-s3:publicAccessBlockedByDefault": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, setting any combination of options for BlockPublicAccess will automatically set true for any options not defined." }, "@aws-cdk/aws-lambda:useCdkManagedLogGroup": { - "userValue": "true", + "userValue": true, "recommendedValue": true, "explanation": "When enabled, CDK creates and manages loggroup for the lambda function" + }, + "@aws-cdk/aws-elasticloadbalancingv2:networkLoadBalancerWithSecurityGroupByDefault": { + "recommendedValue": true, + "explanation": "When enabled, Network Load Balancer will be created with a security group by default." + }, + "@aws-cdk/aws-stepfunctions-tasks:httpInvokeDynamicJsonPathEndpoint": { + "recommendedValue": true, + "explanation": "When enabled, allows using a dynamic apiEndpoint with JSONPath format in HttpInvoke tasks.", + "unconfiguredBehavesLike": { + "v2": true + } + }, + "@aws-cdk/aws-ecs-patterns:uniqueTargetGroupId": { + "recommendedValue": true, + "explanation": "When enabled, ECS patterns will generate unique target group IDs to prevent conflicts during load balancer replacement" } } } } }, - "minimumCliVersion": "2.1019.2" + "minimumCliVersion": "2.1033.0" } \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/tree.json index 3345799b686cf..6ad54d791add1 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.math-alarm-and-dashboard.js.snapshot/tree.json @@ -1 +1 @@ -{"version":"tree-0.1","tree":{"id":"App","path":"","constructInfo":{"fqn":"aws-cdk-lib.App","version":"0.0.0"},"children":{"aws-cdk-cloudwatch":{"id":"aws-cdk-cloudwatch","path":"aws-cdk-cloudwatch","constructInfo":{"fqn":"aws-cdk-lib.Stack","version":"0.0.0"},"children":{"queue":{"id":"queue","path":"aws-cdk-cloudwatch/queue","constructInfo":{"fqn":"aws-cdk-lib.CfnResource","version":"0.0.0"}},"Alarm":{"id":"Alarm","path":"aws-cdk-cloudwatch/Alarm","constructInfo":{"fqn":"aws-cdk-lib.aws_cloudwatch.Alarm","version":"0.0.0","metadata":[{"metric":{"warnings":"*","warningsV2":"*"},"alarmName":"*","alarmDescription":"*","comparisonOperator":"*","datapointsToAlarm":"*","threshold":"*","evaluationPeriods":"*","evaluateLowSampleCountPercentile":"*","treatMissingData":"*","actionsEnabled":"*"},{"toAnnotation":[]}]},"children":{"Resource":{"id":"Resource","path":"aws-cdk-cloudwatch/Alarm/Resource","constructInfo":{"fqn":"aws-cdk-lib.aws_cloudwatch.CfnAlarm","version":"0.0.0"},"attributes":{"aws:cdk:cloudformation:type":"AWS::CloudWatch::Alarm","aws:cdk:cloudformation:props":{"comparisonOperator":"GreaterThanOrEqualToThreshold","evaluationPeriods":3,"metrics":[{"expression":"m1+m2","id":"expr_1","label":"Total Messages","returnData":true},{"metricStat":{"metric":{"metricName":"ApproximateNumberOfMessagesVisible","namespace":"AWS/SQS","dimensions":[{"name":"QueueName","value":{"Fn::GetAtt":["queue","QueueName"]}}]},"period":60,"stat":"Average"},"id":"m1","label":"Visible Messages","returnData":false},{"metricStat":{"metric":{"metricName":"ApproximateNumberOfMessagesNotVisible","namespace":"AWS/SQS","dimensions":[{"name":"QueueName","value":{"Fn::GetAtt":["queue","QueueName"]}}]},"period":60,"stat":"Average"},"id":"m2","label":"NotVisible Messages","returnData":false}],"threshold":100}}}}},"Dash":{"id":"Dash","path":"aws-cdk-cloudwatch/Dash","constructInfo":{"fqn":"aws-cdk-lib.aws_cloudwatch.Dashboard","version":"0.0.0","metadata":[{"dashboardName":"*"},{"addWidgets":[{"warnings":"*","warningsV2":"*","width":"*","height":"*"}]},{"addWidgets":[{"warnings":"*","warningsV2":"*","width":"*","height":"*"}]},{"addWidgets":[{"warnings":"*","warningsV2":"*","width":"*","height":"*"}]},{"addWidgets":[{"warnings":"*","warningsV2":"*","width":"*","height":"*"}]}]},"children":{"Resource":{"id":"Resource","path":"aws-cdk-cloudwatch/Dash/Resource","constructInfo":{"fqn":"aws-cdk-lib.aws_cloudwatch.CfnDashboard","version":"0.0.0"},"attributes":{"aws:cdk:cloudformation:type":"AWS::CloudWatch::Dashboard","aws:cdk:cloudformation:props":{"dashboardBody":{"Fn::Join":["",["{\"widgets\":[{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":0,\"properties\":{\"view\":\"timeSeries\",\"title\":\"Total messages in queue\",\"region\":\"",{"Ref":"AWS::Region"},"\",\"annotations\":{\"alarms\":[\"",{"Fn::GetAtt":["Alarm7103F465","Arn"]},"\"]},\"yAxis\":{},\"accountId\":\"123456789012\"}},{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":6,\"properties\":{\"view\":\"timeSeries\",\"title\":\"More total messages in queue with alarm annotation\",\"region\":\"",{"Ref":"AWS::Region"},"\",\"metrics\":[[{\"label\":\"Total Messages\",\"expression\":\"m1+m2\",\"period\":60}],[\"AWS/SQS\",\"ApproximateNumberOfMessagesVisible\",\"QueueName\",\"",{"Fn::GetAtt":["queue","QueueName"]},"\",{\"label\":\"Visible Messages\",\"id\":\"m1\",\"visible\":false,\"period\":60}],[\"AWS/SQS\",\"ApproximateNumberOfMessagesNotVisible\",\"QueueName\",\"",{"Fn::GetAtt":["queue","QueueName"]},"\",{\"label\":\"NotVisible Messages\",\"id\":\"m2\",\"visible\":false,\"period\":60}],[\"AWS/SQS\",\"ApproximateNumberOfMessagesVisible\",\"QueueName\",\"",{"Fn::GetAtt":["queue","QueueName"]},"\",{\"label\":\"Visible Messages\",\"period\":10,\"yAxis\":\"right\"}],[\"AWS/SQS\",\"ApproximateNumberOfMessagesNotVisible\",\"QueueName\",\"",{"Fn::GetAtt":["queue","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\":{},\"accountId\":\"123456789012\"}},{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":12,\"properties\":{\"view\":\"pie\",\"title\":\"Percentage of messages in each queue as pie chart\",\"region\":\"",{"Ref":"AWS::Region"},"\",\"metrics\":[[\"AWS/SQS\",\"ApproximateNumberOfMessagesVisible\",\"QueueName\",\"",{"Fn::GetAtt":["queue","QueueName"]},"\",{\"label\":\"Visible Messages\",\"period\":10}],[\"AWS/SQS\",\"ApproximateNumberOfMessagesNotVisible\",\"QueueName\",\"",{"Fn::GetAtt":["queue","QueueName"]},"\",{\"label\":\"NotVisible Messages\",\"period\":30}]],\"yAxis\":{},\"setPeriodToTimeRange\":true,\"accountId\":\"123456789012\"}},{\"type\":\"metric\",\"width\":6,\"height\":3,\"x\":0,\"y\":18,\"properties\":{\"view\":\"singleValue\",\"title\":\"Current total messages in queue\",\"region\":\"",{"Ref":"AWS::Region"},"\",\"metrics\":[[{\"label\":\"Total Messages\",\"expression\":\"m1+m2\",\"period\":60}],[\"AWS/SQS\",\"ApproximateNumberOfMessagesVisible\",\"QueueName\",\"",{"Fn::GetAtt":["queue","QueueName"]},"\",{\"label\":\"Visible Messages\",\"id\":\"m1\",\"visible\":false,\"period\":60}],[\"AWS/SQS\",\"ApproximateNumberOfMessagesNotVisible\",\"QueueName\",\"",{"Fn::GetAtt":["queue","QueueName"]},"\",{\"label\":\"NotVisible Messages\",\"id\":\"m2\",\"visible\":false,\"period\":60}]],\"accountId\":\"123456789012\"}}]}"]]},"dashboardName":"MyMathExpressionDashboardName"}}}}},"BootstrapVersion":{"id":"BootstrapVersion","path":"aws-cdk-cloudwatch/BootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnParameter","version":"0.0.0"}},"CheckBootstrapVersion":{"id":"CheckBootstrapVersion","path":"aws-cdk-cloudwatch/CheckBootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnRule","version":"0.0.0"}}}},"cdk-integ-math-alarm-and-dashboard":{"id":"cdk-integ-math-alarm-and-dashboard","path":"cdk-integ-math-alarm-and-dashboard","constructInfo":{"fqn":"@aws-cdk/integ-tests-alpha.IntegTest","version":"0.0.0"},"children":{"DefaultTest":{"id":"DefaultTest","path":"cdk-integ-math-alarm-and-dashboard/DefaultTest","constructInfo":{"fqn":"@aws-cdk/integ-tests-alpha.IntegTestCase","version":"0.0.0"},"children":{"Default":{"id":"Default","path":"cdk-integ-math-alarm-and-dashboard/DefaultTest/Default","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"}},"DeployAssert":{"id":"DeployAssert","path":"cdk-integ-math-alarm-and-dashboard/DefaultTest/DeployAssert","constructInfo":{"fqn":"aws-cdk-lib.Stack","version":"0.0.0"},"children":{"BootstrapVersion":{"id":"BootstrapVersion","path":"cdk-integ-math-alarm-and-dashboard/DefaultTest/DeployAssert/BootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnParameter","version":"0.0.0"}},"CheckBootstrapVersion":{"id":"CheckBootstrapVersion","path":"cdk-integ-math-alarm-and-dashboard/DefaultTest/DeployAssert/CheckBootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnRule","version":"0.0.0"}}}}}}}},"Tree":{"id":"Tree","path":"Tree","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"}}}}} \ No newline at end of file +{"version":"tree-0.1","tree":{"id":"App","path":"","constructInfo":{"fqn":"aws-cdk-lib.App","version":"0.0.0"},"children":{"aws-cdk-cloudwatch":{"id":"aws-cdk-cloudwatch","path":"aws-cdk-cloudwatch","constructInfo":{"fqn":"aws-cdk-lib.Stack","version":"0.0.0"},"children":{"queue":{"id":"queue","path":"aws-cdk-cloudwatch/queue","constructInfo":{"fqn":"aws-cdk-lib.CfnResource","version":"0.0.0"}},"Alarm":{"id":"Alarm","path":"aws-cdk-cloudwatch/Alarm","constructInfo":{"fqn":"aws-cdk-lib.aws_cloudwatch.Alarm","version":"0.0.0","metadata":[{"metric":{"warnings":"*","warningsV2":"*"},"alarmName":"*","alarmDescription":"*","comparisonOperator":"*","datapointsToAlarm":"*","threshold":"*","evaluationPeriods":"*","evaluateLowSampleCountPercentile":"*","treatMissingData":"*","actionsEnabled":"*"},{"toAnnotation":[]}]},"children":{"Resource":{"id":"Resource","path":"aws-cdk-cloudwatch/Alarm/Resource","constructInfo":{"fqn":"aws-cdk-lib.aws_cloudwatch.CfnAlarm","version":"0.0.0"},"attributes":{"aws:cdk:cloudformation:type":"AWS::CloudWatch::Alarm","aws:cdk:cloudformation:props":{"comparisonOperator":"GreaterThanOrEqualToThreshold","evaluationPeriods":3,"metrics":[{"expression":"m1+m2","id":"expr_1","label":"Total Messages","returnData":true},{"metricStat":{"metric":{"metricName":"ApproximateNumberOfMessagesVisible","namespace":"AWS/SQS","dimensions":[{"name":"QueueName","value":{"Fn::GetAtt":["queue","QueueName"]}}]},"period":60,"stat":"Average"},"id":"m1","label":"Visible Messages","returnData":false},{"metricStat":{"metric":{"metricName":"ApproximateNumberOfMessagesNotVisible","namespace":"AWS/SQS","dimensions":[{"name":"QueueName","value":{"Fn::GetAtt":["queue","QueueName"]}}]},"period":60,"stat":"Average"},"id":"m2","label":"NotVisible Messages","returnData":false}],"threshold":100}}}}},"Dash":{"id":"Dash","path":"aws-cdk-cloudwatch/Dash","constructInfo":{"fqn":"aws-cdk-lib.aws_cloudwatch.Dashboard","version":"0.0.0","metadata":[{"dashboardName":"*"},{"addWidgets":[{"width":"*","height":"*","warnings":"*","warningsV2":"*"}]},{"addWidgets":[{"width":"*","height":"*","warnings":"*","warningsV2":"*"}]},{"addWidgets":[{"width":"*","height":"*","warnings":"*","warningsV2":"*"}]},{"addWidgets":[{"width":"*","height":"*","warnings":"*","warningsV2":"*"}]}]},"children":{"Resource":{"id":"Resource","path":"aws-cdk-cloudwatch/Dash/Resource","constructInfo":{"fqn":"aws-cdk-lib.aws_cloudwatch.CfnDashboard","version":"0.0.0"},"attributes":{"aws:cdk:cloudformation:type":"AWS::CloudWatch::Dashboard","aws:cdk:cloudformation:props":{"dashboardBody":{"Fn::Join":["",["{\"widgets\":[{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":0,\"properties\":{\"view\":\"timeSeries\",\"title\":\"Total messages in queue\",\"region\":\"",{"Ref":"AWS::Region"},"\",\"annotations\":{\"alarms\":[\"",{"Fn::GetAtt":["Alarm7103F465","Arn"]},"\"]},\"yAxis\":{},\"accountId\":\"123456789012\"}},{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":6,\"properties\":{\"view\":\"timeSeries\",\"title\":\"More total messages in queue with alarm annotation\",\"region\":\"",{"Ref":"AWS::Region"},"\",\"metrics\":[[{\"label\":\"Total Messages\",\"expression\":\"m1+m2\",\"period\":60}],[\"AWS/SQS\",\"ApproximateNumberOfMessagesVisible\",\"QueueName\",\"",{"Fn::GetAtt":["queue","QueueName"]},"\",{\"label\":\"Visible Messages\",\"period\":10,\"yAxis\":\"right\"}],[\"AWS/SQS\",\"ApproximateNumberOfMessagesNotVisible\",\"QueueName\",\"",{"Fn::GetAtt":["queue","QueueName"]},"\",{\"label\":\"NotVisible Messages\",\"period\":30,\"yAxis\":\"right\"}],[\"AWS/SQS\",\"ApproximateNumberOfMessagesVisible\",\"QueueName\",\"",{"Fn::GetAtt":["queue","QueueName"]},"\",{\"label\":\"Visible Messages\",\"id\":\"m1\",\"visible\":false,\"period\":60}],[\"AWS/SQS\",\"ApproximateNumberOfMessagesNotVisible\",\"QueueName\",\"",{"Fn::GetAtt":["queue","QueueName"]},"\",{\"label\":\"NotVisible Messages\",\"id\":\"m2\",\"visible\":false,\"period\":60}]],\"annotations\":{\"horizontal\":[{\"label\":\"Total Messages >= 100 for 3 datapoints within 3 minutes\",\"value\":100,\"yAxis\":\"left\"}]},\"yAxis\":{},\"accountId\":\"123456789012\"}},{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":12,\"properties\":{\"view\":\"pie\",\"title\":\"Percentage of messages in each queue as pie chart\",\"region\":\"",{"Ref":"AWS::Region"},"\",\"metrics\":[[\"AWS/SQS\",\"ApproximateNumberOfMessagesVisible\",\"QueueName\",\"",{"Fn::GetAtt":["queue","QueueName"]},"\",{\"label\":\"Visible Messages\",\"period\":10}],[\"AWS/SQS\",\"ApproximateNumberOfMessagesNotVisible\",\"QueueName\",\"",{"Fn::GetAtt":["queue","QueueName"]},"\",{\"label\":\"NotVisible Messages\",\"period\":30}]],\"yAxis\":{},\"setPeriodToTimeRange\":true,\"accountId\":\"123456789012\"}},{\"type\":\"metric\",\"width\":6,\"height\":3,\"x\":0,\"y\":18,\"properties\":{\"view\":\"singleValue\",\"title\":\"Current total messages in queue\",\"region\":\"",{"Ref":"AWS::Region"},"\",\"metrics\":[[{\"label\":\"Total Messages\",\"expression\":\"m1+m2\",\"period\":60}],[\"AWS/SQS\",\"ApproximateNumberOfMessagesVisible\",\"QueueName\",\"",{"Fn::GetAtt":["queue","QueueName"]},"\",{\"label\":\"Visible Messages\",\"id\":\"m1\",\"visible\":false,\"period\":60}],[\"AWS/SQS\",\"ApproximateNumberOfMessagesNotVisible\",\"QueueName\",\"",{"Fn::GetAtt":["queue","QueueName"]},"\",{\"label\":\"NotVisible Messages\",\"id\":\"m2\",\"visible\":false,\"period\":60}]],\"accountId\":\"123456789012\"}}]}"]]},"dashboardName":"MyMathExpressionDashboardName"}}}}},"BootstrapVersion":{"id":"BootstrapVersion","path":"aws-cdk-cloudwatch/BootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnParameter","version":"0.0.0"}},"CheckBootstrapVersion":{"id":"CheckBootstrapVersion","path":"aws-cdk-cloudwatch/CheckBootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnRule","version":"0.0.0"}}}},"cdk-integ-math-alarm-and-dashboard":{"id":"cdk-integ-math-alarm-and-dashboard","path":"cdk-integ-math-alarm-and-dashboard","constructInfo":{"fqn":"@aws-cdk/integ-tests-alpha.IntegTest","version":"0.0.0"},"children":{"DefaultTest":{"id":"DefaultTest","path":"cdk-integ-math-alarm-and-dashboard/DefaultTest","constructInfo":{"fqn":"@aws-cdk/integ-tests-alpha.IntegTestCase","version":"0.0.0"},"children":{"Default":{"id":"Default","path":"cdk-integ-math-alarm-and-dashboard/DefaultTest/Default","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"}},"DeployAssert":{"id":"DeployAssert","path":"cdk-integ-math-alarm-and-dashboard/DefaultTest/DeployAssert","constructInfo":{"fqn":"aws-cdk-lib.Stack","version":"0.0.0"},"children":{"BootstrapVersion":{"id":"BootstrapVersion","path":"cdk-integ-math-alarm-and-dashboard/DefaultTest/DeployAssert/BootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnParameter","version":"0.0.0"}},"CheckBootstrapVersion":{"id":"CheckBootstrapVersion","path":"cdk-integ-math-alarm-and-dashboard/DefaultTest/DeployAssert/CheckBootstrapVersion","constructInfo":{"fqn":"aws-cdk-lib.CfnRule","version":"0.0.0"}}}}}}}},"Tree":{"id":"Tree","path":"Tree","constructInfo":{"fqn":"constructs.Construct","version":"10.4.2"}}}}} \ No newline at end of file diff --git a/packages/aws-cdk-lib/aws-cloudwatch/lib/private/rendering.ts b/packages/aws-cdk-lib/aws-cloudwatch/lib/private/rendering.ts index ebcc75cf01e32..b885b012c536b 100644 --- a/packages/aws-cdk-lib/aws-cloudwatch/lib/private/rendering.ts +++ b/packages/aws-cdk-lib/aws-cloudwatch/lib/private/rendering.ts @@ -159,9 +159,11 @@ export class MetricSet { /** * Access all the accumulated timeseries entries + * + * 'Primary' metrics appear first */ public get entries(): ReadonlyArray> { - return this.metrics; + return this.metrics.sort((a, b) => a.level - b.level); } /** diff --git a/packages/aws-cdk-lib/aws-cloudwatch/test/metric-math.test.ts b/packages/aws-cdk-lib/aws-cloudwatch/test/metric-math.test.ts index 3f01a2b5eb73c..5b56e8a430ef8 100644 --- a/packages/aws-cdk-lib/aws-cloudwatch/test/metric-math.test.ts +++ b/packages/aws-cdk-lib/aws-cloudwatch/test/metric-math.test.ts @@ -420,6 +420,29 @@ describe('Metric Math', () => { ]); }); + test('Multiple MathExpressions appear before their constituent metrics', () => { + const graph = new GraphWidget({ + left: [ + new MathExpression({ + expression: 'a', + usingMetrics: { a }, + }), + new MathExpression({ + expression: 'b', + usingMetrics: { b }, + }), + ], + }); + + // THEN + graphMetricsAre(graph, [ + [{ expression: 'a', label: 'a' }], + [{ expression: 'b', label: 'b' }], + ['Test', 'ACount', { visible: false, id: 'a' }], + ['Test', 'BCount', { visible: false, id: 'b' }], + ]); + }); + test('can use percentiles in expression metrics in graphs', () => { // GIVEN const graph = new GraphWidget({ @@ -459,8 +482,8 @@ describe('Metric Math', () => { // THEN graphMetricsAre(graph, [ [{ label: 'a + 1', expression: 'a + 1' }], - ['Test', 'ACount', { visible: false, id: 'a' }], [{ label: 'a + 2', expression: 'a + 2', yAxis: 'right' }], + ['Test', 'ACount', { visible: false, id: 'a' }], ]); });