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

[IT-3471] Create cloudwatch metrics #25

Merged
merged 5 commits into from
Apr 8, 2024
Merged

[IT-3471] Create cloudwatch metrics #25

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9a34492
[IT-3471] Create cloudwatch metrics
zaro0508 Apr 3, 2024
37dab7a
refactor out ConfigDocument to a file
zaro0508 Apr 4, 2024
0b27689
fix linter error
zaro0508 Apr 4, 2024
6796934
send app metrics to cloudwatch
zaro0508 Apr 4, 2024
6b392c6
fix linter error
zaro0508 Apr 4, 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
23 changes: 23 additions & 0 deletions config/EnhancedHealthRulesConfigDocument.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"Rules": {
"Environment": {
"Application": {
"ApplicationRequests4xx": {
"Enabled": false
},
"ApplicationRequests5xx": {
"Enabled": false
}
},
"ELB": {
"ELBRequests4xx": {
"Enabled": true
},
"ELBRequests5xx": {
"Enabled": true
}
}
}
},
"Version": 1
}
2 changes: 1 addition & 1 deletion config/agoradev/develop/agora.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ parameters:
AppHealthcheckUrl: '/about'
AutoScalingMaxSize: '4'
AutoScalingMinSize: '2'
EbHealthReportingSystem: 'enhanced'
EbDeploymentPolicy: 'RollingWithAdditionalBatch'
SnsBounceNotificationEndpoint: '[email protected]'
SnsNotificationEndpoint: '[email protected]'
Expand All @@ -24,3 +23,4 @@ parameters:
MongodbAccessSecurityGroup: !stack_output_external agora-docdb-develop::DocumentDbAccessSecurityGroup
VpcName: 'agoravpc'
CertificateArn: !stack_output_external agora-certificate::SSLCertificate
EnhancedHealthRulesConfigDocument: !file_contents config/EnhancedHealthRulesConfigDocument.json
2 changes: 1 addition & 1 deletion config/agoraprod/prod/agora.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ parameters:
AppHealthcheckUrl: '/about'
AutoScalingMaxSize: '6'
AutoScalingMinSize: '3'
EbHealthReportingSystem: 'enhanced'
EbDeploymentPolicy: 'RollingWithAdditionalBatch'
SnsBounceNotificationEndpoint: '[email protected]'
SnsNotificationEndpoint: '[email protected]'
Expand All @@ -24,3 +23,4 @@ parameters:
MongodbAccessSecurityGroup: !stack_output_external agora-docdb-prod::DocumentDbAccessSecurityGroup
VpcName: 'agoravpc-prod'
CertificateArn: !stack_output_external agora-certificate::SSLCertificate
EnhancedHealthRulesConfigDocument: !file_contents config/EnhancedHealthRulesConfigDocument.json
2 changes: 1 addition & 1 deletion config/agoraprod/staging/agora.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ parameters:
AppHealthcheckUrl: '/about'
AutoScalingMaxSize: '4'
AutoScalingMinSize: '2'
EbHealthReportingSystem: 'enhanced'
EbDeploymentPolicy: 'RollingWithAdditionalBatch'
SnsBounceNotificationEndpoint: '[email protected]'
SnsNotificationEndpoint: '[email protected]'
Expand All @@ -24,3 +23,4 @@ parameters:
MongodbAccessSecurityGroup: !stack_output_external agora-docdb-staging::DocumentDbAccessSecurityGroup
VpcName: 'agoravpc-staging'
CertificateArn: !stack_output_external agora-certificate::SSLCertificate
EnhancedHealthRulesConfigDocument: !file_contents config/EnhancedHealthRulesConfigDocument.json
15 changes: 7 additions & 8 deletions templates/beanstalk.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,6 @@ Parameters:
- true
- false
ConstraintDescription: 'Valid values are true or false'
EbHealthReportingSystem:
Type: String
Default: basic
AllowedValues:
- basic
- enhanced
ConstraintDescription: must be either basic or enhanced
SnsBounceNotificationEndpoint:
Type: String
Description: Email address for SNS bounce notifications
Expand Down Expand Up @@ -86,6 +79,9 @@ Parameters:
CertificateArn:
Description: ARN of the SSL Certificate
Type: String
EnhancedHealthRulesConfigDocument:
Description: Configuration enhanced health rules (https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/health-enhanced-rules.html#health-enhanced-rules.configdocument)
Type: String
Resources:
S3AppDeployBucket:
Type: 'AWS::S3::Bucket'
Expand Down Expand Up @@ -285,7 +281,10 @@ Resources:
Value: 'HTTP'
- Namespace: 'aws:elasticbeanstalk:healthreporting:system'
OptionName: SystemType
Value: !Ref EbHealthReportingSystem
Value: 'enhanced'
- Namespace: 'aws:elasticbeanstalk:healthreporting:system'
OptionName: ConfigDocument
Value: !Ref EnhancedHealthRulesConfigDocument
- Namespace: 'aws:elasticbeanstalk:hostmanager'
OptionName: LogPublicationControl
Value: 'true'
Expand Down
Loading